summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-07-28 18:09:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-01 13:16:55 (GMT)
commit43d3061b17395157d643a3958603ca5d006b3b7a (patch)
treec363e437d3e479b28ec70df135ca42b6f03c003f
parent7dc2732b28b16c9cfcc35136ce9110567cc3b67a (diff)
downloadpoky-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.bb8
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"
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 15SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
16PV = "0.0-git${SRCPV}" 16PV = "0.0-git${SRCPV}"
17PR = "r11" 17PR = "r12"
18 18
19SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ 19SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
20 file://no-doc.patch \ 20 file://no-doc.patch \
@@ -111,9 +111,9 @@ do_archgen () {
111 shift ; continue;; 111 shift ; continue;;
112 esac 112 esac
113 if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then 113 if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
114 ARCH="_$1" 114 CARCH="_$1"
115 else 115 else
116 ARCH="IdString(\"$1\")" 116 CARCH="IdString(\"$1\")"
117 fi 117 fi
118 shift 118 shift
119 COMPAT="" 119 COMPAT=""
@@ -129,7 +129,7 @@ do_archgen () {
129 COMPAT="${arch_val},$COMPAT" 129 COMPAT="${arch_val},$COMPAT"
130 fi 130 fi
131 done 131 done
132 COMPAT_WITH="${ARCH},${COMPAT} $COMPAT_WITH" 132 COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
133 done 133 done
134 for each_compat in ${COMPAT_WITH} ; do 134 for each_compat in ${COMPAT_WITH} ; do
135 echo " defCompatibleWith( ${each_compat} );" >> zypp/poky-arch.h 135 echo " defCompatibleWith( ${each_compat} );" >> zypp/poky-arch.h