From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.25.229.18 with SMTP id c18mr283192lfh.1.1504886192116; Fri, 08 Sep 2017 08:56:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.178.75 with SMTP id b72ls89874wmf.27.canary-gmail; Fri, 08 Sep 2017 08:56:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBCqm/o90MUMLAsf8CAF+94audO+/O/EpX1QFiPeO+rER6dO5URel/dxEZvjqUtx6LduAJB X-Received: by 10.28.4.84 with SMTP id 81mr221689wme.28.1504886191771; Fri, 08 Sep 2017 08:56:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504886191; cv=none; d=google.com; s=arc-20160816; b=zFaM6OVPgHpvE5QHMgH2sFxwqTie6o4EFczL0PFE/ICBDpsNOluTMfWPAIxC/sK4Wn Nr6+K/Zn5hxAHWGbKPMcnBDkys5mj3Jaz+jK4mrK7jz0Fbdo9u1ECFXwIcWNdoPEpVi/ kvGYzJdG2LWOlCJxsUrGLCutDBgg4lWf6KMRZSFWQsNtz6UjEPHmAmOGd4c/bk02NeiV +XSVELltdK0PNRfG91htAd/EdqfqaErRA4WELAjjzvkwWSyjMGM4ChmA6SgSTSVyYTj+ HaLqbZ9b+rF/2yzO09QAayd+FSPVJL4/eq7DzrW8rZGD5q9iDP4wxj+ztcBLJPyXaJaz uSXw== 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=sbvqxhGh15j0GyRfxNx2vcKxPznHtVg71Fn36H2Ek8Rz18gd6kgqW5OFmVZIXe+KZH KNLPtP3HKiOl1w+MD/wXO1p05PyDspsbKveNVV8ozSi0EBTJCocdf/zteTLyeHKKQ+0G qexk0ChA2OksQt0+oDAO8wIglkjK1bjw7KHovi/QfeMykvtciOadPTiwAtMM2PTz5DBx jZxumIWOOw2jxAm8P9pcwD40tPN01gd2u8GtRpvBFuFYwFID3Y++G9srdU8zI3FhCAur pZrHC44UMii6NFcVvKE1u/IQ3Bp5XVHodg03oq6vbAT2HsDgJ0P4XInt289SNaDc2K2B Wlkg== 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 r8si216924wma.4.2017.09.08.08.56.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 08:56:31 -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 v88FuCGQ011354 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Sep 2017 17:56:20 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v2 4/5] image: Name image canonicaly and unified Date: Fri, 8 Sep 2017 18:56:05 +0300 Message-Id: <20170908155606.7654-5-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170908155606.7654-1-asmirnov@ilbers.de> References: <20170908155606.7654-1-asmirnov@ilbers.de> X-TUID: KK0ifZlxOmWI 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