package/busybox: update to 1.29.0
The two patches are still needed, with the second needing a slight refresh around the edge. Since upstream has now full support to perform a noclobber install, drop our BUSYBOX_NOCLOBBER_INSTALL hook and use the new install rule. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Baruch Siach <baruch@tkos.co.il> Cc: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
d5d1df1ba7
commit
50dc350c65
|
@ -4,6 +4,8 @@ Date: Mon, 25 Nov 2013 22:51:53 +0100
|
|||
Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
[yann.morin.1998@free.fr: refresh for 1.29.0]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
Makefile.flags | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
@ -22,7 +24,7 @@ index 307afa7..885e323 100644
|
|||
+ $(SELINUX_PC_MODULES:lib%=%))
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_EFENCE),y)
|
||||
ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
# From https://busybox.net/downloads/busybox-1.28.4.tar.bz2.sign
|
||||
md5 5661d013c9ef7cc31a453640c320f56b busybox-1.28.4.tar.bz2
|
||||
sha1 acd0558a659b795da1dfbd7e0ed5353d6836fa37 busybox-1.28.4.tar.bz2
|
||||
|
||||
# Locally calculated
|
||||
sha256 e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a busybox-1.28.4.tar.bz2
|
||||
sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE
|
||||
# From https://busybox.net/downloads/busybox-1.29.0.tar.bz2.sha256
|
||||
sha256 c8115612f0be640644e7c35098766ddaac4a88b773c4c4f0e43564982f660c82 busybox-1.29.0.tar.bz2
|
||||
sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
BUSYBOX_VERSION = 1.28.4
|
||||
BUSYBOX_VERSION = 1.29.0
|
||||
BUSYBOX_SITE = http://www.busybox.net/downloads
|
||||
BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
|
||||
BUSYBOX_LICENSE = GPL-2.0
|
||||
|
@ -253,12 +253,6 @@ define BUSYBOX_INSTALL_ADD_TO_SHELLS
|
|||
endef
|
||||
BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS
|
||||
|
||||
# Enable "noclobber" in install.sh, to prevent BusyBox from overwriting any
|
||||
# full-blown versions of apps installed by other packages with sym/hard links.
|
||||
define BUSYBOX_NOCLOBBER_INSTALL
|
||||
$(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh
|
||||
endef
|
||||
|
||||
define BUSYBOX_KCONFIG_FIXUP_CMDS
|
||||
$(BUSYBOX_SET_MMU)
|
||||
$(BUSYBOX_PREFER_STATIC)
|
||||
|
@ -280,7 +274,9 @@ define BUSYBOX_BUILD_CMDS
|
|||
endef
|
||||
|
||||
define BUSYBOX_INSTALL_TARGET_CMDS
|
||||
$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install
|
||||
# Use the 'noclobber' install rule, to prevent BusyBox from overwriting
|
||||
# any full-blown versions of apps installed by other packages.
|
||||
$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install-noclobber
|
||||
$(BUSYBOX_INSTALL_INITTAB)
|
||||
$(BUSYBOX_INSTALL_UDHCPC_SCRIPT)
|
||||
$(BUSYBOX_INSTALL_MDEV_CONF)
|
||||
|
|
Loading…
Reference in a new issue