summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/conf/bitbake.conf6
3 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 3806bc5ce7..5b4f070ec4 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -605,6 +605,8 @@ def check_sanity(sanity_data):
605 f.write(current_abi) 605 f.write(current_abi)
606 elif abi == "7" and current_abi == "8": 606 elif abi == "7" and current_abi == "8":
607 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" 607 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"
608 elif (abi != current_abi and current_abi == "9"):
609 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"
608 elif (abi != current_abi): 610 elif (abi != current_abi):
609 # Code to convert from one ABI to another could go here if possible. 611 # Code to convert from one ABI to another could go here if possible.
610 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) 612 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 83b668a2a2..e8cf9a3127 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
4# that breaks the format and have been previously discussed on the mailing list 4# that breaks the format and have been previously discussed on the mailing list
5# with general agreement from the core team. 5# with general agreement from the core team.
6# 6#
7OELAYOUT_ABI = "8" 7OELAYOUT_ABI = "9"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index cf779a4f3d..450a0ee1e9 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -337,9 +337,9 @@ GITDIR = "${CO_DIR}/git2"
337BZRDIR = "${CO_DIR}/bzr" 337BZRDIR = "${CO_DIR}/bzr"
338HGDIR = "${CO_DIR}/hg" 338HGDIR = "${CO_DIR}/hg"
339 339
340STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-${EXTENDPE}${PV}-${PR}" 340STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
341STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-[0-9]*-*" 341STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
342WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" 342WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
343T = "${WORKDIR}/temp" 343T = "${WORKDIR}/temp"
344D = "${WORKDIR}/image" 344D = "${WORKDIR}/image"
345S = "${WORKDIR}/${BP}" 345S = "${WORKDIR}/${BP}"