diff options
author | Sergey Lapin <slapin@ossfans.org> | 2010-04-22 14:31:48 +0400 |
---|---|---|
committer | Sergey Lapin <slapin@ossfans.org> | 2010-04-22 14:44:03 +0400 |
commit | da6df4bb33699e9596cc9ad9d1b587c2557cc206 (patch) | |
tree | d121ca09d2ea8f887f735627e1ce729dad54f996 /recipes/busybox | |
parent | f48823a3a541108b9709ff1a64e5a98a509a159c (diff) |
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.
Diffstat (limited to 'recipes/busybox')
-rw-r--r-- | 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 1ee263ad90..17d8d14a84 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 () { |