diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2013-06-06 13:59:23 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-25 17:30:29 +0100 |
| commit | 87efa83191f0b4f4cec3a821b6dfe425c781c077 (patch) | |
| tree | de4b163cc3a3e47862db6052613f48b5fb1b365c /meta | |
| parent | 5b961afc784747eb8240540e542a789849118596 (diff) | |
| download | openembedded-core-87efa83191f0b4f4cec3a821b6dfe425c781c077.tar.gz openembedded-core-87efa83191f0b4f4cec3a821b6dfe425c781c077.tar.bz2 openembedded-core-87efa83191f0b4f4cec3a821b6dfe425c781c077.zip | |
busybox: add support for CONFIG_FEATURE_INDIVIDUAL
Previously, if CONFIG_FEATURE_INDIVIDUAL was enabled for busybox,
yocto-based systems could start correctly.
This is because if busybox is built as individual apps, '/bin/busybox'
may not be present, so setting the default ALTERNATIVE_TARGET to
'/bin/busybox' is not appropriate and could lead to errors.
This patch fixes this problem by checking the existence of '/bin/busybox'
before setting the ALTERNATIVE_TARGET to '/bin/busybox'.
After this change, if busybox is built as individual apps, we'll have
links like '/bin/ls -> /bin/ls.busybox', otherwise, we'll have links
like '/bin/ls -> /bin/busybox'.
Note there's a grep expression change in this patch. The old expression
doesn't work well, it has an unwanted underscore, so I changed it to make
it work.
[YOCTO #4570]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index f4efeb8323..99d4e997b1 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -171,7 +171,7 @@ do_install () { install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}" done # add suid bit where needed - for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do + for i in `grep -E "APPLET.*BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do find ${D} -name $i.${BPN} -exec chmod a+s {} \; done install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV} @@ -242,8 +242,6 @@ ALTERNATIVE_TARGET[syslog-init] = "${sysconfdir}/init.d/syslog.${BPN}" ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf" ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}" -ALTERNATIVE_TARGET = "/bin/busybox" - python do_package_prepend () { # We need to load the full set of busybox provides from the /etc/busybox.links # Use this to see the update-alternatives with the right information @@ -252,6 +250,9 @@ python do_package_prepend () { pn = d.getVar('PN', True) f = open('%s/etc/busybox.links' % (dvar), 'r') + if os.path.exists('%s/bin/busybox' % (dvar)): + d.setVar('ALTERNATIVE_TARGET', "/bin/busybox") + for alt_link_name in f: alt_link_name = alt_link_name.strip() alt_name = os.path.basename(alt_link_name) |