From ec07a5b4294f510b5a757c97ec88bbdde2873f13 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sun, 4 Jan 2009 13:40:36 +0000 Subject: * patches/busybox-1.10.4, patches/busybox-1.13.2: ported * rules/*.in: changed busybox config symbol from BB_CONFIG to BUSYBOX * config/busybox/* changed busybox config symbol from BB_CONFIG to BUSYBOX imported from busybox-1.13.2 * rules/busybox.make: version bump to 1.13.2 changed busybox config symbol from BB_CONFIG to BUSYBOX git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9373 33e552b5-05e3-0310-8538-816dae2090ed --- rules/busybox.in | 2 +- rules/busybox.make | 8 ++++---- rules/coreutils.in | 26 +++++++++++++------------- rules/diffutils.in | 12 ++++++------ rules/dropbear.in | 2 +- rules/findutils.in | 14 +++++++------- rules/grep.in | 6 +++--- rules/hdparm.in | 6 +++--- rules/inetutils.in | 18 +++++++++--------- rules/ipkg.in | 2 +- rules/less.in | 6 +++--- rules/module-init-tools.in | 24 ++++++++++++------------ rules/ntpclient.in | 6 +++--- rules/oprofile.in | 10 +++++----- rules/procps.in | 12 ++++++------ rules/rootfs.in | 2 +- rules/rootfs.make | 4 ++-- rules/rootfs_configfiles.in | 18 +++++++++--------- rules/rootfs_init_d_files.in | 28 ++++++++++++++-------------- rules/samba.in | 2 +- rules/schedutils.in | 4 ++-- rules/sed.in | 6 +++--- rules/unzip.in | 6 +++--- rules/utelnetd.in | 2 +- rules/util-linux-ng.in | 42 +++++++++++++++++++++--------------------- rules/util-linux.in | 42 +++++++++++++++++++++--------------------- rules/wget.in | 6 +++--- 27 files changed, 158 insertions(+), 158 deletions(-) (limited to 'rules') diff --git a/rules/busybox.in b/rules/busybox.in index 65e925b95..d3adb4353 100644 --- a/rules/busybox.in +++ b/rules/busybox.in @@ -3,7 +3,7 @@ menuconfig BUSYBOX tristate prompt "busybox " - select LIBC_M if BB_CONFIG_FEATURE_AWK_MATH + select LIBC_M if BUSYBOX_FEATURE_AWK_MATH help BusyBox is the Swiss Army Knife of embedded Linux. It is a multi call program which hosts nearly all important unix diff --git a/rules/busybox.make b/rules/busybox.make index 8e5e6e50e..d319a8a88 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox # # Paths and names # -BUSYBOX_VERSION := 1.10.4 +BUSYBOX_VERSION := 1.13.2 BUSYBOX := busybox-$(BUSYBOX_VERSION) BUSYBOX_SUFFIX := tar.bz2 BUSYBOX_URL := http://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX) @@ -52,8 +52,8 @@ $(STATEDIR)/busybox.prepare: cd $(BUSYBOX_DIR) && \ $(BUSYBOX_PATH) $(BUSYBOX_ENV) \ $(MAKE) distclean $(BUSYBOX_MAKEVARS) - grep -e PTXCONF_BB_CONFIG_ $(PTXDIST_PTXCONFIG) | \ - sed -e 's/PTXCONF_BB_CONFIG_/CONFIG_/g' > $(BUSYBOX_DIR)/.config + grep -e PTXCONF_BUSYBOX_ $(PTXDIST_PTXCONFIG) | \ + sed -e 's/PTXCONF_BUSYBOX_/CONFIG_/g' > $(BUSYBOX_DIR)/.config $(call ptx/oldconfig, BUSYBOX) @@ -87,7 +87,7 @@ $(STATEDIR)/busybox.targetinstall: @$(call install_fixup, busybox,DEPENDS,) @$(call install_fixup, busybox,DESCRIPTION,missing) -ifdef PTXCONF_BB_CONFIG_FEATURE_SUID +ifdef PTXCONF_BUSYBOX_FEATURE_SUID @$(call install_copy, busybox, 0, 0, 4755, $(BUSYBOX_DIR)/busybox, /bin/busybox) else @$(call install_copy, busybox, 0, 0, 755, $(BUSYBOX_DIR)/busybox, /bin/busybox) diff --git a/rules/coreutils.in b/rules/coreutils.in index c1e87017a..248b1c5ac 100644 --- a/rules/coreutils.in +++ b/rules/coreutils.in @@ -10,48 +10,48 @@ if COREUTILS config COREUTILS_CP bool prompt "cp" - depends on !BB_CONFIG_CP + depends on !BUSYBOX_CP help copy files and directories -comment "busy box' cp is selected!" - depends on BB_CONFIG_CP +comment "BusyBox' cp is selected!" + depends on BUSYBOX_CP config COREUTILS_DD bool prompt "dd" - depends on !BB_CONFIG_DD + depends on !BUSYBOX_DD help convert and copy a file -comment "busy box' dd is selected!" - depends on COREUTILS && BB_CONFIG_DD +comment "BusyBox' dd is selected!" + depends on COREUTILS && BUSYBOX_DD config COREUTILS_MD5SUM bool prompt "md5sum" - depends on !BB_CONFIG_MD5SUM + depends on !BUSYBOX_MD5SUM help compute and check MD5 message digest -comment "busy box' md5sum is selected!" - depends on BB_CONFIG_MD5SUM +comment "BusyBox' md5sum is selected!" + depends on BUSYBOX_MD5SUM config COREUTILS_READLINK bool prompt "readlink" - depends on !BB_CONFIG_READLINK + depends on !BUSYBOX_READLINK help the readlink tool config COREUTILS_SEQ bool prompt "seq" - depends on !BB_CONFIG_SEQ + depends on !BUSYBOX_SEQ help print a sequence of numbers -comment "busy box' seq is selected!" - depends on BB_CONFIG_SEQ +comment "BusyBox' seq is selected!" + depends on BUSYBOX_SEQ endif diff --git a/rules/diffutils.in b/rules/diffutils.in index da16a055f..84ee2297a 100644 --- a/rules/diffutils.in +++ b/rules/diffutils.in @@ -8,12 +8,12 @@ if DIFFUTILS config DIFFUTILS_DIFF bool prompt "diff" - depends on !BB_CONFIG_DIFF + depends on !BUSYBOX_DIFF help diff - compare files line by line -comment "busybox's diff selected" - depends on BB_CONFIG_DIFF +comment "BusyBox' diff selected" + depends on BUSYBOX_DIFF config DIFFUTILS_DIFF3 bool @@ -30,11 +30,11 @@ config DIFFUTILS_SDIFF config DIFFUTILS_CMP bool prompt "cmp" - depends on !BB_CONFIG_CMP + depends on !BUSYBOX_CMP help cmp - compare two files byte by byte -comment "busybox's cmp selected" - depends on BB_CONFIG_CMP +comment "BusyBox' cmp selected" + depends on BUSYBOX_CMP endif diff --git a/rules/dropbear.in b/rules/dropbear.in index 2d3971b96..aaaa85124 100644 --- a/rules/dropbear.in +++ b/rules/dropbear.in @@ -244,7 +244,7 @@ config DROPBEAR_DROPBEAR select DROPBEAR_DROPBEAR_KEY select DROPBEAR_RSA select DROPBEAR_DSS - select BB_CONFIG_START_STOP_DAEMON if BUSYBOX + select BUSYBOX_START_STOP_DAEMON if BUSYBOX help Installs the dropbar server in /usr/sbin/dropbear on the target diff --git a/rules/findutils.in b/rules/findutils.in index 54f50e1af..2c8ca5238 100644 --- a/rules/findutils.in +++ b/rules/findutils.in @@ -11,27 +11,27 @@ if FINDUTILS config FINDUTILS_FIND bool - depends on !BB_CONFIG_FIND + depends on !BUSYBOX_FIND prompt "find" help Searches given directory trees for files matching the specified criteria -comment "busy box' find is selected!" - depends on BB_CONFIG_FIND +comment "BusyBox' find is selected!" + depends on BUSYBOX_FIND config FINDUTILS_XARGS bool - depends on !BB_CONFIG_XARGS + depends on !BUSYBOX_XARGS prompt "xargs" help Can be used to apply a given command to a list of files -comment "busy box' xargs is selected!" - depends on BB_CONFIG_XARGS +comment "BusyBox' xargs is selected!" + depends on BUSYBOX_XARGS config FINDUTILS_DATABASE bool - depends on !BB_CONFIG_FIND && !BB_CONFIG_XARGS + depends on !BUSYBOX_FIND && !BUSYBOX_XARGS select FINDUTILS_FIND select FINDUTILS_XARGS prompt "database support" diff --git a/rules/grep.in b/rules/grep.in index c6d0e877d..2022f5fe7 100644 --- a/rules/grep.in +++ b/rules/grep.in @@ -1,10 +1,10 @@ ## SECTION=shell_and_console -comment "busy box' grep is selected!" - depends on BB_CONFIG_GREP +comment "BusyBox' grep is selected!" + depends on BUSYBOX_GREP config GREP tristate - depends on !BB_CONFIG_GREP + depends on !BUSYBOX_GREP prompt "grep" help GNUgrep searches one or more input files for lines diff --git a/rules/hdparm.in b/rules/hdparm.in index c69ae9c5a..4a18b9bd8 100644 --- a/rules/hdparm.in +++ b/rules/hdparm.in @@ -1,11 +1,11 @@ ## SECTION=disk_and_file config HDPARM tristate "hdparm" - depends on !BB_CONFIG_HDPARM + depends on !BUSYBOX_HDPARM help hdparm - get/set ATA drive parameters under Linux See http://sourceforge.net/projects/hdparm/ for details. -comment "Busybox' hdparm is selected" - depends on BB_CONFIG_HDPARM +comment "BusyBox' hdparm is selected" + depends on BUSYBOX_HDPARM diff --git a/rules/inetutils.in b/rules/inetutils.in index 3fa1d73cf..6ee59c3cf 100644 --- a/rules/inetutils.in +++ b/rules/inetutils.in @@ -18,24 +18,24 @@ comment "build options ---" config INETUTILS_INETD bool - depends on !BB_CONFIG_INETD + depends on !BUSYBOX_INETD prompt "inetd" help This is the network super daemon. It opens network connection for various other programs and start them if a connection request occures. -comment "busy box' inetd is selected!" - depends on BB_CONFIG_INETD +comment "BusyBox' inetd is selected!" + depends on BUSYBOX_INETD config INETUTILS_PING bool - depends on !BB_CONFIG_PING + depends on !BUSYBOX_PING prompt "ping" help Ping is a small tool to check if another host is alive in the network -comment "busy box' ping is selected!" - depends on BB_CONFIG_PING +comment "BusyBox' ping is selected!" + depends on BUSYBOX_PING config INETUTILS_RCP bool @@ -72,15 +72,15 @@ config INETUTILS_RSHD config INETUTILS_SYSLOGD bool prompt "syslogd" - depends on !BB_CONFIG_SYSLOGD + depends on !BUSYBOX_SYSLOGD help Sysklogd provides two system utilities which provide support for system logging and kernel message trapping. Support of both internet and unix domain sockets enables this utility package to support both local and remote logging. -comment "busy box' syslogd is selected!" - depends on BB_CONFIG_SYSLOGD +comment "BusyBox' syslogd is selected!" + depends on BUSYBOX_SYSLOGD config INETUTILS_TFTPD bool diff --git a/rules/ipkg.in b/rules/ipkg.in index 806914b50..0787b4101 100644 --- a/rules/ipkg.in +++ b/rules/ipkg.in @@ -3,7 +3,7 @@ menuconfig IPKG tristate prompt "ipkg " # ipkg calls wget with long options! - select BB_CONFIG_FEATURE_WGET_LONG_OPTIONS if BB_CONFIG_WGET + select BUSYBOX_FEATURE_WGET_LONG_OPTIONS if BUSYBOX_WGET help IPKG is a small packet mechanism for embedded systems to maintain the applications on the system. diff --git a/rules/less.in b/rules/less.in index 891fc865c..cbd88b444 100644 --- a/rules/less.in +++ b/rules/less.in @@ -1,11 +1,11 @@ ## SECTION=shell_and_console -comment "busy box' less is selected!" - depends on BB_CONFIG_LESS +comment "BusyBox' less is selected!" + depends on BUSYBOX_LESS menuconfig LESS tristate prompt "less " - depends on !BB_CONFIG_LESS + depends on !BUSYBOX_LESS # select LIBPW if LESS_USE_PW # select CURSES if LESS_USE_CURSES # select TINFO if LESS_USE_TINFO diff --git a/rules/module-init-tools.in b/rules/module-init-tools.in index 5cc056bde..7176fa87a 100644 --- a/rules/module-init-tools.in +++ b/rules/module-init-tools.in @@ -14,32 +14,32 @@ if MODULE_INIT_TOOLS config MODULE_INIT_TOOLS_INSMOD bool prompt "Install insmod on target" - depends on !BB_CONFIG_INSMOD + depends on !BUSYBOX_INSMOD help simple program to insert a module into the Linux Kernel -comment "Busybox' insmod is selected!" - depends on BB_CONFIG_INSMOD +comment "BusyBox' insmod is selected!" + depends on BUSYBOX_INSMOD config MODULE_INIT_TOOLS_RMMOD bool prompt "Install rmmod on target" - depends on !BB_CONFIG_RMMOD + depends on !BUSYBOX_RMMOD help simple program to remove a module from the Linux Kernel -comment "Busybox' rmmod is selected!" - depends on BB_CONFIG_RMMOD +comment "BusyBox' rmmod is selected!" + depends on BUSYBOX_RMMOD config MODULE_INIT_TOOLS_LSMOD bool prompt "Install lsmod on target" - depends on !BB_CONFIG_LSMOD + depends on !BUSYBOX_LSMOD help program to show the status of modules in the Linux Kernel -comment "Busybox' lsmod is selected!" - depends on BB_CONFIG_LSMOD +comment "BusyBox' lsmod is selected!" + depends on BUSYBOX_LSMOD config MODULE_INIT_TOOLS_MODINFO bool @@ -50,12 +50,12 @@ config MODULE_INIT_TOOLS_MODINFO config MODULE_INIT_TOOLS_MODPROBE bool prompt "Install modprobe on target" - depends on !BB_CONFIG_MODPROBE + depends on !BUSYBOX_MODPROBE help program to add and remove modules from the Linux Kernel -comment "Busybox' modprobe is selected!" - depends on BB_CONFIG_MODPROBE +comment "BusyBox' modprobe is selected!" + depends on BUSYBOX_MODPROBE config MODULE_INIT_TOOLS_DEPMOD bool diff --git a/rules/ntpclient.in b/rules/ntpclient.in index f7344dff8..ba107435c 100644 --- a/rules/ntpclient.in +++ b/rules/ntpclient.in @@ -33,14 +33,14 @@ config NTPCLIENT_BUILD_NTPCLIENT config NTPCLIENT_BUILD_ADJTIMEX bool - depends on !BB_CONFIG_ADJTIMEX + depends on !BUSYBOX_ADJTIMEX prompt "adjtimex" default y help Builds the adjtimex binary to control system time -comment "Busybox' adjtimex is in use" - depends on BB_CONFIG_ADJTIMEX +comment "BusyBox' adjtimex is in use" + depends on BUSYBOX_ADJTIMEX comment "runtime options ---" diff --git a/rules/oprofile.in b/rules/oprofile.in index 5df59c88c..627c57055 100644 --- a/rules/oprofile.in +++ b/rules/oprofile.in @@ -5,11 +5,11 @@ config OPROFILE select LIBPOPT select KERNEL select KERNEL_VMLINUX - select BB_CONFIG_DIRNAME - select BB_CONFIG_ID - select BB_CONFIG_MKTEMP - select BB_CONFIG_PIDOF - select BB_CONFIG_PRINTF + select BUSYBOX_DIRNAME + select BUSYBOX_ID + select BUSYBOX_MKTEMP + select BUSYBOX_PIDOF + select BUSYBOX_PRINTF select BINUTILS select BINUTILS_OBJDUMP prompt "oprofile tools" diff --git a/rules/procps.in b/rules/procps.in index 8d7771aca..45d5849ab 100644 --- a/rules/procps.in +++ b/rules/procps.in @@ -12,12 +12,12 @@ if PROCPS config PROCPS_TOP bool prompt "top" - depends on !BB_CONFIG_TOP + depends on !BUSYBOX_TOP help FIXME: This item needs to be documented comment "top is disabled by busybox top" - depends on BB_CONFIG_TOP + depends on BUSYBOX_TOP config PROCPS_SLABTOP bool @@ -28,24 +28,24 @@ config PROCPS_SLABTOP config PROCPS_SYSCTL bool prompt "sysctl" - depends on !BB_CONFIG_SYSCTL + depends on !BUSYBOX_SYSCTL help configure kernel parameters at runtime comment "sysctl is disabled by busybox sysctl" - depends on BB_CONFIG_SYSCTL + depends on BUSYBOX_SYSCTL config PROCPS_PS bool prompt "ps" - depends on !BB_CONFIG_PS + depends on !BUSYBOX_PS help ps stands for process status. With this command you analyse current states of all processes running on the system comment "ps is disabled by busybox ps" - depends on BB_CONFIG_PS + depends on BUSYBOX_PS config PROCPS_W bool diff --git a/rules/rootfs.in b/rules/rootfs.in index 6b995555c..dde062cb1 100644 --- a/rules/rootfs.in +++ b/rules/rootfs.in @@ -8,7 +8,7 @@ config ROOTFS bool prompt "Create Directories in /" default y - select BB_CONFIG_FEATURE_SHADOWPASSWDS if BUSYBOX + select BUSYBOX_FEATURE_SHADOWPASSWDS if BUSYBOX help In order to support a standard root filesystem some subdirectories are mandatory. They will be created by ptxdist automatically. Some diff --git a/rules/rootfs.make b/rules/rootfs.make index 347164abc..d2e88604a 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -801,8 +801,8 @@ endif # ----------------------------------------------------------------------------- # add telnetd if enabled # -ifdef PTXCONF_BB_CONFIG_TELNETD -ifdef PTXCONF_BB_CONFIG_FEATURE_TELNETD_STANDALONE +ifdef PTXCONF_BUSYBOX_TELNETD +ifdef PTXCONF_BUSYBOX_FEATURE_TELNETD_STANDALONE # remove all telnetd entries if this service is not enabled @$(call install_replace, rootfs, /etc/inetd.conf, @TELNETD@, ) @$(call install_replace, rootfs, /etc/services, @TELNETD@, ) diff --git a/rules/rootfs_configfiles.in b/rules/rootfs_configfiles.in index 812ff5740..f174bdea1 100644 --- a/rules/rootfs_configfiles.in +++ b/rules/rootfs_configfiles.in @@ -243,7 +243,7 @@ menuconfig ROOTFS_HOSTS # menuconfig ROOTFS_INITTAB depends on ROOTFS - select BB_CONFIG_GETTY if BUSYBOX + select BUSYBOX_GETTY if BUSYBOX bool prompt "/etc/inittab " default y @@ -399,7 +399,7 @@ menuconfig ROOTFS_PROTOCOLS # menuconfig ROOTFS_INETD depends on ROOTFS - depends on BB_CONFIG_INETD || INETUTILS_INETD + depends on BUSYBOX_INETD || INETUTILS_INETD bool prompt "/etc/inetd.conf " default y @@ -448,18 +448,18 @@ config ROOTFS_ETC_MODULES # # /etc/udhcpc.script -# specific to Busybox' udhcp-client +# specific to BusyBox' udhcp-client # menuconfig ROOTFS_UDHCPC depends on ROOTFS - depends on BB_CONFIG_APP_UDHCPC - select BB_CONFIG_IFCONFIG + depends on BUSYBOX_APP_UDHCPC + select BUSYBOX_IFCONFIG bool prompt "/etc/udhcpc.script " default y help Installs a /etc/udhcpc.script file from a selectable source. - You have checked busybox' udhcpc feature. It accepts the -s file or + You have checked BusyBox' udhcpc feature. It accepts the -s file or --script=file option. So this /etc/udhcpc.script will be run at dhcp events. If your network supports DNS, this script will generate /etc/resolv.conf. @@ -490,7 +490,7 @@ menuconfig ROOTFS_UDHCPC endchoice # -# for Busybox' crond only +# for BusyBox' crond only # /var/spool/cron/crontabs/ # /etc/crond.conf # @@ -505,12 +505,12 @@ config ROOTFS_USER_CROND_CONF /etc/cron/daily from projectroot/crond/daily # -# for Busybox' http only +# for BusyBox' http only # install users httpd.conf # config ROOTFS_BUSYBOX_USER_HTTPD_CONF depends on ROOTFS - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD default n bool prompt "project's httpd.conf configuration" diff --git a/rules/rootfs_init_d_files.in b/rules/rootfs_init_d_files.in index 9a9d1ffff..7a27af3df 100644 --- a/rules/rootfs_init_d_files.in +++ b/rules/rootfs_init_d_files.in @@ -9,7 +9,7 @@ config ROOTFS_ETC_INITD bool prompt "Generic Scripts for /etc/init.d" default y - select BB_CONFIG_RUN_PARTS if BUSYBOX + select BUSYBOX_RUN_PARTS if BUSYBOX help When enabled, this option copies the files from ${PTXDIST_TOPDIR}/generic/etc/init.d to the target root @@ -50,18 +50,18 @@ menuconfig ROOTFS_ETC_INITD_RCS your local project endchoice -########################## inetd for Busybox ############################ +########################## inetd for BusyBox ############################ # initd startscript is for busysbox only config ROOTFS_ETC_INITD_INETD depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_INETD + depends on BUSYBOX_INETD bool prompt "inetd" help When enabled, this option installs the generic /etc/init.d/inetd file. This script starts your internet super server (inetd). - This is for Busybox' inetd only. + This is for BusyBox' inetd only. config ROOTFS_ETC_INITD_LOGROTATE bool @@ -76,15 +76,15 @@ config ROOTFS_ETC_INITD_MODULES prompt "modules" help When enabled, load all modules in /etc/modules. This requires - one type of the tool "grep" (from Busybox or paket procps) + one type of the tool "grep" (from BusyBox or paket procps) menuconfig ROOTFS_ETC_INITD_NETWORKING depends on ROOTFS_ETC_INITD bool default y prompt "networking " - select BB_CONFIG_IFUPDOWN if BUSYBOX - select BB_CONFIG_FEATURE_IFUPDOWN_IP if BUSYBOX + select BUSYBOX_IFUPDOWN if BUSYBOX + select BUSYBOX_FEATURE_IFUPDOWN_IP if BUSYBOX help When enabled, this option installs the generic /etc/init.d/networking file. This script starts @@ -103,8 +103,8 @@ menuconfig ROOTFS_ETC_INITD_NETWORKING menuconfig ROOTFS_ETC_INITD_TELNETD depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_TELNETD - depends on BB_CONFIG_FEATURE_TELNETD_STANDALONE + depends on BUSYBOX_TELNETD + depends on BUSYBOX_FEATURE_TELNETD_STANDALONE bool default y prompt "telnetd " @@ -139,7 +139,7 @@ menuconfig ROOTFS_ETC_INITD_TELNETD menuconfig ROOTFS_ETC_INITD_SYSLOGD_KLOGD depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_SYSLOGD + depends on BUSYBOX_SYSLOGD bool prompt "syslogd " help @@ -173,7 +173,7 @@ menuconfig ROOTFS_ETC_INITD_SYSLOGD_KLOGD menuconfig ROOTFS_ETC_INITD_HWCLOCK depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_HWCLOCK + depends on BUSYBOX_HWCLOCK bool prompt "timekeeper " help @@ -261,15 +261,15 @@ menuconfig ROOTFS_ETC_INITD_BANNER ########################## crond ########################################## -# this is for busybox' crond only +# this is for BusyBox' crond only # menuconfig ROOTFS_ETC_INITD_CROND - depends on ROOTFS_ETC_INITD && BB_CONFIG_CROND + depends on ROOTFS_ETC_INITD && BUSYBOX_CROND bool default y prompt "crond " help - The /etc/init.d/crond script lets you control busybox' crond daemon. + The /etc/init.d/crond script lets you control BusyBox' crond daemon. choice prompt "Kind of startup scrict" diff --git a/rules/samba.in b/rules/samba.in index 27125f316..0df2a41ae 100644 --- a/rules/samba.in +++ b/rules/samba.in @@ -135,7 +135,7 @@ if SAMBA config ROOTFS_ETC_INITD_SAMBA bool depends on SAMBA_SERVER - select BB_CONFIG_START_STOP_DAEMON if BUSYBOX + select BUSYBOX_START_STOP_DAEMON if BUSYBOX default y choice prompt "Kind of samba start script" diff --git a/rules/schedutils.in b/rules/schedutils.in index 270cb90b1..f087d3d51 100644 --- a/rules/schedutils.in +++ b/rules/schedutils.in @@ -15,12 +15,12 @@ if SCHEDUTILS config SCHEDUTILS_CHRT bool prompt "chrt" - depends on !BB_CONFIG_CHRT + depends on !BUSYBOX_CHRT help chrt manipulates the real-time attributes of a process. comment "chrt from busybox selected" - depends on BB_CONFIG_CHRT + depends on BUSYBOX_CHRT config SCHEDUTILS_IONICE bool diff --git a/rules/sed.in b/rules/sed.in index 862b24871..f6cdaba07 100644 --- a/rules/sed.in +++ b/rules/sed.in @@ -1,7 +1,7 @@ ## SECTION=shell_and_console config SED tristate - depends on !BB_CONFIG_SED + depends on !BUSYBOX_SED prompt "sed" help sed reads the specified files or the standard input if no @@ -9,6 +9,6 @@ config SED list of commands, and writes the results to the standard output. -comment "busybox's sed selected" - depends on BB_CONFIG_SED +comment "BusyBox' sed selected" + depends on BUSYBOX_SED diff --git a/rules/unzip.in b/rules/unzip.in index be4cb2572..735e88f44 100644 --- a/rules/unzip.in +++ b/rules/unzip.in @@ -10,10 +10,10 @@ if UNZIP config UNZIP_UNZIP bool "unzip" - depends on !BB_CONFIG_UNZIP + depends on !BUSYBOX_UNZIP -comment "busybox's unzip selected" - depends on BB_CONFIG_UNZIP +comment "BusyBox' unzip selected" + depends on BUSYBOX_UNZIP config UNZIP_FUNZIP bool "funzip" diff --git a/rules/utelnetd.in b/rules/utelnetd.in index 85e551226..95bdd1247 100644 --- a/rules/utelnetd.in +++ b/rules/utelnetd.in @@ -1,6 +1,6 @@ ## SECTION=networking menuconfig UTELNETD - depends on !BB_CONFIG_TELNETD + depends on !BUSYBOX_TELNETD tristate prompt "utelnetd " help diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 8ed1a5572..bd6399708 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -11,12 +11,12 @@ config UTIL_LINUX_NG_FDISK bool prompt "fdisk" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_FDISK + depends on !BUSYBOX_FDISK help fdisk - Partition table manipulator for Linux -comment "busy box' fdisk is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_FDISK +comment "BusyBox' fdisk is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_FDISK config UTIL_LINUX_NG_SFDISK bool @@ -38,7 +38,7 @@ config UTIL_LINUX_NG_MKSWAP bool prompt "mkswap" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_MKSWAP + depends on !BUSYBOX_MKSWAP help mkswap sets up a Linux swap area on a device or in a file. @@ -49,62 +49,62 @@ config UTIL_LINUX_NG_MKSWAP_UUID help enable uuid support for mkswap -comment "busy box' mkswap is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_MKSWAP +comment "BusyBox' mkswap is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_MKSWAP config UTIL_LINUX_NG_SWAPON bool prompt "swapon" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_SWAPONOFF + depends on !BUSYBOX_SWAPONOFF help Swapon is used to specify devices on which paging and swapping are to take place. -comment "busy box' swapon is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_SWAPONOFF +comment "BusyBox' swapon is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_SWAPONOFF config UTIL_LINUX_NG_MOUNT bool prompt "mount" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_MOUNT + depends on !BUSYBOX_MOUNT help The mount command serves to attach the file system found on some device to the big file tree. -comment "busy box' mount is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_MOUNT +comment "BusyBox' mount is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_MOUNT config UTIL_LINUX_NG_UMOUNT bool prompt "umount" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_UMOUNT + depends on !BUSYBOX_UMOUNT help The mount(8) command serves to attach the file system found on some device to the big file tree. Conversely, the umount(8) command will detach it again. -comment "busy box' umount is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_UMOUNT +comment "BusyBox' umount is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_UMOUNT config UTIL_LINUX_NG_IPCS bool prompt "ipcs" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_IPCS + depends on !BUSYBOX_IPCS help ipcs provides information on the ipc facilities for which the calling process has read acccess. -comment "busy box' ipcs is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_IPCS +comment "BusyBox' ipcs is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_IPCS config UTIL_LINUX_NG_READPROFILE bool prompt "readprofile" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_READPROFILE + depends on !BUSYBOX_READPROFILE help The readprofile command uses the /proc/profile information to print ascii data on standard output. The output is @@ -115,8 +115,8 @@ config UTIL_LINUX_NG_READPROFILE as a ratio between the number of ticks and the length of the procedure. The output is filled with blanks to ease readability. -comment "busy box' readprofile is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_READPROFILE +comment "BusyBox' readprofile is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_READPROFILE config UTIL_LINUX_NG_SETTERM bool diff --git a/rules/util-linux.in b/rules/util-linux.in index e66894244..92b41af99 100644 --- a/rules/util-linux.in +++ b/rules/util-linux.in @@ -11,12 +11,12 @@ if UTIL_LINUX config UTIL_LINUX_FDISK bool prompt "fdisk" - depends on !BB_CONFIG_FDISK + depends on !BUSYBOX_FDISK help fdisk - Partition table manipulator for Linux -comment "busy box' fdisk is selected!" - depends on UTIL_LINUX && BB_CONFIG_FDISK +comment "BusyBox' fdisk is selected!" + depends on UTIL_LINUX && BUSYBOX_FDISK config UTIL_LINUX_SFDISK bool @@ -35,61 +35,61 @@ config UTIL_LINUX_CFDISK config UTIL_LINUX_MKSWAP bool prompt "mkswap" - depends on !BB_CONFIG_MKSWAP + depends on !BUSYBOX_MKSWAP help mkswap sets up a Linux swap area on a device or in a file. -comment "busy box' mkswap is selected!" - depends on UTIL_LINUX && BB_CONFIG_MKSWAP +comment "BusyBox' mkswap is selected!" + depends on UTIL_LINUX && BUSYBOX_MKSWAP config UTIL_LINUX_SWAPON bool prompt "swapon" - depends on !BB_CONFIG_SWAPONOFF + depends on !BUSYBOX_SWAPONOFF help Swapon is used to specify devices on which paging and swapping are to take place. -comment "busy box' swapon is selected!" - depends on BB_CONFIG_SWAPONOFF +comment "BusyBox' swapon is selected!" + depends on BUSYBOX_SWAPONOFF config UTIL_LINUX_MOUNT bool prompt "mount" - depends on !BB_CONFIG_MOUNT + depends on !BUSYBOX_MOUNT help The mount command serves to attach the file system found on some device to the big file tree. -comment "busy box' mount is selected!" - depends on BB_CONFIG_MOUNT +comment "BusyBox' mount is selected!" + depends on BUSYBOX_MOUNT config UTIL_LINUX_UMOUNT bool prompt "umount" - depends on !BB_CONFIG_UMOUNT + depends on !BUSYBOX_UMOUNT help The mount(8) command serves to attach the file system found on some device to the big file tree. Conversely, the umount(8) command will detach it again. -comment "busy box' umount is selected!" - depends on UTIL_LINUX && BB_CONFIG_UMOUNT +comment "BusyBox' umount is selected!" + depends on UTIL_LINUX && BUSYBOX_UMOUNT config UTIL_LINUX_IPCS bool prompt "ipcs" - depends on !BB_CONFIG_IPCS + depends on !BUSYBOX_IPCS help ipcs provides information on the ipc facilities for which the calling process has read acccess. -comment "busy box' ipcs is selected!" - depends on BB_CONFIG_IPCS +comment "BusyBox' ipcs is selected!" + depends on BUSYBOX_IPCS config UTIL_LINUX_READPROFILE bool prompt "readprofile" - depends on !BB_CONFIG_READPROFILE + depends on !BUSYBOX_READPROFILE help The readprofile command uses the /proc/profile information to print ascii data on standard output. The output is @@ -100,8 +100,8 @@ config UTIL_LINUX_READPROFILE as a ratio between the number of ticks and the length of the procedure. The output is filled with blanks to ease readability. -comment "busy box' readprofile is selected!" - depends on BB_CONFIG_READPROFILE +comment "BusyBox' readprofile is selected!" + depends on BUSYBOX_READPROFILE config UTIL_LINUX_SETTERM bool diff --git a/rules/wget.in b/rules/wget.in index 037ab6fa9..05fd14475 100644 --- a/rules/wget.in +++ b/rules/wget.in @@ -2,7 +2,7 @@ config WGET tristate prompt "wget" - depends on !BB_CONFIG_WGET + depends on !BUSYBOX_WGET help GNU wget is a commandline mirroring tool. @@ -32,5 +32,5 @@ config WGET http://www.gnu.org/software/wget/ -comment "Busybox's wget is selected!" - depends on BB_CONFIG_WGET +comment "BusyBox's wget is selected!" + depends on BUSYBOX_WGET -- cgit v1.2.3