From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041912760086560768 X-Received: by 2002:a5d:64eb:: with SMTP id g11mr4500402wri.438.1639573080885; Wed, 15 Dec 2021 04:58:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1c7:: with SMTP id 190ls2599559wmb.3.canary-gmail; Wed, 15 Dec 2021 04:57:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsaEZNlfKNwPoCM83piHjZuJW+P+tJY7LQn+wjiZ5ZNM81g05yE641GwlfipzsABvRgoWU X-Received: by 2002:a7b:c1c9:: with SMTP id a9mr4406484wmj.152.1639573079854; Wed, 15 Dec 2021 04:57:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639573079; cv=none; d=google.com; s=arc-20160816; b=geA3irH7totqEgw3kg7ZNuWB7iBziWT3zqZq9briOpfm9YKHZIlROCYiP+fLHEFTBU saSJNsa3rN6a+1v1xnc5hg7a2Ird9aO4h7UwjVrUR0cLCS35oh7O/I5gS1sYpoZ7U1c8 xXDo0H3wdCEtLyG2/WyB9FWIw89VmgDzQ1XinW4RD+0tsNMpb96GNRYSxDzIknbkD0ym WDRxcStluETo0GKrSwzFdoSb6MNbB29IdneoUWe63OltR2h6YfGnmzbwIZkpPAb9zRhR +9QcdeLuMGyrR2tSjDWt24iFeftvzzfGxc60I5vHFgUW71R+mVP7JbYMrnMslfORnZGu D1TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=sON66BorAMmdWe+7F0wMb8xUEeGEsOeMAfCnnf13Wow=; b=IlgfvcMxG2xlGAf3Za6gkPo4g6yHfivFwAAX7rQzqjSnyrBGZ50EeGTfhSNY5TgcS/ smdmnuWlCbcxnHdKhZr3szIH8M8zlWgY5EULiuQ26lJ1UxBAsoCgLa+AuPP4/4C4e5nv mYiu1vA/k1tkrQGGUL63YJk0m/GFoXjoy1iwIHND/Ph29mxVvlpkLTQqhrgFLBqoN7yj V/B5mIhos0L9BNRojoZFZudlUfECMMKEwzFEjTy0rJ7X7ua1GBTzv0vF42Ig4v99lr0v 0KS4X9Dkh8QRBpjHcZ4k9vv2JeLeglITb/vHkJ0Pzs9JQJmv9z1G7UfeYCsxPESXGWh2 tLkA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o29si129436wms.1.2021.12.15.04.57.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Dec 2021 04:57:59 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-214-81-214-37.mgts.dynamic.pppoe.byfly.by [37.214.81.214] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1BFCvwE9008243 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Dec 2021 13:57:59 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] sstate: Make image cache imagetype-specific Date: Wed, 15 Dec 2021 15:57:48 +0300 Message-Id: <20211215125748.299859-1-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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: dKBNKIQHU7EN Building of isar-image-base for targets qemuamd64-buster-tgz and qemuamd64-buster-cpiogz with one bitbake call fails with: ERROR: mc:qemuamd64-buster-tgz:isar-image-base-1.0-r0 do_rootfs: Package already staged This is caused by sstate cache conflict for those two packages. We need to add image type to sstate manifest data to fix the issue. Signed-off-by: Anton Mikanovich --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d757256d..50ae03e6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -9,7 +9,7 @@ STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX} STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/*-*" # Sstate also needs to be machine-specific -SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}" +SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}-${IMAGE_SUFFIX}" IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4-img"}" -- 2.20.1