summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
Commit message (Collapse)AuthorAgeFilesLines
* busybox: Security fix BUG9071Martin Balik2017-05-182-0/+54
| | | | | | | | | | | (From OE-Core rev: 3842dc98a471530e23305d09669d7f4bdc05a532) Signed-off-by: Martin Balik <martin.balik@siemens.com> Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0354a9b7adad27b012bcd6bb6cab54dfe0297bcd) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Security fix CVE-2016-6301Andrej Valek2017-05-182-0/+38
| | | | | | | | | | | | | | ntpd: NTP server denial of service flaw CVE: CVE-2016-6301 (From OE-Core rev: dafbf8a9e9ed068ecbf22cc816f9a6a3a2da7aa9) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 301dc9df16cce1f4649f90af47159bc21be0de59) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: ifupdown:pass interface device name for ipv6 route commandHaiqing Bai2017-05-182-0/+53
| | | | | | | | | | | | | | | IPv6 routes need the device argument for link-local routes, or they cannot be used at all. E.g. "gateway fe80::def" seems to be used in some places, but kernel refuses to insert the route unless device name is explicitly specified in the route addition. (From OE-Core rev: 4d9fcf9f2fa573218cda3a133e0da34c4185838a) Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 96ed437d57316153453bb5e170a4fd4f3a95883d) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: allow libiproute to handle table ids larger than 255Lukasz Nowak2017-05-182-0/+135
| | | | | | | | | | | | | These changes are required for compatibility with ConnMan, which by default uses table ids greater than 255. (From OE-Core rev: 8ab20681730a3cbd75ed0c7c208a30b437714915) Signed-off-by: Lukasz Nowak <lnowak@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit e9114bdd8a83b88f59526780910c49e3092fdd57) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: refresh the flock patchMaxin John2017-05-181-43/+34
| | | | | | | | | | | | Upstream accepted the flock fix with some improvements. Backport those changes. (From OE-Core rev: 58c01c9ccbec416b297dacd4b917d4073c35c6fb) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox/mdev.conf: Ignore eMMC RPMB and boot block devicesMike Looijmans2016-11-161-0/+2
| | | | | | | | | | | | | | | | | eMMC devices may report block devices like "mmcblk0rpmb" and "mmcblk0boot0". These are not actually block devices and any read/write operation on them will fail. To prevent spamming error messages attempting to mount them, just ignore these devices. (From OE-Core rev: 9f4a85eb929f67420d9689d7dddadd120ed49843) (From OE-Core rev: 50d97edaeb18a4c6374101d222410a3b0f344bf2) Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sysklogd and busybox: ignore return code from init script stopMarkus Lehtonen2016-10-111-1/+1
| | | | | | | | | | | | | | The init script will return '1' if we try to stop the service and it is not currently running. The prerm scriptlet must not fail because of this because it will cause package deinstallation of upgrade fail if opkg package manager is used. [YOCTO #10299] (From OE-Core rev: 806a910927f479207d47b06c20a0497e91203266) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Avoid race building libbbJuro Bystricky2016-09-155-66/+151
| | | | | | | | | | | | | | | | | | | When building busybox, an occasional error was observed. The error is consistently the same: libbb/appletlib.c:164:13: error: 'NUM_APPLETS' undeclared (first use in this function) while (i < NUM_APPLETS) { The reason is the include file where NUM_APPLETS is defined is not yet generated (or is being modified) at the time libbb/appletlib.c is compiled. The attached patchset fixes the problem by assuring libb is compiled as the last directory. [YOCTO#10116] (From OE-Core rev: a866a05e2c7d090a77aa6e95339c93e3592703a6) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: allow overriding compiler name in KConfigJérémy Rosen2016-09-141-1/+1
| | | | | | | | | | | | The KConfig infrastructure needs to build HOST binaries in order to provide its infratstructure. Yocto needs to force the HOSTCC and HOSTCPP variables to BUILD_CC and BUILD_CPP to make sure that the proper compiler is used when compiling host binaries (From OE-Core rev: 50fb24c889b6add053a5638a7367a8896dfebd8a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: avoid circular dependency when using initramfsStefan Agner2016-09-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kernel does not automatically mount devtmpfs when using initramfs based booting (even when using CONFIG_DEVTMPFS_MOUNT). If the rootfs is built with USE_DEVFS=1 (which is the default), the system ends up with a completely empty /dev to begin with. Busybox uses the first entry in inittab slightly different than other init systems: <id>: WARNING: This field has a non-traditional meaning for BusyBox init! The id field is used by BusyBox init to specify the controlling tty for the specified process to run on. The contents of this field are appended to "/dev/" and used as-is. Since /dev/null is not there yet, Busybox throws errors instead of executing the commands, and hence never mounts devtmpfs: init started: BusyBox v1.24.1 (2016-09-04 11:53:14 PDT) can't open /dev/null: No such file or directory can't open /dev/null: No such file or directory can't open /dev/null: No such file or directory can't open /dev/null: No such file or directory can't open /dev/null: No such file or directory can't open /dev/null: No such file or directory can't open /dev/null: No such file or directory Avoid this circular dependency by not specifing <id>. With that Busybox ends up using the stdio of the init process and executes the inittab just fine. (From OE-Core rev: 82de49b899bca915259ea7ea149f50e1401c2426) Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: fix "sed n (flushes pattern space, terminates early)" testcase failureDengke Du2016-09-032-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a busybox upstream known bug. When the busybox sed sub-command 'n' hit the files EOF, it print an extra character that have been printed, but the GNU sed would not print it. In busybox source code ../editors/sed.c ------------------------------------------------------------------------ case 'n': if (!G.be_quiet) sed_puts(pattern_space, last_gets_char); if (next_line) { free(pattern_space); pattern_space = next_line; last_gets_char = next_gets_char; next_line = get_next_line(&next_gets_char, &last_puts_char, last_gets_char); substituted = 0; linenum++; break; } /* fall through */ /* Quit. End of script, end of input. */ case 'q': /* Exit the outer while loop */ free(next_line); next_line = NULL; goto discard_commands; ------------------------------------------------------------------------ when read at the end of the file, the 'next_line' is null, it would go "case 'q'" and goto discard_commands, the discard_commands would print the old pattern space which have been printed. So in order to comply with GNU sed, in case 'n', when the next_line is null I add "else" at the end of the second "if": "goto again;" and send it to the busybox upstream, the busybox maintainer adopt it and make a little changes to the patch, we can see it at: His reply: http://lists.busybox.net/pipermail/busybox/2016-September/084613.html The new patch on busybox master branch: https://git.busybox.net/busybox/commit/?id=76d72376e0244a5cafd4880cdc623e37d86a75e4 (From OE-Core rev: 5a680c267454d7c135c4bfe4e551a780f38a5087) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Add parallel make fixRichard Purdie2016-08-202-0/+66
| | | | | | | | | | | | We're seeing regular parallel make failures in applet headers in busybox. This adds a patch to try and avoid the issue, building upon a fix already backported from upstream. The patch has been sent to upstream. [YOCTO #10116] (From OE-Core rev: 199cef0e8a50b20d0ee6fefd1d4cf3372eba7728) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Backport makefile fix from upstreamRichard Purdie2016-08-182-0/+41
| | | | | | | | | | This at least partially addresses one of the build races we've seen on the autobuilder in busybox. Its a straightforward backport from upstream. (From OE-Core rev: 8599059164ad0eb908fd1177044af8bc9a9881e4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Fix busybox-init on non-tty consolesStefan Agner2016-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | When using non-tty consoles (e.g. VirtIO console /dev/hvc0) the current init system fails with: process '/sbin/getty 115200 hvc0' (pid 545) exited. Scheduling for restart. can't open /dev/ttyhvc0: No such file or directory The first field needs to be a valid device. The BusyBox inittab example explains as follows: "<id>: WARNING: This field has a non-traditional meaning for BusyBox init! The id field is used by BusyBox init to specify the controlling tty for the specified process to run on. The contents of this field are appended to "/dev/" and used as-is." (From OE-Core rev: a53393082f331a613cb3eb973a07bab22cefcde8) Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox-syslog.default: When systemd is enabled don't use circular bufferAníbal Limón2016-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | Busybox syslog uses a shmmem circular buffer [1][2] when launch with -C option when systemd (is enabled) takes the control of syslog messages and then forward the messages to busybox syslog daemon, systemd journald don't usage of shmmem circular buffer. If -C is specified busybox-syslog never be able to read the forwarded messages from systemd journald and don't wrote it to /var/log/messages. This file is only installed when systemd is enabled [3]. [1] https://git.busybox.net/busybox/tree/sysklogd/syslogd.c?h=1_24_stable#n464 [2] https://git.busybox.net/busybox/tree/sysklogd/logread.c?h=1_24_stable#n82 [3] http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-core/busybox/busybox.inc#n295 (From OE-Core rev: 07ea6b5fb1eae175e18ecdab3ca37304215cd428) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox/mdev: Ensure /sys is mounted before using itKhem Raj2016-05-131-1/+3
| | | | | | | | | echo would fail if /sys is not mounted and boot would abort (From OE-Core rev: b8901336e72639342a1d784557043fa47a9d90ff) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: don't build arRoss Burton2016-04-291-1/+1
| | | | | | | | | | | As it's not 1978 anymore, nobody is using ar for anything apart from static archives. If people are using static archives, then binutils provides a far more capable ar. (From OE-Core rev: 664a7743a7a2dd6a5c3676c06c35b692af2907e2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: musl mips64 ip fixArmin Kuster2016-04-292-0/+91
| | | | | | | (From OE-Core rev: ef64e61c598b64922ca3e1f9126139a0470b71c2) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Security fix CVE-2016-2147Armin Kuster2016-04-293-0/+91
| | | | | | | | | busybox <= 1.24.2 (From OE-Core rev: 8a7a392ef37b3d5bd8ef81ab17d976696ad64dfe) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Security Fix CVE-2016-2148Armin Kuster2016-04-292-0/+75
| | | | | | | | | busybox <= 1.24.2 (From OE-Core rev: ff1a31824a2a43e63682a176a904de43ad0e1c2e) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: update flock behavior to match upstreamMaxin B. John2016-04-222-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In "util-linux" implementation of flock, -c 'PROG ARGS' means run "sh -c 'PROG ARGS'". At present, busybox implementation doesn't follow it. That causes errors like the one listed below: smart install /media/cronie-1.5.0-r0.core2_64.rpm Updating cache... <snip> Output from cronie-1.5.0-r0@core2_64: Running groupadd commands... NOTE: cronie: Performing groupadd with [ --system crontab] ERROR: cronie: groupadd command did not succeed. error: %pre(cronie-1.5.0-r0.core2_64) scriptlet failed, exit status 1 error: install: %pre scriptlet failed (2), skipping cronie-1.5.0-r0.core2_64 This is because we use flock command in preinstall scripts in packages which create new groups/users. [YOCTO #9496] (From OE-Core rev: 84686b51043c5a6b0ae184d00f547ccbd7832f39) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Drop -r passthrough patchKhem Raj2016-03-203-35/+7
| | | | | | | | | | | | | | This was added to help clang compile busybox but since then the option has been added to llvm and now we have upgraded clang to 3.8 which has this option available Fix git recipe to build with mdev feature and update to tip when here (From OE-Core rev: e617b6f9bf0aa3f1a7a19019f6953d0a102f3039) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: add tail symlink so busybox can commit suicide cleanlyAlejandro del Castillo2016-03-091-0/+1
| | | | | | | | | | | | | update-alternatives-opkg uses tail, which requires a temporary symlink on tmpdir during removal, to avoid errors of the type: /usr/bin/update-alternatives: line 113: tail: command not found (From OE-Core rev: 398728a78ddb6cbf770045e2684d910a0ba0fc90) Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: drop patches that are not valid anymoreMaxin B. John2016-02-185-64/+2
| | | | | | | | | | | | | | | 1. Removed following patches a) busybox-appletlib-dependency.patch - Kbuild rules handles that dependency b) get_header_tar.patch - tar applet uses a different code path to handle that scenario now. 2. Updated the upstream-status of fail_on_no_media.patch as Denied. (From OE-Core rev: 48f5c2962a4121ba6172b535c90eaa16e8afa538) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Add musl config for _git recipeMaxin B. John2016-02-181-0/+1
| | | | | | | | | busybox_git recipe also requires musl specific configuration (From OE-Core rev: 2f551835cb9414597eed1f1ae94632aa516488f9) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* udhcpc: specify full path for ip command callsMark O'Donovan2016-02-112-15/+16
| | | | | | | | (From OE-Core rev: 97dd53468537968422569797122ddef4b779a488) Signed-off-by: Mark O'Donovan <modonovan@biotector.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox/gtk/perl/base-passwd: Ensure data is correctly expandedRichard Purdie2016-02-041-0/+2
| | | | | | | | | | | | | Where variables are used in python, we need to ensure they are expanded. This happens to work at the moment but likely will not happen in future and isn't good code practise. Its mostly an issue around key values, since bitbake has already performed key expansion when these functions are executed. (From OE-Core rev: 6d1142b56948c048111c4f78d9909c1846ab225b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: fix stop -vs- start typo in rcS scriptAndre McCurdy2016-01-262-5/+7
| | | | | | | | | | Also make the rcS and rcK comments match the code. (From OE-Core rev: 8b033e6faa0a6927f1e1ee2484381eff8231a549) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: backport upstream truncate open mode fixAndre McCurdy2016-01-262-0/+82
| | | | | | | | | | https://git.busybox.net/busybox/commit/?h=1_24_stable&id=be729c1d3b5c923f10871dd68ea94156d0f8c803 (From OE-Core rev: 123958a4b098fae32fe46552bddec21266698cfa) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Add support for busybox-initKhem Raj2016-01-258-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | in config metadata we can configure busybox based init and device initializer ( mdev ) using e.g. VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" VIRTUAL-RUNTIME_login_manager = "busybox" VIRTUAL-RUNTIME_init_manager = "busybox" VIRTUAL-RUNTIME_initscripts = "initscripts" VIRTUAL-RUNTIME_keymaps = "keymaps" DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" busybox can be used to provide init system combined with mdev it makes it a complete init system for really tiny systems. This patch uses above defines to configure features in busybox to enable the init system and mdev in a configurable manner (From OE-Core rev: 75cb4fe38fade382450c5f6f35d5dcf55962143e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: generalize recipe to work with arbitrary install directoriesMatthias Schiffer2015-12-281-23/+12
| | | | | | | | | | | | | | | | Allow configuring base_bindir, base_sbindir, bindir and sbindir arbitrarily. Also change the temporary symlinks created in the postinst script from relative to absolute to make the code simpler and more flexible. There was no reason to use relative links anyways, as directly afterwards update-alternatives would replace them by absolute links anyways. (From OE-Core rev: d7907c9a32733d716202d6baf76dc450fe791f31) Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Add config for muslKhem Raj2015-12-122-0/+13
| | | | | | | | | | | Default config is enabling additional features that dont compile with musl so lets disable them for musl case (From OE-Core rev: 7568e432890d828fec59134e14d7f60445ff4a1a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: backport upstream fixes for unzipAndre McCurdy2015-12-083-0/+263
| | | | | | | | | | | http://git.busybox.net/busybox/commit/?h=1_24_stable&id=6767af17f11144c7cd3cfe9ef799d7f89a78fe65 http://git.busybox.net/busybox/commit/?h=1_24_stable&id=092fabcf1df5d46cd22be4ffcd3b871f6180eb9c (From OE-Core rev: e69c955d825bdfaa17eb7a75f26df8b7b646f04d) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: enable resize appletAndre McCurdy2015-12-013-0/+4
| | | | | | | | | | | | | | | | The /etc/profile script contains a call to resize, which improves the usability of shells run on the serial console. http://git.openembedded.org/openembedded-core/commit/?id=cc6360f4c4d97e0000f9d3545f381224ee99ce7d Unfortunately the resize applet is not currently enabled in busybox defconfig, so resize is never called. Fix that. (From OE-Core rev: 2136fecd662a6eeea02322628021de7982b5d35e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: disable support for mounting NFS file systems on Linux < 2.6.23Andre McCurdy2015-12-011-2/+2
| | | | | | | | | | | | | | | | | The busybox CONFIG_FEATURE_MOUNT_NFS config option is described as: Enable mounting of NFS file systems on Linux kernels prior to version 2.6.23. Note that in this case mounting of NFS over IPv6 will not be possible. Since OE-core sets OLDEST_KERNEL = "2.6.32", CONFIG_FEATURE_MOUNT_NFS is not required in the default busybox defconfig. (From OE-Core rev: b47ff1605940694150e497d8f18d6201e1627415) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: update 1.23.2 -> 1.24.1Andre McCurdy2015-12-016-502/+25
| | | | | | | | | | | The busybox defconfig has also been refreshed, with all new apps and features disabled by default. Update _git recipe version too. (From OE-Core rev: 4d5f51dd3b2733f15cb2eee40e622ec43f46d91c) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: re-order defconfig to align with busybox 1.24.1Andre McCurdy2015-12-011-19/+19
| | | | | | | | | | | | No functional changes, simply re-order lines in defconfig so that the existing options don't move elsewhere in the file when run though busybox 1.24.1 'make oldconfig'. (From OE-Core rev: 28f197915d816ea249b036f8a4dfe11d477f94e7) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: remove '-e MAKEFLAGS=' from EXTRA_OEMAKEAndre McCurdy2015-12-011-1/+2
| | | | | | | | | | | | Busybox Kbuild likes to control its own MAKEFLAGS (it adds -rR, etc), so avoid over-riding MAKEFLAGS. Relying on 'make -e' is no longer required so remove that too. (From OE-Core rev: 1d841e103b229bf70a1c24c1cc22b7bdc8c9bf64) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: set CC=${CC} via make command lineAndre McCurdy2015-12-011-1/+1
| | | | | | | | | | | | Busybox currently relies on 'make -e' to over-ride CC and the make command line to over-ride LD. Set CC via the make command line to be consistent with LD and to allow '-e' to be dropped from EXTRA_OEMAKE. (From OE-Core rev: b7c265e1edd5c82126c1f3915ba5ca9efef57c00) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangleAndre McCurdy2015-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | With current busybox Kbuild, setting .config to: CONFIG_EXTRA_CFLAGS="foo" "bar" and then running 'make oldconfig' results in .config containing: CONFIG_EXTRA_CFLAGS="foo" ie the CONFIG_EXTRA_CFLAGS configmangle in the busybox.inc doesn't currently work as intended. Remove the extra \" \" to ensure that ${HOST_CC_ARCH} gets added to CONFIG_EXTRA_CFLAGS. (From OE-Core rev: 5f822373fadff2415cf1602b9d58fae0dbd33730) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: don't set .config CROSS_COMPILER_PREFIXAndre McCurdy2015-12-011-4/+2
| | | | | | | | | | | Setting CROSS_COMPILER_PREFIX via .config is redundant (setting CROSS_COMPILE via the make command line will always over-ride it). (From OE-Core rev: db2daff77a9d533dc03ab3aaeffa87e32f834240) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: move EXTRA_OEMAKE etc into busybox.incAndre McCurdy2015-12-013-17/+7
| | | | | | | | | | | EXTRA_OEMAKE options and do_install_ptest() are common to both busybox recipes, so move into busybox.inc. (From OE-Core rev: aeeb80be6db8df0548c97b4a40c1561cc724debb) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: don't export EXTRA_OEMAKEAndre McCurdy2015-12-011-1/+2
| | | | | | | | | | | EXTRA_OEMAKE is private to OE and shouldn't be exported to the busybox build. (From OE-Core rev: 61e1617f9f024ead0b77004c94f2de45c88a4aa8) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox_git: Enable getopt appletAndre McCurdy2015-12-011-0/+1
| | | | | | | | | | | | Keep git recipe in sync with 1.23.2: http://git.openembedded.org/openembedded-core/commit/?id=10c2c484d5916ad476ad7717c3629f6684f01e6d (From OE-Core rev: 33868c680587036d1aa3b56e66599a5b972626c4) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Schedule mdev after mountallKhem Raj2015-11-161-2/+2
| | | | | | | | | | | | | | mdev does automounting of block media, which expects /run/ to be mounted, so let mounting happen before running mdev service and mountall is done with at 03 so trigger mdev at 04 This helps in mounting the devices which are plugged on boot (From OE-Core rev: 7eda8fdd1585ce19e398e64f6bcea1ffafc90b41) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Fix mdev block device automountingKhem Raj2015-11-161-4/+4
| | | | | | | | | | | | | | The directory ${MDEV_AUTOMOUNT_ROOT}/ which is '/run/media' may not exist yet when the device is found, so lets use -p switch to mkdir cmd so it create preceding parent dirs if needed. Remove some bash specific constructs (From OE-Core rev: d5279c49c881a9a8991fda67a70cd49756ac3a92) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: remove redundant @DATADIR@ replacementAndre McCurdy2015-10-121-2/+1
| | | | | | | | | | | The busybox defconfig doesn't contain a @DATADIR@ marker, so the attempt to replace it in do_prepare_config is redundant. (From OE-Core rev: a3b0c401cac043a132e7e2d491b3871ec94c258e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Use CC instead of bare LD to be the LinkerKhem Raj2015-09-283-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was on mailing list, another patch to make sure -r is not passed directly but via -Wl switch is added. This was exposed when using clang and gold linker, clang does not have -r switch to do relocatable objects and problem happens specific to OE becuase we use LD = CC now what happens is that busybox assumes that linker will be called directly, and hence sprinkles linkers options in its kbuild system which aggregate into LDFLAGS, some of these options are happily ignored by gcc as well but it passes -r options rightly to linker so it all works, however when using clang, this falls apart since -r is not known option for clang so it drops this option and all obects which should be partially linked becomes ET_EXEC and when they are added to final link then gold starts to get confused /mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/sysroots/x86_64-linux/usr/bin/arm-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-ld: error: applets/built-in.o: unsupported ELF file type 2 clang-3.7: error: linker command failed with exit code 1 (use -v to see invocation) (From OE-Core rev: 117282486b68e4da468c21795ea87bfc85625885) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Use UTMPX instead of legacy UTMPKhem Raj2015-09-282-0/+389
| | | | | | | | | | | | This makes busybox honor UTMPX feature if available in a libc [YOCTO #8243] (From OE-Core rev: c5de9b2ddb38790866bda5a88b9b7119aac0aa3f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Fix Upstream-Status statementsRoss Burton2015-09-121-1/+1
| | | | | | | | | | Fix a variety of problems such as typos, bad punctuations, or incorrect Upstream-Status values. (From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>