From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.25.207.83 with SMTP id f80mr292419lfg.0.1504886192018; Fri, 08 Sep 2017 08:56:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.109.18 with SMTP id i18ls5150ljc.27.gmail; Fri, 08 Sep 2017 08:56:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDMCJVIToRBOH3t6kTw0/CahpxRshzx6t3x7ySbKscGYRUHGZnSpoTYQJVDYVmVHG6gSfiX X-Received: by 10.25.22.24 with SMTP id m24mr252984lfi.36.1504886191757; 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=z1TegDOU9ewkKKIm4rrELKwCpC62somNLJI2rsSG7Gs6vvqhGP+TruVDiSOdO/aA++ eaohfaRLmlbUepqHwz8SyPGAmV/8ghdCZabvwqE36O/2LELMw3dJtSHsptUOPb0P6r+k xj+LnSLJ2d3mlNW3sfr2Ps1CvlXd3WvBlwJVn7IaHRUc9nLKiM084tGzfUoTBo5m1/at 6+Z2bM8KmxTY85/F1ePIA6F3ASbLBWwAVxDipq6hwSJ81DnpC2I5sdP42iei8dX7yy2r aKhpbuPr698sjNRSu1Hsg42aKBMITWERT+8jObAmlwivM5bdEjF3X2CXl6hp0bzWJ690 J3dA== 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=YDetL1Pqqo6M59iSvRDbB2oEJEKR+YEuyn3wQxWTPe0=; b=BUJfe4+XqEVaG59IBzQMmKUQ7fjNV15rTna2j5GKZrsJXWCWTrTzOO+z2ZmagrpX95 RyTaTGjJxImhdNDMwNnREwg0RbpkP4usRr20I5k8xSHZIcnyUONLYoEFdsygAdPA86ah PPPXb4Qd7oPjKFINwp6sVaMuos53FEE1fbvYC2Nm0GWegyv7f/Qhv3qx5YJ58sdqx7NF XR8+XEHVzkOfXN07J8OI8n8SE5r9RroK2gSzk8shb4Alpt+/geDlRWmy7NYhHUoCmkrb iornQAbjtKTIDle8lQtQps+0u8arMl6C0wxygUaLt/gY7x1p4/1whv27zf+UwrCt+2Go q1Pw== 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 k18si190047wmd.1.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 v88FuCGP011354 (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 3/5] stamps: Name stamps canonicaly and unified Date: Fri, 8 Sep 2017 18:56:04 +0300 Message-Id: <20170908155606.7654-4-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: 3GlFIpMJsQDM Name task stamps canonically according to the build folders structure: ${DISTRO}-${DISTRO_ARCH} or ${DISTRO}-${MACHINE}. Signed-off-by: Alexander Smirnov --- meta-isar/recipes-core/images/isar-image-base.bb | 2 +- meta/classes/ext4-img.bbclass | 2 +- meta/classes/image.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index cde506e..2e33ca0 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -19,7 +19,7 @@ IMAGE_PREINSTALL += "apt \ WORKDIR_NAME = "${PN}" -do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" +do_rootfs[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_rootfs() { install -d -m 755 ${WORKDIR}/hooks_multistrap diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index f493037..9af781f 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -6,7 +6,7 @@ ROOTFS_EXTRA ?= "64" EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${MACHINE}-${DISTRO}.ext4.img" -do_ext4_image[stamp-extra-info] = "${MACHINE}-${DISTRO}" +do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" # Generate ext4 filesystem image do_ext4_image() { diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index dff2705..590725c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -10,7 +10,7 @@ IMAGE_ROOTFS = "${WORKDIR}/rootfs" inherit ${IMAGE_TYPE} -do_populate[stamp-extra-info] = "${MACHINE}-${DISTRO}" +do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}" # Install Debian packages, that were built from sources do_populate() { -- 2.1.4