From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 93-97-173-237.zone5.bethere.co.uk ([93.97.173.237] helo=tim.rpsys.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TF4L3-0003DL-R4 for openembedded-core@lists.openembedded.org; Fri, 21 Sep 2012 16:36:18 +0200 Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q8LENYLR026227 for ; Fri, 21 Sep 2012 15:23:34 +0100 Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 26012-03 for ; Fri, 21 Sep 2012 15:23:30 +0100 (BST) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q8LENPOt026221 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO) for ; Fri, 21 Sep 2012 15:23:26 +0100 Message-ID: <1348237405.10108.81.camel@ted> From: Richard Purdie To: openembedded-core Date: Fri, 21 Sep 2012 15:23:25 +0100 X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 X-Virus-Scanned: amavisd-new at rpsys.net Subject: [RFC PATCH] bitbake.conf/sanity: Separate versions and PN stamp components into separate directories X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2012 14:36:18 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Signed-off-by: Richard Purdie --- I haven't made my mind up about this layout change idea yet. I thought I'd put it out there for feedback. It would make the STAMPCLEAN function more accurate/easier. I'll follow this email with the WORKDIR counterpart we could consider which would make some of the cleanup scripts easier. diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 385d733..1b7125d 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -540,6 +540,8 @@ def check_sanity(sanity_data): f.write(current_abi) elif abi == "7" and current_abi == "8": messages = messages + "Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n" + elif (abi != current_abi and current_abi == "9"): + messages = messages + "The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n" elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. messages = messages + "Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi) diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index 83b668a..e8cf9a3 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "8" +OELAYOUT_ABI = "9" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9b41749..4b6fdb7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -332,8 +332,8 @@ GITDIR = "${CO_DIR}/git2" BZRDIR = "${CO_DIR}/bzr" HGDIR = "${CO_DIR}/hg" -STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-${EXTENDPE}${PV}-${PR}" -STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-[0-9]*-*" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" +STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/*-*" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image"