From 8fba43d0f136bdd7414ce94587d89c7a9e2b0900 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 10 Nov 2007 16:51:11 +0000 Subject: upgrade busybox to 1.8.1 SVN-Revision: 9524 --- package/busybox/config/Config.in | 145 +++++++++++++++++-------- package/busybox/config/archival/Config.in | 16 ++- package/busybox/config/console-tools/Config.in | 6 + package/busybox/config/miscutils/Config.in | 6 + package/busybox/config/networking/Config.in | 48 ++++++-- package/busybox/config/procps/Config.in | 19 ++++ package/busybox/config/selinux/Config.in | 8 ++ package/busybox/config/util-linux/Config.in | 10 ++ 8 files changed, 199 insertions(+), 59 deletions(-) (limited to 'package/busybox/config') diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index d3c1cb6341..abeb472dba 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -185,10 +185,10 @@ config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG The file has to be owned by user root, group root and has to be writeable only by root: - (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) + (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) The busybox executable has to be owned by user root, group root and has to be setuid root for this to work: - (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) + (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) Robert 'sandman' Griebl has more information here: . @@ -282,41 +282,80 @@ config BUSYBOX_CONFIG_STATIC config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX bool "Build shared libbusybox" default n + depends on !BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS + help + Build a shared library libbusybox.so.N.N.N which contains all + busybox code. + + This feature allows every applet to be built as a tiny + separate executable. Enabling it for "one big busybox binary" + approach serves no purpose and increases code size. + You should almost certainly say "no" to this. + +### config FEATURE_FULL_LIBBUSYBOX +### bool "Feature-complete libbusybox" +### default n if !FEATURE_SHARED_BUSYBOX +### depends on BUILD_LIBBUSYBOX +### help +### Build a libbusybox with the complete feature-set, disregarding +### the actually selected config. +### +### Normally, libbusybox will only contain the features which are +### used by busybox itself. If you plan to write a separate +### standalone application which uses libbusybox say 'Y'. +### +### Note: libbusybox is GPL, not LGPL, and exports no stable API that +### might act as a copyright barrier. We can and will modify the +### exported function set between releases (even minor version number +### changes), and happily break out-of-tree features. +### +### Say 'N' if in doubt. + +config BUSYBOX_CONFIG_FEATURE_INDIVIDUAL + bool "Produce a binary for each applet, linked against libbusybox" + default n + depends on !BUSYBOX_CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX help - Build a shared library libbusybox.so which contains all - libraries used inside busybox. - - This is an experimental feature intended to support the upcoming - "make standalone" mode. Enabling it against the one big busybox - binary serves no purpose (and increases the size). You should - almost certainly say "no" to this right now. - -config BUSYBOX_CONFIG_FEATURE_FULL_LIBBUSYBOX - bool "Feature-complete libbusybox" - default n if !BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX - depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX - help - Build a libbusybox with the complete feature-set, disregarding - the actually selected config. + If your CPU architecture doesn't allow for sharing text/rodata + sections of running binaries, but allows for runtime dynamic + libraries, this option will allow you to reduce memory footprint + when you have many different applets running at once. - Normally, libbusybox will only contain the features which are - used by busybox itself. If you plan to write a separate - standalone application which uses libbusybox say 'Y'. + If your CPU architecture allows for sharing text/rodata, + having single binary is more optimal. - Note: libbusybox is GPL, not LGPL, and exports no stable API that - might act as a copyright barrier. We can and will modify the - exported function set between releases (even minor version number - changes), and happily break out-of-tree features. + Each applet will be a tiny program, dynamically linked + against libbusybox.so.N.N.N. - Say 'N' if in doubt. + You need to have a working dynamic linker. config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX - bool "Use shared libbusybox for busybox" - default n if BUSYBOX_CONFIG_BUILD_LIBBUSYBOX + bool "Produce additional busybox binary linked against libbusybox" + default n depends on !BUSYBOX_CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX help - Use libbusybox.so also for busybox itself. - You need to have a working dynamic linker to use this variant. + Build busybox, dynamically linked against libbusybox.so.N.N.N. + + You need to have a working dynamic linker. + +### config BUILD_AT_ONCE +### bool "Compile all sources at once" +### default n +### help +### Normally each source-file is compiled with one invocation of +### the compiler. +### If you set this option, all sources are compiled at once. +### This gives the compiler more opportunities to optimize which can +### result in smaller and/or faster binaries. +### +### Setting this option will consume alot of memory, e.g. if you +### enable all applets with all features, gcc uses more than 300MB +### RAM during compilation of busybox. +### +### This option is most likely only beneficial for newer compilers +### such as gcc-4.1 and above. +### +### Say 'N' unless you know what you are doing. config BUSYBOX_CONFIG_LFS bool @@ -330,25 +369,6 @@ config BUSYBOX_CONFIG_LFS cp, mount, tar, and many others. If you want to access files larger than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'. -config BUSYBOX_CONFIG_BUILD_AT_ONCE - bool "Compile all sources at once" - default n - help - Normally each source-file is compiled with one invocation of - the compiler. - If you set this option, all sources are compiled at once. - This gives the compiler more opportunities to optimize which can - result in smaller and/or faster binaries. - - Setting this option will consume alot of memory, e.g. if you - enable all applets with all features, gcc uses more than 300MB - RAM during compilation of busybox. - - This option is most likely only beneficial for newer compilers - such as gcc-4.1 and above. - - Say 'N' unless you know what you are doing. - endmenu menu 'Debugging Options' @@ -464,6 +484,11 @@ config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS Install applets as hard-links to the busybox binary. This might count on a filesystem with few inodes. +config BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS + bool "as script wrappers" + help + Install applets as script wrappers that call the busybox binary. + config BUSYBOX_CONFIG_INSTALL_APPLET_DONT bool "not installed" depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE || BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS @@ -473,6 +498,30 @@ config BUSYBOX_CONFIG_INSTALL_APPLET_DONT endchoice +choice + prompt "/bin/sh applet link" + default BUSYBOX_CONFIG_INSTALL_SH_APPLET_SYMLINK + depends on BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS + help + Choose how you install /bin/sh applet link. + +config BUSYBOX_CONFIG_INSTALL_SH_APPLET_SYMLINK + bool "as soft-link" + help + Install /bin/sh applet as soft-link to the busybox binary. + +config BUSYBOX_CONFIG_INSTALL_SH_APPLET_HARDLINK + bool "as hard-link" + help + Install /bin/sh applet as hard-link to the busybox binary. + +config BUSYBOX_CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER + bool "as script wrapper" + help + Install /bin/sh applet as script wrapper that call the busybox binary. + +endchoice + config BUSYBOX_CONFIG_PREFIX string "BusyBox installation prefix" default "./_install" diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index 9895dba04b..8d62d2bf51 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -48,12 +48,22 @@ config BUSYBOX_CONFIG_BUNZIP2 conventional LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors. - The BusyBox bunzip2 applet is limited to de-compression only. - On an x86 system, this applet adds about 11K. - Unless you have a specific application which requires bunzip2, you should probably say N here. +config BUSYBOX_CONFIG_BZIP2 + bool "bzip2" + default n + help + bzip2 is a compression utility using the Burrows-Wheeler block + sorting text compression algorithm, and Huffman coding. Compression + is generally considerably better than that achieved by more + conventional LZ77/LZ78-based compressors, and approaches the + performance of the PPM family of statistical compressors. + + Unless you have a specific application which requires bzip2, you + should probably say N here. + config BUSYBOX_CONFIG_CPIO bool "cpio" default n diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in index 7b044ead9c..957b1d3a97 100644 --- a/package/busybox/config/console-tools/Config.in +++ b/package/busybox/config/console-tools/Config.in @@ -31,6 +31,12 @@ config BUSYBOX_CONFIG_DUMPKMAP This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. +config BUSYBOX_CONFIG_KBD_MODE + bool "kbd_mode" + default n + help + This program reports and sets keyboard mode. + config BUSYBOX_CONFIG_LOADFONT bool "loadfont" default n diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 44f11a98d1..d038f118bd 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -282,6 +282,12 @@ config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE endchoice +config BUSYBOX_CONFIG_MICROCOM + bool "microcom" + default n + help + The poor man's minicom utility for chatting with serial port devices. + config BUSYBOX_CONFIG_MOUNTPOINT bool "mountpoint" default n diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 1da1dc56f2..186e94509a 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -83,6 +83,15 @@ config BUSYBOX_CONFIG_HTTPD help Serve web pages via an HTTP server. +config BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES + bool "Support 'Ranges:' header" + default y + depends on BUSYBOX_CONFIG_HTTPD + help + Makes httpd emit "Accept-Ranges: bytes" header and understand + "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted + downloads, seeking in multimedia players etc. + config BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE bool "Use sendfile system call" default y @@ -183,6 +192,18 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES '/path/e404.html' file instead of the terse '404 NOT FOUND' message. +config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY + bool "Enable support for reverse proxy" + default n + depends on BUSYBOX_CONFIG_HTTPD + help + This option allows you to define URLs that will be forwarded + to another HTTP server. To setup add the following line to the + configuration file + P:/url/:http://hostname[:port]/new/path/ + Then a request to /url/myfile will be forwarded to + http://hostname[:port]/new/path/myfile. + config BUSYBOX_CONFIG_IFCONFIG bool "ifconfig" default y @@ -248,7 +269,8 @@ config BUSYBOX_CONFIG_IFUPDOWN config BUSYBOX_CONFIG_IFUPDOWN_IFSTATE_PATH string "Absolute path to ifstate file" - default "/var/run/ifstate" + default n + depends on BUSYBOX_CONFIG_IFUPDOWN help ifupdown keeps state information in a file called ifstate. Typically it is located in /var/run/ifstate, however @@ -307,13 +329,13 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6 If you need support for IPv6, turn this option on. ### UNUSED -### config FEATURE_IFUPDOWN_IPX -### bool "Enable support for IPX" -### default n -### depends on IFUPDOWN -### help -### If this option is selected you can use busybox to work with IPX -### networks. +###config FEATURE_IFUPDOWN_IPX +### bool "Enable support for IPX" +### default n +### depends on IFUPDOWN +### help +### If this option is selected you can use busybox to work with IPX +### networks. config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING bool "Enable mapping support" @@ -441,6 +463,16 @@ config BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS Say N unless you desparately need the short form of the ip object commands. +config BUSYBOX_CONFIG_FEATURE_IP_RARE_PROTOCOLS + bool "Support displaying rarely used link types" + default n + depends on BUSYBOX_CONFIG_IP + help + If you are not going to use links of type "frad", "econet", + "bif" etc, you probably don't need to enable this. + Ethernet, wireless, infrared, ppp/slip, ip tunnelling + link types are supported without this option selected. + config BUSYBOX_CONFIG_IPADDR bool default n diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in index cd063dbf0b..59018cbac6 100644 --- a/package/busybox/config/procps/Config.in +++ b/package/busybox/config/procps/Config.in @@ -49,6 +49,12 @@ config BUSYBOX_CONFIG_NMETER help Prints selected system stats continuously, one line per update. +config BUSYBOX_CONFIG_PGREP + bool "pgrep" + default y + help + Look for processes by name. + config BUSYBOX_CONFIG_PIDOF bool "pidof" default y @@ -72,6 +78,12 @@ config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT The special pid %PPID can be used to name the parent process of the pidof, in other words the calling shell or shell script. +config BUSYBOX_CONFIG_PKILL + bool "pkill" + default y + help + Send signals to processes by name. + config BUSYBOX_CONFIG_PS bool "ps" default y @@ -128,6 +140,13 @@ config BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS help Show 1/10th of a percent in CPU/mem statistics. +config BUSYBOX_CONFIG_FEATURE_TOPMEM + bool "topmem" + default n + depends on BUSYBOX_CONFIG_TOP + help + Enable 's' in top (gives lots of memory info) + config BUSYBOX_CONFIG_UPTIME bool "uptime" default y diff --git a/package/busybox/config/selinux/Config.in b/package/busybox/config/selinux/Config.in index 907c9753ec..d3a8acfafe 100644 --- a/package/busybox/config/selinux/Config.in +++ b/package/busybox/config/selinux/Config.in @@ -104,5 +104,13 @@ config BUSYBOX_CONFIG_FEATURE_SETFILES_CHECK_OPTION Support "-c" option (check the validity of the contexts against the specified binary policy) for setfiles. Requires libsepol. +config BUSYBOX_CONFIG_SETSEBOOL + bool "setsebool" + default n + depends on BUSYBOX_CONFIG_SELINUX + help + Enable support for change boolean. + semanage and -P option is not supported yet. + endmenu diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 28dc7b7fdb..457fdc8f5d 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -360,6 +360,16 @@ config BUSYBOX_CONFIG_MOUNT NFS filesystems. Most people using BusyBox will also want to enable the 'mount' utility. +config BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS + bool "Support mount helpers" + default n + depends on BUSYBOX_CONFIG_MOUNT + help + Enable mounting of virtual file systems via external helpers. + E.g. mount obexfs#-b00.11.22.33.44.55 /mnt will in effect call + obexfs -b00.11.22.33.44.55 /mnt + The idea is to use such virtual filesystems in /etc/fstab + config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS bool "Support mounting NFS file systems" default y -- cgit v1.2.3