diff options
author | Rosen Penev <rosenp@gmail.com> | 2021-01-31 16:15:53 -0800 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-02-14 15:15:32 +0100 |
commit | 0275ee5dde7c36c925396779dd23d4f470ab40e1 (patch) | |
tree | 88e07de1fa39b6c9909478b0909e617523d6c830 /package/utils/busybox/config/miscutils | |
parent | 157cd0bd97bcfec8a34d4ebb558f37bee4f0515f (diff) | |
download | upstream-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/miscutils')
-rw-r--r-- | package/utils/busybox/config/miscutils/Config.in | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/package/utils/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in index 6ce6d2d7e3..f3b29787d1 100644 --- a/package/utils/busybox/config/miscutils/Config.in +++ b/package/utils/busybox/config/miscutils/Config.in @@ -9,7 +9,6 @@ menu "Miscellaneous Utilities" config BUSYBOX_CONFIG_ADJTIMEX bool "adjtimex (4.7 kb)" default BUSYBOX_DEFAULT_ADJTIMEX - select BUSYBOX_CONFIG_PLATFORM_LINUX help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. @@ -122,7 +121,6 @@ endif config BUSYBOX_CONFIG_BEEP bool "beep (2.4 kb)" default BUSYBOX_DEFAULT_BEEP - select BUSYBOX_CONFIG_PLATFORM_LINUX help The beep applets beeps in a given freq/Hz. @@ -210,7 +208,6 @@ config BUSYBOX_CONFIG_FEATURE_CHAT_CLR_ABORT config BUSYBOX_CONFIG_CONSPY bool "conspy (10 kb)" default BUSYBOX_DEFAULT_CONSPY - select BUSYBOX_CONFIG_PLATFORM_LINUX help A text-mode VNC like program for Linux virtual terminals. example: conspy NUM shared access to console num @@ -276,7 +273,6 @@ config BUSYBOX_CONFIG_CRONTAB config BUSYBOX_CONFIG_DEVFSD bool "devfsd (obsolete)" default BUSYBOX_DEFAULT_DEVFSD - select BUSYBOX_CONFIG_PLATFORM_LINUX select BUSYBOX_CONFIG_FEATURE_SYSLOG help This is deprecated and should NOT be used anymore. @@ -319,7 +315,6 @@ config BUSYBOX_CONFIG_DEVFSD_VERBOSE config BUSYBOX_CONFIG_FEATURE_DEVFS bool "Use devfs names for all devices (obsolete)" default BUSYBOX_DEFAULT_FEATURE_DEVFS - select BUSYBOX_CONFIG_PLATFORM_LINUX help This is obsolete and should NOT be used anymore. Use linux >= 2.6 (optionally with hotplug) and mdev instead! @@ -337,7 +332,6 @@ config BUSYBOX_CONFIG_DEVMEM config BUSYBOX_CONFIG_FBSPLASH bool "fbsplash (26 kb)" default BUSYBOX_DEFAULT_FBSPLASH - select BUSYBOX_CONFIG_PLATFORM_LINUX help Shows splash image and progress bar on framebuffer device. Can be used during boot phase of an embedded device. @@ -383,7 +377,6 @@ config BUSYBOX_CONFIG_FLASHCP config BUSYBOX_CONFIG_HDPARM bool "hdparm (25 kb)" default BUSYBOX_DEFAULT_HDPARM - select BUSYBOX_CONFIG_PLATFORM_LINUX help Get/Set hard drive parameters. Primarily intended for ATA drives. @@ -445,35 +438,30 @@ config BUSYBOX_CONFIG_HEXEDIT config BUSYBOX_CONFIG_I2CGET bool "i2cget (5.5 kb)" default BUSYBOX_DEFAULT_I2CGET - select BUSYBOX_CONFIG_PLATFORM_LINUX help Read from I2C/SMBus chip registers. config BUSYBOX_CONFIG_I2CSET bool "i2cset (6.7 kb)" default BUSYBOX_DEFAULT_I2CSET - select BUSYBOX_CONFIG_PLATFORM_LINUX help Set I2C registers. config BUSYBOX_CONFIG_I2CDUMP bool "i2cdump (7.1 kb)" default BUSYBOX_DEFAULT_I2CDUMP - select BUSYBOX_CONFIG_PLATFORM_LINUX help Examine I2C registers. config BUSYBOX_CONFIG_I2CDETECT bool "i2cdetect (7.1 kb)" default BUSYBOX_DEFAULT_I2CDETECT - select BUSYBOX_CONFIG_PLATFORM_LINUX help Detect I2C chips. config BUSYBOX_CONFIG_I2CTRANSFER bool "i2ctransfer (4.0 kb)" default BUSYBOX_DEFAULT_I2CTRANSFER - select BUSYBOX_CONFIG_PLATFORM_LINUX help Send user-defined I2C messages in one transfer. @@ -587,7 +575,6 @@ config BUSYBOX_CONFIG_LOCK config BUSYBOX_CONFIG_LSSCSI bool "lsscsi (2.5 kb)" default BUSYBOX_DEFAULT_LSSCSI - #select PLATFORM_LINUX help lsscsi is a utility for displaying information about SCSI buses in the system and devices connected to them. @@ -634,6 +621,13 @@ config BUSYBOX_CONFIG_MICROCOM default BUSYBOX_DEFAULT_MICROCOM help The poor man's minicom utility for chatting with serial port devices. +config BUSYBOX_CONFIG_MIM + bool "mim (0.5 kb)" + default BUSYBOX_DEFAULT_MIM + depends on BUSYBOX_CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS + help + Run a script from a Makefile-like specification file. + Unlike 'make' dependencies aren't supported. config BUSYBOX_CONFIG_MT bool "mt (2.5 kb)" default BUSYBOX_DEFAULT_MT @@ -644,26 +638,22 @@ config BUSYBOX_CONFIG_MT config BUSYBOX_CONFIG_NANDWRITE bool "nandwrite (4.8 kb)" default BUSYBOX_DEFAULT_NANDWRITE - select BUSYBOX_CONFIG_PLATFORM_LINUX help Write to the specified MTD device, with bad blocks awareness config BUSYBOX_CONFIG_NANDDUMP bool "nanddump (5.2 kb)" default BUSYBOX_DEFAULT_NANDDUMP - select BUSYBOX_CONFIG_PLATFORM_LINUX help Dump the content of raw NAND chip config BUSYBOX_CONFIG_PARTPROBE bool "partprobe (3.5 kb)" default BUSYBOX_DEFAULT_PARTPROBE - select BUSYBOX_CONFIG_PLATFORM_LINUX help Ask kernel to rescan partition table. config BUSYBOX_CONFIG_RAIDAUTORUN bool "raidautorun (1.3 kb)" default BUSYBOX_DEFAULT_RAIDAUTORUN - select BUSYBOX_CONFIG_PLATFORM_LINUX help raidautorun tells the kernel md driver to search and start RAID arrays. @@ -671,7 +661,6 @@ config BUSYBOX_CONFIG_READAHEAD bool "readahead (1.5 kb)" default BUSYBOX_DEFAULT_READAHEAD depends on BUSYBOX_CONFIG_LFS - select BUSYBOX_CONFIG_PLATFORM_LINUX help Preload the files listed on the command line into RAM cache so that subsequent reads on these files will not block on disk I/O. @@ -687,7 +676,6 @@ config BUSYBOX_CONFIG_READAHEAD config BUSYBOX_CONFIG_RFKILL bool "rfkill (4.4 kb)" default BUSYBOX_DEFAULT_RFKILL # doesn't build on Ubuntu 9.04 - select BUSYBOX_CONFIG_PLATFORM_LINUX help Enable/disable wireless devices. @@ -708,7 +696,6 @@ config BUSYBOX_CONFIG_RUNLEVEL config BUSYBOX_CONFIG_RX bool "rx (2.9 kb)" default BUSYBOX_DEFAULT_RX - select BUSYBOX_CONFIG_PLATFORM_LINUX help Receive files using the Xmodem protocol. config BUSYBOX_CONFIG_SETFATTR @@ -719,7 +706,6 @@ config BUSYBOX_CONFIG_SETFATTR config BUSYBOX_CONFIG_SETSERIAL bool "setserial (6.9 kb)" default BUSYBOX_DEFAULT_SETSERIAL - select BUSYBOX_CONFIG_PLATFORM_LINUX help Retrieve or set Linux serial port. config BUSYBOX_CONFIG_STRINGS @@ -749,48 +735,41 @@ config BUSYBOX_CONFIG_TTYSIZE config BUSYBOX_CONFIG_UBIATTACH bool "ubiattach (4.2 kb)" default BUSYBOX_DEFAULT_UBIATTACH - select BUSYBOX_CONFIG_PLATFORM_LINUX help Attach MTD device to an UBI device. config BUSYBOX_CONFIG_UBIDETACH bool "ubidetach (4.1 kb)" default BUSYBOX_DEFAULT_UBIDETACH - select BUSYBOX_CONFIG_PLATFORM_LINUX help Detach MTD device from an UBI device. config BUSYBOX_CONFIG_UBIMKVOL bool "ubimkvol (5.3 kb)" default BUSYBOX_DEFAULT_UBIMKVOL - select BUSYBOX_CONFIG_PLATFORM_LINUX help Create a UBI volume. config BUSYBOX_CONFIG_UBIRMVOL bool "ubirmvol (4.9 kb)" default BUSYBOX_DEFAULT_UBIRMVOL - select BUSYBOX_CONFIG_PLATFORM_LINUX help Delete a UBI volume. config BUSYBOX_CONFIG_UBIRSVOL bool "ubirsvol (4.2 kb)" default BUSYBOX_DEFAULT_UBIRSVOL - select BUSYBOX_CONFIG_PLATFORM_LINUX help Resize a UBI volume. config BUSYBOX_CONFIG_UBIUPDATEVOL bool "ubiupdatevol (5.2 kb)" default BUSYBOX_DEFAULT_UBIUPDATEVOL - select BUSYBOX_CONFIG_PLATFORM_LINUX help Update a UBI volume. config BUSYBOX_CONFIG_UBIRENAME bool "ubirename (2.4 kb)" default BUSYBOX_DEFAULT_UBIRENAME - select BUSYBOX_CONFIG_PLATFORM_LINUX help Utility to rename UBI volumes config BUSYBOX_CONFIG_VOLNAME @@ -801,7 +780,6 @@ config BUSYBOX_CONFIG_VOLNAME config BUSYBOX_CONFIG_WATCHDOG bool "watchdog (5.3 kb)" default BUSYBOX_DEFAULT_WATCHDOG - select BUSYBOX_CONFIG_PLATFORM_LINUX help The watchdog utility is used with hardware or software watchdog device drivers. It opens the specified watchdog device special file |