Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (13 years ago)
Author:
Bruno Cornec
Message:
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod? silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René? Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/Config.in

    r902 r1770  
    1414menu "General Configuration"
    1515
    16 config CONFIG_NITPICK
     16config NITPICK
    1717    bool "See lots more (probably unnecessary) configuration options."
    1818    default n
     
    3030      You have been warned.
    3131
     32config DESKTOP
     33    bool "Enable options for full-blown desktop systems"
     34    default n
     35    help
     36      Enable options and features which are not essential.
     37      Select this only if you plan to use busybox on full-blown
     38      desktop machine with common Linux distro, not on an embedded box.
     39
    3240choice
    3341    prompt "Buffer allocation policy"
    34     default CONFIG_FEATURE_BUFFERS_USE_MALLOC
    35     depends on CONFIG_NITPICK
     42    default FEATURE_BUFFERS_USE_MALLOC
     43    depends on NITPICK
    3644    help
    3745      There are 3 ways BusyBox can handle buffer allocations:
     
    4452        earlier.
    4553
    46 config CONFIG_FEATURE_BUFFERS_USE_MALLOC
     54config FEATURE_BUFFERS_USE_MALLOC
    4755    bool "Allocate with Malloc"
    4856
    49 config CONFIG_FEATURE_BUFFERS_GO_ON_STACK
     57config FEATURE_BUFFERS_GO_ON_STACK
    5058    bool "Allocate on the Stack"
    5159
    52 config CONFIG_FEATURE_BUFFERS_GO_IN_BSS
     60config FEATURE_BUFFERS_GO_IN_BSS
    5361    bool "Allocate in the .bss section"
    5462
    5563endchoice
    5664
    57 config CONFIG_SHOW_USAGE
     65config SHOW_USAGE
    5866    bool "Show terse applet usage messages"
    5967    default y
     
    6472      This will save you up to 7k.
    6573
    66 config CONFIG_FEATURE_VERBOSE_USAGE
     74config FEATURE_VERBOSE_USAGE
    6775    bool "Show verbose applet usage messages"
    6876    default n
    69     select CONFIG_SHOW_USAGE
     77    select SHOW_USAGE
    7078    help
    7179      All BusyBox applets will show more verbose help messages when
     
    7482      13k, but it can add much more depending on your configuration.
    7583
    76 config CONFIG_FEATURE_COMPRESS_USAGE
     84config FEATURE_COMPRESS_USAGE
    7785    bool "Store applet usage messages in compressed form"
    7886    default y
    79     depends on CONFIG_SHOW_USAGE
     87    depends on SHOW_USAGE
    8088    help
    8189      Store usage messages in compressed form, uncompress them on-the-fly
     
    8896      you probably want this.
    8997
    90 config CONFIG_FEATURE_INSTALLER
     98config FEATURE_INSTALLER
    9199    bool "Support --install [-s] to install applet links at runtime"
    92100    default n
     
    94102      Enable 'busybox --install [-s]' support.  This will allow you to use
    95103      busybox at runtime to create hard links or symlinks for all the
    96       applets that are compiled into busybox.  This feature requires the
    97       /proc filesystem.
    98 
    99 config CONFIG_LOCALE_SUPPORT
     104      applets that are compiled into busybox.
     105
     106config LOCALE_SUPPORT
    100107    bool "Enable locale support (system needs locale for this to work)"
    101108    default n
     
    104111      busybox to support locale settings.
    105112
    106 config CONFIG_GETOPT_LONG
    107     bool
    108     default y
    109 #   bool "Enable support for --long-options"
    110 #   default n
    111 #   help
    112 #     Enable this if you want busybox applets to use the gnu --long-option
    113 #     style, in addition to single character -a -b -c style options.
    114 
    115 config CONFIG_FEATURE_DEVPTS
     113config GETOPT_LONG
     114    bool "Enable support for --long-options"
     115    default y
     116    help
     117      Enable this if you want busybox applets to use the gnu --long-option
     118      style, in addition to single character -a -b -c style options.
     119
     120config FEATURE_DEVPTS
    116121    bool "Use the devpts filesystem for Unix98 PTYs"
    117122    default y
     
    123128      devpts mounted.
    124129
    125 config CONFIG_FEATURE_CLEAN_UP
     130config FEATURE_CLEAN_UP
    126131    bool "Clean up all memory before exiting (usually not needed)"
    127132    default n
    128     depends on CONFIG_NITPICK
     133    depends on NITPICK
    129134    help
    130135      As a size optimization, busybox normally exits without explicitly
     
    136141      things up manually.
    137142
    138 config CONFIG_FEATURE_SUID
     143config FEATURE_PIDFILE
     144    bool "Support writing pidfiles"
     145    default n
     146    help
     147      This option makes some applets (e.g. crond, syslogd, inetd) write
     148      a pidfile in /var/run. Some applications rely on them.
     149
     150config FEATURE_SUID
    139151    bool "Support for SUID/SGID handling"
    140152    default n
     
    151163      and vlock.
    152164
    153 config CONFIG_FEATURE_SUID_CONFIG
     165config FEATURE_SUID_CONFIG
    154166    bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
    155     default n if CONFIG_FEATURE_SUID
    156     depends on CONFIG_FEATURE_SUID
     167    default n if FEATURE_SUID
     168    depends on FEATURE_SUID
    157169    help
    158170      Allow the SUID / SGID state of an applet to be determined at runtime
     
    183195      <url: http://www.softforge.de/bb/suid.html >.
    184196
    185 config CONFIG_FEATURE_SUID_CONFIG_QUIET
     197config FEATURE_SUID_CONFIG_QUIET
    186198    bool "Suppress warning message if /etc/busybox.conf is not readable"
    187199    default y
    188     depends on CONFIG_FEATURE_SUID_CONFIG
     200    depends on FEATURE_SUID_CONFIG
    189201    help
    190202      /etc/busybox.conf should be readable by the user needing the SUID, check
    191203      this option to avoid users to be notified about missing permissions.
    192204
    193 config CONFIG_SELINUX
     205config SELINUX
    194206    bool "Support NSA Security Enhanced Linux"
    195207    default n
     
    211223      Most people will leave this set to 'N'.
    212224
    213 config CONFIG_BUSYBOX_EXEC_PATH
     225config FEATURE_PREFER_APPLETS
     226    bool "exec prefers applets"
     227    default n
     228    help
     229      This is an experimental option which directs applets about to
     230      call 'exec' to try and find an applicable busybox applet before
     231      searching the PATH. This is typically done by exec'ing
     232      /proc/self/exe.
     233      This may affect shell, find -exec, xargs and similar applets.
     234      They will use applets even if /bin/<applet> -> busybox link
     235      is missing (or is not a link to busybox). However, this causes
     236      problems in chroot jails without mounted /proc and with ps/top
     237      (command name can be shown as 'exe' for applets started this way).
     238
     239config BUSYBOX_EXEC_PATH
    214240    string "Path to BusyBox executable"
    215241    default "/proc/self/exe"
     
    221247      want to run BusyBox from.
    222248
     249# These are auto-selected by other options
     250
     251config FEATURE_SYSLOG
     252    bool "Support for logging to syslog"
     253    default n
     254    help
     255      This option is auto-selected when you select any applet which may
     256      send its output to syslog. You do not need to select it manually.
     257
     258config FEATURE_HAVE_RPC
     259    bool "RPC support"
     260    default n
     261    help
     262      This is automatically selected if any of enabled applets need it.
     263      You do not need to select it manually.
     264
    223265endmenu
    224266
    225267menu 'Build Options'
    226268
    227 config CONFIG_STATIC
     269config STATIC
    228270    bool "Build BusyBox as a static binary (no shared libs)"
    229271    default n
     
    239281      Most people will leave this set to 'N'.
    240282
    241 config CONFIG_BUILD_LIBBUSYBOX
     283config BUILD_LIBBUSYBOX
    242284    bool "Build shared libbusybox"
    243285    default n
     
    251293      almost certainly say "no" to this right now.
    252294
    253 config CONFIG_FEATURE_FULL_LIBBUSYBOX
     295config FEATURE_FULL_LIBBUSYBOX
    254296    bool "Feature-complete libbusybox"
    255     default n if !CONFIG_FEATURE_SHARED_BUSYBOX
    256     depends on CONFIG_BUILD_LIBBUSYBOX
     297    default n if !FEATURE_SHARED_BUSYBOX
     298    depends on BUILD_LIBBUSYBOX
    257299    help
    258300      Build a libbusybox with the complete feature-set, disregarding
     
    270312      Say 'N' if in doubt.
    271313
    272 config CONFIG_FEATURE_SHARED_BUSYBOX
     314config FEATURE_SHARED_BUSYBOX
    273315    bool "Use shared libbusybox for busybox"
    274     default y if CONFIG_BUILD_LIBBUSYBOX
    275     depends on !CONFIG_STATIC && CONFIG_BUILD_LIBBUSYBOX
     316    default y if BUILD_LIBBUSYBOX
     317    depends on !STATIC && BUILD_LIBBUSYBOX
    276318    help
    277319      Use libbusybox.so also for busybox itself.
    278320      You need to have a working dynamic linker to use this variant.
    279321
    280 config CONFIG_LFS
     322config LFS
    281323    bool "Build with Large File Support (for accessing files > 2 GB)"
    282324    default n
     
    290332      than 2 Gigabytes, enable this option.  Otherwise, leave it set to 'N'.
    291333
    292 config USING_CROSS_COMPILER
    293     bool "Do you want to build BusyBox with a Cross Compiler?"
    294     default n
    295     help
    296       Do you want to build BusyBox with a Cross Compiler?  If so,
    297       then enable this option.  Otherwise leave it set to 'N'.
    298 
    299 config CROSS_COMPILER_PREFIX
    300     string "Cross Compiler prefix"
    301     default "/usr/i386-linux-uclibc/bin/i386-uclibc-"
    302     depends on USING_CROSS_COMPILER
    303     help
    304       If you want to build BusyBox with a cross compiler, then you
    305       will need to set this to the cross-compiler prefix.  For example,
    306       if my cross-compiler is /usr/i386-linux-uclibc/bin/i386-uclibc-gcc
    307       then I would enter '/usr/i386-linux-uclibc/bin/i386-uclibc-' here,
    308       which will ensure the correct compiler is used.
    309 
    310 config CONFIG_BUILD_AT_ONCE
     334config BUILD_AT_ONCE
    311335    bool "Compile all sources at once"
    312336    default n
     
    331355menu 'Debugging Options'
    332356
    333 config CONFIG_DEBUG
     357config DEBUG
    334358    bool "Build BusyBox with extra Debugging symbols"
    335359    default n
     
    342366      Most people should answer N.
    343367
    344 config CONFIG_DEBUG_PESSIMIZE
    345     bool "Disable compiler optimizations."
    346     default n
    347     depends on CONFIG_DEBUG
    348     help
    349       The compiler's optimization of source code can eliminate and reorder
    350       code, resulting in an executable that's hard to understand when
    351       stepping through it with a debugger.  This switches it off, resulting
    352       in a much bigger executable that more closely matches the source
    353       code.
     368config WERROR
     369    bool "Abort compilation on any warning"
     370    default n
     371    help
     372      Selecting this will add -Werror to gcc command line.
     373
     374      Most people should answer N.
     375
     376# Seems to be unused
     377#config DEBUG_PESSIMIZE
     378#   bool "Disable compiler optimizations."
     379#   default n
     380#   depends on DEBUG
     381#   help
     382#     The compiler's optimization of source code can eliminate and reorder
     383#     code, resulting in an executable that's hard to understand when
     384#     stepping through it with a debugger.  This switches it off, resulting
     385#     in a much bigger executable that more closely matches the source
     386#     code.
    354387
    355388choice
    356389    prompt "Additional debugging library"
    357     default CONFIG_NO_DEBUG_LIB
    358     depends on CONFIG_DEBUG
     390    default NO_DEBUG_LIB
    359391    help
    360392      Using an additional debugging library will make BusyBox become
     
    384416
    385417
    386 config CONFIG_NO_DEBUG_LIB
     418config NO_DEBUG_LIB
    387419    bool "None"
    388420
    389 config CONFIG_DMALLOC
     421config DMALLOC
    390422    bool "Dmalloc"
    391423
    392 config CONFIG_EFENCE
     424config EFENCE
    393425    bool "Electric-fence"
    394426
    395427endchoice
    396428
    397 config CONFIG_DEBUG_YANK_SUSv2
    398     bool "Disable obsolete features removed before SUSv3?"
    399     default y
    400     help
    401       This option will disable backwards compatibility with SuSv2,
     429config INCLUDE_SUSv2
     430    bool "Enable obsolete features removed before SUSv3?"
     431    default y
     432    help
     433      This option will enable backwards compatibility with SuSv2,
    402434      specifically, old-style numeric options ('command -1 <file>')
    403       will not be supported in head, tail, and fold.  (Note: should
    404       yank from renice too.)
     435      will be supported in head, tail, and fold.  (Note: should
     436      affect renice too.)
    405437
    406438endmenu
     
    408440menu 'Installation Options'
    409441
    410 config CONFIG_INSTALL_NO_USR
     442config INSTALL_NO_USR
    411443    bool "Don't use /usr"
    412444    default n
     
    416448
    417449choice
    418        prompt "Applets links"
    419        default CONFIG_INSTALL_APPLET_SYMLINKS
    420        help
    421          Choose how you install applets links.
    422 
    423 config CONFIG_INSTALL_APPLET_SYMLINKS
    424        bool "as soft-links"
    425        help
    426          Install applets as soft-links to the busybox binary. This needs some
    427          free inodes on the filesystem, but might help with filesystem
    428          generators that can't cope with hard-links.
    429 
    430 config CONFIG_INSTALL_APPLET_HARDLINKS
    431        bool "as hard-links"
    432        help
    433          Install applets as hard-links to the busybox binary. This might count
    434          on a filesystem with few inodes.
    435 
    436 config CONFIG_INSTALL_APPLET_DONT
    437        bool
    438        prompt "not installed"
    439        depends on CONFIG_FEATURE_INSTALLER || CONFIG_FEATURE_SH_STANDALONE_SHELL
    440        help
    441          Do not install applets links. Usefull when using the -install feature
    442          or a standalone shell for rescue pruposes.
     450    prompt "Applets links"
     451    default INSTALL_APPLET_SYMLINKS
     452    help
     453      Choose how you install applets links.
     454
     455config INSTALL_APPLET_SYMLINKS
     456    bool "as soft-links"
     457    help
     458      Install applets as soft-links to the busybox binary. This needs some
     459      free inodes on the filesystem, but might help with filesystem
     460      generators that can't cope with hard-links.
     461
     462config INSTALL_APPLET_HARDLINKS
     463    bool "as hard-links"
     464    help
     465      Install applets as hard-links to the busybox binary. This might count
     466      on a filesystem with few inodes.
     467
     468config INSTALL_APPLET_DONT
     469    bool "not installed"
     470    depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE || FEATURE_PREFER_APPLETS
     471    help
     472      Do not install applet links. Useful when using the -install feature
     473      or a standalone shell for rescue purposes.
    443474
    444475endchoice
     
    474505source shell/Config.in
    475506source sysklogd/Config.in
     507source runit/Config.in
     508source selinux/Config.in
     509source ipsvd/Config.in
Note: See TracChangeset for help on using the changeset viewer.