Bug#323670: config-*-linux
Ok, I didn't notice that there's already support for handling this. I'm
attaching a patch that removes Linux-specific options in
config-{udeb,deb,static}. It does also add CONFIG_TTY in config-udeb (see
patch comment).
(you're expected to copy config-{udeb,static} to config-{udeb,static}-linux
before applying)
As for the upstream part, unless you want to apply the upstream patch directly,
I'll try to merge it in upstream first.
--
Robert Millan
diff -ur busybox-1.01.old/debian/config-deb busybox-1.01/debian/config-deb
--- busybox-1.01.old/debian/config-deb 2006-04-29 10:41:01.000000000 +0200
+++ busybox-1.01/debian/config-deb 2006-04-29 11:01:41.000000000 +0200
@@ -178,15 +178,15 @@
#
# Console Utilities
#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_SETKEYCODES=y
+# CONFIG_CHVT is not set
+# CONFIG_CLEAR is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
+# CONFIG_RESET is not set
+# CONFIG_SETKEYCODES is not set
#
# Debian Utilities
@@ -273,7 +273,7 @@
#
# Miscellaneous Utilities
#
-CONFIG_ADJTIMEX=y
+# CONFIG_ADJTIMEX is not set
# CONFIG_CROND is not set
# CONFIG_CRONTAB is not set
CONFIG_DC=y
@@ -281,7 +281,7 @@
CONFIG_LAST=y
# CONFIG_HDPARM is not set
# CONFIG_MAKEDEVS is not set
-CONFIG_MT=y
+# CONFIG_MT is not set
# CONFIG_RX is not set
CONFIG_STRINGS=y
CONFIG_TIME=y
@@ -294,7 +294,7 @@
CONFIG_MODUTILS_OBJ=y
CONFIG_MODUTILS_OBJ_2_6=y
# CONFIG_DEPMOD is not set
-CONFIG_INSMOD=y
+# CONFIG_INSMOD is not set
CONFIG_FEATURE_2_4_MODULES=y
CONFIG_FEATURE_2_6_MODULES=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
@@ -309,7 +309,7 @@
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
-CONFIG_ARPING=y
+# CONFIG_ARPING is not set
CONFIG_FTPGET=y
CONFIG_FTPPUT=y
CONFIG_HOSTNAME=y
@@ -322,15 +322,15 @@
# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
# CONFIG_FEATURE_HTTPD_CGI is not set
# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+# CONFIG_IFCONFIG is not set
+# CONFIG_FEATURE_IFCONFIG_STATUS is not set
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
# CONFIG_IFUPDOWN is not set
# CONFIG_INETD is not set
-CONFIG_IP=y
+# CONFIG_IP is not set
CONFIG_FEATURE_IP_ADDRESS=y
#
@@ -341,7 +341,7 @@
#
# link (forced enabled for iplink)
#
-CONFIG_FEATURE_IP_ROUTE=y
+# CONFIG_FEATURE_IP_ROUTE is not set
#
# route (forced enabled for iproute)
@@ -353,19 +353,19 @@
#
CONFIG_IPCALC=y
CONFIG_FEATURE_IPCALC_FANCY=y
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_NAMEIF=y
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
CONFIG_NC=y
-CONFIG_NETSTAT=y
+# CONFIG_NETSTAT is not set
CONFIG_NSLOOKUP=y
-CONFIG_PING=y
+# CONFIG_PING is not set
CONFIG_FEATURE_FANCY_PING=y
-CONFIG_PING6=y
+# CONFIG_PING6 is not set
CONFIG_FEATURE_FANCY_PING6=y
-CONFIG_ROUTE=y
+# CONFIG_ROUTE is not set
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
@@ -376,8 +376,8 @@
CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
CONFIG_FEATURE_TFTP_DEBUG=y
-CONFIG_TRACEROUTE=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_TRACEROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
# CONFIG_VCONFIG is not set
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
@@ -387,9 +387,9 @@
#
# udhcp Server/Client
#
-CONFIG_UDHCPD=y
-CONFIG_UDHCPC=y
-CONFIG_DUMPLEASES=y
+# CONFIG_UDHCPD is not set
+# CONFIG_UDHCPC is not set
+# CONFIG_DUMPLEASES is not set
CONFIG_FEATURE_UDHCP_SYSLOG=y
CONFIG_FEATURE_UDHCP_DEBUG=y
@@ -404,7 +404,7 @@
CONFIG_RENICE=y
CONFIG_TOP=y
FEATURE_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
+# CONFIG_UPTIME is not set
# CONFIG_SYSCTL is not set
#
@@ -449,12 +449,12 @@
# System Logging Utilities
#
# CONFIG_SYSLOGD is not set
-CONFIG_LOGGER=y
+# CONFIG_LOGGER is not set
#
# Linux System Utilities
#
-CONFIG_DMESG=y
+# CONFIG_DMESG is not set
# CONFIG_FBSET is not set
# CONFIG_FDFLUSH is not set
# CONFIG_FDFORMAT is not set
@@ -466,16 +466,16 @@
CONFIG_GETOPT=y
CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set
-CONFIG_LOSETUP=y
+# CONFIG_LOSETUP is not set
# CONFIG_MKSWAP is not set
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
# CONFIG_PIVOT_ROOT is not set
CONFIG_RDATE=y
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
+# CONFIG_SWAPONOFF is not set
+# CONFIG_MOUNT is not set
CONFIG_NFSMOUNT=y
-CONFIG_UMOUNT=y
+# CONFIG_UMOUNT is not set
CONFIG_FEATURE_MOUNT_FORCE=y
#
Only in busybox-1.01/debian: config-deb-linux
diff -ur busybox-1.01.old/debian/config-static busybox-1.01/debian/config-static
--- busybox-1.01.old/debian/config-static 2006-04-29 10:41:01.000000000 +0200
+++ busybox-1.01/debian/config-static 2006-04-29 11:01:42.000000000 +0200
@@ -186,15 +186,15 @@
#
# Console Utilities
#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_SETKEYCODES=y
+# CONFIG_CHVT is not set
+# CONFIG_CLEAR is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
+# CONFIG_RESET is not set
+# CONFIG_SETKEYCODES is not set
#
# Debian Utilities
@@ -276,7 +276,7 @@
CONFIG_PASSWD=y
CONFIG_SU=y
CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
+# CONFIG_VLOCK is not set
#
# Common options for adduser, deluser, login, su
@@ -287,7 +287,7 @@
#
# Miscellaneous Utilities
#
-CONFIG_ADJTIMEX=y
+# CONFIG_ADJTIMEX is not set
CONFIG_CROND=y
CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
CONFIG_CRONTAB=y
@@ -296,7 +296,7 @@
CONFIG_LAST=y
# CONFIG_HDPARM is not set
CONFIG_MAKEDEVS=y
-CONFIG_MT=y
+# CONFIG_MT is not set
# CONFIG_RX is not set
CONFIG_STRINGS=y
CONFIG_TIME=y
@@ -318,7 +318,7 @@
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
-CONFIG_ARPING=y
+# CONFIG_ARPING is not set
CONFIG_FTPGET=y
CONFIG_FTPPUT=y
CONFIG_HOSTNAME=y
@@ -331,21 +331,21 @@
# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
# CONFIG_FEATURE_HTTPD_CGI is not set
# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+# CONFIG_IFCONFIG is not set
+# CONFIG_FEATURE_IFCONFIG_STATUS is not set
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
CONFIG_IFUPDOWN=y
# CONFIG_FEATURE_IFUPDOWN_IP is not set
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
CONFIG_FEATURE_IFUPDOWN_IPV4=y
CONFIG_FEATURE_IFUPDOWN_IPV6=y
CONFIG_FEATURE_IFUPDOWN_IPX=y
CONFIG_FEATURE_IFUPDOWN_MAPPING=y
# CONFIG_INETD is not set
-CONFIG_IP=y
+# CONFIG_IP is not set
CONFIG_FEATURE_IP_ADDRESS=y
#
@@ -356,7 +356,7 @@
#
# link (forced enabled for iplink)
#
-CONFIG_FEATURE_IP_ROUTE=y
+# CONFIG_FEATURE_IP_ROUTE is not set
#
# route (forced enabled for iproute)
@@ -368,19 +368,19 @@
#
CONFIG_IPCALC=y
CONFIG_FEATURE_IPCALC_FANCY=y
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_NAMEIF=y
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
CONFIG_NC=y
-CONFIG_NETSTAT=y
+# CONFIG_NETSTAT is not set
CONFIG_NSLOOKUP=y
-CONFIG_PING=y
+# CONFIG_PING is not set
CONFIG_FEATURE_FANCY_PING=y
-CONFIG_PING6=y
+# CONFIG_PING6 is not set
CONFIG_FEATURE_FANCY_PING6=y
-CONFIG_ROUTE=y
+# CONFIG_ROUTE is not set
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
@@ -391,8 +391,8 @@
CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
CONFIG_FEATURE_TFTP_DEBUG=y
-CONFIG_TRACEROUTE=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_TRACEROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
# CONFIG_VCONFIG is not set
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
@@ -402,9 +402,9 @@
#
# udhcp Server/Client
#
-CONFIG_UDHCPD=y
-CONFIG_UDHCPC=y
-CONFIG_DUMPLEASES=y
+# CONFIG_UDHCPD is not set
+# CONFIG_UDHCPC is not set
+# CONFIG_DUMPLEASES is not set
CONFIG_FEATURE_UDHCP_SYSLOG=y
CONFIG_FEATURE_UDHCP_DEBUG=y
@@ -419,7 +419,7 @@
CONFIG_RENICE=y
CONFIG_TOP=y
FEATURE_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
+# CONFIG_UPTIME is not set
# CONFIG_SYSCTL is not set
#
@@ -463,26 +463,26 @@
#
# System Logging Utilities
#
-CONFIG_SYSLOGD=y
+# CONFIG_SYSLOGD is not set
# CONFIG_FEATURE_ROTATE_LOGFILE is not set
CONFIG_FEATURE_REMOTE_LOG=y
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_LOGREAD=y
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
+# CONFIG_KLOGD is not set
+# CONFIG_LOGGER is not set
#
# Linux System Utilities
#
-CONFIG_DMESG=y
+# CONFIG_DMESG is not set
CONFIG_FBSET=y
CONFIG_FEATURE_FBSET_FANCY=y
CONFIG_FEATURE_FBSET_READMODE=y
CONFIG_FDFLUSH=y
# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
+# CONFIG_FDISK is not set
FDISK_SUPPORT_LARGE_DISKS=y
CONFIG_FEATURE_FDISK_WRITABLE=y
CONFIG_FEATURE_AIX_LABEL=y
@@ -502,16 +502,16 @@
CONFIG_HEXDUMP=y
CONFIG_HWCLOCK=y
CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-CONFIG_LOSETUP=y
+# CONFIG_LOSETUP is not set
CONFIG_MKSWAP=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_PIVOT_ROOT=y
CONFIG_RDATE=y
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
+# CONFIG_SWAPONOFF is not set
+# CONFIG_MOUNT is not set
CONFIG_NFSMOUNT=y
-CONFIG_UMOUNT=y
+# CONFIG_UMOUNT is not set
CONFIG_FEATURE_MOUNT_FORCE=y
#
Only in busybox-1.01/debian: config-static-linux
diff -ur busybox-1.01.old/debian/config-udeb busybox-1.01/debian/config-udeb
--- busybox-1.01.old/debian/config-udeb 2006-04-29 10:41:01.000000000 +0200
+++ busybox-1.01/debian/config-udeb 2006-04-29 11:08:25.000000000 +0200
@@ -135,7 +135,8 @@
CONFIG_TOUCH=y
CONFIG_TR=y
CONFIG_TRUE=y
-# CONFIG_TTY is not set
+# On non-Linux, /proc/self/fd/0 cannot be used as replacement for tty(1)
+CONFIG_TTY=y
CONFIG_UNAME=y
CONFIG_UNIQ=y
# CONFIG_USLEEP is not set
@@ -282,18 +283,18 @@
# CONFIG_FTPPUT is not set
# CONFIG_HOSTNAME is not set
# CONFIG_HTTPD is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_IFCONFIG is not set
+# CONFIG_FEATURE_IFCONFIG_STATUS is not set
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
# CONFIG_FEATURE_IFCONFIG_HW is not set
# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
# CONFIG_IFUPDOWN is not set
# CONFIG_INETD is not set
-CONFIG_IP=y
+# CONFIG_IP is not set
CONFIG_FEATURE_IP_ADDRESS=y
CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
+# CONFIG_FEATURE_IP_ROUTE is not set
# CONFIG_FEATURE_IP_TUNNEL is not set
# CONFIG_IPCALC is not set
# CONFIG_IPADDR is not set
@@ -305,7 +306,7 @@
# CONFIG_NETSTAT is not set
# CONFIG_NSLOOKUP is not set
# CONFIG_PING is not set
-CONFIG_ROUTE=y
+# CONFIG_ROUTE is not set
# CONFIG_TELNET is not set
# CONFIG_TELNETD is not set
# CONFIG_TFTP is not set
@@ -376,17 +377,17 @@
#
# System Logging Utilities
#
-CONFIG_SYSLOGD=y
+# CONFIG_SYSLOGD is not set
# CONFIG_FEATURE_ROTATE_LOGFILE is not set
# CONFIG_FEATURE_REMOTE_LOG is not set
# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
+# CONFIG_KLOGD is not set
+# CONFIG_LOGGER is not set
#
# Linux System Utilities
#
-CONFIG_DMESG=y
+# CONFIG_DMESG is not set
# CONFIG_FBSET is not set
# CONFIG_FDFLUSH is not set
# CONFIG_FDFORMAT is not set
@@ -404,10 +405,10 @@
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_PIVOT_ROOT=y
# CONFIG_RDATE is not set
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
+# CONFIG_SWAPONOFF is not set
+# CONFIG_MOUNT is not set
# CONFIG_NFSMOUNT is not set
-CONFIG_UMOUNT=y
+# CONFIG_UMOUNT is not set
CONFIG_FEATURE_MOUNT_FORCE=y
#
Reply to: