summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-08 16:49:57 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-08 16:49:57 +0000
commitfb439d9bc05a1cbe9f5752d7f52494e6c8de8efb (patch)
treec711d38899778937c30f11c87498f43447e6acbd /meta
parent3dc1ade034ee427f87a8b6691ed3492e2a2f72e4 (diff)
downloadpoky-fb439d9bc05a1cbe9f5752d7f52494e6c8de8efb.tar.gz
package_ipk/rootfs_ipk.bbclass: Update image from feed handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5465 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_ipk.bbclass16
-rw-r--r--meta/classes/rootfs_ipk.bbclass25
2 files changed, 25 insertions, 16 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index b4308d55a6..d99150ec56 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -94,15 +94,11 @@ package_update_index_ipk () {
94# use against the host system in sdk builds 94# use against the host system in sdk builds
95# 95#
96package_generate_ipkg_conf () { 96package_generate_ipkg_conf () {
97 mkdir -p ${STAGING_ETCDIR_NATIVE}/ 97 package_generate_archlist
98 echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_TARGET} 98 echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_TARGET}
99 echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_SDK} 99 echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_SDK}
100 ipkgarchs="${PACKAGE_ARCHS}" 100 ipkgarchs="${PACKAGE_ARCHS}"
101 priority=1
102 for arch in $ipkgarchs; do 101 for arch in $ipkgarchs; do
103 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
104 echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
105 priority=$(expr $priority + 5)
106 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then 102 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
107 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} 103 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
108 fi 104 fi
@@ -112,6 +108,16 @@ package_generate_ipkg_conf () {
112 done 108 done
113} 109}
114 110
111package_generate_archlist () {
112 ipkgarchs="${PACKAGE_ARCHS}"
113 priority=1
114 for arch in $ipkgarchs; do
115 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
116 echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
117 priority=$(expr $priority + 5)
118 done
119}
120
115python do_package_ipk () { 121python do_package_ipk () {
116 import sys, re, copy 122 import sys, re, copy
117 123
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 6cf38d80be..08f03cd66d 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -20,6 +20,9 @@ OPKG_POSTPROCESS_COMMANDS = "ipk_insert_feed_uris"
20fakeroot rootfs_ipk_do_rootfs () { 20fakeroot rootfs_ipk_do_rootfs () {
21 set -x 21 set -x
22 22
23 rm ${IPKGCONF_TARGET}
24 touch ${IPKGCONF_TARGET}
25
23 ${OPKG_PREPROCESS_COMMANDS} 26 ${OPKG_PREPROCESS_COMMANDS}
24 27
25 mkdir -p ${T}/ 28 mkdir -p ${T}/
@@ -119,19 +122,19 @@ install_all_locales() {
119 122
120ipk_insert_feed_uris () { 123ipk_insert_feed_uris () {
121 124
122 echo "Building from feeds activated!" 125 echo "Building from feeds activated!"
123 126
124 for line in ${IPK_FEED_URIS} 127 for line in ${IPK_FEED_URIS}
125 do 128 do
126 # strip leading and trailing spaces/tabs, then split into name and uri 129 # strip leading and trailing spaces/tabs, then split into name and uri
127 line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" 130 line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
128 feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" 131 feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
129 feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" 132 feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
130 133
131 echo "Added $feed_name feed with URL $feed_uri" 134 echo "Added $feed_name feed with URL $feed_uri"
132 135
133 # insert new feed-sources 136 # insert new feed-sources
134 echo "src/gz $feed_name $feed_uri" >> ${IPKGCONF_TARGET} 137 echo "src/gz $feed_name $feed_uri" >> ${IPKGCONF_TARGET}
135 done 138 done
136} 139}
137 140
@@ -143,7 +146,7 @@ python () {
143 flags = flags.replace("do_deploy", "") 146 flags = flags.replace("do_deploy", "")
144 flags = flags.replace("do_populate_staging", "") 147 flags = flags.replace("do_populate_staging", "")
145 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d) 148 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d)
146 bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_ipkg_conf\nipk_insert_feed_uris", d) 149 bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_archlist\nipk_insert_feed_uris", d)
147 bb.data.setVar('OPKG_POSTPROCESS_COMMANDS', '', d) 150 bb.data.setVar('OPKG_POSTPROCESS_COMMANDS', '', d)
148} 151}
149 152