aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Randolf <br1@subnet.at>2004-10-04 19:38:31 +0000
committerBruno Randolf <br1@subnet.at>2004-10-04 19:38:31 +0000
commit72ba0a194cdcdbe5e749797d97c04c34696a8818 (patch)
treeae38d546220fc6e00ebc6cb45037e3da56458dbb
parent21d43977649d099f08c958300bc85aea3e9c51d6 (diff)
downloadopenembedded-72ba0a194cdcdbe5e749797d97c04c34696a8818.tar.gz
Merge bk://openembedded@openembedded.bkbits.net/packages
into null.(none):/data/mtx/oe/oe.write/packages 2004/10/04 21:38:30+02:00 local!CoreDump Fail gracefully if FEED_URIS is empty BKrev: 4161a6b7mBiadmZbJIQpmO8W-IWlug
-rw-r--r--meta/opie-image.oe2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index 00e58aad13..9d0f1d866b 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -30,6 +30,8 @@ DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS}
# merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
merge_feeds() {
+ test -z "${FEED_URIS}" && exit 0
+
# 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