diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-03-19 06:45:42 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-19 06:45:42 +0000 |
| commit | cc7571c8daffa499295e62c7a5c42c0e32f926ad (patch) | |
| tree | f8be261f4c78917a9f059e8309cdb75ab58b6a56 /classes/image.bbclass | |
| parent | 42fcd2ba5af8d6ebf10fc8a3d57a6fac30dc6a57 (diff) | |
| parent | ebc0c581d446761ece1729a4b9b2c66359eb20dc (diff) | |
merge of '3562d52be2dd03372ae3c01837858e920fe1b216'
and 'd791da1ae7aaac6a51195013e3c686e0c5172ad3'
Diffstat (limited to 'classes/image.bbclass')
| -rw-r--r-- | classes/image.bbclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 67a3a4fa10..f8d896d813 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -85,8 +85,6 @@ fakeroot do_rootfs () { insert_feed_uris - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/* - ${IMAGE_PREPROCESS_COMMAND} export TOPDIR=${TOPDIR} @@ -132,7 +130,7 @@ insert_feed_uris () { echo "Added $feed_name feed with URL $feed_uri" # insert new feed-sources - echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf + echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf done # Allow to use package deploy directory contents as quick devel-testing @@ -142,7 +140,7 @@ insert_feed_uris () { if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then for arch in ${PACKAGE_ARCHS} do - echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf + echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/opkg/local-$arch-feed.conf done fi } |