NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

busybox: add 1.14.x

Browse Source
This commit is contained in:
Peter Korsgaard 2009-04-15 13:42:03 +00:00
parent edfe9feee7
commit c19a51f993
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/busybox/Config.in
View File

@ -12,7 +12,7 @@ config BR2_PACKAGE_BUSYBOX
choice choice
prompt "BusyBox Version" prompt "BusyBox Version"
depends on BR2_PACKAGE_BUSYBOX depends on BR2_PACKAGE_BUSYBOX
default BR2_BUSYBOX_VERSION_1_13_X default BR2_BUSYBOX_VERSION_1_14_X
help help
Select the version of BusyBox you wish to use. Select the version of BusyBox you wish to use.
@ -46,10 +46,14 @@ choice
config BR2_BUSYBOX_VERSION_1_12_X config BR2_BUSYBOX_VERSION_1_12_X
bool "BusyBox 1.12.x" bool "BusyBox 1.12.x"
depends on BR2_DEPRECATED || BR2_RECENT depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_13_X config BR2_BUSYBOX_VERSION_1_13_X
bool "BusyBox 1.13.x" bool "BusyBox 1.13.x"
depends on BR2_DEPRECATED || BR2_RECENT
config BR2_BUSYBOX_VERSION_1_14_X
bool "BusyBox 1.14.x"
config BR2_PACKAGE_BUSYBOX_SNAPSHOT config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot" bool "daily snapshot"
@ -67,6 +71,7 @@ config BR2_BUSYBOX_VERSION
default "1.11.3" if BR2_BUSYBOX_VERSION_1_11_X default "1.11.3" if BR2_BUSYBOX_VERSION_1_11_X
default "1.12.4" if BR2_BUSYBOX_VERSION_1_12_X default "1.12.4" if BR2_BUSYBOX_VERSION_1_12_X
default "1.13.4" if BR2_BUSYBOX_VERSION_1_13_X default "1.13.4" if BR2_BUSYBOX_VERSION_1_13_X
default "1.14.0" if BR2_BUSYBOX_VERSION_1_14_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation" bool "Run BusyBox's own full installation"
@ -94,6 +99,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X
default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_14_X
help help
Some people may wish to use their own modified BusyBox configuration Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option. file, and will specify their config file location with this option.

4
package/busybox/busybox.mk
View File

@ -52,8 +52,8 @@ ifeq ($(BR2_BUSYBOX_VERSION_1_2_2_1),y)
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ $(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config $(BUSYBOX_DIR)/.config
endif endif
# id applet breaks on 1.13.0 with old uclibc unless the bb pwd routines are used # id applet breaks on >=1.13.0 with old uclibc unless the bb pwd routines are used
ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_UCLIBC_VERSION_0_9_28_3)$(BR2_UCLIBC_VERSION_0_9_29),yy) ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_BUSYBOX_VERSION_1_14_X)$(BR2_UCLIBC_VERSION_0_9_28_3)$(BR2_UCLIBC_VERSION_0_9_29),yy)
if grep -q 'CONFIG_ID=y' $(BUSYBOX_DIR)/.config; \ if grep -q 'CONFIG_ID=y' $(BUSYBOX_DIR)/.config; \
then \ then \
echo 'warning: CONFIG_ID needs BB_PWD_GRP with old uclibc, enabling' >&2;\ echo 'warning: CONFIG_ID needs BB_PWD_GRP with old uclibc, enabling' >&2;\