busybox: update to 1.37.0
Add a patch to fix non-x86 builds, refresh patches and update/fix the configuration as described in98b09ba250(cited here for future reference). Config refresh: Refresh commands, run after busybox is first built once: cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/busybox-default/busybox-1.37.0 cd .. ./convert_defaults.pl ../../../build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/busybox-default/busybox-1.37.0/.config > Config-defaults.in Manual edits needed after config refresh: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt config TARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit547f1ec) * Config-defaults.in: OpenWrt logic applied to BUSYBOX_DEFAULT_LOGIN_SESSION_AS_CHILD (commitdc92917) * Config-defaults.in: correct the default ports that get reset BUSYBOX_DEFAULT_FEATURE_HTTPD_PORT_DEFAULT 80 BUSYBOX_DEFAULT_FEATURE_TELNETD_PORT_DEFAULT 23 * config/editors/Config.in: Add USE_GLIBC dependency to BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commitf141090) * config/shell/Config.in: change at "Options common to all shells" the conditional symbol SHELL_ASH --> BUSYBOX_CONFIG_SHELL_ASH (discussion in http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html Apparently our script does not see the hidden option while prepending config options with "BUSYBOX_CONFIG_" which leads to a missed dependency when the options are later evaluated.) * Edit a few Config.in files by adding quotes to sourced items in config/Config.in, config/networking/Config.in and config/util-linux/Config.in (commit1da014fcca) Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [rebased with the change download line commit] [corrected version in the refresh example in commit message] Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> Link: https://github.com/openwrt/openwrt/pull/17107 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
committed by
Hauke Mehrtens
parent
1aa2695620
commit
89bb4050f7
@@ -87,7 +87,7 @@ config BUSYBOX_CONFIG_SHELL_ASH
|
||||
depends on !BUSYBOX_CONFIG_NOMMU
|
||||
|
||||
config BUSYBOX_CONFIG_ASH
|
||||
bool "ash (78 kb)"
|
||||
bool "ash (80 kb)"
|
||||
default BUSYBOX_DEFAULT_ASH
|
||||
depends on !BUSYBOX_CONFIG_NOMMU
|
||||
select BUSYBOX_CONFIG_SHELL_ASH
|
||||
@@ -201,11 +201,6 @@ config BUSYBOX_CONFIG_ASH_TEST
|
||||
default BUSYBOX_DEFAULT_ASH_TEST
|
||||
depends on BUSYBOX_CONFIG_SHELL_ASH
|
||||
|
||||
config BUSYBOX_CONFIG_ASH_SLEEP
|
||||
bool "sleep builtin"
|
||||
default BUSYBOX_DEFAULT_ASH_SLEEP
|
||||
depends on BUSYBOX_CONFIG_SHELL_ASH
|
||||
|
||||
config BUSYBOX_CONFIG_ASH_HELP
|
||||
bool "help builtin"
|
||||
default BUSYBOX_DEFAULT_ASH_HELP
|
||||
@@ -227,7 +222,7 @@ config BUSYBOX_CONFIG_ASH_CMDCMD
|
||||
|
||||
endif # ash options
|
||||
config BUSYBOX_CONFIG_CTTYHACK
|
||||
bool "cttyhack (2.4 kb)"
|
||||
bool "cttyhack (2.7 kb)"
|
||||
default BUSYBOX_DEFAULT_CTTYHACK
|
||||
help
|
||||
One common problem reported on the mailing list is the "can't
|
||||
@@ -270,7 +265,7 @@ config BUSYBOX_CONFIG_CTTYHACK
|
||||
|
||||
# getty 115200 $(cttyhack)
|
||||
config BUSYBOX_CONFIG_HUSH
|
||||
bool "hush (68 kb)"
|
||||
bool "hush (70 kb)"
|
||||
default BUSYBOX_DEFAULT_HUSH
|
||||
select BUSYBOX_CONFIG_SHELL_HUSH
|
||||
help
|
||||
|
||||
Reference in New Issue
Block a user