Changeset 26455


Ignore:
Timestamp:
2011-04-03T20:31:00+02:00 (7 years ago)
Author:
florian
Message:

[package] update busybox to 1.18.4, patch from Peter Wagner

Location:
trunk/package/busybox
Files:
5 deleted
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/Makefile

    r26430 r26455  
    99 
    1010PKG_NAME:=busybox 
    11 PKG_VERSION:=1.17.3 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=1.18.4 
     12PKG_RELEASE:=1 
    1313PKG_FLAGS:=essential 
    1414 
     
    1616PKG_SOURCE_URL:=http://www.busybox.net/downloads \ 
    1717                http://distfiles.gentoo.org/distfiles/ 
    18 PKG_MD5SUM:=a2ce1a951571da8c6e0eaf75b1acef60 
     18PKG_MD5SUM:=b03c5b46ced732679e525a920a1a62f5 
    1919 
    2020PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc 
  • trunk/package/busybox/config/Config.in

    r25508 r26455  
    4646          compiler other than gcc. 
    4747          If you do use gcc, this option may needlessly increase code size. 
     48 
     49config BUSYBOX_CONFIG_PLATFORM_LINUX 
     50        bool "Enable Linux-specific applets and features" 
     51        default y 
     52        help 
     53          For the most part, busybox requires only POSIX compatibility 
     54          from the target system, but some applets and features use 
     55          Linux-specific interfaces. 
     56 
     57          Answering 'N' here will disable such applets and hide the 
     58          corresponding configuration options. 
    4859 
    4960choice 
     
    112123          applets that are compiled into busybox. 
    113124 
     125config BUSYBOX_CONFIG_INSTALL_NO_USR 
     126        bool "Don't use /usr" 
     127        default n 
     128        depends on BUSYBOX_CONFIG_FEATURE_INSTALLER 
     129        help 
     130          Disable use of /usr. busybox --install and "make install" 
     131          will install applets only to /bin and /sbin, 
     132          never to /usr/bin or /usr/sbin. 
     133 
    114134config BUSYBOX_CONFIG_LOCALE_SUPPORT 
    115135        bool "Enable locale support (system needs locale for this to work)" 
     
    138158          With this option on, Unicode support is implemented using libc 
    139159          routines. Otherwise, internal implementation is used. 
     160          Internal implementation is smaller. 
    140161 
    141162config BUSYBOX_CONFIG_FEATURE_CHECK_UNICODE_IN_ENV 
     
    263284          things up manually. 
    264285 
    265 config BUSYBOX_CONFIG_FEATURE_UTMP 
    266         bool "Support utmp file" 
    267         default n 
    268         help 
    269           The file /var/run/utmp is used to track who is currently logged in. 
    270           With this option on, certain applets (getty, login, telnetd etc) 
    271           will create and delete entries there. 
    272           "who" applet requires this option. 
    273  
    274286config BUSYBOX_CONFIG_FEATURE_WTMP 
    275287        bool "Support wtmp file" 
     
    283295          "last" applet requires this option. 
    284296 
     297config BUSYBOX_CONFIG_FEATURE_UTMP 
     298        bool "Support utmp file" 
     299        default n 
     300        help 
     301          The file /var/run/utmp is used to track who is currently logged in. 
     302          With this option on, certain applets (getty, login, telnetd etc) 
     303          will create and delete entries there. 
     304          "who" applet requires this option. 
     305 
    285306config BUSYBOX_CONFIG_FEATURE_PIDFILE 
    286307        bool "Support writing pidfiles" 
     
    295316        help 
    296317          With this option you can install the busybox binary belonging 
    297           to root with the suid bit set, and it will automatically drop 
    298           priviledges for applets that don't need root access. 
     318          to root with the suid bit set, enabling some applets to perform 
     319          root-level operations even when run by ordinary users 
     320          (for example, mounting of user mounts in fstab needs this). 
     321 
     322          Busybox will automatically drop priviledges for applets 
     323          that don't need root access. 
    299324 
    300325          If you are really paranoid and don't want to do this, build two 
    301326          busybox binaries with different applets in them (and the appropriate 
    302327          symlinks pointing to each binary), and only set the suid bit on the 
    303           one that needs it. The applets currently marked to need the suid bit 
    304           are: 
     328          one that needs it. 
     329 
     330          The applets currently marked to need the suid bit are: 
    305331 
    306332          crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, 
     
    352378        bool "Support NSA Security Enhanced Linux" 
    353379        default n 
     380        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    354381        help 
    355382          Enable support for SELinux in applets ls, ps, and id. Also provide 
     
    638665endmenu 
    639666 
    640 menu 'Installation Options' 
    641  
    642 config BUSYBOX_CONFIG_INSTALL_NO_USR 
    643         bool "Don't use /usr" 
    644         default n 
    645         help 
    646           Disable use of /usr. Don't activate this option if you don't know 
    647           that you really want this behaviour. 
     667menu 'Installation Options ("make install" behavior)' 
    648668 
    649669choice 
    650         prompt "Applets links" 
     670        prompt "What kind of applet links to install" 
    651671        default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS 
    652672        help 
    653           Choose how you install applets links. 
     673          Choose what kind of links to applets are created by "make install". 
    654674 
    655675config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS 
     
    675695        depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE || BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS 
    676696        help 
    677           Do not install applet links. Useful when using the -install feature 
    678           or a standalone shell for rescue purposes. 
     697          Do not install applet links. Useful when you plan to use 
     698          busybox --install for installing links, or plan to use 
     699          a standalone shell and thus don't need applet links. 
    679700 
    680701endchoice 
     
    700721        bool "as script wrapper" 
    701722        help 
    702           Install /bin/sh applet as script wrapper that call the busybox 
    703           binary. 
     723          Install /bin/sh applet as script wrapper that calls 
     724          the busybox binary. 
    704725 
    705726endchoice 
  • trunk/package/busybox/config/archival/Config.in

    r22665 r26455  
    205205        default n 
    206206        help 
    207           Converts an RPM file into a CPIO archive. 
     207          Converts a RPM file into a CPIO archive. 
    208208 
    209209config BUSYBOX_CONFIG_RPM 
  • trunk/package/busybox/config/console-tools/Config.in

    r22665 r26455  
    66menu "Console Utilities" 
    77 
     8 
     9 
    810config BUSYBOX_CONFIG_CHVT 
    911        bool "chvt" 
    1012        default n 
     13        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    1114        help 
    1215          This program is used to change to another terminal. 
     
    1619        bool "fgconsole" 
    1720        default n 
     21        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    1822        help 
    1923          This program prints active (foreground) console number. 
     
    2832        bool "deallocvt" 
    2933        default n 
     34        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    3035        help 
    3136          This program deallocates unused virtual consoles. 
     
    3439        bool "dumpkmap" 
    3540        default n 
     41        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    3642        help 
    3743          This program dumps the kernel's keyboard translation table to 
     
    4147        bool "kbd_mode" 
    4248        default n 
     49        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    4350        help 
    4451          This program reports and sets keyboard mode. 
     
    4754        bool "loadfont" 
    4855        default n 
     56        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    4957        help 
    5058          This program loads a console font from standard input. 
     
    5361        bool "loadkmap" 
    5462        default n 
     63        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    5564        help 
    5665          This program loads a keyboard translation table from 
     
    6069        bool "openvt" 
    6170        default n 
     71        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    6272        help 
    6373          This program is used to start a command on an unused 
     
    91101        bool "setconsole" 
    92102        default n 
     103        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    93104        help 
    94105          This program redirects the system console to another device, 
     
    105116        bool "setfont" 
    106117        default n 
     118        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    107119        help 
    108120          Allows to load console screen map. Useful for i18n. 
     
    126138        bool "setkeycodes" 
    127139        default n 
     140        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    128141        help 
    129142          This program loads entries into the kernel's scancode-to-keycode 
     
    133146        bool "setlogcons" 
    134147        default n 
     148        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    135149        help 
    136150          This program redirects the output console of kernel messages. 
     
    139153        bool "showkey" 
    140154        default n 
     155        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    141156        help 
    142157          Shows keys pressed. 
  • trunk/package/busybox/config/coreutils/Config.in

    r22665 r26455  
    3737        bool "Support %[num]N nanosecond format specifier" 
    3838        default n 
    39         depends on BUSYBOX_CONFIG_DATE 
     39        depends on BUSYBOX_CONFIG_DATE && BUSYBOX_CONFIG_PLATFORM_LINUX 
    4040        help 
    4141          Support %[num]N format specifier. Adds ~250 bytes of code. 
     
    9797          useful for cases when no other way of expressing a character 
    9898          is possible. 
     99config BUSYBOX_CONFIG_BASE64 
     100        bool "base64" 
     101        default n 
     102        help 
     103          Base64 encode and decode 
    99104 
    100105config BUSYBOX_CONFIG_CAL 
     
    682687        bool "stat" 
    683688        default n 
     689        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    684690        help 
    685691          display file or filesystem status. 
  • trunk/package/busybox/config/e2fsprogs/Config.in

    r22665 r26455  
    3232        bool "lsattr" 
    3333        default n 
     34        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    3435        help 
    3536          lsattr lists the file attributes on a second extended file system. 
  • trunk/package/busybox/config/editors/Config.in

    r26356 r26455  
    55 
    66menu "Editors" 
     7 
     8config BUSYBOX_CONFIG_PATCH 
     9        bool "patch" 
     10        default n 
     11        help 
     12          Apply a unified diff formatted patch. 
    713 
    814config BUSYBOX_CONFIG_AWK 
     
    5864          Small, simple, evil. Part of SUSv3. If you're not already using 
    5965          this, you don't need it. 
    60  
    61 config BUSYBOX_CONFIG_PATCH 
    62         bool "patch" 
    63         default n 
    64         help 
    65           Apply a unified diff formatted patch. 
    6666 
    6767config BUSYBOX_CONFIG_SED 
  • trunk/package/busybox/config/init/Config.in

    r22665 r26455  
    4444          Enable reading and parsing of $PWD/bootchartd.conf 
    4545          and /etc/bootchartd.conf files. 
     46config BUSYBOX_CONFIG_HALT 
     47        bool "poweroff, halt, and reboot" 
     48        default y 
     49        help 
     50          Stop all processes and either halt, reboot, or power off the system. 
    4651 
     52config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT 
     53        bool "Call telinit on shutdown and reboot" 
     54        default n 
     55        depends on BUSYBOX_CONFIG_HALT && !BUSYBOX_CONFIG_INIT 
     56        help 
     57          Call an external program (normally telinit) to facilitate 
     58          a switch to a proper runlevel. 
     59 
     60          This option is only available if you selected halt and friends, 
     61          but did not select init. 
     62 
     63config BUSYBOX_CONFIG_TELINIT_PATH 
     64        string "Path to telinit executable" 
     65        default "/sbin/telinit" 
     66        depends on BUSYBOX_CONFIG_FEATURE_CALL_TELINIT 
     67        help 
     68          When busybox halt and friends have to call external telinit 
     69          to facilitate proper shutdown, this path is to be used when 
     70          locating telinit executable. 
    4771config BUSYBOX_CONFIG_INIT 
    4872        bool "init" 
     
    127151          requires no special support. 
    128152 
    129 config BUSYBOX_CONFIG_HALT 
    130         bool "poweroff, halt, and reboot" 
    131         default y 
     153config BUSYBOX_CONFIG_INIT_TERMINAL_TYPE 
     154        string "Initial terminal type" 
     155        default "linux" 
     156        depends on BUSYBOX_CONFIG_INIT 
    132157        help 
    133           Stop all processes and either halt, reboot, or power off the system. 
     158          This is the initial value set by init for the TERM environment 
     159          variable. This variable is used by programs which make use of 
     160          extended terminal capabilities. 
    134161 
    135 config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT 
    136         bool "Call telinit on shutdown and reboot" 
    137         default n 
    138         depends on BUSYBOX_CONFIG_HALT && !BUSYBOX_CONFIG_INIT 
    139         help 
    140           Call an external program (normally telinit) to facilitate 
    141           a switch to a proper runlevel. 
    142  
    143           This option is only available if you selected halt and friends, 
    144           but did not select init. 
    145  
    146 config BUSYBOX_CONFIG_TELINIT_PATH 
    147         string "Path to telinit executable" 
    148         default "/sbin/telinit" 
    149         depends on BUSYBOX_CONFIG_FEATURE_CALL_TELINIT 
    150         help 
    151           When busybox halt and friends have to call external telinit 
    152           to facilitate proper shutdown, this path is to be used when 
    153           locating telinit executable. 
    154  
     162          Note that on Linux, init attempts to detect serial terminal and 
     163          sets TERM to "vt102" if one is found. 
    155164config BUSYBOX_CONFIG_MESG 
    156165        bool "mesg" 
  • trunk/package/busybox/config/libbb/Config.in

    r20661 r26455  
    4242          instead of IP/mask pairs in route command. 
    4343 
     44config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS 
     45        bool "Use termios to manipulate the screen" 
     46        default n 
     47        depends on BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TOP || BUSYBOX_CONFIG_POWERTOP 
     48        help 
     49          This option allows utilities such as 'more' and 'top' to determine 
     50          the size of the screen. If you leave this disabled, your utilities 
     51          that display things on the screen will be especially primitive and 
     52          will be unable to determine the current screen size, and will be 
     53          unable to move the cursor. 
     54 
    4455config BUSYBOX_CONFIG_FEATURE_EDITING 
    4556        bool "Command line editing" 
     
    7788        bool "History saving" 
    7889        default n 
    79         depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_EDITING 
     90        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
    8091        help 
    81           Enable history saving in ash shell. 
     92          Enable history saving in shells. 
    8293 
    8394config BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION 
     
    152163        bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" 
    153164        default n 
     165        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    154166        help 
    155167          Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring 
  • trunk/package/busybox/config/loginutils/Config.in

    r22665 r26455  
    55 
    66menu "Login/Password Management Utilities" 
     7 
     8config BUSYBOX_CONFIG_ADD_SHELL 
     9       bool "add-shell" 
     10       default n if BUSYBOX_CONFIG_DESKTOP 
     11       help 
     12         Add shells to /etc/shells. 
     13 
     14config BUSYBOX_CONFIG_REMOVE_SHELL 
     15       bool "remove-shell" 
     16       default n if BUSYBOX_CONFIG_DESKTOP 
     17       help 
     18         Remove shells from /etc/shells. 
    719 
    820config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS 
     
    92104          user which has password encrypted with these algorithms. 
    93105 
    94 config BUSYBOX_CONFIG_ADDGROUP 
    95         bool "addgroup" 
    96         default n 
    97         help 
    98           Utility for creating a new group account. 
    99  
    100 config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS 
     106config BUSYBOX_CONFIG_ADDUSER 
     107        bool "adduser" 
     108        default n 
     109        help 
     110          Utility for creating a new user account. 
     111 
     112config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS 
    101113        bool "Enable long options" 
    102114        default n 
    103         depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS 
    104         help 
    105           Support long options for the addgroup applet. 
    106  
    107 config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP 
    108         bool "Support for adding users to groups" 
    109         default n 
    110         depends on BUSYBOX_CONFIG_ADDGROUP 
    111         help 
    112           If  called  with two non-option arguments, 
    113           addgroup will add an existing user to an 
    114           existing group. 
    115  
    116 config BUSYBOX_CONFIG_DELGROUP 
    117         bool "delgroup" 
    118         default n 
    119         help 
    120           Utility for deleting a group account. 
    121  
    122 config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP 
    123         bool "Support for removing users from groups" 
    124         default n 
    125         depends on BUSYBOX_CONFIG_DELGROUP 
    126         help 
    127           If called with two non-option arguments, deluser 
    128           or delgroup will remove an user from a specified group. 
     115        depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_LONG_OPTS 
     116        help 
     117          Support long options for the adduser applet. 
    129118 
    130119config BUSYBOX_CONFIG_FEATURE_CHECK_NAMES 
     
    140129          at the end of the user or group name. 
    141130 
    142 config BUSYBOX_CONFIG_ADDUSER 
    143         bool "adduser" 
    144         default n 
    145         help 
    146           Utility for creating a new user account. 
    147  
    148 config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS 
    149         bool "Enable long options" 
    150         default n 
    151         depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_LONG_OPTS 
    152         help 
    153           Support long options for the adduser applet. 
    154  
    155131config BUSYBOX_CONFIG_FIRST_SYSTEM_ID 
    156132        int "First valid system uid or gid for adduser and addgroup" 
     
    169145          Last valid system uid or gid for adduser and addgroup 
    170146 
     147config BUSYBOX_CONFIG_ADDGROUP 
     148        bool "addgroup" 
     149        default n 
     150        help 
     151          Utility for creating a new group account. 
     152 
     153config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS 
     154        bool "Enable long options" 
     155        default n 
     156        depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS 
     157        help 
     158          Support long options for the addgroup applet. 
     159 
     160config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP 
     161        bool "Support for adding users to groups" 
     162        default n 
     163        depends on BUSYBOX_CONFIG_ADDGROUP 
     164        help 
     165          If  called  with two non-option arguments, 
     166          addgroup will add an existing user to an 
     167          existing group. 
     168 
    171169config BUSYBOX_CONFIG_DELUSER 
    172170        bool "deluser" 
     
    175173          Utility for deleting a user account. 
    176174 
     175config BUSYBOX_CONFIG_DELGROUP 
     176        bool "delgroup" 
     177        default n 
     178        help 
     179          Utility for deleting a group account. 
     180 
     181config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP 
     182        bool "Support for removing users from groups" 
     183        default n 
     184        depends on BUSYBOX_CONFIG_DELGROUP 
     185        help 
     186          If called with two non-option arguments, deluser 
     187          or delgroup will remove an user from a specified group. 
     188 
    177189config BUSYBOX_CONFIG_GETTY 
    178190        bool "getty" 
     
    185197        bool "login" 
    186198        default n 
    187         select BUSYBOX_CONFIG_FEATURE_SUID 
    188199        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    189200        help 
     
    228239        bool "passwd" 
    229240        default y 
    230         select BUSYBOX_CONFIG_FEATURE_SUID 
    231241        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    232242        help 
     
    264274        bool "su" 
    265275        default n 
    266         select BUSYBOX_CONFIG_FEATURE_SUID 
    267276        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    268277        help 
     
    294303        bool "vlock" 
    295304        default n 
    296         select BUSYBOX_CONFIG_FEATURE_SUID 
    297305        help 
    298306          Build the "vlock" applet which allows you to lock (virtual) terminals. 
  • trunk/package/busybox/config/miscutils/Config.in

    r22665 r26455  
    99        bool "conspy" 
    1010        default n 
     11        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    1112        help 
    1213          A text-mode VNC like program for Linux virtual terminals. 
     
    1415          or        conspy -nd NUM  screenshot of console num 
    1516          or        conspy -cs NUM  poor man's GNU screen like 
    16  
     17config BUSYBOX_CONFIG_NANDWRITE 
     18        bool "nandwrite" 
     19        default n 
     20        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     21        help 
     22          Write to the specified MTD device, with bad blocks awareness 
     23 
     24config BUSYBOX_CONFIG_NANDDUMP 
     25        bool "nanddump" 
     26        default n 
     27        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     28        help 
     29          Dump the content of raw NAND chip 
    1730config BUSYBOX_CONFIG_UBIATTACH 
    1831        bool "ubiattach" 
    1932        default n 
     33        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    2034        help 
    2135          Attach MTD device to an UBI device. 
     
    2438        bool "ubidetach" 
    2539        default n 
     40        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    2641        help 
    2742          Detach MTD device from an UBI device. 
     
    3045        bool "adjtimex" 
    3146        default n 
     47        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    3248        help 
    3349          Adjtimex reads and optionally sets adjustment parameters for 
     
    4157          busybox was built. 
    4258 
     59config BUSYBOX_CONFIG_FEATURE_COMPRESS_BBCONFIG 
     60        bool "Compress bbconfig data" 
     61        default n 
     62        depends on BUSYBOX_CONFIG_BBCONFIG 
     63        help 
     64          Store bbconfig data in compressed form, uncompress them on-the-fly 
     65          before output. 
     66 
     67          If you have a really tiny busybox with few applets enabled (and 
     68          bunzip2 isn't one of them), the overhead of the decompressor might 
     69          be noticeable. Also, if you run executables directly from ROM 
     70          and have very little memory, this might not be a win. Otherwise, 
     71          you probably want this. 
     72 
    4373config BUSYBOX_CONFIG_BEEP 
    4474        bool "beep" 
    4575        default n 
     76        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    4677        help 
    4778          The beep applets beeps in a given freq/Hz. 
     
    140171        bool "crond" 
    141172        default y 
    142         select BUSYBOX_CONFIG_FEATURE_SUID 
    143173        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    144174        help 
     
    175205        bool "crontab" 
    176206        default y 
    177         select BUSYBOX_CONFIG_FEATURE_SUID 
    178207        help 
    179208          Crontab manipulates the crontab for a particular user. Only 
     
    200229        bool "devfsd (obsolete)" 
    201230        default n 
     231        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    202232        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    203233        help 
     
    243273        bool "Use devfs names for all devices (obsolete)" 
    244274        default n 
     275        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    245276        help 
    246277          This is obsolete and should NOT be used anymore. 
     
    262293        bool "eject" 
    263294        default n 
     295        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    264296        help 
    265297          Used to eject cdroms. (defaults to /dev/cdrom) 
     
    276308        bool "fbsplash" 
    277309        default n 
     310        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    278311        help 
    279312          Shows splash image and progress bar on framebuffer device. 
     
    325358        bool "ionice" 
    326359        default n 
     360        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    327361        help 
    328362          Set/set program io scheduling class and priority 
     
    425459        depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD 
    426460        help 
    427           Enable "-N" command. 
     461          Enables "-N" command. 
    428462 
    429463config BUSYBOX_CONFIG_HDPARM 
    430464        bool "hdparm" 
    431465        default n 
     466        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    432467        help 
    433468          Get/Set hard drive parameters. Primarily intended for ATA 
     
    497532          'makedevs' is a utility used to create a batch of devices with 
    498533          one command. 
    499           . 
     534 
    500535          There are two choices for command line behaviour, the interface 
    501536          as used by LEAF/Linux Router Project, or a device table file. 
    502           . 
     537 
    503538          'leaf' is traditionally what busybox follows, it allows multiple 
    504539          devices of a particluar type to be created per command. 
    505540          e.g. /dev/hda[0-9] 
    506541          Device properties are passed as command line arguments. 
    507           . 
     542 
    508543          'table' reads device properties from a file or stdin, allowing 
    509544          a batch of unrelated devices to be made with one command. 
     
    552587        bool "raidautorun" 
    553588        default n 
     589        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    554590        help 
    555591          raidautorun tells the kernel md driver to 
     
    559595        bool "readahead" 
    560596        default n 
    561         depends on BUSYBOX_CONFIG_LFS 
     597        depends on BUSYBOX_CONFIG_LFS && BUSYBOX_CONFIG_PLATFORM_LINUX 
    562598        help 
    563599          Preload the files listed on the command line into RAM cache so that 
     
    576612        bool "rfkill" 
    577613        default n 
     614        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    578615        help 
    579616          Enable/disable wireless devices. 
     
    596633        bool "rx" 
    597634        default n 
     635        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    598636        help 
    599637          Receive files using the Xmodem protocol. 
     
    667705        bool "watchdog" 
    668706        default y 
     707        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    669708        help 
    670709          The watchdog utility is used with hardware or software watchdog 
  • trunk/package/busybox/config/modutils/Config.in

    r22665 r26455  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "Linux Module Utilities" 
     8depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    79 
    810config BUSYBOX_CONFIG_MODINFO 
  • trunk/package/busybox/config/networking/Config.in

    r22665 r26455  
    55 
    66menu "Networking Utilities" 
     7 
     8config BUSYBOX_CONFIG_NBDCLIENT 
     9        bool "nbd-client" 
     10        default n 
     11        help 
     12          Network block device client 
    713 
    814config BUSYBOX_CONFIG_NC 
     
    8389        bool "arp" 
    8490        default n 
     91        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    8592        help 
    8693          Manipulate the system ARP cache. 
     
    8996        bool "arping" 
    9097        default y 
     98        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    9199        help 
    92100          Ping hosts by ARP packets. 
     
    95103        bool "brctl" 
    96104        default y 
     105        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    97106        help 
    98107          Manage ethernet bridges. 
     
    127136        bool "ether-wake" 
    128137        default n 
     138        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    129139        help 
    130140          Send a magic packet to wake up sleeping machines. 
     
    298308          http://hostname[:port]/new/path/myfile. 
    299309 
     310config BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP 
     311        bool "Support for GZIP content encoding" 
     312        default n 
     313        depends on BUSYBOX_CONFIG_HTTPD 
     314        help 
     315          Makes httpd send files using GZIP content encoding if the 
     316          client supports it and a pre-compressed <file>.gz exists. 
     317 
    300318config BUSYBOX_CONFIG_IFCONFIG 
    301319        bool "ifconfig" 
    302320        default y 
     321        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    303322        help 
    304323          Ifconfig is used to configure the kernel-resident network interfaces. 
     
    348367        bool "ifenslave" 
    349368        default n 
     369        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    350370        help 
    351371          Userspace application to bind several interfaces 
     
    355375        bool "ifplugd" 
    356376        default n 
     377        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    357378        help 
    358379          Network interface plug detection daemon. 
     
    396417        bool "Use busybox ip applet" 
    397418        default n 
    398         depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP 
     419        depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP && BUSYBOX_CONFIG_PLATFORM_LINUX 
    399420        select BUSYBOX_CONFIG_IP 
    400421        select BUSYBOX_CONFIG_FEATURE_IP_ADDRESS 
     
    515536        bool "ip" 
    516537        default n 
     538        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    517539        help 
    518540          The "ip" applet is a TCP/IP interface configuration and routing 
     
    630652        bool "nameif" 
    631653        default n 
     654        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    632655        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    633656        help 
     
    664687        bool "netstat" 
    665688        default y 
     689        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    666690        help 
    667691          netstat prints information about the Linux networking subsystem. 
     
    692716        bool "ntpd" 
    693717        default n 
     718        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    694719        help 
    695720          The NTP client/server daemon. 
     
    706731        bool "ping" 
    707732        default y 
     733        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    708734        help 
    709735          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to 
     
    734760        bool "route" 
    735761        default y 
     762        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    736763        help 
    737764          Route displays or manipulates the kernel's IP routing tables. 
     
    740767        bool "slattach" 
    741768        default n 
     769        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    742770        help 
    743771          slattach is a small utility to attach network interfaces to serial 
     
    820848                  mount -t devpts devpts /dev/pts 
    821849 
    822           You need to be sure that Busybox has LOGIN and 
     850          You need to be sure that busybox has LOGIN and 
    823851          FEATURE_SUID enabled. And finally, you should make 
    824852          certain that Busybox has been installed setuid root: 
     
    926954        bool "traceroute" 
    927955        default y 
     956        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    928957        help 
    929958          Utility to trace the route of IP packets. 
     
    962991        bool "tunctl" 
    963992        default n 
     993        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    964994        help 
    965995          tunctl creates or deletes tun devices. 
     
    9941024        bool "vconfig" 
    9951025        default y 
     1026        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    9961027        help 
    9971028          Creates, removes, and configures VLAN interfaces 
     
    10251056          Support long options for the wget applet. 
    10261057 
     1058config BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT 
     1059        bool "Enable read timeout option -T SEC" 
     1060        default n 
     1061        depends on BUSYBOX_CONFIG_WGET 
     1062        help 
     1063          Supports network read timeout for wget, so that wget will give 
     1064          up and timeout when reading network data, through the -T command 
     1065          line option.  Currently only network data read timeout is 
     1066          supported (i.e., timeout is not applied to the DNS nor TCP 
     1067          connection initialization).  When FEATURE_WGET_LONG_OPTIONS is 
     1068          also enabled, the --timeout option will work in addition to -T. 
     1069 
    10271070config BUSYBOX_CONFIG_ZCIP 
    10281071        bool "zcip" 
    10291072        default n 
     1073        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    10301074        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    10311075        help 
  • trunk/package/busybox/config/networking/udhcp/Config.in

    r22665 r26455  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    45# 
    56 
     7 
     8 
    69config BUSYBOX_CONFIG_UDHCPD 
    710        bool "udhcp server (udhcpd)" 
    811        default n 
     12        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    913        help 
    1014          udhcpd is a DHCP server geared primarily toward embedded systems, 
     
    5054        bool "udhcp client (udhcpc)" 
    5155        default y 
     56        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    5257        help 
    5358          udhcpc is a DHCP client geared primarily toward embedded systems, 
  • trunk/package/busybox/config/procps/Config.in

    r25512 r26455  
    66menu "Process Utilities" 
    77 
     8config BUSYBOX_CONFIG_IOSTAT 
     9        bool "iostat" 
     10        default n 
     11        help 
     12          Report CPU and I/O statistics 
     13config BUSYBOX_CONFIG_MPSTAT 
     14        bool "mpstat" 
     15        default n 
     16        help 
     17          Per-processor statistics 
     18config BUSYBOX_CONFIG_PMAP 
     19       bool "pmap" 
     20       default n 
     21       help 
     22         Display processes' memory mappings. 
     23config BUSYBOX_CONFIG_POWERTOP 
     24        bool "powertop" 
     25        default n 
     26        help 
     27          Analyze power consumption on Intel-based laptops 
    828config BUSYBOX_CONFIG_SMEMCAP 
    929        bool "smemcap" 
     
    1636        bool "free" 
    1737        default y 
     38        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    1839        help 
    1940          free displays the total amount of free and used physical and swap 
     
    110131        bool "Enable time and elapsed time output" 
    111132        default n 
    112         depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP 
     133        depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP && BUSYBOX_CONFIG_PLATFORM_LINUX 
    113134        help 
    114135          Support -o time and -o etime output specifiers. 
     
    206227        bool "uptime" 
    207228        default y 
     229        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    208230        help 
    209231          uptime gives a one line display of the current time, how long 
  • trunk/package/busybox/config/shell/Config.in

    r22665 r26455  
    55 
    66menu "Shells" 
    7  
    8  
    97 
    108config BUSYBOX_CONFIG_ASH 
     
    111109          variable each time it is displayed. 
    112110 
     111config BUSYBOX_CONFIG_CTTYHACK 
     112        bool "cttyhack" 
     113        default n 
     114        help 
     115          One common problem reported on the mailing list is "can't access tty; 
     116          job control turned off" error message which typically appears when 
     117          one tries to use shell with stdin/stdout opened to /dev/console. 
     118          This device is special - it cannot be a controlling tty. 
     119 
     120          Proper solution is to use correct device instead of /dev/console. 
     121 
     122          cttyhack provides "quick and dirty" solution to this problem. 
     123          It analyzes stdin with various ioctls, trying to determine whether 
     124          it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). 
     125          If it detects one, it closes stdin/out/err and reopens that device. 
     126          Then it executes given program. Opening the device will make 
     127          that device a controlling tty. This may require cttyhack 
     128          to be a session leader. 
     129 
     130          Example for /etc/inittab (for busybox init): 
     131 
     132          ::respawn:/bin/cttyhack /bin/sh 
     133 
     134          Starting an interactive shell from boot shell script: 
     135 
     136          setsid cttyhack sh 
     137 
     138          Giving controlling tty to shell running with PID 1: 
     139 
     140          # exec cttyhack sh 
     141 
     142          Without cttyhack, you need to know exact tty name, 
     143          and do something like this: 
     144 
     145          # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1' 
     146 
    113147config BUSYBOX_CONFIG_HUSH 
    114148        bool "hush" 
    115149        default n 
    116150        help 
    117           hush is a small shell (22k). It handles the normal flow control 
     151          hush is a small shell (25k). It handles the normal flow control 
    118152          constructs such as if/then/elif/else/fi, for/in/do/done, while loops, 
    119153          case/esac. Redirections, here documents, $((arithmetic)) 
     
    122156          It will compile and work on no-mmu systems. 
    123157 
    124           It does not handle select, aliases, brace expansion, 
    125           tilde expansion, &>file and >&file redirection of stdout+stderr. 
     158          It does not handle select, aliases, tilde expansion, 
     159          &>file and >&file redirection of stdout+stderr. 
    126160 
    127161config BUSYBOX_CONFIG_HUSH_BASH_COMPAT 
     
    131165        help 
    132166          Enable bash-compatible extensions. 
     167 
     168config BUSYBOX_CONFIG_HUSH_BRACE_EXPANSION 
     169        bool "Brace expansion" 
     170        default n 
     171        depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT 
     172        help 
     173          Enable {abc,def} extension. 
    133174 
    134175config BUSYBOX_CONFIG_HUSH_HELP 
     
    148189          from stdin just like a shell script from a file. 
    149190          No prompt, no PS1/PS2 magic shell variables. 
     191 
     192config BUSYBOX_CONFIG_HUSH_SAVEHISTORY 
     193        bool "Save command history to .hush_history" 
     194        default n 
     195        depends on BUSYBOX_CONFIG_HUSH_INTERACTIVE && BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY 
     196        help 
     197          Enable history saving in hush. 
    150198 
    151199config BUSYBOX_CONFIG_HUSH_JOB 
     
    202250          Enable support for local variables in functions. 
    203251 
    204 config BUSYBOX_CONFIG_HUSH_EXPORT_N 
    205         bool "Support export '-n' option" 
    206         default y 
    207         depends on BUSYBOX_CONFIG_HUSH 
    208         help 
    209           Enable support for export '-n' option in hush. It is a bash extension. 
    210  
    211252config BUSYBOX_CONFIG_HUSH_RANDOM_SUPPORT 
    212253        bool "Pseudorandom generator and $RANDOM variable" 
     
    216257          Enable pseudorandom generator and dynamic variable "$RANDOM". 
    217258          Each read of "$RANDOM" will generate a new pseudorandom value. 
     259 
     260config BUSYBOX_CONFIG_HUSH_EXPORT_N 
     261        bool "Support 'export -n' option" 
     262        default y 
     263        depends on BUSYBOX_CONFIG_HUSH 
     264        help 
     265          export -n unexports variables. It is a bash extension. 
     266 
     267config BUSYBOX_CONFIG_HUSH_MODE_X 
     268        bool "Support 'hush -x' option and 'set -x' command" 
     269        default n 
     270        depends on BUSYBOX_CONFIG_HUSH 
     271        help 
     272          This instructs hush to print commands before execution. 
     273          Adds ~300 bytes. 
     274 
     275config BUSYBOX_CONFIG_MSH 
     276        bool "msh (deprecated: aliased to hush)" 
     277        default n 
     278        select BUSYBOX_CONFIG_HUSH 
     279        help 
     280          msh is deprecated and will be removed, please migrate to hush. 
    218281 
    219282 
     
    270333 
    271334endchoice 
    272  
    273  
    274 config BUSYBOX_CONFIG_LASH 
    275         bool "lash (deprecated: aliased to hush)" 
    276         default n 
    277         select BUSYBOX_CONFIG_HUSH 
    278         help 
    279           lash is deprecated and will be removed, please migrate to hush. 
    280  
    281 config BUSYBOX_CONFIG_MSH 
    282         bool "msh (deprecated: please use hush)" 
    283         default n 
    284         select BUSYBOX_CONFIG_HUSH 
    285         help 
    286           msh is deprecated and will be removed, please migrate to hush. 
    287           If there is a feature msh has but hush does not, please let us know. 
    288  
    289 #         The minix shell (adds just 30k) is quite complete and handles things 
    290 #         like for/do/done, case/esac and all the things you expect a Bourne 
    291 #         shell to do. It is not always pedantically correct about Bourne 
    292 #         shell grammar (try running the shell testscript "tests/sh.testcases" 
    293 #         on it and compare vs bash) but for most things it works quite well. 
    294 #         It uses only vfork, so it can be used on uClinux systems. 
    295335 
    296336 
     
    368408          This feature is relatively new. Use with care. 
    369409 
    370 config BUSYBOX_CONFIG_CTTYHACK 
    371         bool "cttyhack" 
    372         default n 
    373         help 
    374           One common problem reported on the mailing list is "can't access tty; 
    375           job control turned off" error message which typically appears when 
    376           one tries to use shell with stdin/stdout opened to /dev/console. 
    377           This device is special - it cannot be a controlling tty. 
    378  
    379           Proper solution is to use correct device instead of /dev/console. 
    380  
    381           cttyhack provides "quick and dirty" solution to this problem. 
    382           It analyzes stdin with various ioctls, trying to determine whether 
    383           it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). 
    384           If it detects one, it closes stdin/out/err and reopens that device. 
    385           Then it executes given program. Opening the device will make 
    386           that device a controlling tty. This may require cttyhack 
    387           to be a session leader. 
    388  
    389           Example for /etc/inittab (for busybox init): 
    390  
    391           ::respawn:/bin/cttyhack /bin/sh 
    392  
    393           Giving controlling tty to shell running with PID 1: 
    394  
    395           $ exec cttyhack sh 
    396  
    397           Starting an interactive shell from boot shell script: 
    398  
    399           setsid cttyhack sh 
    400  
    401410endmenu 
  • trunk/package/busybox/config/sysklogd/Config.in

    r22665 r26455  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "System Logging Utilities" 
     8 
     9 
    710 
    811config BUSYBOX_CONFIG_SYSLOGD 
     
    115118          you should enable this option. 
    116119 
     120config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL 
     121        bool "Use the klogctl() interface" 
     122        default y 
     123        depends on BUSYBOX_CONFIG_KLOGD && BUSYBOX_CONFIG_PLATFORM_LINUX 
     124        help 
     125          The klogd applet supports two interfaces for reading 
     126          kernel messages. Linux provides the klogctl() interface 
     127          which allows reading messages from the kernel ring buffer 
     128          independently from the file system. 
     129 
     130          If you answer 'N' here, klogd will use the more portable 
     131          approach of reading them from /proc or a device node. 
     132          However, this method requires the file to be available. 
     133 
     134          If in doubt, say 'Y'. 
     135 
    117136config BUSYBOX_CONFIG_LOGGER 
    118137        bool "logger" 
  • trunk/package/busybox/config/util-linux/Config.in

    r26245 r26455  
    66menu "Linux System Utilities" 
    77 
     8config BUSYBOX_CONFIG_BLOCKDEV 
     9        bool "blockdev" 
     10        default n 
     11        help 
     12          Performs some ioctls with block devices. 
    813config BUSYBOX_CONFIG_REV 
    914        bool "rev" 
     
    1520        bool "acpid" 
    1621        default n 
     22        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    1723        help 
    1824          acpid listens to ACPI events coming either in textual form from 
     
    3743        bool "blkid" 
    3844        default n 
     45        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    3946        select BUSYBOX_CONFIG_VOLUMEID 
    4047        help 
     
    4653        bool "dmesg" 
    4754        default y 
     55        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    4856        help 
    4957          dmesg is used to examine or control the kernel ring buffer. When the 
     
    7987        bool "fbset" 
    8088        default n 
     89        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    8190        help 
    8291          fbset is used to show or change the settings of a Linux frame buffer 
     
    107116        bool "fdflush" 
    108117        default n 
     118        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    109119        help 
    110120          fdflush is only needed when changing media on slightly-broken 
     
    119129        bool "fdformat" 
    120130        default n 
     131        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    121132        help 
    122133          fdformat is used to low-level format a floppy disk. 
     
    125136        bool "fdisk" 
    126137        default n 
     138        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    127139        help 
    128140          The fdisk utility is used to divide hard disks into one or more 
     
    179191          and define and edit BSD disk slices. 
    180192 
     193config BUSYBOX_CONFIG_FEATURE_GPT_LABEL 
     194        bool "Support GPT disklabels" 
     195        default n 
     196        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE 
     197        help 
     198          Enabling this option allows you to view GUID Partition Table 
     199          disklabels. 
     200 
    181201config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED 
    182202        bool "Support expert mode" 
     
    192212        bool "findfs" 
    193213        default n 
     214        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    194215        select BUSYBOX_CONFIG_VOLUMEID 
    195216        help 
     
    207228        bool "freeramdisk" 
    208229        default n 
     230        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    209231        help 
    210232          Linux allows you to create ramdisks. This utility allows you to 
     
    229251        bool "mkfs_ext2" 
    230252        default n 
     253        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    231254        help 
    232255          Utility to create EXT2 filesystems. 
     
    235258        bool "mkfs_minix" 
    236259        default n 
     260        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    237261        help 
    238262          The minix filesystem is a nice, small, compact, read-write filesystem 
     
    252276        bool "mkfs_reiser" 
    253277        default n 
     278        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    254279        help 
    255280          Utility to create ReiserFS filesystems. 
     
    259284        bool "mkfs_vfat" 
    260285        default n 
     286        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    261287        help 
    262288          Utility to create FAT32 filesystems. 
     
    307333        bool "hwclock" 
    308334        default y 
     335        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    309336        help 
    310337          The hwclock utility is used to read and set the hardware clock 
     
    337364        bool "ipcrm" 
    338365        default n 
    339         select BUSYBOX_CONFIG_FEATURE_SUID 
    340366        help 
    341367          The ipcrm utility allows the removal of System V interprocess 
     
    346372        bool "ipcs" 
    347373        default n 
    348         select BUSYBOX_CONFIG_FEATURE_SUID 
     374        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    349375        help 
    350376          The ipcs utility is used to provide information on the currently 
     
    354380        bool "losetup" 
    355381        default n 
     382        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    356383        help 
    357384          losetup is used to associate or detach a loop device with a regular 
     
    380407        bool "mdev" 
    381408        default n 
     409        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    382410        help 
    383411          mdev is a mini-udev implementation for dynamically creating device 
     
    464492          any need to reading text files, you can leave this disabled. 
    465493 
    466 config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS 
    467         bool "Use termios to manipulate the screen" 
    468         default n 
    469         depends on BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TOP 
    470         help 
    471           This option allows utilities such as 'more' and 'top' to determine 
    472           the size of the screen. If you leave this disabled, your utilities 
    473           that display things on the screen will be especially primitive and 
    474           will be unable to determine the current screen size, and will be 
    475           unable to move the cursor. 
    476  
    477494config BUSYBOX_CONFIG_MOUNT 
    478495        bool "mount" 
    479496        default y 
     497        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    480498        help 
    481499          All files and filesystems in Unix are arranged into one big directory 
     
    560578        bool "pivot_root" 
    561579        default y 
     580        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    562581        help 
    563582          The pivot_root utility swaps the mount points for the root filesystem 
     
    593612        bool "rtcwake" 
    594613        default n 
     614        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    595615        help 
    596616          Enter a system sleep state until specified wakeup time. 
     
    612632        bool "setarch" 
    613633        default n 
     634        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    614635        help 
    615636          The linux32 utility is used to create a 32bit environment for the 
     
    621642        bool "swaponoff" 
    622643        default n 
     644        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    623645        help 
    624646          This option enables both the 'swapon' and the 'swapoff' utilities. 
     
    639661        bool "switch_root" 
    640662        default y 
     663        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    641664        help 
    642665          The switch_root utility is used from initramfs to select a new 
     
    658681        bool "umount" 
    659682        default y 
     683        depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    660684        help 
    661685          When you want to remove a mounted filesystem from its current mount 
     
    778802### config FEATURE_VOLUMEID_UFS 
    779803###     bool "ufs filesystem" 
    780 ###     default y 
     804###     default n 
    781805###     depends on VOLUMEID 
    782806###     help 
  • trunk/package/busybox/patches/241-udhcpc-oversized_packets.patch

    r22665 r26455  
     1diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c 
     2index 2b7528c..94e53dc 100644 
    13--- a/networking/udhcp/packet.c 
    24+++ b/networking/udhcp/packet.c 
    3 @@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * 
     5@@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void *addr, int count) 
    46        return ~sum; 
    57 } 
     
    1315 int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, 
    1416                uint32_t source_nip, int source_port, 
    15 @@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     17@@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, 
    1618 { 
    1719        struct sockaddr_ll dest_sll; 
     
    2527        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); 
    2628        if (fd < 0) { 
    27 @@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     29@@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, 
    2830        } 
    2931  
     
    3638        dest_sll.sll_family = AF_PACKET; 
    3739        dest_sll.sll_protocol = htons(ETH_P_IP); 
    38 @@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     40@@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, 
    3941                goto ret_close; 
    4042        } 
     
    5759        packet.udp.dest = htons(dest_port); 
    5860-       /* size, excluding IP header: */ 
    59 -       packet.udp.len = htons(UPD_DHCP_SIZE - padding); 
     61-       packet.udp.len = htons(UDP_DHCP_SIZE - padding); 
    6062-       /* for UDP checksumming, ip.len is set to UDP packet len */ 
    6163+       p_len += sizeof(packet.udp); 
    6264+       packet.udp.len = htons(p_len); 
    6365        packet.ip.tot_len = packet.udp.len; 
    64 -       packet.udp.check = udhcp_checksum(&packet, IP_UPD_DHCP_SIZE - padding); 
     66-       packet.udp.check = udhcp_checksum(&packet, IP_UDP_DHCP_SIZE - padding); 
    6567-       /* but for sending, it is set to IP packet len */ 
    66 -       packet.ip.tot_len = htons(IP_UPD_DHCP_SIZE - padding); 
     68-       packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding); 
    6769+       p_len += sizeof(packet.ip); 
    6870+       packet.udp.check = udhcp_checksum(&packet, p_len); 
     
    7476  
    7577        udhcp_dump_packet(dhcp_pkt); 
    76 -       result = sendto(fd, &packet, IP_UPD_DHCP_SIZE - padding, /*flags:*/ 0, 
     78-       result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0, 
    7779+       result = sendto(fd, &packet, p_len, /*flags:*/ 0, 
    7880                        (struct sockaddr *) &dest_sll, sizeof(dest_sll)); 
    7981        msg = "sendto"; 
    8082  ret_close: 
    81 @@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
     83@@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt, 
    8284                uint32_t dest_nip, int dest_port) 
    8385 { 
     
    8789        int result = -1; 
    8890        const char *msg; 
    89 @@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
     91@@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt, 
    9092        } 
    9193  
  • trunk/package/busybox/patches/244-udhcpc_add_6rd_option.patch

    r24245 r26455  
     1diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c 
     2index 0a60261..eaf2b4b 100644 
    13--- a/networking/udhcp/common.c 
    24+++ b/networking/udhcp/common.c 
    3 @@ -54,6 +54,8 @@ const struct dhcp_optflag dhcp_optflags[ 
    4         { OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */ 
     5@@ -56,6 +56,8 @@ const struct dhcp_optflag dhcp_optflags[] = { 
    56 #endif 
    67        { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */ 
     8        { OPTION_STATIC_ROUTES                    , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ 
    79+       { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD (RFC)     */ 
    810+       { OPTION_6RD                              , 0x96 }, /* DHCP_6RD (Comcast) */ 
     
    1012  
    1113        /* Options below have no match in dhcp_option_strings[], 
    12 @@ -114,6 +116,8 @@ const char dhcp_option_strings[] ALIGN1  
     14@@ -118,6 +120,8 @@ const char dhcp_option_strings[] ALIGN1 = 
    1315 // doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES 
    1416 // is not handled yet by "string->option" conversion code: 
     
    1618+       "ip6rd" "\0"       /* DHCP_6RD (RFC)      */ 
    1719+       "ip6rd" "\0"       /* DHCP_6RD (Comcast)  */ 
     20        "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ 
    1821        "wpad" "\0"        /* DHCP_WPAD           */ 
    1922        ; 
    20   
    21 @@ -141,6 +145,7 @@ const uint8_t dhcp_option_lengths[] ALIG 
     23@@ -146,6 +150,7 @@ const uint8_t dhcp_option_lengths[] ALIGN1 = { 
    2224        [OPTION_S32] =     4, 
    2325        /* Just like OPTION_STRING, we use minimum length here */ 
     
    2729  
    2830  
     31diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h 
     32index f8f18ff..56cd8b0 100644 
     33--- a/networking/udhcp/common.h 
     34+++ b/networking/udhcp/common.h 
     35@@ -88,6 +88,7 @@ enum { 
     36        OPTION_S32, 
     37        OPTION_BIN, 
     38        OPTION_STATIC_ROUTES, 
     39+       OPTION_6RD, 
     40 #if ENABLE_FEATURE_UDHCP_RFC3397 
     41        OPTION_DNS_STRING,  /* RFC1035 compressed domain name list */ 
     42        OPTION_SIP_SERVERS, 
     43diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c 
     44index 78aabed..993326f 100644 
    2945--- a/networking/udhcp/dhcpc.c 
    3046+++ b/networking/udhcp/dhcpc.c 
    31 @@ -45,6 +45,7 @@ static const uint8_t len_of_option_as_st 
     47@@ -45,6 +45,7 @@ static const uint8_t len_of_option_as_string[] = { 
    3248        [OPTION_IP              ] = sizeof("255.255.255.255 "), 
    3349        [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2, 
     
    3753 #if ENABLE_FEATURE_UDHCP_RFC3397 
    3854        [OPTION_DNS_STRING      ] = 1, /* unused */ 
    39 @@ -68,6 +69,23 @@ static int sprint_nip(char *dest, const  
     55@@ -68,6 +69,23 @@ static int sprint_nip(char *dest, const char *pre, const uint8_t *ip) 
    4056        return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]); 
    4157 } 
     
    6177 static int mton(uint32_t mask) 
    6278 { 
    63 @@ -177,6 +195,70 @@ static NOINLINE char *xmalloc_optname_op 
     79@@ -177,6 +195,70 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_ 
    6480  
    6581                        return ret; 
     
    132148                case OPTION_DNS_STRING: 
    133149                        /* unpack option into dest; use ret for prefix (i.e., "optname=") */ 
    134 --- a/networking/udhcp/common.h 
    135 +++ b/networking/udhcp/common.h 
    136 @@ -88,6 +88,7 @@ enum { 
    137         OPTION_S32, 
    138         OPTION_BIN, 
    139         OPTION_STATIC_ROUTES, 
    140 +       OPTION_6RD, 
    141  #if ENABLE_FEATURE_UDHCP_RFC3397 
    142         OPTION_DNS_STRING,  /* RFC1035 compressed domain name list */ 
    143         OPTION_SIP_SERVERS, 
  • trunk/package/busybox/patches/300-netmsg.patch

    r22665 r26455  
     1diff --git a/include/applets.src.h b/include/applets.src.h 
     2index f4fab53..f97f2d8 100644 
    13--- a/include/applets.src.h 
    24+++ b/include/applets.src.h 
    3 @@ -278,6 +278,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D 
     5@@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_DROP)) 
    46 IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP)) 
    57 IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP)) 
     
    911 IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP)) 
    1012 IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 
     13diff --git a/include/usage.src.h b/include/usage.src.h 
     14index 30fef24..ac78992 100644 
     15--- a/include/usage.src.h 
     16+++ b/include/usage.src.h 
     17@@ -1,3 +1,4 @@ 
     18+ 
     19 /* vi: set sw=8 ts=8: */ 
     20 /* 
     21  * This file suffers from chronically incorrect tabification 
     22@@ -2706,6 +2707,9 @@ INSERT 
     23        " or\n" \ 
     24        "$ nameif -c /etc/my_mactab_file\n" \ 
     25  
     26+#define netmsg_trivial_usage NOUSAGE_STR 
     27+#define netmsg_full_usage "" 
     28+ 
     29 #define nmeter_trivial_usage \ 
     30        "format_string" 
     31 #define nmeter_full_usage "\n\n" \ 
     32diff --git a/networking/Config.src b/networking/Config.src 
     33index 6dd7df7..4682dd3 100644 
    1134--- a/networking/Config.src 
    1235+++ b/networking/Config.src 
    13 @@ -623,6 +623,12 @@ config FEATURE_NAMEIF_EXTENDED 
     36@@ -640,6 +640,12 @@ config FEATURE_NAMEIF_EXTENDED 
    1437            new_interface_name  mac=00:80:C8:38:91:B5 
    1538            new_interface_name  00:80:C8:38:91:B5 
     
    2447        bool "netstat" 
    2548        default y 
     49diff --git a/networking/Kbuild.src b/networking/Kbuild.src 
     50index f41a2df..6070a40 100644 
    2651--- a/networking/Kbuild.src 
    2752+++ b/networking/Kbuild.src 
     
    3459 lib-$(CONFIG_NSLOOKUP)     += nslookup.o 
    3560 lib-$(CONFIG_NTPD)         += ntpd.o 
     61diff --git a/networking/netmsg.c b/networking/netmsg.c 
     62new file mode 100644 
     63index 0000000..43aba0d 
    3664--- /dev/null 
    3765+++ b/networking/netmsg.c 
     
    100128+       exit(1); 
    101129+} 
    102 --- a/include/usage.src.h 
    103 +++ b/include/usage.src.h 
    104 @@ -1,3 +1,4 @@ 
    105 + 
    106  /* vi: set sw=8 ts=8: */ 
    107  /* 
    108   * This file suffers from chronically incorrect tabification 
    109 @@ -2961,6 +2962,9 @@ INSERT 
    110         " or\n" \ 
    111         "$ nameif -c /etc/my_mactab_file\n" \ 
    112   
    113 +#define netmsg_trivial_usage NOUSAGE_STR 
    114 +#define netmsg_full_usage "" 
    115 + 
    116  #define netstat_trivial_usage \ 
    117         "[-laentuwxr"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]" 
    118  #define netstat_full_usage "\n\n" \ 
Note: See TracChangeset for help on using the changeset viewer.