diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-21 14:18:05 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-21 14:18:07 +0100 |
| commit | d7fbc70b6c6ac629d2a23ac16ab45461f88b4b26 (patch) | |
| tree | 7a35aee632c97e23f60b45d2fd648a0983b15225 | |
| parent | 069992a502658e8e44b870601e2e189cd9596ec9 (diff) | |
| download | openembedded-core-d7fbc70b6c6ac629d2a23ac16ab45461f88b4b26.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 2 |
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" HGDIR = "${CO_DIR}/hg" STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-${EXTENDPE}${PV}-${PR}" -STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-*-*" +STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-[0-9]*-*" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" T = "${WORKDIR}/temp" D = "${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}" do_fetch[stamp-base] = "${SS}" do_unpack[stamp-base] = "${SS}" do_patch[stamp-base] = "${SS}" -SSCLEAN = "${TMPDIR}/stamps/work-shared/gcc-*-*" +SSCLEAN = "${TMPDIR}/stamps/work-shared/gcc-[0-9]*-*" do_fetch[stamp-base-clean] = "${SSCLEAN}" do_unpack[stamp-base-clean] = "${SSCLEAN}" do_patch[stamp-base-clean] = "${SSCLEAN}" |