From 0275ee5dde7c36c925396779dd23d4f470ab40e1 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 31 Jan 2021 16:15:53 -0800 Subject: 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 [Added comments from Hannu Nyman to commit message] Signed-off-by: Rosen Penev --- package/utils/busybox/config/util-linux/Config.in | 62 ++++------------------- 1 file changed, 9 insertions(+), 53 deletions(-) (limited to 'package/utils/busybox/config/util-linux/Config.in') diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in index 1a3871e92c..e3e59f1506 100644 --- a/package/utils/busybox/config/util-linux/Config.in +++ b/package/utils/busybox/config/util-linux/Config.in @@ -9,7 +9,6 @@ menu "Linux System Utilities" config BUSYBOX_CONFIG_ACPID bool "acpid (9 kb)" default BUSYBOX_DEFAULT_ACPID - select BUSYBOX_CONFIG_PLATFORM_LINUX help acpid listens to ACPI events coming either in textual form from /proc/acpi/event (though it is marked deprecated it is still widely @@ -31,13 +30,11 @@ config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT config BUSYBOX_CONFIG_BLKDISCARD bool "blkdiscard (4.3 kb)" default BUSYBOX_DEFAULT_BLKDISCARD - select BUSYBOX_CONFIG_PLATFORM_LINUX help blkdiscard discards sectors on a given device. config BUSYBOX_CONFIG_BLKID bool "blkid (12 kb)" default BUSYBOX_DEFAULT_BLKID - select BUSYBOX_CONFIG_PLATFORM_LINUX select BUSYBOX_CONFIG_VOLUMEID help Lists labels and UUIDs of all filesystems. @@ -67,7 +64,6 @@ config BUSYBOX_CONFIG_CHRT config BUSYBOX_CONFIG_DMESG bool "dmesg (3.7 kb)" default BUSYBOX_DEFAULT_DMESG - select BUSYBOX_CONFIG_PLATFORM_LINUX help dmesg is used to examine or control the kernel ring buffer. When the Linux kernel prints messages to the system log, they are stored in @@ -100,7 +96,6 @@ config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY config BUSYBOX_CONFIG_EJECT bool "eject (4 kb)" default BUSYBOX_DEFAULT_EJECT - select BUSYBOX_CONFIG_PLATFORM_LINUX help Used to eject cdroms. (defaults to /dev/cdrom) @@ -119,13 +114,11 @@ config BUSYBOX_CONFIG_FALLOCATE config BUSYBOX_CONFIG_FATATTR bool "fatattr (1.9 kb)" default BUSYBOX_DEFAULT_FATATTR - select BUSYBOX_CONFIG_PLATFORM_LINUX help fatattr lists or changes the file attributes on a fat file system. config BUSYBOX_CONFIG_FBSET bool "fbset (5.9 kb)" default BUSYBOX_DEFAULT_FBSET - select BUSYBOX_CONFIG_PLATFORM_LINUX help fbset is used to show or change the settings of a Linux frame buffer device. The frame buffer device provides a simple and unique @@ -153,13 +146,11 @@ config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE config BUSYBOX_CONFIG_FDFORMAT bool "fdformat (4.4 kb)" default BUSYBOX_DEFAULT_FDFORMAT - select BUSYBOX_CONFIG_PLATFORM_LINUX help fdformat is used to low-level format a floppy disk. config BUSYBOX_CONFIG_FDISK bool "fdisk (37 kb)" default BUSYBOX_DEFAULT_FDISK - select BUSYBOX_CONFIG_PLATFORM_LINUX help The fdisk utility is used to divide hard disks into one or more logical disks, which are generally called partitions. This utility @@ -233,7 +224,6 @@ config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED config BUSYBOX_CONFIG_FINDFS bool "findfs (12 kb)" default BUSYBOX_DEFAULT_FINDFS - select BUSYBOX_CONFIG_PLATFORM_LINUX select BUSYBOX_CONFIG_VOLUMEID help Prints the name of a filesystem with given label or UUID. @@ -245,7 +235,6 @@ config BUSYBOX_CONFIG_FLOCK config BUSYBOX_CONFIG_FDFLUSH bool "fdflush (1.3 kb)" default BUSYBOX_DEFAULT_FDFLUSH - select BUSYBOX_CONFIG_PLATFORM_LINUX help fdflush is only needed when changing media on slightly-broken removable media drives. It is used to make Linux believe that a @@ -258,7 +247,6 @@ config BUSYBOX_CONFIG_FDFLUSH config BUSYBOX_CONFIG_FREERAMDISK bool "freeramdisk (1.3 kb)" default BUSYBOX_DEFAULT_FREERAMDISK - select BUSYBOX_CONFIG_PLATFORM_LINUX help Linux allows you to create ramdisks. This utility allows you to delete them and completely free all memory that was used for the @@ -279,14 +267,12 @@ config BUSYBOX_CONFIG_FSCK_MINIX config BUSYBOX_CONFIG_FSFREEZE bool "fsfreeze (3.5 kb)" default BUSYBOX_DEFAULT_FSFREEZE - select BUSYBOX_CONFIG_PLATFORM_LINUX select BUSYBOX_CONFIG_LONG_OPTS help Halt new accesses and flush writes on a mounted filesystem. config BUSYBOX_CONFIG_FSTRIM bool "fstrim (4.4 kb)" default BUSYBOX_DEFAULT_FSTRIM - select BUSYBOX_CONFIG_PLATFORM_LINUX help Discard unused blocks on a mounted filesystem. config BUSYBOX_CONFIG_GETOPT @@ -313,16 +299,6 @@ config BUSYBOX_CONFIG_HEXDUMP The hexdump utility is used to display binary data in a readable way that is comparable to the output from most hex editors. -config BUSYBOX_CONFIG_FEATURE_HEXDUMP_REVERSE - bool "Support -R, reverse of 'hexdump -Cv'" - default BUSYBOX_DEFAULT_FEATURE_HEXDUMP_REVERSE - depends on BUSYBOX_CONFIG_HEXDUMP - help - The hexdump utility is used to display binary data in an ascii - readable way. This option creates binary data from an ascii input. - NB: this option is non-standard. It's unwise to use it in scripts - aimed to be portable. - config BUSYBOX_CONFIG_HD bool "hd (7.8 kb)" default BUSYBOX_DEFAULT_HD @@ -337,7 +313,6 @@ config BUSYBOX_CONFIG_XXD config BUSYBOX_CONFIG_HWCLOCK bool "hwclock (5.8 kb)" default BUSYBOX_DEFAULT_HWCLOCK - select BUSYBOX_CONFIG_PLATFORM_LINUX help The hwclock utility is used to read and set the hardware clock on a system. This is primarily used to set the current time on @@ -358,7 +333,6 @@ config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS config BUSYBOX_CONFIG_IONICE bool "ionice (3.8 kb)" default BUSYBOX_DEFAULT_IONICE - select BUSYBOX_CONFIG_PLATFORM_LINUX help Set/set program io scheduling class and priority Requires kernel >= 2.6.13 @@ -372,7 +346,6 @@ config BUSYBOX_CONFIG_IPCRM config BUSYBOX_CONFIG_IPCS bool "ipcs (11 kb)" default BUSYBOX_DEFAULT_IPCS - select BUSYBOX_CONFIG_PLATFORM_LINUX help The ipcs utility is used to provide information on the currently allocated System V interprocess (IPC) objects in the system. @@ -393,7 +366,6 @@ config BUSYBOX_CONFIG_FEATURE_LAST_FANCY config BUSYBOX_CONFIG_LOSETUP bool "losetup (5.5 kb)" default BUSYBOX_DEFAULT_LOSETUP - select BUSYBOX_CONFIG_PLATFORM_LINUX help losetup is used to associate or detach a loop device with a regular file or block device, and to query the status of a loop device. This @@ -401,7 +373,6 @@ config BUSYBOX_CONFIG_LOSETUP config BUSYBOX_CONFIG_LSPCI bool "lspci (6.3 kb)" default BUSYBOX_DEFAULT_LSPCI - #select PLATFORM_LINUX help lspci is a utility for displaying information about PCI buses in the system and devices connected to them. @@ -410,7 +381,6 @@ config BUSYBOX_CONFIG_LSPCI config BUSYBOX_CONFIG_LSUSB bool "lsusb (4.2 kb)" default BUSYBOX_DEFAULT_LSUSB - #select PLATFORM_LINUX help lsusb is a utility for displaying information about USB buses in the system and devices connected to them. @@ -419,7 +389,6 @@ config BUSYBOX_CONFIG_LSUSB config BUSYBOX_CONFIG_MDEV bool "mdev (17 kb)" default BUSYBOX_DEFAULT_MDEV - select BUSYBOX_CONFIG_PLATFORM_LINUX help mdev is a mini-udev implementation for dynamically creating device nodes in the /dev directory. @@ -505,20 +474,17 @@ config BUSYBOX_CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP config BUSYBOX_CONFIG_MKE2FS bool "mke2fs (10 kb)" default BUSYBOX_DEFAULT_MKE2FS - select BUSYBOX_CONFIG_PLATFORM_LINUX help Utility to create EXT2 filesystems. config BUSYBOX_CONFIG_MKFS_EXT2 bool "mkfs.ext2 (10 kb)" default BUSYBOX_DEFAULT_MKFS_EXT2 - select BUSYBOX_CONFIG_PLATFORM_LINUX help Alias to "mke2fs". config BUSYBOX_CONFIG_MKFS_MINIX bool "mkfs.minix (10 kb)" default BUSYBOX_DEFAULT_MKFS_MINIX - select BUSYBOX_CONFIG_PLATFORM_LINUX help The minix filesystem is a nice, small, compact, read-write filesystem with little overhead. If you wish to be able to create minix @@ -535,21 +501,18 @@ config BUSYBOX_CONFIG_FEATURE_MINIX2 config BUSYBOX_CONFIG_MKFS_REISER bool "mkfs_reiser" default BUSYBOX_DEFAULT_MKFS_REISER - select BUSYBOX_CONFIG_PLATFORM_LINUX help Utility to create ReiserFS filesystems. Note: this applet needs a lot of testing and polishing. config BUSYBOX_CONFIG_MKDOSFS bool "mkdosfs (7.2 kb)" default BUSYBOX_DEFAULT_MKDOSFS - select BUSYBOX_CONFIG_PLATFORM_LINUX help Utility to create FAT32 filesystems. config BUSYBOX_CONFIG_MKFS_VFAT bool "mkfs.vfat (7.2 kb)" default BUSYBOX_DEFAULT_MKFS_VFAT - select BUSYBOX_CONFIG_PLATFORM_LINUX help Alias to "mkdosfs". config BUSYBOX_CONFIG_MKSWAP @@ -583,7 +546,6 @@ config BUSYBOX_CONFIG_MORE config BUSYBOX_CONFIG_MOUNT bool "mount (23 kb)" default BUSYBOX_DEFAULT_MOUNT - select BUSYBOX_CONFIG_PLATFORM_LINUX help All files and filesystems in Unix are arranged into one big directory tree. The 'mount' utility is used to graft a filesystem onto a @@ -685,7 +647,7 @@ config BUSYBOX_CONFIG_NOLOGIN config BUSYBOX_CONFIG_NOLOGIN_DEPENDENCIES bool "Enable dependencies for nologin" - default BUSYBOX_DEFAULT_NOLOGIN_DEPENDENCIES + default BUSYBOX_DEFAULT_NOLOGIN_DEPENDENCIES # Y default makes it harder to select single-applet test depends on BUSYBOX_CONFIG_NOLOGIN select BUSYBOX_CONFIG_CAT select BUSYBOX_CONFIG_ECHO @@ -699,13 +661,11 @@ config BUSYBOX_CONFIG_NOLOGIN_DEPENDENCIES config BUSYBOX_CONFIG_NSENTER bool "nsenter (6.5 kb)" default BUSYBOX_DEFAULT_NSENTER - select BUSYBOX_CONFIG_PLATFORM_LINUX help Run program with namespaces of other processes. config BUSYBOX_CONFIG_PIVOT_ROOT bool "pivot_root (1.1 kb)" default BUSYBOX_DEFAULT_PIVOT_ROOT - select BUSYBOX_CONFIG_PLATFORM_LINUX help The pivot_root utility swaps the mount points for the root filesystem with some other mounted filesystem. This allows you to do all sorts @@ -730,7 +690,6 @@ config BUSYBOX_CONFIG_RDEV config BUSYBOX_CONFIG_READPROFILE bool "readprofile (7.1 kb)" default BUSYBOX_DEFAULT_READPROFILE - #select PLATFORM_LINUX help This allows you to parse /proc/profile for basic profiling. config BUSYBOX_CONFIG_RENICE @@ -747,7 +706,6 @@ config BUSYBOX_CONFIG_REV config BUSYBOX_CONFIG_RTCWAKE bool "rtcwake (6.8 kb)" default BUSYBOX_DEFAULT_RTCWAKE - select BUSYBOX_CONFIG_PLATFORM_LINUX help Enter a system sleep state until specified wakeup time. config BUSYBOX_CONFIG_SCRIPT @@ -764,7 +722,6 @@ config BUSYBOX_CONFIG_SCRIPTREPLAY config BUSYBOX_CONFIG_SETARCH bool "setarch (3.6 kb)" default BUSYBOX_DEFAULT_SETARCH - select BUSYBOX_CONFIG_PLATFORM_LINUX help The linux32 utility is used to create a 32bit environment for the specified program (usually a shell). It only makes sense to have @@ -774,20 +731,17 @@ config BUSYBOX_CONFIG_SETARCH config BUSYBOX_CONFIG_LINUX32 bool "linux32 (3.3 kb)" default BUSYBOX_DEFAULT_LINUX32 - select BUSYBOX_CONFIG_PLATFORM_LINUX help Alias to "setarch linux32". config BUSYBOX_CONFIG_LINUX64 bool "linux64 (3.3 kb)" default BUSYBOX_DEFAULT_LINUX64 - select BUSYBOX_CONFIG_PLATFORM_LINUX help Alias to "setarch linux64". config BUSYBOX_CONFIG_SETPRIV bool "setpriv (6.6 kb)" default BUSYBOX_DEFAULT_SETPRIV - select BUSYBOX_CONFIG_PLATFORM_LINUX select BUSYBOX_CONFIG_LONG_OPTS help Run a program with different Linux privilege settings. @@ -828,7 +782,6 @@ config BUSYBOX_CONFIG_SETSID config BUSYBOX_CONFIG_SWAPON bool "swapon (15 kb)" default BUSYBOX_DEFAULT_SWAPON - select BUSYBOX_CONFIG_PLATFORM_LINUX help Once you have created some swap space using 'mkswap', you also need to enable your swap space with the 'swapon' utility. The 'swapoff' @@ -855,7 +808,6 @@ config BUSYBOX_CONFIG_FEATURE_SWAPON_PRI config BUSYBOX_CONFIG_SWAPOFF bool "swapoff (14 kb)" default BUSYBOX_DEFAULT_SWAPOFF - select BUSYBOX_CONFIG_PLATFORM_LINUX config BUSYBOX_CONFIG_FEATURE_SWAPONOFF_LABEL bool "Support specifying devices by label or UUID" @@ -868,7 +820,6 @@ config BUSYBOX_CONFIG_FEATURE_SWAPONOFF_LABEL config BUSYBOX_CONFIG_SWITCH_ROOT bool "switch_root (5.5 kb)" default BUSYBOX_DEFAULT_SWITCH_ROOT - select BUSYBOX_CONFIG_PLATFORM_LINUX help The switch_root utility is used from initramfs to select a new root device. Under initramfs, you have to use this instead of @@ -900,17 +851,23 @@ config BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY Needed for machines with more than 32-64 CPUs: affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long in this case. Otherwise, it is limited to sizeof(long). + +config BUSYBOX_CONFIG_FEATURE_TASKSET_CPULIST + bool "CPU list support (-c option)" + default BUSYBOX_DEFAULT_FEATURE_TASKSET_CPULIST + depends on BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY + help + Add support for taking/printing affinity as CPU list when '-c' + option is used. For example, it prints '0-3,7' instead of mask '8f'. config BUSYBOX_CONFIG_UEVENT bool "uevent (3.1 kb)" default BUSYBOX_DEFAULT_UEVENT - select BUSYBOX_CONFIG_PLATFORM_LINUX help uevent is a netlink listener for kernel uevent notifications sent via netlink. It is usually used for dynamic device creation. config BUSYBOX_CONFIG_UMOUNT bool "umount (5.1 kb)" default BUSYBOX_DEFAULT_UMOUNT - select BUSYBOX_CONFIG_PLATFORM_LINUX help When you want to remove a mounted filesystem from its current mount point, for example when you are shutting down the system, the @@ -927,7 +884,6 @@ config BUSYBOX_CONFIG_UNSHARE bool "unshare (7.2 kb)" default BUSYBOX_DEFAULT_UNSHARE depends on !BUSYBOX_CONFIG_NOMMU - select BUSYBOX_CONFIG_PLATFORM_LINUX select BUSYBOX_CONFIG_LONG_OPTS help Run program with some namespaces unshared from parent. -- cgit v1.2.3