diff options
Diffstat (limited to 'package/busybox')
-rw-r--r-- | package/busybox/Makefile | 4 | ||||
-rw-r--r-- | package/busybox/config/Config.in | 20 | ||||
-rw-r--r-- | package/busybox/config/console-tools/Config.in | 13 | ||||
-rw-r--r-- | package/busybox/config/coreutils/Config.in | 7 | ||||
-rw-r--r-- | package/busybox/config/e2fsprogs/Config.in | 1 | ||||
-rw-r--r-- | package/busybox/config/klibc-utils/Config.in | 1 | ||||
-rw-r--r-- | package/busybox/config/libbb/Config.in | 2 | ||||
-rw-r--r-- | package/busybox/config/miscutils/Config.in | 29 | ||||
-rw-r--r-- | package/busybox/config/modutils/Config.in | 6 | ||||
-rw-r--r-- | package/busybox/config/networking/Config.in | 62 | ||||
-rw-r--r-- | package/busybox/config/networking/udhcp/Config.in | 2 | ||||
-rw-r--r-- | package/busybox/config/procps/Config.in | 3 | ||||
-rw-r--r-- | package/busybox/config/shell/Config.in | 2 | ||||
-rw-r--r-- | package/busybox/config/sysklogd/Config.in | 2 | ||||
-rw-r--r-- | package/busybox/config/util-linux/Config.in | 60 | ||||
-rw-r--r-- | package/busybox/config/util-linux/volume_id/Config.in | 6 |
16 files changed, 64 insertions, 156 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 12ce1707c..5aad49e2f 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.32.0 +PKG_VERSION:= 1.33.0 PKG_RELEASE:= 1 -PKG_HASH:= c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 +PKG_HASH:= d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 36b047540..6f19502f4 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -312,7 +312,6 @@ config BUSYBOX_BUSYBOX_EXEC_PATH config BUSYBOX_SELINUX bool "Support NSA Security Enhanced Linux" default n - select BUSYBOX_PLATFORM_LINUX help Enable support for SELinux in applets ls, ps, and id. Also provide the option of compiling in SELinux applets. @@ -358,17 +357,6 @@ config BUSYBOX_FEATURE_SYSLOG #This option is auto-selected when you select any applet which may #send its output to syslog. You do not need to select it manually. -config BUSYBOX_PLATFORM_LINUX - bool #No description makes it a hidden option - default n - #help - #For the most part, busybox requires only POSIX compatibility - #from the target system, but some applets and features use - #Linux-specific interfaces. - # - #This is automatically selected if any applet or feature requires - #Linux-specific interfaces. You do not need to select it manually. - comment 'Build Options' config BUSYBOX_STATIC @@ -541,6 +529,14 @@ config BUSYBOX_STACK_OPTIMIZATION_386 do not work with it (they use SSE instructions without ensuring stack alignment). +config BUSYBOX_STATIC_LIBGCC + bool "Use -static-libgcc" + default y + help + This option instructs gcc to link in a static version of its + support library, libgcc. This means that the binary will require + one fewer dynamic library at run time. + comment 'Installation Options ("make install" behavior)' choice diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in index e67bb61ed..d0e43ca43 100644 --- a/package/busybox/config/console-tools/Config.in +++ b/package/busybox/config/console-tools/Config.in @@ -9,7 +9,6 @@ menu "Console Utilities" config BUSYBOX_CHVT bool "chvt (2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) @@ -21,39 +20,33 @@ config BUSYBOX_CLEAR config BUSYBOX_DEALLOCVT bool "deallocvt (1.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program deallocates unused virtual consoles. config BUSYBOX_DUMPKMAP bool "dumpkmap (1.6 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. config BUSYBOX_FGCONSOLE bool "fgconsole (1.5 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program prints active (foreground) console number. config BUSYBOX_KBD_MODE bool "kbd_mode (4.1 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program reports and sets keyboard mode. config BUSYBOX_LOADFONT bool "loadfont (5.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program loads a console font from standard input. config BUSYBOX_SETFONT bool "setfont (24 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Allows to load console screen map. Useful for i18n. @@ -87,14 +80,12 @@ config BUSYBOX_FEATURE_LOADFONT_RAW config BUSYBOX_LOADKMAP bool "loadkmap (1.8 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program loads a keyboard translation table from standard input. config BUSYBOX_OPENVT bool "openvt (7.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program is used to start a command on an unused virtual terminal. @@ -123,7 +114,6 @@ config BUSYBOX_FEATURE_RESIZE_PRINT config BUSYBOX_SETCONSOLE bool "setconsole (3.6 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Redirect writes to /dev/console to another device, like the current tty while logged in via telnet. @@ -137,20 +127,17 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS config BUSYBOX_SETKEYCODES bool "setkeycodes (2.1 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. config BUSYBOX_SETLOGCONS bool "setlogcons (1.8 kb)" default y - select BUSYBOX_PLATFORM_LINUX help This program redirects the output console of kernel messages. config BUSYBOX_SHOWKEY bool "showkey (4.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Shows keys pressed. diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 2038e6e95..6293694de 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -114,7 +114,6 @@ config BUSYBOX_FEATURE_DATE_NANO bool "Support %[num]N nanosecond format specifier" default n # stat's nanosecond field is a bit non-portable depends on BUSYBOX_DATE - select BUSYBOX_PLATFORM_LINUX help Support %[num]N format specifier. Adds ~250 bytes of code. @@ -635,7 +634,6 @@ config BUSYBOX_FEATURE_STAT_FILESYSTEM bool "Enable display of filesystem status (-f)" default y depends on BUSYBOX_STAT - select BUSYBOX_PLATFORM_LINUX # statfs() help Without this, stat will not support the '-f' option to display information about filesystem status. @@ -836,6 +834,11 @@ config BUSYBOX_UUDECODE default y help uudecode is used to decode a uuencoded file. +config BUSYBOX_BASE32 + bool "base32 (4.9 kb)" + default y + help + Base32 encode and decode config BUSYBOX_BASE64 bool "base64 (4.9 kb)" default y diff --git a/package/busybox/config/e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/Config.in index dbf2737ed..08533d6cc 100644 --- a/package/busybox/config/e2fsprogs/Config.in +++ b/package/busybox/config/e2fsprogs/Config.in @@ -21,7 +21,6 @@ config BUSYBOX_FSCK config BUSYBOX_LSATTR bool "lsattr (5.5 kb)" default y - select BUSYBOX_PLATFORM_LINUX help lsattr lists the file attributes on a second extended file system. config BUSYBOX_TUNE2FS diff --git a/package/busybox/config/klibc-utils/Config.in b/package/busybox/config/klibc-utils/Config.in index 8121e605f..fdaddc397 100644 --- a/package/busybox/config/klibc-utils/Config.in +++ b/package/busybox/config/klibc-utils/Config.in @@ -24,7 +24,6 @@ config BUSYBOX_RESUME config BUSYBOX_RUN_INIT bool "run-init (7.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help The run-init utility is used from initramfs to select a new root device. Under initramfs, you have to use this instead of diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in index 84bed23ea..1dd61c62e 100644 --- a/package/busybox/config/libbb/Config.in +++ b/package/busybox/config/libbb/Config.in @@ -390,7 +390,6 @@ config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE config BUSYBOX_FEATURE_USE_SENDFILE bool "Use sendfile system call" default y - select BUSYBOX_PLATFORM_LINUX help When enabled, busybox will use the kernel sendfile() function instead of read/write loops to copy data between file descriptors @@ -432,7 +431,6 @@ config BUSYBOX_FEATURE_SKIP_ROOTFS config BUSYBOX_MONOTONIC_SYSCALL bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" default y - select BUSYBOX_PLATFORM_LINUX help Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring time intervals (time, ping, traceroute etc need this). diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index d7d60a0cd..549042515 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -9,7 +9,6 @@ menu "Miscellaneous Utilities" config BUSYBOX_ADJTIMEX bool "adjtimex (4.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. @@ -122,7 +121,6 @@ endif config BUSYBOX_BEEP bool "beep (2.4 kb)" default y - select BUSYBOX_PLATFORM_LINUX help The beep applets beeps in a given freq/Hz. @@ -210,7 +208,6 @@ config BUSYBOX_FEATURE_CHAT_CLR_ABORT config BUSYBOX_CONSPY bool "conspy (10 kb)" default y - select BUSYBOX_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_CRONTAB config BUSYBOX_DEVFSD bool "devfsd (obsolete)" default n - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_FEATURE_SYSLOG help This is deprecated and should NOT be used anymore. @@ -319,7 +315,6 @@ config BUSYBOX_DEVFSD_VERBOSE config BUSYBOX_FEATURE_DEVFS bool "Use devfs names for all devices (obsolete)" default n - select BUSYBOX_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_DEVMEM config BUSYBOX_FBSPLASH bool "fbsplash (26 kb)" default y - select BUSYBOX_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_FLASHCP config BUSYBOX_HDPARM bool "hdparm (25 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Get/Set hard drive parameters. Primarily intended for ATA drives. @@ -445,35 +438,30 @@ config BUSYBOX_HEXEDIT config BUSYBOX_I2CGET bool "i2cget (5.5 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Read from I2C/SMBus chip registers. config BUSYBOX_I2CSET bool "i2cset (6.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Set I2C registers. config BUSYBOX_I2CDUMP bool "i2cdump (7.1 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Examine I2C registers. config BUSYBOX_I2CDETECT bool "i2cdetect (7.1 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Detect I2C chips. config BUSYBOX_I2CTRANSFER bool "i2ctransfer (4.0 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Send user-defined I2C messages in one transfer. @@ -582,7 +570,6 @@ config BUSYBOX_FEATURE_LESS_ENV config BUSYBOX_LSSCSI bool "lsscsi (2.5 kb)" default y - #select BUSYBOX_PLATFORM_LINUX help lsscsi is a utility for displaying information about SCSI buses in the system and devices connected to them. @@ -646,26 +633,22 @@ config BUSYBOX_MT config BUSYBOX_NANDWRITE bool "nandwrite (4.8 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Write to the specified MTD device, with bad blocks awareness config BUSYBOX_NANDDUMP bool "nanddump (5.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Dump the content of raw NAND chip config BUSYBOX_PARTPROBE bool "partprobe (3.5 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Ask kernel to rescan partition table. config BUSYBOX_RAIDAUTORUN bool "raidautorun (1.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help raidautorun tells the kernel md driver to search and start RAID arrays. @@ -673,7 +656,6 @@ config BUSYBOX_READAHEAD bool "readahead (1.5 kb)" default y depends on BUSYBOX_LFS - select BUSYBOX_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. @@ -689,7 +671,6 @@ config BUSYBOX_READAHEAD config BUSYBOX_RFKILL bool "rfkill (4.4 kb)" default n # doesn't build on Ubuntu 9.04 - select BUSYBOX_PLATFORM_LINUX help Enable/disable wireless devices. @@ -710,7 +691,6 @@ config BUSYBOX_RUNLEVEL config BUSYBOX_RX bool "rx (2.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Receive files using the Xmodem protocol. config BUSYBOX_SETFATTR @@ -721,7 +701,6 @@ config BUSYBOX_SETFATTR config BUSYBOX_SETSERIAL bool "setserial (6.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Retrieve or set Linux serial port. config BUSYBOX_STRINGS @@ -751,48 +730,41 @@ config BUSYBOX_TTYSIZE config BUSYBOX_UBIATTACH bool "ubiattach (4.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Attach MTD device to an UBI device. config BUSYBOX_UBIDETACH bool "ubidetach (4.1 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Detach MTD device from an UBI device. config BUSYBOX_UBIMKVOL bool "ubimkvol (5.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Create a UBI volume. config BUSYBOX_UBIRMVOL bool "ubirmvol (4.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Delete a UBI volume. config BUSYBOX_UBIRSVOL bool "ubirsvol (4.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Resize a UBI volume. config BUSYBOX_UBIUPDATEVOL bool "ubiupdatevol (5.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Update a UBI volume. config BUSYBOX_UBIRENAME bool "ubirename (2.4 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Utility to rename UBI volumes config BUSYBOX_VOLNAME @@ -803,7 +775,6 @@ config BUSYBOX_VOLNAME config BUSYBOX_WATCHDOG bool "watchdog (5.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help The watchdog utility is used with hardware or software watchdog device drivers. It opens the specified watchdog device special file diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in index 141e5ea85..795b00a0d 100644 --- a/package/busybox/config/modutils/Config.in +++ b/package/busybox/config/modutils/Config.in @@ -37,7 +37,6 @@ config BUSYBOX_MODPROBE_SMALL config BUSYBOX_DEPMOD bool "depmod (27 kb)" default y - select BUSYBOX_PLATFORM_LINUX help depmod generates modules.dep (and potentially modules.alias and modules.symbols) that contain dependency information @@ -45,13 +44,11 @@ config BUSYBOX_DEPMOD config BUSYBOX_INSMOD bool "insmod (22 kb)" default y - select BUSYBOX_PLATFORM_LINUX help insmod is used to load specified modules in the running kernel. config BUSYBOX_LSMOD bool "lsmod (1.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help lsmod is used to display a list of loaded modules. @@ -66,13 +63,11 @@ config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT config BUSYBOX_MODINFO bool "modinfo (24 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Show information about a Linux Kernel module config BUSYBOX_MODPROBE bool "modprobe (28 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Handle the loading of modules, and their dependencies on a high level. @@ -90,7 +85,6 @@ config BUSYBOX_FEATURE_MODPROBE_BLACKLIST config BUSYBOX_RMMOD bool "rmmod (3.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help rmmod is used to unload specified modules from the kernel. diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 85171edcb..4832a82d0 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -61,19 +61,16 @@ config BUSYBOX_FEATURE_TLS_SHA1 config BUSYBOX_ARP bool "arp (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Manipulate the system ARP cache. config BUSYBOX_ARPING bool "arping (9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Ping hosts by ARP packets. config BUSYBOX_BRCTL bool "brctl (4.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Manage ethernet bridges. Supports addbr/delbr and addif/delif. @@ -104,7 +101,6 @@ config BUSYBOX_DNSD config BUSYBOX_ETHER_WAKE bool "ether-wake (4.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Send a magic packet to wake up sleeping machines. config BUSYBOX_FTPD @@ -289,10 +285,47 @@ config BUSYBOX_FEATURE_HTTPD_GZIP help Makes httpd send files using GZIP content encoding if the client supports it and a pre-compressed <file>.gz exists. + +config BUSYBOX_FEATURE_HTTPD_ETAG + bool "Support caching via ETag header" + default y + depends on BUSYBOX_HTTPD + help + If server responds with ETag then next time client (browser) + resend it via If-None-Match header. + Then httpd will check if file wasn't modified and if not, + return 304 Not Modified status code. + The ETag value is constructed from last modification date + in unix epoch, and size: "hex(last_mod)-hex(file_size)". + It's not completely reliable as hash functions but fair enough. + +config BUSYBOX_FEATURE_HTTPD_LAST_MODIFIED + bool "Add Last-Modified header to response" + default y + depends on BUSYBOX_HTTPD + help + The Last-Modified header is used for cache validation. + The client sends last seen mtime to server in If-Modified-Since. + Both headers MUST be an RFC 1123 formatted, which is hard to parse. + Use ETag header instead. + +config BUSYBOX_FEATURE_HTTPD_DATE + bool "Add Date header to response" + default y + depends on BUSYBOX_HTTPD + help + RFC2616 says that server MUST add Date header to response. + But it is almost useless and can be omitted. + +config BUSYBOX_FEATURE_HTTPD_ACL_IP + bool "ACL IP" + default y + depends on BUSYBOX_HTTPD + help + Support IP deny/allow rules config BUSYBOX_IFCONFIG bool "ifconfig (12 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Ifconfig is used to configure the kernel-resident network interfaces. @@ -339,14 +372,12 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS config BUSYBOX_IFENSLAVE bool "ifenslave (13 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Userspace application to bind several interfaces to a logical interface (use with kernel bonding driver). config BUSYBOX_IFPLUGD bool "ifplugd (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Network interface plug detection daemon. config BUSYBOX_IFUP @@ -498,7 +529,6 @@ config BUSYBOX_FEATURE_INETD_RPC config BUSYBOX_IP bool "ip (35 kb)" default y - select BUSYBOX_PLATFORM_LINUX help The "ip" applet is a TCP/BUSYBOX_IP interface configuration and routing utility. @@ -510,7 +540,6 @@ config BUSYBOX_IPADDR bool "ipaddr (14 kb)" default y select BUSYBOX_FEATURE_IP_ADDRESS - select BUSYBOX_PLATFORM_LINUX help Short form of "ip addr" @@ -518,7 +547,6 @@ config BUSYBOX_IPLINK bool "iplink (17 kb)" default y select BUSYBOX_FEATURE_IP_LINK - select BUSYBOX_PLATFORM_LINUX help Short form of "ip link" @@ -526,7 +554,6 @@ config BUSYBOX_IPROUTE bool "iproute (15 kb)" default y select BUSYBOX_FEATURE_IP_ROUTE - select BUSYBOX_PLATFORM_LINUX help Short form of "ip route" @@ -534,7 +561,6 @@ config BUSYBOX_IPTUNNEL bool "iptunnel (9.6 kb)" default y select BUSYBOX_FEATURE_IP_TUNNEL - select BUSYBOX_PLATFORM_LINUX help Short form of "ip tunnel" @@ -542,7 +568,6 @@ config BUSYBOX_IPRULE bool "iprule (10 kb)" default y select BUSYBOX_FEATURE_IP_RULE - select BUSYBOX_PLATFORM_LINUX help Short form of "ip rule" @@ -550,7 +575,6 @@ config BUSYBOX_IPNEIGH bool "ipneigh (8.3 kb)" default y select BUSYBOX_FEATURE_IP_NEIGH - select BUSYBOX_PLATFORM_LINUX help Short form of "ip neigh" @@ -641,7 +665,6 @@ config BUSYBOX_FAKEIDENTD config BUSYBOX_NAMEIF bool "nameif (6.6 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_FEATURE_SYSLOG help nameif is used to rename network interface by its MAC address. @@ -713,7 +736,6 @@ config BUSYBOX_NC_110_COMPAT config BUSYBOX_NETSTAT bool "netstat (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help netstat prints information about the Linux networking subsystem. @@ -750,7 +772,6 @@ config BUSYBOX_FEATURE_NSLOOKUP_LONG_OPTIONS config BUSYBOX_NTPD bool "ntpd (22 kb)" default y - select BUSYBOX_PLATFORM_LINUX help The NTP client/server daemon. @@ -777,7 +798,6 @@ config BUSYBOX_FEATURE_NTP_AUTH config BUSYBOX_PING bool "ping (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to elicit an ICMP ECHO_RESPONSE from a host or gateway. @@ -805,13 +825,11 @@ config BUSYBOX_PSCAN config BUSYBOX_ROUTE bool "route (8.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Route displays or manipulates the kernel's IP routing tables. config BUSYBOX_SLATTACH bool "slattach (6.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help slattach configures serial line as SLIP network interface. config BUSYBOX_SSL_CLIENT @@ -1011,7 +1029,6 @@ config BUSYBOX_TLS config BUSYBOX_TRACEROUTE bool "traceroute (11 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Utility to trace the route of IP packets. @@ -1037,7 +1054,6 @@ config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP config BUSYBOX_TUNCTL bool "tunctl (6.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help tunctl creates or deletes tun devices. @@ -1051,7 +1067,6 @@ config BUSYBOX_FEATURE_TUNCTL_UG config BUSYBOX_VCONFIG bool "vconfig (2.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Creates, removes, and configures VLAN interfaces config BUSYBOX_WGET @@ -1174,7 +1189,6 @@ config BUSYBOX_WHOIS config BUSYBOX_ZCIP bool "zcip (8.4 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_FEATURE_SYSLOG help BUSYBOX_ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927. diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 9edb9a214..52f1ef5b2 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -7,7 +7,6 @@ config BUSYBOX_UDHCPD bool "udhcpd (21 kb)" default y - select BUSYBOX_PLATFORM_LINUX help udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -63,7 +62,6 @@ config BUSYBOX_DHCPRELAY config BUSYBOX_UDHCPC bool "udhcpc (24 kb)" default y - select BUSYBOX_PLATFORM_LINUX help udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in index dfd4e2c14..56086da2c 100644 --- a/package/busybox/config/procps/Config.in +++ b/package/busybox/config/procps/Config.in @@ -9,7 +9,6 @@ menu "Process Utilities" config BUSYBOX_FREE bool "free (3.1 kb)" default y - select BUSYBOX_PLATFORM_LINUX #sysinfo() help free displays the total amount of free and used physical and swap memory in the system, as well as the buffers used by the kernel. @@ -144,7 +143,6 @@ config BUSYBOX_FEATURE_PS_TIME bool "Enable -o time and -o etime specifiers" default y depends on (BUSYBOX_PS || BUSYBOX_MINIPS) && BUSYBOX_DESKTOP - select BUSYBOX_PLATFORM_LINUX config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS bool "Support Linux prior to 2.4.0 and non-ELF systems" @@ -243,7 +241,6 @@ config BUSYBOX_FEATURE_TOPMEM config BUSYBOX_UPTIME bool "uptime (3.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX #sysinfo() help uptime gives a one line display of the current time, how long the system has been running, how many users are currently logged diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 0ce917dc3..bc96b0267 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -88,7 +88,7 @@ config BUSYBOX_SHELL_ASH config BUSYBOX_ASH bool "ash (78 kb)" - default n + default y depends on !BUSYBOX_NOMMU select BUSYBOX_SHELL_ASH help diff --git a/package/busybox/config/sysklogd/Config.in b/package/busybox/config/sysklogd/Config.in index 4c2a54e87..0d8b63557 100644 --- a/package/busybox/config/sysklogd/Config.in +++ b/package/busybox/config/sysklogd/Config.in @@ -23,7 +23,6 @@ config BUSYBOX_FEATURE_KLOGD_KLOGCTL bool "Use the klogctl() interface" default y depends on BUSYBOX_KLOGD - select BUSYBOX_PLATFORM_LINUX help The klogd applet supports two interfaces for reading kernel messages. Linux provides the klogctl() interface @@ -161,7 +160,6 @@ config BUSYBOX_FEATURE_KMSG_SYSLOG bool "Linux kernel printk buffer support" default y depends on BUSYBOX_SYSLOGD - select BUSYBOX_PLATFORM_LINUX help When you enable this feature, the syslogd utility will write system log message to the Linux kernel's printk buffer. diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index b383ec87f..bce5fafe1 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -9,7 +9,6 @@ menu "Linux System Utilities" config BUSYBOX_ACPID bool "acpid (9 kb)" default y - select BUSYBOX_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_FEATURE_ACPID_COMPAT config BUSYBOX_BLKDISCARD bool "blkdiscard (4.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help blkdiscard discards sectors on a given device. config BUSYBOX_BLKID bool "blkid (12 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_VOLUMEID help Lists labels and UUIDs of all filesystems. @@ -67,7 +64,6 @@ config BUSYBOX_CHRT config BUSYBOX_DMESG bool "dmesg (3.7 kb)" default y - select BUSYBOX_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_FEATURE_DMESG_PRETTY config BUSYBOX_EJECT bool "eject (4 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Used to eject cdroms. (defaults to /dev/cdrom) @@ -119,13 +114,11 @@ config BUSYBOX_FALLOCATE config BUSYBOX_FATATTR bool "fatattr (1.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help fatattr lists or changes the file attributes on a fat file system. config BUSYBOX_FBSET bool "fbset (5.9 kb)" default y - select BUSYBOX_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_FEATURE_FBSET_READMODE config BUSYBOX_FDFORMAT bool "fdformat (4.4 kb)" default y - select BUSYBOX_PLATFORM_LINUX help fdformat is used to low-level format a floppy disk. config BUSYBOX_FDISK bool "fdisk (37 kb)" default y - select BUSYBOX_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_FEATURE_FDISK_ADVANCED config BUSYBOX_FINDFS bool "findfs (12 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_VOLUMEID help Prints the name of a filesystem with given label or UUID. @@ -245,7 +235,6 @@ config BUSYBOX_FLOCK config BUSYBOX_FDFLUSH bool "fdflush (1.3 kb)" default y - select BUSYBOX_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_FDFLUSH config BUSYBOX_FREERAMDISK bool "freeramdisk (1.3 kb)" default y - select BUSYBOX_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_FSCK_MINIX config BUSYBOX_FSFREEZE bool "fsfreeze (3.5 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_LONG_OPTS help Halt new accesses and flush writes on a mounted filesystem. config BUSYBOX_FSTRIM bool "fstrim (4.4 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Discard unused blocks on a mounted filesystem. config BUSYBOX_GETOPT @@ -313,16 +299,6 @@ config BUSYBOX_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_FEATURE_HEXDUMP_REVERSE - bool "Support -R, reverse of 'hexdump -Cv'" - default y - depends on BUSYBOX_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_HD bool "hd (7.8 kb)" default y @@ -337,7 +313,6 @@ config BUSYBOX_XXD config BUSYBOX_HWCLOCK bool "hwclock (5.8 kb)" default y - select BUSYBOX_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_FEATURE_HWCLOCK_ADJTIME_FHS config BUSYBOX_IONICE bool "ionice (3.8 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Set/set program io scheduling class and priority Requires kernel >= 2.6.13 @@ -372,7 +346,6 @@ config BUSYBOX_IPCRM config BUSYBOX_IPCS bool "ipcs (11 kb)" default y - select BUSYBOX_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_FEATURE_LAST_FANCY config BUSYBOX_LOSETUP bool "losetup (5.5 kb)" default y - select BUSYBOX_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_LOSETUP config BUSYBOX_LSPCI bool "lspci (6.3 kb)" default y - #select BUSYBOX_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_LSPCI config BUSYBOX_LSUSB bool "lsusb (4.2 kb)" default y - #select BUSYBOX_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_LSUSB config BUSYBOX_MDEV bool "mdev (17 kb)" default y - select BUSYBOX_PLATFORM_LINUX help mdev is a mini-udev implementation for dynamically creating device nodes in the /dev directory. @@ -505,20 +474,17 @@ config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP config BUSYBOX_MKE2FS bool "mke2fs (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Utility to create EXT2 filesystems. config BUSYBOX_MKFS_EXT2 bool "mkfs.ext2 (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Alias to "mke2fs". config BUSYBOX_MKFS_MINIX bool "mkfs.minix (10 kb)" default y - select BUSYBOX_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,26 +501,23 @@ config BUSYBOX_FEATURE_MINIX2 config BUSYBOX_MKFS_REISER bool "mkfs_reiser" default n - select BUSYBOX_PLATFORM_LINUX help Utility to create ReiserFS filesystems. Note: this applet needs a lot of testing and polishing. config BUSYBOX_MKDOSFS bool "mkdosfs (7.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Utility to create FAT32 filesystems. config BUSYBOX_MKFS_VFAT bool "mkfs.vfat (7.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Alias to "mkdosfs". config BUSYBOX_MKSWAP bool "mkswap (6.3 kb)" - default n + default y help The mkswap utility is used to configure a file or disk partition as Linux swap space. This allows Linux to use the entire file or @@ -583,7 +546,6 @@ config BUSYBOX_MORE config BUSYBOX_MOUNT bool "mount (23 kb)" default y - select BUSYBOX_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 @@ -699,13 +661,11 @@ config BUSYBOX_NOLOGIN_DEPENDENCIES config BUSYBOX_NSENTER bool "nsenter (6.5 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Run program with namespaces of other processes. config BUSYBOX_PIVOT_ROOT bool "pivot_root (1.1 kb)" default y - select BUSYBOX_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_RDEV config BUSYBOX_READPROFILE bool "readprofile (7.1 kb)" default y - #select BUSYBOX_PLATFORM_LINUX help This allows you to parse /proc/profile for basic profiling. config BUSYBOX_RENICE @@ -747,7 +706,6 @@ config BUSYBOX_REV config BUSYBOX_RTCWAKE bool "rtcwake (6.8 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Enter a system sleep state until specified wakeup time. config BUSYBOX_SCRIPT @@ -764,7 +722,6 @@ config BUSYBOX_SCRIPTREPLAY config BUSYBOX_SETARCH bool "setarch (3.6 kb)" default y - select BUSYBOX_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_SETARCH config BUSYBOX_LINUX32 bool "linux32 (3.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Alias to "setarch linux32". config BUSYBOX_LINUX64 bool "linux64 (3.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Alias to "setarch linux64". config BUSYBOX_SETPRIV bool "setpriv (6.6 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_LONG_OPTS help Run a program with different Linux privilege settings. @@ -827,8 +781,7 @@ config BUSYBOX_SETSID setsid runs a program in a new session config BUSYBOX_SWAPON bool "swapon (15 kb)" - default n - select BUSYBOX_PLATFORM_LINUX + default y help Once you have created some swap space using 'mkswap', you also need to enable your swap space with the 'swapon' utility. The 'swapoff' @@ -854,8 +807,7 @@ config BUSYBOX_FEATURE_SWAPON_PRI config BUSYBOX_SWAPOFF bool "swapoff (14 kb)" - default n - select BUSYBOX_PLATFORM_LINUX + default y config BUSYBOX_FEATURE_SWAPONOFF_LABEL bool "Support specifying devices by label or UUID" @@ -868,7 +820,6 @@ config BUSYBOX_FEATURE_SWAPONOFF_LABEL config BUSYBOX_SWITCH_ROOT bool "switch_root (5.5 kb)" default y - select BUSYBOX_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 @@ -911,14 +862,12 @@ config BUSYBOX_FEATURE_TASKSET_CPULIST config BUSYBOX_UEVENT bool "uevent (3.1 kb)" default y - select BUSYBOX_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_UMOUNT bool "umount (5.1 kb)" default y - select BUSYBOX_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 @@ -933,9 +882,8 @@ config BUSYBOX_FEATURE_UMOUNT_ALL Support -a option to unmount all currently mounted filesystems. config BUSYBOX_UNSHARE bool "unshare (7.2 kb)" - default n + default y depends on !BUSYBOX_NOMMU - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_LONG_OPTS help Run program with some namespaces unshared from parent. diff --git a/package/busybox/config/util-linux/volume_id/Config.in b/package/busybox/config/util-linux/volume_id/Config.in index 72696b126..74824fb42 100644 --- a/package/busybox/config/util-linux/volume_id/Config.in +++ b/package/busybox/config/util-linux/volume_id/Config.in @@ -23,6 +23,12 @@ config BUSYBOX_FEATURE_VOLUMEID_CRAMFS bool "cramfs filesystem" default y depends on BUSYBOX_VOLUMEID +config BUSYBOX_FEATURE_VOLUMEID_EROFS + bool "erofs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + Erofs is a compressed readonly filesystem for Linux. config BUSYBOX_FEATURE_VOLUMEID_EXFAT bool "exFAT filesystem" default y |