Sync with 20030104-2 cvs package, disable fdisk BSD label as they dont

compile on m68k
This commit is contained in:
Glenn L McGrath
2003-01-04 13:45:42 +00:00
parent 4dcc2ddfcc
commit 39dd4011e4
4 changed files with 84 additions and 17 deletions

45
debian/config-static vendored
View File

@@ -21,7 +21,7 @@ CONFIG_FEATURE_DEVPTS=y
# Build Options
#
DOSTATIC=y
# DOLFS is not set
DOLFS=y
# USING_CROSS_COMPILER is not set
EXTRA_CFLAGS_OPTIONS=""
@@ -41,7 +41,7 @@ CONFIG_GUNZIP=y
CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
CONFIG_GZIP=y
CONFIG_RPM2CPIO=y
# CONFIG_RPM is not set
CONFIG_RPM=y
CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y
CONFIG_FEATURE_TAR_BZIP2=y
@@ -208,8 +208,8 @@ CONFIG_WATCHDOG=y
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
# CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set
CONFIG_FTPGET=y
CONFIG_FTPPUT=y
CONFIG_HOSTNAME=y
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -221,19 +221,35 @@ CONFIG_IFUPDOWN=y
CONFIG_FEATURE_IFUPDOWN_IPV4=y
CONFIG_FEATURE_IFUPDOWN_IPV6=y
CONFIG_FEATURE_IFUPDOWN_IPX=y
# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
CONFIG_FEATURE_IFUPDOWN_MAPPING=y
CONFIG_IP=y
CONFIG_FEATURE_IP_ADDRESS=y
#
# address (forced enabled for ipaddr)
#
CONFIG_FEATURE_IP_LINK=y
#
# link (forced enabled for iplink)
#
CONFIG_FEATURE_IP_ROUTE=y
#
# route (forced enabled for iproute)
#
CONFIG_FEATURE_IP_TUNNEL=y
#
# tunnel (forced enabled for iptunnel)
#
CONFIG_IPCALC=y
CONFIG_FEATURE_IPCALC_FANCY=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_IPADDR=y
CONFIG_IPLINK=y
CONFIG_IPROUTE=y
CONFIG_IPTUNNEL=y
CONFIG_NAMEIF=y
CONFIG_NC=y
CONFIG_NETSTAT=y
CONFIG_NSLOOKUP=y
@@ -311,7 +327,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
# Bourne Shell Options
#
CONFIG_FEATURE_COMMAND_EDITING=y
# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
CONFIG_FEATURE_COMMAND_HISTORY=15
@@ -400,7 +416,12 @@ CONFIG_FBSET=y
CONFIG_FEATURE_FBSET_FANCY=y
CONFIG_FEATURE_FBSET_READMODE=y
CONFIG_FDFLUSH=y
# CONFIG_FDISK is not set
CONFIG_FDISK=y
CONFIG_FEATURE_AIX_LABEL=y
CONFIG_FEATURE_SGI_LABEL=y
CONFIG_FEATURE_SUN_LABEL=y
# CONFIG_FEATURE_OSF_LABEL is not set
CONFIG_FEATURE_FDISK_ADVANCED=y
CONFIG_FREERAMDISK=y
CONFIG_FSCK_MINIX=y
CONFIG_MKFS_MINIX=y