summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 14:18:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 14:20:18 +0100
commit3c101af5e33b21f53171c66de0c2c3e797d95247 (patch)
treee870542ab945a89f1cb3bbdcf87785df7f038420 /meta
parent30b7781650e3ff092d04889beab2e87eaff29cdb (diff)
downloadpoky-3c101af5e33b21f53171c66de0c2c3e797d95247.tar.gz
bitbake.conf/gcc-common.inc: Fix STAMPCLEAN expression
The globs used for STAMPCLEAN were too greedy matching gcc-cross-initial stamps for gcc-cross for example. This patch resolves that problem making the assumption that PV starts with something numeric. This assumption should hold in most cases and has a better failure case that the current situation. (From OE-Core rev: d7fbc70b6c6ac629d2a23ac16ab45461f88b4b26) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b3d3f52609..9b41749e2d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -333,7 +333,7 @@ BZRDIR = "${CO_DIR}/bzr"
333HGDIR = "${CO_DIR}/hg" 333HGDIR = "${CO_DIR}/hg"
334 334
335STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-${EXTENDPE}${PV}-${PR}" 335STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-${EXTENDPE}${PV}-${PR}"
336STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-*-*" 336STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-[0-9]*-*"
337WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" 337WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
338T = "${WORKDIR}/temp" 338T = "${WORKDIR}/temp"
339D = "${WORKDIR}/image" 339D = "${WORKDIR}/image"
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 4ef2a1b8a0..f0ddfd8b2b 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -63,7 +63,7 @@ SS = "${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}"
63do_fetch[stamp-base] = "${SS}" 63do_fetch[stamp-base] = "${SS}"
64do_unpack[stamp-base] = "${SS}" 64do_unpack[stamp-base] = "${SS}"
65do_patch[stamp-base] = "${SS}" 65do_patch[stamp-base] = "${SS}"
66SSCLEAN = "${TMPDIR}/stamps/work-shared/gcc-*-*" 66SSCLEAN = "${TMPDIR}/stamps/work-shared/gcc-[0-9]*-*"
67do_fetch[stamp-base-clean] = "${SSCLEAN}" 67do_fetch[stamp-base-clean] = "${SSCLEAN}"
68do_unpack[stamp-base-clean] = "${SSCLEAN}" 68do_unpack[stamp-base-clean] = "${SSCLEAN}"
69do_patch[stamp-base-clean] = "${SSCLEAN}" 69do_patch[stamp-base-clean] = "${SSCLEAN}"