Package: kernel-patch-uml Version: 2.4.26-3m Severity: wishlist Tags: patch
Hi Matt, Sorry in the previous mail I forgot the tags, sorry again!!! :(( I have worked for a bit on the user-mode-linux package to support the 2.6.12-1um kernel. Now you have a patch, in attachment, that provides the transition from previous package to the new. I make also available at the following: deb http://etinarcadiaego.dyndns.org/~ste/debian/ ./ deb-src http://etinarcadiaego.dyndns.org/~ste/debian/ ./ Please consider, if you feel confident, to use this effort to improve user-mode-linux availability in debian. Thanks in advance Cheers SteX -- GPG key = D52DF829 -- SteX -- <[EMAIL PROTECTED]> Keyserver: http://keyserver.linu.it, User#324592, http://counter.li.org http://www.openlabs.it/~stex -- http://www.stex.name http://etinarcadiaego.dyndns.org
diff -Naur user-mode-linux-2.4.26-3um/config user-mode-linux-2.6.12-1um/config
--- user-mode-linux-2.4.26-3um/config 2004-09-09 02:51:00.000000000 +0200
+++ user-mode-linux-2.6.12-1um/config 2005-11-01 17:12:17.000000000 +0100
@@ -1,169 +1,262 @@
#
# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.12
+# Tue Nov 1 17:12:04 2005
#
-CONFIG_USERMODE=y
-# CONFIG_ISA is not set
-# CONFIG_SBUS is not set
-# CONFIG_PCI is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_UML=y
+CONFIG_MMU=y
CONFIG_UID16=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# General Setup
+# UML-specific options
#
-CONFIG_MODE_SKAS=y
CONFIG_MODE_TT=y
+CONFIG_MODE_SKAS=y
+CONFIG_UML_X86=y
+# CONFIG_64BIT is not set
+CONFIG_TOP_ADDR=0xc0000000
+# CONFIG_3_LEVEL_PGTABLES is not set
+CONFIG_ARCH_HAS_SC_SIGNALS=y
+CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
+CONFIG_LD_SCRIPT_STATIC=y
CONFIG_NET=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=y
CONFIG_HOSTFS=y
-CONFIG_HUMFS=y
-CONFIG_EXTERNFS=y
CONFIG_HPPFS=y
CONFIG_MCONSOLE=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_HOST_2G_2G is not set
-# CONFIG_UML_SMP is not set
# CONFIG_SMP is not set
CONFIG_NEST_LEVEL=0
CONFIG_KERNEL_HALF_GIGS=1
# CONFIG_HIGHMEM is not set
-CONFIG_PROC_MM=y
CONFIG_KERNEL_STACK_ORDER=2
CONFIG_UML_REAL_TIME_CLOCK=y
#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+# CONFIG_CLEAN_COMPILE is not set
+CONFIG_BROKEN=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
# Loadable module support
#
CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+
+#
# Character Devices
#
+CONFIG_STDERR_CONSOLE=y
CONFIG_STDIO_CONSOLE=y
CONFIG_SSL=y
-CONFIG_FD_CHAN=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
CONFIG_PTY_CHAN=y
CONFIG_TTY_CHAN=y
CONFIG_XTERM_CHAN=y
+# CONFIG_NOCONFIG_CHAN is not set
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CON_CHAN="xterm"
CONFIG_SSL_CHAN="pty"
CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-# CONFIG_WATCHDOG is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
# CONFIG_UML_WATCHDOG is not set
-CONFIG_UML_SOUND=m
-CONFIG_SOUND=m
-CONFIG_HOSTAUDIO=m
-# CONFIG_TTY_LOG is not set
+# CONFIG_UML_SOUND is not set
+# CONFIG_SOUND is not set
+# CONFIG_HOSTAUDIO is not set
+# CONFIG_UML_RANDOM is not set
+CONFIG_MMAPPER=y
#
-# Block Devices
+# Block devices
#
CONFIG_BLK_DEV_UBD=y
-# CONFIG_BLK_DEV_UBD_SYNC is not set
-CONFIG_COW=y
-CONFIG_COW_COMMON=y
+CONFIG_BLK_DEV_UBD_SYNC=y
+CONFIG_BLK_DEV_COW_COMMON=y
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+CONFIG_BLK_DEV_NBD=y
CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_BLK_DEV_INITRD=y
-# CONFIG_MMAPPER is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_LBD=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
CONFIG_NETDEVICES=y
#
-# Network Devices
+# UML Network Devices
#
CONFIG_UML_NET=y
CONFIG_UML_NET_ETHERTAP=y
CONFIG_UML_NET_TUNTAP=y
CONFIG_UML_NET_SLIP=y
-CONFIG_UML_NET_SLIRP=y
CONFIG_UML_NET_DAEMON=y
CONFIG_UML_NET_MCAST=y
-# CONFIG_UML_NET_PCAP is not set
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_PPP=m
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-CONFIG_PPP_MPPE=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_UML_NET_PCAP=y
+CONFIG_UML_NET_SLIRP=y
+
+#
+# Networking support
+#
#
# Networking options
#
-CONFIG_PACKET=y
+CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_FILTER=y
-CONFIG_UNIX=y
+CONFIG_UNIX=m
CONFIG_NET_KEY=m
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_ROUTE_FWMARK is not set
-CONFIG_IP_ROUTE_NAT=y
+CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
+# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_NET_IPGRE_BROADCAST=y
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_INET_ECN=y
+# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
+CONFIG_IP_TCPDIAG=y
+# CONFIG_IP_TCPDIAG_IPV6 is not set
+
+#
+# IP: Virtual Server Configuration
+#
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
#
-# IP: Netfilter Configuration
+# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
CONFIG_IP_NF_MATCH_MARK=m
@@ -179,67 +272,43 @@
CONFIG_IP_NF_MATCH_HELPER=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_UNCLEAN=m
CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_MATCH_SCTP is not set
+# CONFIG_IP_NF_MATCH_COMMENT is not set
+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_MIRROR=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_NAT_LOCAL=y
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_TARGET_NOTRACK=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_COMPAT_IPCHAINS=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_COMPAT_IPFWADM=m
-CONFIG_IP_NF_NAT_NEEDED=y
-
-#
-# IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-
-#
-# IPv6: Netfilter Configuration
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
#
CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
@@ -256,20 +325,46 @@
CONFIG_IP6_NF_MATCH_AHESP=m
CONFIG_IP6_NF_MATCH_LENGTH=m
CONFIG_IP6_NF_MATCH_EUI64=m
+# CONFIG_IP6_NF_MATCH_PHYSDEV is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_LOG=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_TARGET_MARK=m
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+# CONFIG_BRIDGE_EBT_ULOG is not set
CONFIG_XFRM=y
CONFIG_XFRM_USER=m
-CONFIG_KHTTPD=m
#
-# SCTP Configuration (EXPERIMENTAL)
+# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_MSG is not set
@@ -277,223 +372,487 @@
# CONFIG_SCTP_HMAC_NONE is not set
# CONFIG_SCTP_HMAC_SHA1 is not set
CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_ATM is not set
+CONFIG_ATM=y
+CONFIG_ATM_CLIP=y
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
-
-#
-#
-#
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
-# CONFIG_ATALK is not set
-
-#
-# Appletalk devices
-#
-# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DECNET is not set
-CONFIG_BRIDGE=m
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
CONFIG_WAN_ROUTER=m
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
#
# QoS and/or fair queueing
#
CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_CSZ=m
CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DELAY=m
CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_QOS=y
CONFIG_NET_ESTIMATOR=y
CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_BASIC is not set
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_NET_CLS_IND is not set
+# CONFIG_CLS_U32_MARK is not set
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_CLS_ACT is not set
CONFIG_NET_CLS_POLICE=y
#
# Network testing
#
CONFIG_NET_PKTGEN=m
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_YAM=m
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+
+#
+# Old SIR device drivers
+#
+CONFIG_IRPORT_SIR=m
+
+#
+# Old Serial dongle support
+#
+# CONFIG_DONGLE_OLD is not set
+
+#
+# FIR device drivers
+#
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_BCSP_TXCRC is not set
+CONFIG_BT_HCIVHCI=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+
+#
+# Wan interfaces
+#
+CONFIG_WAN=y
+CONFIG_SYNCLINK_SYNCPPP=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=y
+CONFIG_HDLC_RAW_ETH=y
+CONFIG_HDLC_CISCO=y
+CONFIG_HDLC_FR=y
+CONFIG_HDLC_PPP=y
+CONFIG_HDLC_X25=y
+CONFIG_DLCI=m
+CONFIG_DLCI_COUNT=24
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=y
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+
+#
+# ATM drivers
+#
+CONFIG_ATM_TCP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_SHAPER=m
+CONFIG_NETCONSOLE=m
#
# File systems
#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_FS_POSIX_ACL=y
+
+#
+# XFS support
+#
+CONFIG_XFS_FS=m
+CONFIG_XFS_EXPORT=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_SECURITY=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_MINIX_FS=m
+CONFIG_ROMFS_FS=m
CONFIG_QUOTA=y
+CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_DNOTIFY=y
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
-CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_XATTR_SHARING=y
-# CONFIG_EXT3_FS_XATTR_USER is not set
-# CONFIG_EXT3_FS_XATTR_TRUSTED is not set
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
-CONFIG_UMSDOS_FS=m
CONFIG_VFAT_FS=m
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_CRAMFS=y
-CONFIG_TMPFS=y
-CONFIG_RAMFS=y
-CONFIG_ISO9660_FS=m
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-CONFIG_JFS_FS=m
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_MINIX_FS=m
-CONFIG_VXFS_FS=m
-# CONFIG_NTFS_FS is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set
-CONFIG_HPFS_FS=m
+
+#
+# Pseudo filesystems
+#
CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
CONFIG_DEVFS_FS=y
# CONFIG_DEVFS_MOUNT is not set
# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+CONFIG_DEVPTS_FS_SECURITY=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_XATTR is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ASFS_FS=m
+CONFIG_ASFS_DEFAULT_CODEPAGE=""
+# CONFIG_ASFS_RW is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=y
+CONFIG_VXFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
# CONFIG_QNX4FS_RW is not set
-CONFIG_ROMFS_FS=m
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XATTR_SHARING is not set
-# CONFIG_EXT2_FS_XATTR_USER is not set
-# CONFIG_EXT2_FS_XATTR_TRUSTED is not set
-# CONFIG_EXT2_FS_POSIX_ACL is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_UDF_FS=m
-CONFIG_UDF_RW=y
-# CONFIG_UFS_FS is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
-CONFIG_XFS_FS=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_TRACE is not set
-# CONFIG_XFS_DEBUG is not set
#
# Network File Systems
#
-CONFIG_CODA_FS=m
-CONFIG_INTERMEZZO_FS=m
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_ROOT_NFS=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
-# CONFIG_NFSD_TCP is not set
-CONFIG_SUNRPC=y
-CONFIG_LOCKD=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_SMB_UNIX=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+# CONFIG_CODA_FS_OLD_API is not set
+CONFIG_AFS_FS=m
+CONFIG_RXRPC=m
#
# Partition Types
#
-# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_ACORN_PARTITION=y
+CONFIG_ACORN_PARTITION_CUMANA=y
+# CONFIG_ACORN_PARTITION_EESOX is not set
+CONFIG_ACORN_PARTITION_ICS=y
+# CONFIG_ACORN_PARTITION_ADFS is not set
+# CONFIG_ACORN_PARTITION_POWERTEC is not set
+CONFIG_ACORN_PARTITION_RISCIX=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_PARTITION=y
-CONFIG_SMB_NLS=y
-CONFIG_NLS=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+# CONFIG_EFI_PARTITION is not set
#
# Native Language Support
#
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
+CONFIG_SECURITY_CAPABILITIES=m
+# CONFIG_SECURITY_SECLVL is not set
+# CONFIG_SECURITY_SELINUX is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC32=m
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
#
# SCSI support
#
CONFIG_SCSI=m
+CONFIG_GENERIC_ISA_DMA=y
#
# SCSI support type (disk, tape, CD-ROM)
@@ -510,7 +869,7 @@
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
# CONFIG_SCSI_DEBUG_QUEUES is not set
-# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_DEBUG=m
@@ -518,55 +877,25 @@
#
# Multi-device support (RAID and LVM)
#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_BLK_DEV_LVM=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_DM_MIRROR=m
+# CONFIG_MD is not set
#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Library routines
-#
-CONFIG_CRC32=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_INPUT=y
#
# Kernel hacking
#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUGSYM=y
-CONFIG_PT_PROXY=y
-# CONFIG_GCOV is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_FRAME_POINTER is not set
diff -Naur user-mode-linux-2.4.26-3um/debian/changelog
user-mode-linux-2.6.12-1um/debian/changelog
--- user-mode-linux-2.4.26-3um/debian/changelog 2004-09-09 02:51:02.000000000
+0200
+++ user-mode-linux-2.6.12-1um/debian/changelog 2005-11-14 23:51:39.000000000
+0100
@@ -1,3 +1,12 @@
+user-mode-linux (2.6.12-1um.1) unstable; urgency=low
+
+ * New upstream release (Closes: #271246, Closes: #271246, Closes: #276993,
Closes: #170878).
+ * 2.4 and 2.6 support available (Closes: #264722).
+ * uml_net support fixed bug (Closes: #140790).
+ * Non-Maintainer Upload needed.
+
+ -- Stefano Melchior <[EMAIL PROTECTED]> Wed, 26 Oct 2005 14:58:47 +0200
+
user-mode-linux (2.4.26-3um-1) unstable; urgency=low
* New upstream release
diff -Naur user-mode-linux-2.4.26-3um/debian/control
user-mode-linux-2.6.12-1um/debian/control
--- user-mode-linux-2.4.26-3um/debian/control 2004-09-09 02:02:41.000000000
+0200
+++ user-mode-linux-2.6.12-1um/debian/control 2005-11-15 00:21:00.000000000
+0100
@@ -2,12 +2,12 @@
Section: misc
Priority: extra
Maintainer: Matt Zimmerman <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), kernel-source-2.4.26, kernel-patch-uml
(>= 20040824-1), docbook-to-man, bzip2, m4, modutils
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>> 4.0.0), linux-source-2.6.12, docbook-to-man,
bzip2, m4, modutils
+Standards-Version: 3.6.2
Package: user-mode-linux
Architecture: i386
-Depends: uml-utilities (>= 20020718-1)
+Depends: uml-utilities (>= 20040406-1)
Suggests: x-terminal-emulator, rootstrap, user-mode-linux-doc, slirp,
kernel-patch-skas
Description: User-mode Linux (kernel)
User-mode Linux (UML) is a port of the Linux kernel to its own system
diff -Naur user-mode-linux-2.4.26-3um/debian/crypto.diff
user-mode-linux-2.6.12-1um/debian/crypto.diff
--- user-mode-linux-2.4.26-3um/debian/crypto.diff 2003-12-30
18:15:43.000000000 +0100
+++ user-mode-linux-2.6.12-1um/debian/crypto.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-diff -ru kernel-source-2.4.23.orig-uml/arch/um/config.in
kernel-source-2.4.23/arch/um/config.in
---- kernel-source-2.4.23.orig-uml/arch/um/config.in 2003-12-30
09:13:10.000000000 -0800
-+++ kernel-source-2.4.23/arch/um/config.in 2003-12-30 09:12:23.000000000
-0800
-@@ -89,6 +89,7 @@
-
- source drivers/mtd/Config.in
-
-+source crypto/Config.in
- source lib/Config.in
-
- mainmenu_option next_comment
diff -Naur user-mode-linux-2.4.26-3um/debian/patches/crypto.diff
user-mode-linux-2.6.12-1um/debian/patches/crypto.diff
--- user-mode-linux-2.4.26-3um/debian/patches/crypto.diff 1970-01-01
01:00:00.000000000 +0100
+++ user-mode-linux-2.6.12-1um/debian/patches/crypto.diff 2005-10-26
14:57:40.000000000 +0200
@@ -0,0 +1,11 @@
+diff -ru kernel-source-2.4.23.orig-uml/arch/um/config.in
kernel-source-2.4.23/arch/um/config.in
+--- kernel-source-2.4.23.orig-uml/arch/um/config.in 2003-12-30
09:13:10.000000000 -0800
++++ kernel-source-2.4.23/arch/um/config.in 2003-12-30 09:12:23.000000000
-0800
+@@ -89,6 +89,7 @@
+
+ source drivers/mtd/Config.in
+
++source crypto/Config.in
+ source lib/Config.in
+
+ mainmenu_option next_comment
diff -Naur user-mode-linux-2.4.26-3um/debian/patches/tkill.diff
user-mode-linux-2.6.12-1um/debian/patches/tkill.diff
--- user-mode-linux-2.4.26-3um/debian/patches/tkill.diff 1970-01-01
01:00:00.000000000 +0100
+++ user-mode-linux-2.6.12-1um/debian/patches/tkill.diff 2005-10-26
14:57:40.000000000 +0200
@@ -0,0 +1,20 @@
+--- kernel-source-2.4.25/arch/um/os-Linux/process.c.orig 2004-06-04
14:15:08.000000000 -0700
++++ kernel-source-2.4.25/arch/um/os-Linux/process.c 2004-06-04
14:20:08.000000000 -0700
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <linux/unistd.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+ #include "os.h"
+@@ -92,7 +93,8 @@
+
+ void os_usr1_process(int pid)
+ {
+- kill(pid, SIGUSR1);
++ syscall(__NR_tkill, pid, SIGUSR1);
++/* tkill(pid, SIGUSR1);*/
+ }
+
+ int os_getpid(void)
diff -Naur user-mode-linux-2.4.26-3um/debian/patches/uml_net.diff
user-mode-linux-2.6.12-1um/debian/patches/uml_net.diff
--- user-mode-linux-2.4.26-3um/debian/patches/uml_net.diff 1970-01-01
01:00:00.000000000 +0100
+++ user-mode-linux-2.6.12-1um/debian/patches/uml_net.diff 2005-10-26
14:57:40.000000000 +0200
@@ -0,0 +1,60 @@
+diff -u arch/um/drivers.old/ethertap_user.c arch/um/drivers/ethertap_user.c
+--- arch/um/os-Linux/drivers.old/ethertap_user.c Mon Apr 29 20:59:30 2002
++++ arch/um/os-Linux/drivers/ethertap_user.c Mon Apr 29 21:00:27 2002
+@@ -93,9 +93,9 @@
+ char version_buf[sizeof("nnnnn\0")];
+ char data_fd_buf[sizeof("nnnnnn\0")];
+ char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
+- char *setup_args[] = { "uml_net", version_buf, "ethertap", dev,
++ char *setup_args[] = { "/usr/lib/uml/uml_net", version_buf, "ethertap",
dev,
+ data_fd_buf, gate_buf, NULL };
+- char *nosetup_args[] = { "uml_net", version_buf, "ethertap",
++ char *nosetup_args[] = { "/usr/lib/uml/uml_net", version_buf,
"ethertap",
+ dev, data_fd_buf, NULL };
+ char **args, c;
+
+diff -u arch/um/drivers.old/net_user.c arch/um/drivers/net_user.c
+--- arch/um/drivers.old/net_user.c Mon Apr 29 20:59:30 2002
++++ arch/um/drivers/net_user.c Mon Apr 29 21:00:59 2002
+@@ -185,7 +185,7 @@
+ char addr_buf[sizeof("255.255.255.255\0")];
+ char netmask_buf[sizeof("255.255.255.255\0")];
+ char version[sizeof("nnnnn\0")];
+- char *argv[] = { "uml_net", version, what, dev, addr_buf,
++ char *argv[] = { "/usr/lib/uml/uml_net", version, what, dev, addr_buf,
+ netmask_buf, NULL };
+ char *output;
+ int output_len, pid;
+diff -u arch/um/drivers.old/slip_user.c arch/um/drivers/slip_user.c
+--- arch/um/drivers.old/slip_user.c Mon Apr 29 20:59:30 2002
++++ arch/um/drivers/slip_user.c Mon Apr 29 21:01:12 2002
+@@ -113,7 +113,7 @@
+ struct slip_data *pri = data;
+ char version_buf[sizeof("nnnnn\0")];
+ char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
+- char *argv[] = { "uml_net", version_buf, "slip", "up", gate_buf,
++ char *argv[] = { "/usr/lib/uml/uml_net", version_buf, "slip", "up",
gate_buf,
+ NULL };
+ int sfd, mfd, disc, sencap, err;
+
+@@ -166,7 +166,7 @@
+ {
+ struct slip_data *pri = data;
+ char version_buf[sizeof("nnnnn\0")];
+- char *argv[] = { "uml_net", version_buf, "slip", "down", pri->name,
++ char *argv[] = { "/usr/lib/uml/uml_net", version_buf, "slip", "down",
pri->name,
+ NULL };
+ int err;
+
+diff -u arch/um/drivers.old/tuntap_user.c arch/um/drivers/tuntap_user.c
+--- arch/um/os-Linux/drivers.old/tuntap_user.c Mon Apr 29 20:59:30 2002
++++ arch/um/os-Linux/drivers/tuntap_user.c Mon Apr 29 21:01:22 2002
+@@ -68,7 +68,7 @@
+ {
+ struct tuntap_pre_exec_data data;
+ char version_buf[sizeof("nnnnn\0")];
+- char *argv[] = { "uml_net", version_buf, "tuntap", "up", gate,
++ char *argv[] = { "/usr/lib/uml/uml_net", version_buf, "tuntap", "up",
gate,
+ NULL };
+ char buf[CMSG_SPACE(sizeof(*fd_out))];
+ struct msghdr msg;
diff -Naur user-mode-linux-2.4.26-3um/debian/patches/uml_switch.diff
user-mode-linux-2.6.12-1um/debian/patches/uml_switch.diff
--- user-mode-linux-2.4.26-3um/debian/patches/uml_switch.diff 1970-01-01
01:00:00.000000000 +0100
+++ user-mode-linux-2.6.12-1um/debian/patches/uml_switch.diff 2005-10-26
14:57:40.000000000 +0200
@@ -0,0 +1,11 @@
+--- kernel-source-2.4.22/arch/um/drivers/daemon_kern.c.orig 2003-09-19
21:32:52.000000000 -0400
++++ kernel-source-2.4.22/arch/um/drivers/daemon_kern.c 2003-09-19
21:32:53.000000000 -0400
+@@ -72,7 +72,7 @@
+
+ *init = ((struct daemon_init)
+ { .sock_type = "unix",
+- .ctl_sock = "/tmp/uml.ctl" });
++ .ctl_sock =
"/var/run/uml-utilities/uml_switch.ctl" });
+
+ remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,
+ NULL);
diff -Naur user-mode-linux-2.4.26-3um/debian/patches/x-terminal-emulator.diff
user-mode-linux-2.6.12-1um/debian/patches/x-terminal-emulator.diff
--- user-mode-linux-2.4.26-3um/debian/patches/x-terminal-emulator.diff
1970-01-01 01:00:00.000000000 +0100
+++ user-mode-linux-2.6.12-1um/debian/patches/x-terminal-emulator.diff
2005-10-26 14:57:40.000000000 +0200
@@ -0,0 +1,20 @@
+--- arch/um/drivers/xterm.c.orig 2002-10-04 23:51:39.000000000 -0400
++++ arch/um/drivers/xterm.c 2002-10-04 23:55:14.000000000 -0400
+@@ -45,7 +45,7 @@
+ }
+
+ /* Only changed by xterm_setup, which is a setup */
+-static char *terminal_emulator = "xterm";
++static char *terminal_emulator = "x-terminal-emulator";
+ static char *title_switch = "-T";
+ static char *exec_switch = "-e";
+
+@@ -76,7 +76,7 @@
+ " respectively. The title switch must have the form '<switch> title',\n"
+ " not '<switch>=title'. Similarly, the exec switch must have the form\n"
+ " '<switch> command arg1 arg2 ...'.\n"
+-" The default values are 'xterm=xterm,-T,-e'. Values for gnome-terminal\n"
++" The default values are 'xterm=x-terminal-emulator,-T,-e'. Values for
gnome-terminal\n"
+ " are 'xterm=gnome-terminal,-t,-x'.\n\n"
+ );
+
diff -Naur user-mode-linux-2.4.26-3um/debian/rules
user-mode-linux-2.6.12-1um/debian/rules
--- user-mode-linux-2.4.26-3um/debian/rules 2004-09-09 02:03:06.000000000
+0200
+++ user-mode-linux-2.6.12-1um/debian/rules 2005-11-01 17:09:47.000000000
+0100
@@ -9,8 +9,8 @@
export DH_COMPAT=3
config_target:=oldconfig
-kernel_version:=2.4.26
-kernel_dir:=kernel-source-$(kernel_version)
+kernel_version:=2.6.12
+kernel_dir:=linux-source-$(kernel_version)
debian:=$(CURDIR)/debian
tmp:=$(debian)/user-mode-linux
tmpmodules:=$(debian)/uml-modules
@@ -21,17 +21,11 @@
unpack: unpack-stamp
unpack-stamp:
- tar -x --bzip2 -f /usr/src/kernel-source-$(kernel_version).tar.bz2
+ tar -x --bzip2 -f /usr/src/linux-source-$(kernel_version).tar.bz2
touch $@
patch: patch-stamp
patch-stamp: unpack-stamp
- cd $(kernel_dir) && /usr/src/kernel-patches/all/apply/uml
- patch -p0 -d $(kernel_dir) < $(debian)/uml_net.diff
- patch -p0 -d $(kernel_dir) < $(debian)/x-terminal-emulator.diff
- patch -p1 -d $(kernel_dir) < $(debian)/uml_switch.diff
- patch -p1 -d $(kernel_dir) < $(debian)/crypto.diff
- patch -p1 -d $(kernel_dir) < $(debian)/tkill.diff
touch $@
$(kernel_dir)/.config: config
@@ -51,7 +45,6 @@
$(MAKE) -C $(kernel_dir) $(KBUILDVARS) linux modules ARCH=um
docbook-to-man linux.sgml > linux.1
- zcat /usr/share/kernel-patch-uml/changelog.gz > changelog
touch $@
@@ -111,7 +104,7 @@
dh_installman linux.1
dh_installinfo
# dh_undocumented
- dh_installchangelogs changelog
+ dh_installchangelogs $(CURDIR)/debian/changelog
dh_link
dh_strip
dh_compress
diff -Naur user-mode-linux-2.4.26-3um/debian/tkill.diff
user-mode-linux-2.6.12-1um/debian/tkill.diff
--- user-mode-linux-2.4.26-3um/debian/tkill.diff 2004-06-05
03:18:10.000000000 +0200
+++ user-mode-linux-2.6.12-1um/debian/tkill.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- kernel-source-2.4.25/arch/um/os-Linux/process.c.orig 2004-06-04
14:15:08.000000000 -0700
-+++ kernel-source-2.4.25/arch/um/os-Linux/process.c 2004-06-04
14:20:08.000000000 -0700
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <signal.h>
-+#include <linux/unistd.h>
- #include <sys/mman.h>
- #include <sys/wait.h>
- #include "os.h"
-@@ -92,7 +93,8 @@
-
- void os_usr1_process(int pid)
- {
-- kill(pid, SIGUSR1);
-+ syscall(__NR_tkill, pid, SIGUSR1);
-+/* tkill(pid, SIGUSR1);*/
- }
-
- int os_getpid(void)
diff -Naur user-mode-linux-2.4.26-3um/debian/uml_net.diff
user-mode-linux-2.6.12-1um/debian/uml_net.diff
--- user-mode-linux-2.4.26-3um/debian/uml_net.diff 2002-07-09
04:07:03.000000000 +0200
+++ user-mode-linux-2.6.12-1um/debian/uml_net.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-diff -u arch/um/drivers.old/ethertap_user.c arch/um/drivers/ethertap_user.c
---- arch/um/os-Linux/drivers.old/ethertap_user.c Mon Apr 29 20:59:30 2002
-+++ arch/um/os-Linux/drivers/ethertap_user.c Mon Apr 29 21:00:27 2002
-@@ -93,9 +93,9 @@
- char version_buf[sizeof("nnnnn\0")];
- char data_fd_buf[sizeof("nnnnnn\0")];
- char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
-- char *setup_args[] = { "uml_net", version_buf, "ethertap", dev,
-+ char *setup_args[] = { "/usr/lib/uml/uml_net", version_buf, "ethertap",
dev,
- data_fd_buf, gate_buf, NULL };
-- char *nosetup_args[] = { "uml_net", version_buf, "ethertap",
-+ char *nosetup_args[] = { "/usr/lib/uml/uml_net", version_buf,
"ethertap",
- dev, data_fd_buf, NULL };
- char **args, c;
-
-diff -u arch/um/drivers.old/net_user.c arch/um/drivers/net_user.c
---- arch/um/drivers.old/net_user.c Mon Apr 29 20:59:30 2002
-+++ arch/um/drivers/net_user.c Mon Apr 29 21:00:59 2002
-@@ -185,7 +185,7 @@
- char addr_buf[sizeof("255.255.255.255\0")];
- char netmask_buf[sizeof("255.255.255.255\0")];
- char version[sizeof("nnnnn\0")];
-- char *argv[] = { "uml_net", version, what, dev, addr_buf,
-+ char *argv[] = { "/usr/lib/uml/uml_net", version, what, dev, addr_buf,
- netmask_buf, NULL };
- char *output;
- int output_len, pid;
-diff -u arch/um/drivers.old/slip_user.c arch/um/drivers/slip_user.c
---- arch/um/drivers.old/slip_user.c Mon Apr 29 20:59:30 2002
-+++ arch/um/drivers/slip_user.c Mon Apr 29 21:01:12 2002
-@@ -113,7 +113,7 @@
- struct slip_data *pri = data;
- char version_buf[sizeof("nnnnn\0")];
- char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
-- char *argv[] = { "uml_net", version_buf, "slip", "up", gate_buf,
-+ char *argv[] = { "/usr/lib/uml/uml_net", version_buf, "slip", "up",
gate_buf,
- NULL };
- int sfd, mfd, disc, sencap, err;
-
-@@ -166,7 +166,7 @@
- {
- struct slip_data *pri = data;
- char version_buf[sizeof("nnnnn\0")];
-- char *argv[] = { "uml_net", version_buf, "slip", "down", pri->name,
-+ char *argv[] = { "/usr/lib/uml/uml_net", version_buf, "slip", "down",
pri->name,
- NULL };
- int err;
-
-diff -u arch/um/drivers.old/tuntap_user.c arch/um/drivers/tuntap_user.c
---- arch/um/os-Linux/drivers.old/tuntap_user.c Mon Apr 29 20:59:30 2002
-+++ arch/um/os-Linux/drivers/tuntap_user.c Mon Apr 29 21:01:22 2002
-@@ -68,7 +68,7 @@
- {
- struct tuntap_pre_exec_data data;
- char version_buf[sizeof("nnnnn\0")];
-- char *argv[] = { "uml_net", version_buf, "tuntap", "up", gate,
-+ char *argv[] = { "/usr/lib/uml/uml_net", version_buf, "tuntap", "up",
gate,
- NULL };
- char buf[CMSG_SPACE(sizeof(*fd_out))];
- struct msghdr msg;
diff -Naur user-mode-linux-2.4.26-3um/debian/uml_switch.diff
user-mode-linux-2.6.12-1um/debian/uml_switch.diff
--- user-mode-linux-2.4.26-3um/debian/uml_switch.diff 2003-09-20
03:34:37.000000000 +0200
+++ user-mode-linux-2.6.12-1um/debian/uml_switch.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- kernel-source-2.4.22/arch/um/drivers/daemon_kern.c.orig 2003-09-19
21:32:52.000000000 -0400
-+++ kernel-source-2.4.22/arch/um/drivers/daemon_kern.c 2003-09-19
21:32:53.000000000 -0400
-@@ -72,7 +72,7 @@
-
- *init = ((struct daemon_init)
- { .sock_type = "unix",
-- .ctl_sock = "/tmp/uml.ctl" });
-+ .ctl_sock =
"/var/run/uml-utilities/uml_switch.ctl" });
-
- remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,
- NULL);
diff -Naur user-mode-linux-2.4.26-3um/debian/x-terminal-emulator.diff
user-mode-linux-2.6.12-1um/debian/x-terminal-emulator.diff
--- user-mode-linux-2.4.26-3um/debian/x-terminal-emulator.diff 2002-10-05
05:56:13.000000000 +0200
+++ user-mode-linux-2.6.12-1um/debian/x-terminal-emulator.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- arch/um/drivers/xterm.c.orig 2002-10-04 23:51:39.000000000 -0400
-+++ arch/um/drivers/xterm.c 2002-10-04 23:55:14.000000000 -0400
-@@ -45,7 +45,7 @@
- }
-
- /* Only changed by xterm_setup, which is a setup */
--static char *terminal_emulator = "xterm";
-+static char *terminal_emulator = "x-terminal-emulator";
- static char *title_switch = "-T";
- static char *exec_switch = "-e";
-
-@@ -76,7 +76,7 @@
- " respectively. The title switch must have the form '<switch> title',\n"
- " not '<switch>=title'. Similarly, the exec switch must have the form\n"
- " '<switch> command arg1 arg2 ...'.\n"
--" The default values are 'xterm=xterm,-T,-e'. Values for gnome-terminal\n"
-+" The default values are 'xterm=x-terminal-emulator,-T,-e'. Values for
gnome-terminal\n"
- " are 'xterm=gnome-terminal,-t,-x'.\n\n"
- );
-
signature.asc
Description: Digital signature
