diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-07-28 13:09:50 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-01 14:16:55 +0100 |
| commit | 43d3061b17395157d643a3958603ca5d006b3b7a (patch) | |
| tree | c363e437d3e479b28ec70df135ca42b6f03c003f | |
| parent | 7dc2732b28b16c9cfcc35136ce9110567cc3b67a (diff) | |
| download | ast2050-yocto-poky-43d3061b17395157d643a3958603ca5d006b3b7a.zip ast2050-yocto-poky-43d3061b17395157d643a3958603ca5d006b3b7a.tar.gz | |
libzypp: Fix variable substitution problem in do_archgen step
The do_archgen step creates a script that utilizes the variable name
${ARCH}. However, we also utilize and define ${ARCH} so instead of
having the following in the script:
COMPAT_WITH="${ARCH},${COMPAT} $COMPAT_WITH"
We get something like:
COMPAT_WITH="powerpc,${COMPAT} $COMPAT_WITH"
Just renaming the variable in the script to not conflict with ${ARCH}
fixes the issue.
[PR bump from Saul Wold]
(From OE-Core rev: 09573a276456122b408c5bcebc537455fd1c5f29)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 6555bd4..6e8fe16 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb @@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver" S = "${WORKDIR}/git" SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" PV = "0.0-git${SRCPV}" -PR = "r11" +PR = "r12" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \ @@ -111,9 +111,9 @@ do_archgen () { shift ; continue;; esac if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then - ARCH="_$1" + CARCH="_$1" else - ARCH="IdString(\"$1\")" + CARCH="IdString(\"$1\")" fi shift COMPAT="" @@ -129,7 +129,7 @@ do_archgen () { COMPAT="${arch_val},$COMPAT" fi done - COMPAT_WITH="${ARCH},${COMPAT} $COMPAT_WITH" + COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH" done for each_compat in ${COMPAT_WITH} ; do echo " defCompatibleWith( ${each_compat} );" >> zypp/poky-arch.h |
