From f3da837ad2c1e3a5bab6528da0505bd356e578b5 Mon Sep 17 00:00:00 2001 From: Michal Sieron Date: Fri, 11 Jul 2025 18:38:49 +0200 Subject: bitbake.conf: Remove PR glob part from STAMPCLEAN Since OE-Core rev: cc83e45484656a6b577ff84817131735023daad4 the STAMP value and STAMPCLEAN glob have been mismatched. The issue is present since the PR part was removed from the STAMP variable in that comit. An example use case that I found was broken due to this: 1. Have recipes foo_A.bb and foo_B.bb 2. Build foo-native with PREFERRED_VERSION_foo-native = "A" 3. ${COMPONENTS_DIR}/x86_64-linux/foo-native has version A 4. Build foo-native with PREFERRED_VERSION_foo-native = "B" 5. ${COMPONENTS_DIR}/x86_64-linux/foo-native has version B 6. Build foo-native with PREFERRED_VERSION_foo-native = "A" 7. ${COMPONENTS_DIR}/x86_64-linux/foo-native still has version B In my case the PREFERRED_VERSION comes from different machines. The issue showed itself when a bar-native compiled against foo-native version A was pulled from sstate-cache and foo-native in version B was kept in ${COMPONENTS_DIR} after previous build for a different machine. The two variables should be in sync and this patch corrects that. [RP: Tweak commit message] (From OE-Core rev: 932be19f48735d72a72de2771911119433956f4f) Signed-off-by: Michal Sieron Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index bd186ffeec..b02459c18f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -404,7 +404,7 @@ LOG_DIR = "${TMPDIR}/log" STAMPS_DIR ?= "${TMPDIR}/stamps" STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" -STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" +STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*" BASE_WORKDIR ?= "${TMPDIR}/work" WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" UNPACKDIR ??= "${WORKDIR}/sources" -- cgit v1.2.3-54-g00ecf