diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-02 01:40:05 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-02 01:40:05 +0000 |
| commit | 63fad339e01d4b16105146c32a61f24460397126 (patch) | |
| tree | a52043a583b75e5ff88a5ecdf6de25f7e23c131f /packages | |
| parent | a1db19f36c009a0587118377ebe5541f7d996fef (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/02 02:37:18+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded
2005/01/02 02:37:06+01:00 handhelds.org!CoreDump
rootfs_ipk: Check the logfile for error messages and error-out if necessary
2005/01/02 02:34:54+01:00 handhelds.org!CoreDump
opie-image: Fail gracefully if ipkg.conf is missing
BKrev: 41d750f5kYn8z0gnIKOxG2q7gzJaXw
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/meta/opie-image.bb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index 83004f184b..1a7f51216d 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -31,7 +31,13 @@ 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 |