diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-01-11 11:34:07 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-01-11 11:34:07 +0000 |
| commit | 026b90c609cd593aff6c38273539e4b8802150c5 (patch) | |
| tree | e37b7da04a19d1547bf8207d31344c6570ee5db3 /packages/images/opie-image-16mb.bb | |
| parent | 7e8411a730dbfa42b70ac583e14f64bd0465f2a3 (diff) | |
opie-image*: Remove merge-feeds workaround for opie-aqpkg.
* Bad in itself, it's not going to work for user-created feeds, packaged
feed configs, etc.
* opie-aqpkg's bugs must be fixed or worked around in itself.
Diffstat (limited to 'packages/images/opie-image-16mb.bb')
| -rw-r--r-- | packages/images/opie-image-16mb.bb | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb index 06bcdad7e8..42bf611880 100644 --- a/packages/images/opie-image-16mb.bb +++ b/packages/images/opie-image-16mb.bb @@ -13,50 +13,7 @@ IMAGE_INSTALL = "task-boot \ task-opie-16mb-pim \ task-opie-irda" -# merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. -merge_feeds() { - - if ! test -z "${FEED_URIS}" - then - # Die gracefully if ipkg-collateral failed - if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf" - then - echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" - exit 1 - fi - - # comment out existing feed-sources inserted by ipkg-collateral - cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ - rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - - # extract, then delete destinations - cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ - rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - - - for line in ${FEED_URIS} - do - # strip leading and trailing spaces/tabs, then split into name and uri - line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" - feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" - - # insert new feed-sources - echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf - done - - # remove temporary files and rebuild ipkg.conf - echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf - cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf - rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - - # remove -feed.conf files which are no longer needed - cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf - fi -} - -# merge feed-sources into ipkg.conf and create /etc/timestamp from build date +# create /etc/timestamp from build date IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" inherit image |