summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-16 15:35:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 15:31:49 +0000
commitf93f43cbb37c06608ffabcb9a5ce2244d7196e22 (patch)
tree7ec07321409121cc2b903f4fba458a8b0a7a27c8 /meta/conf
parent265f69a593cdf70e40bcbe6383b865dac3632f55 (diff)
downloadpoky-f93f43cbb37c06608ffabcb9a5ce2244d7196e22.tar.gz
bitbake.conf/sanity: Separate versions and PN stamp components into separate directories for WORKDIR and STAMP
This means some of the hacks we have to tell where the package name ends and the version starts in the directory layout becomes obsolete, simplifying the work of some of the cleanup scripts. It also makes the layout slightly more intuitive to the user. It does force a rebuild onto the user but it will reuse sstate successfully. (From OE-Core rev: 05075cf3138d1c61f5cf4fe0e1a4587acc00c692) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/conf/bitbake.conf6
2 files changed, 4 insertions, 4 deletions
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}"