From d7ce7d67994f02367750d03e9e97ebdf89cd7a33 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 10 Aug 2023 17:26:28 +0100 Subject: [PATCH] bitbake.conf: Drop PE and PR from WORKDIR and STAMP Once, we relied upon stamps changing to rebuild. PE and PR are packaging variables and are reflected in the taskhashes when/where they're used so they do not need to be in STAMP. Similarly, once, multiple versions were something which was useful in WORKDIR but this is really just noise causing long pathnames now. Drop PR and PE from these variables to clean up the paths a bit. This may break some tool assumptions about paths but those are probably things we need to fix. (From OE-Core rev: cc83e45484656a6b577ff84817131735023daad4) Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 475d6523bb..599bbc4ba8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -402,10 +402,10 @@ PERSISTENT_DIR = "${TOPDIR}/cache" LOG_DIR = "${TMPDIR}/log" STAMPS_DIR ?= "${TMPDIR}/stamps" -STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" +STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" BASE_WORKDIR ?= "${TMPDIR}/work" -WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" +WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image" S = "${WORKDIR}/${BP}"