From 43d3061b17395157d643a3958603ca5d006b3b7a Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 28 Jul 2011 13:09:50 -0500 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-extended/libzypp/libzypp_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 6555bd4044..6e8fe16a15 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 -- cgit v1.2.3-54-g00ecf