From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669498841705742336 X-Received: by 2002:a1c:7518:: with SMTP id o24mr366396wmc.14.1552863708183; Sun, 17 Mar 2019 16:01:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:55c5:: with SMTP id j188ls1798325wmb.13.canary-gmail; Sun, 17 Mar 2019 16:01:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwTVhTuGAZz+5dcASrCZmfyhKilf+dYpYSeA3btf5whODFb1r/M3PgAXAot0g8A/mx1sW9U X-Received: by 2002:a1c:761a:: with SMTP id r26mr872777wmc.1.1552863707785; Sun, 17 Mar 2019 16:01:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552863707; cv=none; d=google.com; s=arc-20160816; b=x1hSKuiowJUm00Mx7CaGjHW3y1ZGzrnueSw9xaszS2QHdT91RwGGW0UYPErK7NuePs 4pnrf3iO3WfHfBsTU9Y3dsHpMVbuE5OkyiZeD8GveVXUZp0WEIcbPB2m4dQUfm9icFD9 sf/etD9JzmP6bYoSWF8dH36xor9YuD5mVBETx6B4LGe4qk3tlb3gjzvwHIyZSfGA3d0B DoVhaySFxlUzJuFGPmoWPkTfhmhxc4V7GyVSI+B4YJMy1OcKlqNgi8fyEONTd/Gp7reS SmuY3Oh3V/hSPFBsL4YOZ4Dv9c9L9qghz0gxox7TdPmFcOwfHp0yEL0pxbGkQAnW6VgX LSew== 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:to:from; bh=pSiO9Yrz9Gym05nsaLZvUSCU8EBrWQ7HSE2QlAJZIjE=; b=X0Y+01LZXlVVEzILB1emnV+wXEpOT06/rUsO+vdkMUK6L87jKq6YIyw9lvW3M1lfxJ BORQD2X8AWQOMogExWnAmLy05hT2kFkqw/Fmv0uwBSDuSiujGrcBp3XyfGr+u50dl5zk /jRDTZGHE9W+RLsYfzVU4RYAZJQj3aln8V3VagRUB35DtaPQOqiIXZxqDjx+6v+HBisp 8E+0qwOg5XAamt6U3Jy0p8V7cWPWV5MbabdVWhmxRk9EE9jM115pPjyLDe8X65hGsJ6q S/kQzIzHujQI5sJvy8/Awf2Wv2S404b2gxPzaz+LaUHixLDMgLr2f/BImRH0T4jE59ea YWyA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g10si408949wmk.1.2019.03.17.16.01.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Mar 2019 16:01:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x2HN1Uxl008559 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 18 Mar 2019 00:01:47 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 1/2] classes/image: Unify and add missing extra stamps Date: Mon, 18 Mar 2019 00:01:28 +0100 Message-Id: <20190317230129.17048-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190317230129.17048-1-mosipov@ilbers.de> References: <20190317230129.17048-1-mosipov@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 0Ge+bzhXoWO9 Signed-off-by: Maxim Yu. Osipov --- meta/classes/image.bbclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index a60441c..bebac6b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -97,7 +97,10 @@ python set_image_size () { d.setVarFlag('ROOTFS_SIZE', 'export', '1') } -do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" +do_fetch[stamp-extra-info] = "${DISTRO}-${MACHINE}" +do_unpack[stamp-extra-info] = "${DISTRO}-${MACHINE}" + +do_rootfs[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_rootfs[depends] = "isar-apt:do_cache_config isar-bootstrap-target:do_bootstrap" do_rootfs() { @@ -114,6 +117,8 @@ do_mark_rootfs() { "${IMAGE_ROOTFS}" } +do_mark_rootfs[stamp-extra-info] = "${DISTRO}-${MACHINE}" + addtask mark_rootfs before do_copy_boot_files do_transform_template after do_rootfs do_copy_boot_files() { @@ -171,7 +176,7 @@ do_populate_sdk() { ln -Tfsr ${SDKCHROOT_DIR}/rootfs ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH} } -do_populate_sdk[stamp-extra-info] = "${MACHINE}-${DISTRO}" +do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" addtask populate_sdk after do_rootfs @@ -180,7 +185,7 @@ inherit base-apt-helper do_cache_base_repo[depends] = "base-apt:do_cache_config" do_cache_base_repo[lockfiles] = "${REPO_BASE_DIR}/isar.lock" -do_cache_base_repo[stamp-extra-info] = "${MACHINE}-${DISTRO}" +do_cache_base_repo[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_cache_base_repo() { if [ -d ${WORKDIR}/apt_cache ]; then -- 2.11.0