aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/config/modutils/Config.in
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2021-01-31 16:15:53 -0800
committerHauke Mehrtens <hauke@hauke-m.de>2021-02-14 15:15:32 +0100
commit0275ee5dde7c36c925396779dd23d4f470ab40e1 (patch)
tree88e07de1fa39b6c9909478b0909e617523d6c830 /package/utils/busybox/config/modutils/Config.in
parent157cd0bd97bcfec8a34d4ebb558f37bee4f0515f (diff)
downloadupstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.tar.gz
upstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.tar.bz2
upstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.zip
busybox: update to 1.33
Remove stime backport. Remove static libgcc patch as upstream fixed it with BUSYBOX_DEFAULT_STATIC_LIBGCC which defauls to off. Remove date -k patch as it no longer applies. It's also pointless as busybox' hwclock utility can do the same thing. Remove ntpd patch as that seems to have been applied upstream. Add smalll patch fixing compilation with SELinux. Upstream commit 2496616b0a8d1c80cd1416b73a4847b59b9f969a renamed the variable without renaming it in the SELinux path. Refresh config and patches. Config refresh: Refresh commands, run after busybox is first built once: cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0 cd .. ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0/.config > Config-defaults.in Manual edits needed afterward: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt configTARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit 547f1ec) * editors/Config.in: Add USE_GLIBC dependency to BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commit f141090) * shell/Config.in : change at "Options common to all shells" the 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 Config.in files by adding quotes to sourced items in config/Config.in, networking/Config.in and util-linux/Config.in (commit 1da014f) Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [Added comments from Hannu Nyman to commit message] Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/utils/busybox/config/modutils/Config.in')
-rw-r--r--package/utils/busybox/config/modutils/Config.in6
1 files changed, 0 insertions, 6 deletions
diff --git a/package/utils/busybox/config/modutils/Config.in b/package/utils/busybox/config/modutils/Config.in
index cc2d20813b..e3538081ea 100644
--- a/package/utils/busybox/config/modutils/Config.in
+++ b/package/utils/busybox/config/modutils/Config.in
@@ -37,7 +37,6 @@ config BUSYBOX_CONFIG_MODPROBE_SMALL
config BUSYBOX_CONFIG_DEPMOD
bool "depmod (27 kb)"
default BUSYBOX_DEFAULT_DEPMOD
- select BUSYBOX_CONFIG_PLATFORM_LINUX
help
depmod generates modules.dep (and potentially modules.alias
and modules.symbols) that contain dependency information
@@ -45,13 +44,11 @@ config BUSYBOX_CONFIG_DEPMOD
config BUSYBOX_CONFIG_INSMOD
bool "insmod (22 kb)"
default BUSYBOX_DEFAULT_INSMOD
- select BUSYBOX_CONFIG_PLATFORM_LINUX
help
insmod is used to load specified modules in the running kernel.
config BUSYBOX_CONFIG_LSMOD
bool "lsmod (1.9 kb)"
default BUSYBOX_DEFAULT_LSMOD
- select BUSYBOX_CONFIG_PLATFORM_LINUX
help
lsmod is used to display a list of loaded modules.
@@ -66,13 +63,11 @@ config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
config BUSYBOX_CONFIG_MODINFO
bool "modinfo (24 kb)"
default BUSYBOX_DEFAULT_MODINFO
- select BUSYBOX_CONFIG_PLATFORM_LINUX
help
Show information about a Linux Kernel module
config BUSYBOX_CONFIG_MODPROBE
bool "modprobe (28 kb)"
default BUSYBOX_DEFAULT_MODPROBE
- select BUSYBOX_CONFIG_PLATFORM_LINUX
help
Handle the loading of modules, and their dependencies on a high
level.
@@ -90,7 +85,6 @@ config BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST
config BUSYBOX_CONFIG_RMMOD
bool "rmmod (3.3 kb)"
default BUSYBOX_DEFAULT_RMMOD
- select BUSYBOX_CONFIG_PLATFORM_LINUX
help
rmmod is used to unload specified modules from the kernel.