[oe-commits] Sergey Lapin : busybox: prevent postinst script from failing

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: da6df4bb33699e9596cc9ad9d1b587c2557cc206
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=da6df4bb33699e9596cc9ad9d1b587c2557cc206

Author: Sergey Lapin <slapin at ossfans.org>
Date:   Thu Apr 22 14:31:48 2010 +0400

busybox: prevent postinst script from failing

recent addition in rootfs_ipk.bbclass which runs postinst scripts with
-e option, while very useful, prevents busybox from configuring at image
build time. It will be configured at first image boot if your file
system is writable, but in case of e.g. squashfs, that will be fatal
error. This commit prevents postinst to fail, so busybox will create
all needed links at image build time.

---

 recipes/busybox/busybox.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 1ee263a..17d8d14 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
 SECTION = "base"
 PRIORITY = "required"
 
-INC_PR = "r26"
+INC_PR = "r27"
 
 SRC_URI = "\
   file://busybox-cron \
@@ -142,7 +142,9 @@ pkg_postinst_${PN} () {
 	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
 
 	# This adds the links, remember that this has to work when building an image too, hence the $D
+    set +e
 	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
+    set -e
 }
 
 pkg_postinst_${PN}-mountall () {