summaryrefslogtreecommitdiffstats
path: root/package/busybox
Commit message (Collapse)AuthorAgeFilesLines
* infra/pkg-kconfig: incorporate oldconfig call to avoid endless rebuildsThomas De Schampheleire2014-08-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The configure step of the busybox package performs 'make oldconfig', which causes the .config file to be updated. Thus, the .config file is more recent than our stamp file .stamp_kconfig_fixup_done. On a subsequent build, our dependency rules would kick in, and run the config fixup again, thus kicking in the package's configure, build and install steps yet once more, that, ad infinitum. One solution is to modify kconfig-package to introduce an explicit touch of the .kconfig_fixup_config_done stamp file, as post-configure hook. Another solution, implemented by this patch, is to move the oldconfig call from the package's .mk file to the kconfig-package infrastructure and make sure it is done as part of the fixup commands. This way, the stamp file will only be touched once, after the full fixup (including oldconfig) and no endless rebuilds will occur. Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Suggested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: enable ash getoptsGustavo Zacarias2014-08-061-1/+1
| | | | | | | It's increasingly used by scripts like some in the btrfs-progs package. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: convert to kconfig-package infrastructureThomas De Schampheleire2014-08-041-16/+9
| | | | | | | | | | | This patch converts the busybox package to the new kconfig-package infrastructure, thus removing code duplication and ensuring a consistent behavior of kconfig packages. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: enable fdisk in default configGustavo Zacarias2014-07-261-5/+5
| | | | | | | | | | | | As noted by mnemoc on IRC the default busybox config doesn't enable fdisk and util-linux is hidden by !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS. On modern systems fdisk usage is becoming more common so enable it, it just adds up ~25 KiB to total binary size. People who are on the edge for space savings will normally customize their busybox config. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: fix typo 'overwritting'Thomas De Schampheleire2014-07-141-1/+1
| | | | | | Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: fix interaction with version selection removal and lzo fixThomas Petazzoni2014-07-124-198/+0
| | | | | | | | | | | | The fix for the LZO issue in Busybox was merged between the moment the patch removing the Busybox version selection was posted and merged. This patch adjusts the Busybox patches to take into account this issue: it removes the LZO patches for the no-longer existing Busybox versions, and moves the LZO fix for the 1.22.1 Busybox version as appropriate. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
* busybox: support only one versionThomas Petazzoni2014-07-1019-3600/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the version selection for the busybox package. Busybox is very well maintained, and bugs are typically fixed in a timely fashion. Moreover, regressions are fairly unlikely in this very stable and well-tested tool. Therefore, there isn't a very compelling reason to have a version selection for Busybox since we don't accept such a version selection for the vast majority of other packages, unless there is a strong reason to do so. Consequently, this commit: * Removes the 1.19.4, 1.20.2 and 1.21.1 Busybox versions, patches and default configuration file. * Moves the 1.22.1 patches from package/busybox/1.22.1 to just package/busybox/ like all other packages. * Renames the default 1.22.1 configuration file to just busybox.config. * Adapts the busybox.mk makefile to encode the current version to use. * Adds appropriate options to Config.in.legacy. However, even though the BR2_BUSYBOX_VERSION_1_22_X is removed, we don't add a Config.in.legacy option for it, since it would cause a legacy warning for virtually *all* users as most people are currently using 1.22.x. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: add security patch for CVE-2014-4607Gustavo Zacarias2014-06-304-0/+264
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: replace command install by $(INSTALL)Maxime Hadjinlian2014-06-081-3/+3
| | | | | | Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: enable noclobber option in install.shDanomi Manchego2014-06-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | We support a busybox-menuconfig target so that the BusyBox configuration can be adjusted as needed. However, depending on what other packages are enabled, re-installing BusyBox symlinks that duplicate "real" apps after the configuration change can result in bad behaviors: * At best, the BusyBox applet will be used after the install, versus the desired "real" app. * At worst, the built rootfs can become unbootable. The BusyBox install.sh has some capability to avoid this issue by means of a --noclobber option. By default, this option is disabled. When enabled, the install.sh will not overwrite a target file with a symlink or hardlink, be it an actual file or a previously installed BusyBox link. The install.sh's argument processing is somewhat broken, so this patch simply changes the default value of the noclobber option to on, rather than add --noclobber to the install.sh invocation. Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: use SED macro instead of 'sed -i'Danomi Manchego2014-06-041-1/+1
| | | | | Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: add fbset to default configsHadrien Boutteville2014-06-024-12/+12
| | | | | | | | | | Some drivers (like ti-gfx) need fbset and we can't select it when we use BusyBox because it is provided by BusyBox and as a package. Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-by: "Spenser Gilliland" <spenser@gillilanding.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* replace references to Busybox with BusyBoxSimon Dawson2014-06-012-2/+2
| | | | | | | | | The correct capitalised form appears to be "BusyBox" rather than "Busybox"; fix all references to the latter form. (Most such references occur in the manual and in commentary in package makefiles.) Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: allow build with muslThomas Petazzoni2014-05-051-0/+9
| | | | | | | | | The musl C library does not yet implemented the getpwent_r() function, needed by the Busybox password code when CONFIG_USE_BB_PWD_GRP is disabled. So we enable it when the musl C library is used. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox 1.22.1: add nc patchGustavo Zacarias2014-03-011-0/+15
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: copy config file from configure iso extract stepThomas De Schampheleire2014-02-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The three typical packages that use .config files in buildroot copy the config file at different times in the build process: busybox copies its .config from the post-extract hook. linux copies its .config in the configure_cmds. uclibc copies its .config from the post-patch hook. Copying the .config file from the configure step is the only way to properly support an OVERRIDE_SRCDIR that does not yet have the .config file, because the extract and patch steps are skipped in that case. For example, when setting a BUSYBOX_OVERRIDE_SRCDIR to a cleanly extracted busybox tarball: $ make busybox-dirclean busybox rm -Rf [..]/output/build/busybox-custom >>> busybox custom Syncing from source dir >>> /home/tdescham/repo/contrib/busybox-1.21.1 rsync -au --exclude .svn --exclude .git --exclude .hg --exclude .bzr --exclude CVS /home/tdescham/repo/contrib/busybox-1.21.1/ [..]/output/build/busybox-custom >>> busybox custom Configuring /bin/sed -i -e "/\\<CONFIG_NOMMU\\>/d" [..]/output/build/busybox-custom/.config /bin/sed: can't read [..]/output/build/busybox-custom/.config: No such file or directory make: *** [[..]/output/build/busybox-custom/.stamp_configured] Error 2 This patch modifies busybox.mk to copy the config file from the configure step instead, as linux is doing, and fixing the described scenario. This fixes bug #5030: https://bugs.busybox.net/show_bug.cgi?id=5030 Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: ensure SHA passwords are supported if usedPeter Korsgaard2014-02-111-0/+8
| | | | | | | As reported on IRC, our default busybox configuration doesn't support SHA encoded passwords, breaking login if enabled under system configuration. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: ensure $(BUSYBOX_BUILD_CONFIG) is writableNathan Lynch2014-01-281-1/+1
| | | | | | | | | | | | If $(BUSYBOX_CONFIG_FILE) is read-only (eg. because Buildroot's source dir is), the sed fixups to $(BUSYBOX_BUILD_CONFIG) fail. Fixes: #4363 Signed-off-by: Nathan Lynch <ntl@pobox.com> [yann.morin.1998@free.fr: use $(INSTALL) instead of cp] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: 1.22.1: correct ash patchPeter Korsgaard2014-01-231-20/+11
| | | | | | | | Upstream initially put the wrong patch online: http://lists.busybox.net/pipermail/busybox/2014-January/080364.html Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox 1.22.1: add upstream iplink fixGustavo Zacarias2014-01-231-0/+19
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: 1.22.1: add upstream date fixPeter Korsgaard2014-01-211-0/+30
| | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: bump 1.22 series to 1.22.1Gustavo Zacarias2014-01-207-144/+21
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: udhcpc script: suppress useless error messageBaruch Siach2014-01-161-1/+1
| | | | | | | | | Suppress the following error: route: SIOCDELRT: No such process Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: udhcpc script: create resolv.confBaruch Siach2014-01-151-0/+1
| | | | | | | | | Eliminate the following error message on every boot: grep: /etc/resolv.conf: No such file or directory Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox 1.22.0: add line edit patchGustavo Zacarias2014-01-151-0/+12
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* deprecated handling: introduce BR2_DEPRECATED_SINCE_xxxx_xxThomas De Schampheleire2014-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | In order to keep better track of when a feature got deprecated, and hence when it can be removed, a new set of symbols BR2_DEPRECATED_SINCE_xxxx_xx is introduced. These symbols are automatically selected when BR2_DEPRECATED is selected, and thus are transparent to the user. A deprecated feature will no longer depend on BR2_DEPRECATED directly, but rather on the appropriate BR2_DEPRECATED_SINCE_xxxx_xx. If that symbol does not yet exist, it has to be created in Config.in. When removing a deprecated feature, one should also check whether this was the last feature using the BR2_DEPRECATED_SINCE_xxxx_xx symbol, in which case the latter can be removed from Config.in. A followup patch will make sure the overview is added to the list of deprecated features in the manual, so that a buildroot core developer can easily determine which features to remove in a given development cycle. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: add upstream 1.22.0 fixesPeter Korsgaard2014-01-093-0/+131
| | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox 1.22.x: disable touch -hGustavo Zacarias2014-01-021-1/+1
| | | | | | | | | | Disable the busybox touch --no-dereference since it requires lutimes support and breaks old toolchains that don't support it (example: avr32). Probably nobody cares that much since it's a new feature. Fixes: http://autobuild.buildroot.net/results/9c2/9c29379719ae5cf5800c0dcb4cf514c5dc15d9b6/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: add 1.22.x series, deprecate 1.19.xGustavo Zacarias2014-01-013-1/+1070
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: remove package clean commandsThomas De Schampheleire2013-12-081-4/+0
| | | | | Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: remove uninstall commandsThomas De Schampheleire2013-12-061-4/+0
| | | | | Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* Config.in files: whitespace cleanupThomas De Schampheleire2013-11-111-1/+1
| | | | | | | | | | This patch fixes the following whitespace problems in Config.in files: - trailing whitespace - spaces instead of tabs for indentation - help text not indented with tab + 2 spaces Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: minor fixes to S01logging bootscriptJavier Viguera2013-11-061-2/+2
| | | | | | | | | | | | | | | | | * The PID file is not created unless the '-m' option is passed to start-stop-daemon. * Remove the mark '-m 0' option as it's not supported by busybox's syslogd. * Syslogd and Klogd forks to background by default giving as a result that the pid stored in the PID file is not correct. Let the background job be done by 'start-stop-daemon' by passing '-n' (foreground) to the daemons and '-b' to start-stop-daemon. This way the pid stored in the PID files is correct. Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: add patches to fix build with the musl C libraryThomas Petazzoni2013-10-093-0/+101
| | | | | | | Those patches have been submitted upstream. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* busybox: set/unset CONFIG_NOMMUGustavo Zacarias2013-08-101-9/+14
| | | | | | | | | Set busybox .config CONFIG_NOMMU appropiately and streamline this new setting with the previous BUSYBOX_DISABLE_MMU_APPLETS in a single BUSYBOX_SET_MMU definition (since it's not just applets now). Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: register mdev as hotplug helper when selectedGustavo Zacarias2013-07-281-0/+1
| | | | | | | | | It's also done in the kernel configuration, however users may be using some other pre-built kernel and miss functionality like firmware loading. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* busybox: don't use kernel headers directlyThomas Petazzoni2013-07-031-2/+1
| | | | | | | | The kernel headers are part of the staging directory, so there is no reason to point the Busybox CFLAGS directly to them. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: bump 1.21.x series to 1.21.1Gustavo Zacarias2013-06-295-821/+1
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: udhcpc.script: fix resolv.conf handling with multiple interfacesPeter Korsgaard2013-06-261-3/+16
| | | | | | | | | | | | | | | | | | | | | When udhcpc is used on multiple network devices at the same time (or a mix of dhcp and fixed configuration), /etc/resolv.conf should contain the union of information from all the interfaces. Currently that's not the case. The udhcpc script simply overwrites resolv.conf with the information from the specific interface on each dhcp bound/renew event. Fix it by tagging lines with the interface they came from when added, and drop the affected lines on deconfig/renew. As /etc/resolv.conf is often a symlink to /tmp (and rootfs might be read only), special care has to be taken when it is updated. Notice that I'm not really aware of any official documentation requiring that '#' comments in /etc/resolv.conf must be supported, but atleast glibc and uClibc do. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: udhcpc.script: cleanupPeter Korsgaard2013-06-261-8/+3
| | | | | | | | | | | | | | | | ifconfig up is a no-op if the device is already running, so let's just do that unconditionally. Systems might have multiple network devices, and perhaps run udhcpc on another interface even when booted over nfs, so don't disable the per-interface deconfig based on the global nfsroot= setting on the kernel command line. If you don't want udhcpc to mess with kernel level IP autoconfiguration (E.G. for nfs boot), you should instead ensure udhcpc/ifup/ifplugd isn't started for that interface. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: use a single udhcpc script, with or without avahi-autoipdPeter Korsgaard2013-06-261-1/+20
| | | | | | | | | | | | | We're currently using two different udhcpc scripts, one in the busybox package and another in the avahi one, which calls avahi-autoipd on dhcp failures. The avahi one actually only does something differently from the default if avahi-autoipd is available, so let's just always use this one instead of the complicated logic about writing the file if not present / overwriting it afterwards. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* Normalize separator size to 80Alexandre Belloni2013-06-061-2/+2
| | | | | Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox 1.21.0: update mdev patch and add ntfs volume patchGustavo Zacarias2013-05-142-30/+99
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox 1.21.0: update mdev patchGustavo Zacarias2013-04-231-16/+624
| | | | | | | Update the mdev patch so that subsystem matching is reintroduced. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: move patches to new modelGustavo Zacarias2013-04-238-0/+0
| | | | | | | | On commit 5538e4766201aa0c1c23721cfc99cbbde595964b the versioned package patches changed the directory structure but the packages weren't fixed. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: don't disable static optionPatrick Ziegler2013-04-171-4/+0
| | | | | | | | | | Don't change the busybox STATIC option if buildroots PREFER_STATIC_LIB option is not set. Not to prefer static linking doesn't imply prefer dynamic linking for all packages. Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* Fix path to pidfileTilman Keskinöz2013-03-311-2/+2
| | | | | | Signed-off-by: Tilman Keskinöz <arved@arved.at> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: 1.21.0 platform fix-on-fixPeter Korsgaard2013-02-271-0/+13
| | | | | | The unxz hunk was missing. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: add 1.21.0 xz fixPeter Korsgaard2013-02-271-0/+84
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* busybox: 1.21.1 fix for move_to_unaligned16()Peter Korsgaard2013-02-271-0/+11
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
OpenPOWER on IntegriCloud