From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.223.142.172 with SMTP id q41mr676652wrb.25.1505158081903; Mon, 11 Sep 2017 12:28:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.74.73 with SMTP id x70ls1185467wma.1.canary-gmail; Mon, 11 Sep 2017 12:28:01 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDKupzHyXEtovVhUHNJEPNJ8NGM4zf2CMcs1kMXVShuXN/V6WKR6Xux5+QjPCdn7YT/IpB2 X-Received: by 10.28.9.12 with SMTP id 12mr902058wmj.7.1505158081516; Mon, 11 Sep 2017 12:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505158081; cv=none; d=google.com; s=arc-20160816; b=PH+H9fflE3cfw8a/IrvMOptkgqbQPMIvr2FrKGgu8QMaqqtgDfG4tNW7mlm6TdOUg4 t9mSZCEb/DW55RhG2+uqptOFoXwmZMw4l1Gspehb799exzXMDIksmJe4EmmrnsXNzpNn dElb0/7MiNi9uQuuK5Hu3/k28j/8lno8wgrdb5LpAw9ARBa7G4xiooZOu98RNKcggIXm MLeQ1rBwFOxcvOm+31ilFReZlhgfj8jA3FaSON+UyqlV9uSV00SKpws4spy+0gc7lgyd 7NaIw8LsAv+iUk/1k92DNMzeq/z+JB0SdWsSTehoppXMVhsikmg3SszM+84WuLIedLBx PRfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=i4VfkBo6k9YQBkubwtWp+4L0HI/5TmEyWQdjZTDKCdI=; b=aVo/AQVeY10+KaCUtaNVr3f66NKrHpheNA2ymiUqiQxIqeMu6kjetCHHq9yKmIsNxD xxoQnaqeWxJQX7XdqurS0dT2nZ7mJaHcY9nXQyEnpXAkM8ERrNZ/YUiKnbwjEqPaOmlu XGfHuH90o1SViptT21gqg+QVG6rZRU/5L+fXkDBqDPRx50u6FFs1tLkS0xbLVigiz6O5 VLhCYjxvR7CbSM5b35XVFVU9EG9C0wSORidVBtFBa1wcutWxEHNrRLa0qKB/VVPgm/FP iLVMYLYQCM6Cq3GuOY1hTmcRnaVfBJwrPcNXZiKFATQNIKZDXN5O7evp+kEjAJRe9/UG 47Hg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id e135si559823wmg.6.2017.09.11.12.28.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 12:28:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v8BJRjMQ000908 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Sep 2017 21:27:53 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v3 4/5] image: Name image canonicaly and unified Date: Mon, 11 Sep 2017 22:27:37 +0300 Message-Id: <20170911192738.1323-5-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170911192738.1323-1-asmirnov@ilbers.de> References: <20170911192738.1323-1-asmirnov@ilbers.de> X-TUID: JJgopnEA22Em Name images according to the build folders structure: ${DISTRO}-${MACHINE}. Now all the build artifacts have the same unified names. Signed-off-by: Alexander Smirnov --- meta/classes/ext4-img.bbclass | 2 +- scripts/start_vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 9af781f..3e3768b 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -4,7 +4,7 @@ # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" -EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${MACHINE}-${DISTRO}.ext4.img" +EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.ext4.img" do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" diff --git a/scripts/start_vm b/scripts/start_vm index 32d4864..1ce84b7 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -109,7 +109,7 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF |bb2sh)" readonly CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf eval "$(egrep '(KERNEL|INITRD)_IMAGE|ROOTFS_DEV|QEMU_' $CONFIG_CONF |bb2sh)" -readonly ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO.ext4.img +readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img QCPU= [ -n "$QEMU_CPU" ] && QCPU="-cpu $QEMU_CPU" -- 2.1.4