summaryrefslogtreecommitdiff
path: root/meta/recipes-core/busybox
AgeCommit message (Collapse)AuthorFiles
2014-04-25Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador1
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. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-24PR bumps to remove PRINC use in meta-openpliMike Looijmans1
Resolves warnings of this kind in the OpenPLi layer: WARNING: Use of PRINC * was detected in the recipe * Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-08busybox: fix a sh link wrongWenlin Kang1
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. Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-05busybox: Specify '-nostdlib' when linking to a .o file.Drew Moseley2
Ensure that linking to the built-in.a file uses the 'nostlib' option. Submitted to busybox mailing list here: http://lists.busybox.net/pipermail/busybox/2014-March/080730.html This has been accepted into upstream busybox so it will not be needed for future versions. Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-05busybox: Use CCLDDrew Moseley1
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 Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-23busybox: disable fsck.minix and mkfs.minixJonathan Liu1
The MINIX and MINIX 2 filesystems are not really used anymore. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-20recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues (part 2)Matthieu Crapet1
Completes previous commit b5292d4115a4555a66b5e35acdc67dd71fb8577f. Updates SUMMARY[doc] (meta/conf/documentation.conf). Changes: - rename DESCRIPTION with length < 80 to (non present tag) SUMMARY - drop final point character at the end of SUMMARY string - remove trailing whitespace of SUMMARY line Note: don't bump PR Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2014-02-13busybox-syslog: add more comments to systemd configuration fileChen Qi1
Add more comments to the systemd configuration file for busybox's syslogd utility. The purpose is to easy the life of system administrators. These comments are mostly derived from the comments in syslogd.c in busybox. [YOCTO #5722] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02busybox: upgrade to stable 1.22.1Chen Qi11
Upgrade busybox to the stable release 1.22.1. During this upgrade, 9 patches are removed. Reasons are detailed below. The following 6 patches are removed as they have been merged. meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch The following three patches are removed because they are mainly about moving binaries from /bin to /usr/bin to make the update-alternative work correctly at rootfs time. We can easily solve this problem by changing recipes. There's no compelling reason why such patches are needed. meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch meta/recipes-core/busybox/busybox/stat-usr-bin.patch meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2014-01-10busybox: lineedit: initialize delptrMing Liu2
In vi mode, the 'p' and 'P' commands caused a segfault when nothing had been put in the buffer yet because the delptr was not initialized. Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-10busybox: enable SEAMLESS_XZ by defaultChen Qi1
We have enabled SEAMLESS_GZ and SEAMLESS_BZ2 in defconfig, it's reasonable for us to enable SEAMLESS_XZ as well. Otherwise, we couldn't extract tar.xz file while we could extract tar.gz file. Such situation would be somewhat confusing. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-12-16busybox: get rid of nested functions in findMuhammad Tauqir Ahmad2
This allows us to compile busybox using clang. Nested functions is a gcc extension not supported by clang. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-05classes/recipes: More optimal DISTRO_FEATURES referencesRichard Purdie1
Using the contains function results in more optimal sstate checksums resulting in better cache reuse as we as more consistent code. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-29busybox: add busybox_git.bb recipeChen Qi14
Add busybox_git.bb recipe so that it would be easier to hack with busybox. Set DEFAULT_PREFERENCE to "-1" in the git recipe so that we still use the busybox_1.21.1.bb recipe by default. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-31busybox: fix sed auto insert newline testcaseJackie Huang2
backport the patch from busybox upstream to fix the auto insert newline issue. busybox defect: https://bugs.busybox.net/show_bug.cgi?id=6584 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-10-30recipes: Remove PR = r0 from all recipesRichard Purdie1
Remove all PR = "r0" from all .bb files in oe-core. This was done with the command sed -e '/^PR.*=.*r0\"/d' recipes*/*/*.bb -i We've switching to the PR server, PR bumps are no longer needed and this saves people either accidentally bumping them or forgetting to remove the lines (r0 is the default anyway). Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-16busybox: Add depmod (adds 2240 bytes)Saul Wold1
This will allow packages that update kernel modules to run correctly Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-26busybox: update mdev.confEric Bénard1
busybox 1.21.1 's mdev has changed the way the device's name is reported so now we get input/event0 instead of event0. I think this commit is responsible of this new behaviour : http://git.busybox.net/busybox/commit/util-linux/mdev.c?id=c3cf1e30a3022453311a7e9fe11d94c7a381640e Update mdev.conf according to this behaviour so that sound and input devices are correctly populated (and now /etc/mdev/find-touchscreen.sh is executed). Tested on an arm board. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17busybox: move su to /bin for lsb command check testHongxu Jia2
In busybox, util-linux and shadow, su has been moved to /usr/bin/, but lsb cmdchk needs su in /bin. Move su to /bin could fix this issue. [YOCTO#5175] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-06busybox-syslog: add configuration file /etc/syslog.confChen Qi3
By default, busybox has CONFIG_FEATURE_SYSLOGD_CFG enabled, but it doesn't ship a configuration file. This patch adds a configuration file (/etc/syslog.conf) to the busybox-syslog package. This configuration file mainly serves as a placeholder now. The advantages of this change are: 1. Make the users aware of the fact that the /etc/syslog.conf file will actually be parsed by busybox's syslogd utility. And configuring that file will change the logging behaviour. 2. In a systemd based system, this file will prevent the same configuration file provided by the sysklogd package from messing things up. [YOCTO #5066] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-30busybox: configure system user id to range from 100 to 999Chen Qi1
Previously, the range was 0 to 0. This made it impossible to use busybox's adduser utility to add a system user. The following error would appear. adduser: no uids left This patch fixes this problem by giving it a reasonable range. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-29busybox: set default log buffer size to 64 at compile timePaul Eggleton1
This provides a more reasonable log buffer size to avoid losing earlier events, and 64K is not a problem for modern systems. When the buffer is used on sysvinit-based systems, which it isn't by default, 64K is already the runtime default size unless /etc/syslog-startup.conf is modified or deleted, so this only really affects systems using systemd. This completely removes the need for the busybox bbappend in meta-oe. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-26busybox: enable shared memory logging for systemdPaul Eggleton3
The default command-line options for launching busybox's syslogd are "-C" if using sysvinit; but because we use /etc/default/busybox-syslog when using systemd which the sysvinit initscript doesn't use, and no /etc/default/busybox-syslog is installed by default in OE-Core, the default arguments with systemd were no arguments at all with OE-Core alone. Effectively merge in the bbappend from meta-oe that adds a default file in order to set the default options to "-C" for systemd as well. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-08-22busybox.inc: Avoid error when SYSLOG is not enabledFlorin Sarbu1
Add -f to rm of ${D}${sysconfdir}/syslog-startup.conf.${BPN} so as to not error out when the busybox config used does not have SYSLOG enabled and DISTRO_FEATURES does not contain sysvinit. Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-09busybox: remove syslog-startup.conf if sysvinit not in DISTRO_FEATURESChen Qi1
sysvinit and systemd have different ideas about configuration files (or environment files in systemd), so basically we can't use the same one in both cases. To avoid confusion, this patch removes syslog-startup.conf if 'sysvinit' is not in DISTRO_FEATURES. [YOCTO #4837] [YOCTO #4860] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-31busybox: move /bin/su to /usr/bin/su to match util-linux and shadowHongxu Jia2
Both of util-linux and shadow have su binary in /usr/bin, fix busybox to use the same path so they can be properly tracked by alternatives. [YOCTO #4926] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-30busybox: Add syslog-init alternative only if SysV in enabledMuhammad Shakeel1
If systemd is enabled then syslog is handled through a service file and related files in /etc/init.d are removed. This removes following warning: WARNING: busybox: NOT adding alternative provide /etc/init.d/syslog: /etc/init.d/syslog.busybox does not exist Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-18busybox: fix ip reference in simple.scriptMark Hatle1
The ip is being installed into /sbin as of the latest busybox. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-05busybox: upgrade to stable 1.21.1Chen Qi20
Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-05busybox: fix the on-target upgrade problemChen Qi1
We now can have a 'one-binary' version of busybox, or 'two-binary' version of busybox, controlled by the 'BUSYBOX_SPLIT_SUID' variable. This makes on-target upgrade a problem, as we have to support the following four upgrading paths. For convenience, in the following context, A is used to denote a 'two-binary' version of busybox while B is used to denote a 'one-binary' version of busybox. A --(upgrade)--> B B --(upgrade)--> A A --(upgrade)--> A B --(upgrade)--> B This patch makes effort to support the above four situations. [YOCTO #4802] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-25busybox: Add ptestBjörn Stenberg3
Install busybox test suite and run it as ptest. Signed-off-by: Anders Roxell <anders.roxell@enea.com> Signed-off-by: Björn Stenberg <bjst@enea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-25busybox: add the ability to split the busybox binaryChen Qi1
This patch enables us to split the busybox into two binaries, one containing suid applications, and the other containing nosuid apps. Add a variable, BUSYBOX_SPLIT_SUID, to control whether to split the busybox binary into two parts. We default it to "1" to enable the splitting, but users could still override it to disable the splitting. After all, busybox has no internal support for this suid apps splitting, so there might be users out there who want just one busybox binary. The basic idea here is to build the busybox twice, each with the correct configuration items. We extract the non-app part of the original .config file, and merge this part with the suid-app part to form a .config which contains only suid apps. The same strategy applies to the non-suid apps. [YOCTO #4207] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-25busybox: enable to list suid and non-suid app configsChen Qi2
This patch, written by Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, adds the ability to busybox to list configuration items of suid apps and non-suid apps separately. `make busybox.cfg.suid' generates a file containing config items of the suid apps. 'make busybox.cfg.nosuid' generates a file containing config items of the non-suid apps. This patch helps to separate busybox into two binaries, the suid one and the non-suid one. [YOCTO #4207] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-25busybox: add a config fragment to enable login utilitiesChen Qi2
Create a config fragment to enable the login/passwd utilities of busybox. [YOCTO #4207] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-25busybox: add support for CONFIG_FEATURE_INDIVIDUALChen Qi1
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>
2013-06-25busybox: remove the postinst part of the recipeChen Qi1
Remove the pkg_postinst_${PN} from this recipe, as it's redundant. It basically wants to do the same thing as the update-alternatives does. But it doesn't do it well. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-24busybox: backport sulogin empty root password fixJonathan Liu2
This allows system maintenance login if the root password is empty. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-16busybox-mdev: Startup at level S03 instead of S06Mike Looijmans1
The udev hotplug deamon starts at 03, so mdev should start at the same point. This fixes the bug that when modutils (runs at 04) initializes devices that the mdev hotplug will often not pick them up, resulting in missing device nodes and similar problems. Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-09class/lib: Fix up various file access methodsRichard Purdie1
There are various bits of cruft that have built up around our file accesses. This patch cleans some of them up, specifically: * Remove pointless "from __builtin__ import file" * Use open(), not file() * Wrap file usage in a with container to ensure files are closed * Add missing .close() calls in some cases Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-18busybox: hard-code the syslog service fileRoss Burton1
Previously this was using ${PN}-syslog.service, which changes with multilib. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-17busybox: fix mount issueLaurentiu Palcu1
When the mount command is not given the filesystem type to mount, then it will try all the known filesystems. However, when a filesystem is not supported by the kernel, the mount function call will return ENODEV. The following patch, ecd90bc6aa63da2aef2513ac090d4b426b2b719c, introduced a problem because it bailed out on ENODEV too. Instead it should have only bailed out on ENOMEDIUM. [YOCTO #4308] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-15busybox: Add inetd related filesTing Liu4
Add back inetd and inetd.conf files which are needed if CONFIG_INETD is enabled in the defconfig. Grabbed these files from oe-classic This patch is based on the previous patch for denzil: http://patches.openembedded.org/patch/33235/ Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-15busybox: detects customized configs when do_installTing Liu2
After using 'bitbake -c menuconfig busybox' to customize defconfig, do_install fail to detect the changes. Grep configs in ${B}/.config instead of ${WORKDIR}/defconfig. Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-10busybox: fail on no mediaSaul Wold2
The current behaviour of busybox is to try all fstype when automounting even when no media exists. The util-linux mount command bails when no media exists, so change the behaviour of busybox to do the same. It could also be argued that the KERN_INFO message from btrfs could be removed, but that would be harder to accomplish. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-26busybox: order and group initscript variables logicallyRoss Burton1
Signed-off-by: Ross Burton <ross.burton@intel.com>
2013-03-26busybox: add strictatime support to mountRoss Burton2
systemd uses strictatime when mounting tmpfs. Luckily this is already supported upstream, so backport the patch from git. Signed-off-by: Ross Burton <ross.burton@intel.com>
2013-03-26busybox: enable systemd integration for syslogdRadu Moisan4
Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Ross Burton <ross.burton@intel.com>
2013-03-15busybox: enable swapon -p (91 byte increase)Ross Burton1
systemd needs "swapon -p", so as the impact is minimal enable it unversally. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-02-22hwclock.sh: check for the existence of /etc/default/rcSChen Qi1
/etc/default/rcS might be missing if the init manager is not sysvinit. So we have to check for the existence of this file before sourcing it. [YOCTO #3697] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-02-13busybox: add config fragmentsChen Qi1
Add config fragments to busybox. The implementation makes use of merge_config.sh script in kern-tools-native. The use case is similar to the yocto kernel's configuration fragments. We also add kern-tools-native to busybox's DEPENDS variable to ensure that merge_config.sh is available when required. [YOCTO #3379] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>