From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 15 Feb 2011 08:33:50 +0000 (+0100)
Subject: rootfs_ipk: don't emit error code when ONLINE_PACKAGE_MANAGEMENT is really none
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4f2f04f7478018d195331179e7e8b95997e7ffc;p=openembedded.git

rootfs_ipk: don't emit error code when ONLINE_PACKAGE_MANAGEMENT is really none

* currently do_rootfs fails when it's "none", because that test returns
  exit code '1':
  | log_check: Using /OE/tmpdir-shr/work/spitz-oe-linux-gnueabi/initramfs-kexecboot-klibc-image-1.0-r0/temp/log.do_rootfs.21324 as logfile
  | Logfile is clean
  | + rm -rf /OE/tmpdir-shr/rootfs/initramfs-kexecboot-klibc-image-tmp
  | + '[' none '!=' none ']'
  NOTE: package initramfs-kexecboot-klibc-image-1.0-r0: task do_rootfs: Failed
  ERROR: Function 'do_rootfs' failed (see /OE/tmpdir-shr/work/spitz-oe-linux-gnueabi/initramfs-kexecboot-klibc-image-1.0-r0/temp/log.do_rootfs.21324 for further information)
  ERROR: Task 1356 (/OE/dev/recipes/images/initramfs-kexecboot-klibc-image.bb, do_rootfs) failed with exit code '1'
  ERROR: '/OE/dev/recipes/images/initramfs-kexecboot-klibc-image.bb' failed

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index b173184bf7..22b95c789b 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -105,8 +105,9 @@ fakeroot rootfs_ipk_do_rootfs () {
 	log_check rootfs 	
 	rm -rf ${IPKG_TMP_DIR}
 
-	[ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ] && \
+	if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then
 		rootfs_ipk_insert_feed_uris
+	fi
 }
 
 rootfs_ipk_insert_feed_uris () {