summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_ipk.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-08-01 12:11:22 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-02 14:32:11 +0100
commitf9da3c269fd7c8260e3457f7f77b22ef659d3752 (patch)
tree53288a5bbee92d57af64b000b4009d80f77840c0 /meta/classes/package_ipk.bbclass
parent0d5dfb29c359eb778182660e852a6aca273f8179 (diff)
downloadpoky-f9da3c269fd7c8260e3457f7f77b22ef659d3752.tar.gz
bitbake.conf: Add SDK_PACKAGE_ARCHS
Add SDK_PACKAGE_ARCHS to avoid the sed operations we were previously doing inside of the variouns populate_sdk functions and related items. Also add documentation to populate_sdk to explain when the various functions are expected to be doing. Finally fix a bug in populate_sdk_rpm where the wrong value was being set, noticed while working on this change. (From OE-Core rev: 587c1d5bac71fa6faa65ee3a271391cbf931e8f7) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r--meta/classes/package_ipk.bbclass37
1 files changed, 17 insertions, 20 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 16574e98b4..3768889e1a 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -161,7 +161,7 @@ ipk_log_check() {
161package_update_index_ipk () { 161package_update_index_ipk () {
162 set -x 162 set -x
163 163
164 ipkgarchs="${PACKAGE_ARCHS}" 164 ipkgarchs="${PACKAGE_ARCHS} ${SDK_PACKAGE_ARCHS}"
165 165
166 if [ ! -z "${DEPLOY_KEEP_PACKAGES}" ]; then 166 if [ ! -z "${DEPLOY_KEEP_PACKAGES}" ]; then
167 return 167 return
@@ -169,8 +169,7 @@ package_update_index_ipk () {
169 169
170 packagedirs="${DEPLOY_DIR_IPK}" 170 packagedirs="${DEPLOY_DIR_IPK}"
171 for arch in $ipkgarchs; do 171 for arch in $ipkgarchs; do
172 sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'` 172 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch"
173 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk"
174 done 173 done
175 174
176 multilib_archs="${MULTILIB_ARCHS}" 175 multilib_archs="${MULTILIB_ARCHS}"
@@ -193,21 +192,20 @@ package_update_index_ipk () {
193# 192#
194package_generate_ipkg_conf () { 193package_generate_ipkg_conf () {
195 package_generate_archlist 194 package_generate_archlist
196 echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_TARGET}
197 echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_SDK} 195 echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_SDK}
196 ipkgarchs="${SDK_PACKAGE_ARCHS}"
197 for arch in $ipkgarchs; do
198 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
199 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK}
200 fi
201 done
202
203 echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_TARGET}
198 ipkgarchs="${PACKAGE_ARCHS}" 204 ipkgarchs="${PACKAGE_ARCHS}"
199 for arch in $ipkgarchs; do 205 for arch in $ipkgarchs; do
200 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then 206 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
201 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} 207 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
202 fi 208 fi
203 sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
204 extension=-nativesdk
205 if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
206 extension=""
207 fi
208 if [ -e ${DEPLOY_DIR_IPK}/$sdkarch$extension/Packages ] ; then
209 echo "src oe-$sdkarch$extension file:${DEPLOY_DIR_IPK}/$sdkarch$extension" >> ${IPKGCONF_SDK}
210 fi
211 done 209 done
212 210
213 multilib_archs="${MULTILIB_ARCHS}" 211 multilib_archs="${MULTILIB_ARCHS}"
@@ -219,16 +217,17 @@ package_generate_ipkg_conf () {
219} 217}
220 218
221package_generate_archlist () { 219package_generate_archlist () {
220 ipkgarchs="${SDK_PACKAGE_ARCHS}"
221 priority=1
222 for arch in $ipkgarchs; do
223 echo "arch $arch $priority" >> ${IPKGCONF_SDK}
224 priority=$(expr $priority + 5)
225 done
226
222 ipkgarchs="${PACKAGE_ARCHS}" 227 ipkgarchs="${PACKAGE_ARCHS}"
223 priority=1 228 priority=1
224 for arch in $ipkgarchs; do 229 for arch in $ipkgarchs; do
225 sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
226 echo "arch $arch $priority" >> ${IPKGCONF_TARGET} 230 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
227 extension=-nativesdk
228 if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
229 extension=""
230 fi
231 echo "arch $sdkarch$extension $priority" >> ${IPKGCONF_SDK}
232 priority=$(expr $priority + 5) 231 priority=$(expr $priority + 5)
233 done 232 done
234 233
@@ -237,8 +236,6 @@ package_generate_archlist () {
237 echo "arch $arch $priority" >> ${IPKGCONF_TARGET} 236 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
238 priority=$(expr $priority + 5) 237 priority=$(expr $priority + 5)
239 done 238 done
240
241
242} 239}
243 240
244python do_package_ipk () { 241python do_package_ipk () {