summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox.inc
Commit message (Collapse)AuthorAgeFilesLines
* recipes: Remove tab indentations in python codeRobert Yang2019-01-081-21/+21
| | | | | | | | | | | | | Use 4 spaces to replace a tab. (From OE-Core rev: cbb6743d46752481782789fa1a0dfade11057114) (From OE-Core rev: 42ebdc7253c3a319d671a7f924603d85a22bbb4e) Signed-off-by: Robert Yang <liezhi.yang@windriver.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>
* busybox: make busybox.links.{suid, nosuid} reproducibleMartin Hundebøll2018-11-241-1/+2
| | | | | | | | | | | | | | The busybox.link.* files are generated from autoconf.h and applets.h, which are both auto-generated by the build system. The contents of the two files might be in different order, and so the link files are not reproducble as is. Fix this by sorting the lists using `sort`. (From OE-Core rev: bade7cc344c2f0e9316f973c34e9c9dfcbdbe32d) Signed-off-by: Martin Hundebøll <martin@geanix.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: unify recipe styleAndrej Valek2018-10-101-49/+49
| | | | | | | | | - change spaces to tabs and unify indent level (From OE-Core rev: 38f8c4725da016df100e7ed434eece26ba77bf5f) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: do not write grep outputs into logAndrej Valek2018-10-101-8/+8
| | | | | | | | | Make grep quiet for prevent to write information into logs. (From OE-Core rev: f9f150fa38b188b279b65886cad187b15bae0ce6) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: fix conflict with runlevel appletAndrej Valek2018-10-101-3/+1
| | | | | | | | | | - remove OE runlevel script which conflicts with busybox's applet - don't install empty directories (From OE-Core rev: dca804a9595002ddc3893720a96b7f1a67b6e6c4) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox/packagegroups: Break out the busybox-syslog dependencyRichard Purdie2018-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | The busybox-syslog rrecomends is proving tricky as it gets pulled in early and there are conflicts between its use of update-alternatives and busybox needing to provide those things. We already have recipes using BAD_RRECOMMENDS to remove this dependency, it probably makes sense to spell it out explicitly and allow it to be overridden more easily. This patch does this, dropping the now unneeded BAD_RRECOMMENDS. It preserves the dependency as a recommendation for now, further cleanup may allow simplication of that. This unbreaks certain build failures on the autobuilder, more as a workaround but is a change we probably want to make anyway. (From OE-Core rev: 544ade2d78f1375d9e93d6bf5842d857ddaf3530) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Ensure busybox-syslog depends on busyboxRichard Purdie2018-09-101-0/+1
| | | | | | | | | | If we don't do this, busybox-syslog can install before busybox which clearly doesn't make sense and can trigger postinst failures (missing sed which u-a depends upon). (From OE-Core rev: 7080711849347c7fff55f925c33e6ea69d7c46bb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Put klogd/syslogd alternative links in syslog packageRichard Purdie2018-09-051-1/+4
| | | | | | | | | | | Currently these are in ${PN} and ${PN}-syslog may get replaced by other packages but update-alternatives would error in the postinst if other files were installed first. Avoid the problems by putting the links in the correct package. (From OE-Core rev: ef11c54ba99af261a70ec31091216cdd1556da24) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Sync arch and link locations with coreutilsRichard Purdie2018-09-051-0/+4
| | | | | | | | | coreutils installs these into bindir, folllow its lead to avoid postinst failures when installing coreutils and busybox together. (From OE-Core rev: ed6e039bf9b16ea882995780425b33b84f9356cf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: update to 1.29.2Andrej Valek2018-09-051-1/+1
| | | | | | | | | | | | | - refresh busybox-udhcpc-no_deconfig.patch - remove obsolete patches which are included in this update - update defconfig - Add newly required virtual/crypt depends [RB] (From OE-Core rev: b9c7fdd4b204ab1c2466e9ec5d933bbc635fcc4f) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: handle syslogYadi.hu2018-07-091-5/+9
| | | | | | | | | | | | | | | | | | If CONFIG_KLOGD is not enabled, then the related service file should not be installed, The error message is below: Cannot add dependency job for unit busybox-klogd.service, ignoring: Unit busybox-klogd.service failed to load: No such file or directory. So we should first check the configuration before we install these service files. (From OE-Core rev: c3cc402df996654bf6f838b1e79e16a8bdd6d4d7) Signed-off-by: Yadi.hu <yadi.hu@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/recipes: Use expanded BUILD_REPRODUCIBLE_BINARIES valueJuro Bystricky2018-03-121-2/+2
| | | | | | | | | | | Replace the occurences of BUILD_REPRODUCIBLE_BINARIES with expanded values ${BUILD_REPRODUCIBLE_BINARIES} so the variable does not need to be exported. (From OE-Core rev: 27f87bbc8395a2481ef808465a62d213a6b678ac) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: separate inittab into own package, due to SERIAL_CONSOLES being ↵Denys Dmytriyenko2018-03-041-10/+2
| | | | | | | | | | | | | | | | machine-specific * Create busybox-inittab recipe to produce machine-specific package with /etc/inittab and necessary getty calls for a machine, based on SERIAL_CONSOLES, similar to how sysvinit-inittab was done * Since CONFIG_FEATURE_USE_INITTAB is controlled by VIRTUAL-RUNTIME_init_manager, make main busybox package RDEPENDS on busybox-inittab when init_manager is set to busybox (From OE-Core rev: afb09abd2f0f7555ba156260a87fd3867f591310) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: Add sanity check to test if the suid binary provides shNathan Rossi2018-01-291-0/+6
| | | | | | | | | | | | | | | Add a sanity check during the do_compile task to fail if the suid busybox provides /bin/sh. This is considered as a hard fail since not only is providing sh as suid problematic for security reasons but also because the sh configured for suid is less functional than the nosuid configured sh and breaks a number of required features (e.g. 64-bit test). (From OE-Core rev: b64807549569817c8f1921a0aad52c815af90731) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: Fix bashism in compile, which fixes sh being suidNathan Rossi2017-11-091-1/+1
| | | | | | | | | | | | | | | Fix the bashism in the suid check. This ensures that the check works correctly on hosts that default sh to e.g. dash. If this check fails the suid shell workaround does not remove sh from the suid binary and results in the target system containing a busybox.suid with sh as well as /bin/sh -> /bin/busybox.suid. (From OE-Core rev: 28547cf01b5ebb81c525a2b982db9b04997d7c4f) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Cc: Andrej Valek <andrej.valek@siemens.com> Cc: Radovan Scasny <radovan.scasny@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: 1.24.1 -> 1.27.2Andrej Valek2017-11-051-2/+14
| | | | | | | | | | | | | | - fixed link creation to shell - reported bug with suid shells [https://bugs.busybox.net/show_bug.cgi?id=10346] - removed and modified already merged patches - updated defconfig regarding to new version (From OE-Core rev: 55740077a1f3bed5956fe02ef17ba1d99176ea24) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: fix syslog related meta dataChen Qi2017-09-251-20/+7
| | | | | | | | | | | | | | | | | | | Set RCONFLICTS to disallow multiple syslog daemon providers to be installed on the target at the same time, and remove codes which dealt with such situation. Supporting multiple syslog daemons on the same image doesn't have much sense. rsyslog and syslog-ng in meta-oe have set RCONFLICTS to disallow this. And we do the same for busybox. Also, remove the line of creating a meaningless symlink of /lib/systemd/syslog.service to /dev/null. (From OE-Core rev: 597bbf99ee8e88294f2ed96c84a51f9ed83e8933) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: improve reproducibilityJuro Bystricky2017-08-161-0/+7
| | | | | | | | | | | | | | For reproducible builds do not generate build timestamp as part of the version string. Remove host tools references from .config file. With this patch all eight busybox packages are built as binary reproducible. (From OE-Core rev: fad94cdb02be86b463e691ca2598b393e7875919) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Drop remnants of uclibc supportRichard Purdie2017-06-221-1/+1
| | | | | | | | | | | | | | uclibc support was removed a while ago and musl works much better. Start to remove the various overrides and patches related to uclibc which are no longer needed. uclibc support in a layer would still be possible. I have strong reasons to believe nobody is still using uclibc since patches are missing and I doubt the metadata even parses anymore. (From OE-Core rev: 653704e9cf325cb494eb23facca19e9f05132ffd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: changes to support merged /usrAmarnath Valluri2017-06-141-0/+2
| | | | | | | | | | | Most of the shell scripts refer to /bin/sh inside the script. When 'usrmege' feature is enabled, this path would be /usr/bin/sh. Hence, to satisfy build dependency add '/bin/sh' to it's providers list. (From OE-Core rev: 1f6c14939c8daa5e09103789c3ff5031cc888d16) Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: make SYSLOGD optionnalRomain Perier2017-05-291-3/+3
| | | | | | | | | | | | | | | | Some distros might choose another syslogd provider like rsyslogd. update-alternative will update the link from syslogd to the right provider. However the syslogd feature is still present and enabled in busybox. This commit adds a new configuration fragment to make syslogd optionnal in busybox. (From OE-Core rev: 9732a2ba2edf2607e61ae4fe0d65a02b7918cfe7) Signed-off-by: Romain Perier <romain.perier@collabora.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: make bash a valid login shell if enabledAndreas Oberritter2017-04-291-0/+9
| | | | | | | | | | Add bash to /etc/shells if busybox is built with bash applet anabled to fix login via dropbear. (From OE-Core rev: 86a2db0b2997fd05882ae0119ef45b1ea5411d39) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKEAndre McCurdy2017-04-051-1/+0
| | | | | | | | | | | EXTRA_OEMAKE no longer contains '-e MAKEFLAGS=' so the comment explaining that it needs to be removed / over-ridden is obsolete. (From OE-Core rev: 19be2237798f51c01c1c21a68382d114a2f6ead2) 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: ignore the largefile distro feature ( always enable LFS )Andre McCurdy2017-03-221-2/+2
| | | | | | | | (From OE-Core rev: f16723f66837a2acad3c114e4064e0ab1cb3a7a6) 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: Guard against interrupted compilesRichard Purdie2017-01-231-0/+4
| | | | | | | | | | | | | | If busybox is interrupted during do_compile, it can corrupt .config with the suid version, or worse. Typically this leads to files disappearing, particularly /etc/init.d/* which leads to an empty busybox-hwclock. That then results in errors at do_rootfs time due to the missing package. The fix is to use any 'orig' present to restore stat at the start of compile. (From OE-Core rev: 601abb497531823a73bdec3baf56952086e5b4f4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: remove True option to getVar callsJoshua Lock2016-12-161-7/+7
| | | | | | | | | | | | | getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.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: 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: 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.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>
* udhcpc: specify full path for ip command callsMark O'Donovan2016-02-111-1/+2
| | | | | | | | (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: Add support for busybox-initKhem Raj2016-01-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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.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-011-1/+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: 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.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: fixes for when base_bindir != /binJoshua Lock2015-09-061-23/+26
| | | | | | | | | | * Replace all hard-coded paths with variables * Run sed over busybox.links.* to replace /bin with ${base_bindir} (From OE-Core rev: c61463a45441315b0006a28bb9f6069a393a8309) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox-mdev: Support automatic mounting of block devicesmike.looijmans@topic.nl2014-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon inserting a USB stick or similar device, mdev will run an automounter script that mounts valid partitions on /media/<device>. The script first checks /etc/fstab entries so that mounting on UUID or LABEL or using custom mount options is still possible. If /etc/fstab does not contain particular mount options, the script will create (and remove) the mountpoint automatically. The script also supports full disk partitions (devices without partition table). The following environments can be set in /etc/default/mdev: MDEV_AUTOMOUNT=n (Disables automounting completely) MDEV_AUTOMOUNT_ROOT=/media (Change the mount root location) Automatic mounting for a particular device can be disabled by creating a file "/dev/<device>.nomount". This is helpful in scripts that create partitions for example, and want to perform specific actions which require the device to remain unmounted. A more complex variation (using LABEL based mounts) on this script has been in use in OpenPLi for many years now, and I've used this one on many projects already, so it's about time to push this to mainline. (From OE-Core rev: 19073fb991b3e2d2304e55f94e30674adf375197) 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>
* busybox-mdev: Install missing find-touchscreen.shmike.looijmans@topic.nl2014-12-191-1/+3
| | | | | | | | | | | | mdev.conf references the find-touchscreen.sh script, but this file was not being installed. Add the script to the busybox-mdev package. (From OE-Core rev: 44f6df0dfac54845ef5c3ab1af5663d1b6c1d64b) Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: handle syslog related files properlyChen Qi2014-06-141-11/+14
| | | | | | | | | | | | | | | | | | | | | If CONFIG_SYSLOGD is not enabled, then the related service file should not be installed as it will always fail at system start-up. The error message is as following. [FAILED] Failed to start System Logging Service. The same logic applies to CONFIG_KLOGD. So we should first check the configuration before we install these service files. [YOCTO #5302] (From OE-Core rev: b44e291a87539fbb8e6da1a16c56f425a417e7bd) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: put udhcpc in backgroundSaul Wold2014-06-061-0/+1
| | | | | | | | | | | If the interface is slow to come up udhcpc will continue in the background [YOCTO #6339] (From OE-Core rev: 45af0ba08dbc676be41fd29e9877fe820b531f7c) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador2014-04-251-13/+13
| | | | | | | | | | | The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: fix a sh link wrongWenlin Kang2014-04-091-2/+6
| | | | | | | | | | | | When both bash and busybox be installed, without ash support in busybox,if bash is installed before busybox in the final stage, even if ALTERNATIVE_PRIORITY of bash > ALTERNATIVE_PRIORITY of busybox, the symlink from /bin/sh to bash can be yet overwritten by busybox. (From OE-Core rev: 6ef650359cc2a49376eb5ca92bc97b34cdd82862) Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Use CCLDDrew Moseley2014-04-051-0/+1
| | | | | | | | | | | | | | | | Use the CCLD variable to ensure proper tuning parameters. Notably when building on a x86-64 host with an i686 toolchain there is an error building built-in.o because it is trying to link 32-bit and 64-bit object files: i686-pc-linux-gnu-ld --sysroot=/work/dmoseley/Mentor/amd-2014.05/build.genericx86-64-external/tmp/sysroots/genericx86-64 -r -o applets/built-in.o applets/ap i686-pc-linux-gnu-ld: Relocatable linking with relocations from format elf64-x86-64 (applets/applets.o) to format elf32-i386 (applets/built-in.o) is not support make[1]: *** [applets/built-in.o] Error 1 (From OE-Core rev: 088d2f0185da6648305b4719ee9cb0d2f2b37c6f) Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>