From 72ba0a194cdcdbe5e749797d97c04c34696a8818 Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Mon, 4 Oct 2004 19:38:31 +0000 Subject: 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 --- meta/opie-image.oe | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3