[Pkg-uml-commit] r21 - in trunk/src/user-mode-linux: . debian
debian/patches
Mattia Dongili
malattia at costa.debian.org
Sat Mar 25 17:51:55 UTC 2006
Author: malattia
Date: 2006-03-25 17:51:55 +0000 (Sat, 25 Mar 2006)
New Revision: 21
Added:
trunk/src/user-mode-linux/debian/patches/
trunk/src/user-mode-linux/debian/patches/crypto.diff
trunk/src/user-mode-linux/debian/patches/tkill.diff
trunk/src/user-mode-linux/debian/patches/uml_net.diff
trunk/src/user-mode-linux/debian/patches/uml_switch.diff
trunk/src/user-mode-linux/debian/patches/x-terminal-emulator.diff
Modified:
trunk/src/user-mode-linux/config
trunk/src/user-mode-linux/debian/README.Debian
trunk/src/user-mode-linux/debian/changelog
trunk/src/user-mode-linux/debian/control
trunk/src/user-mode-linux/debian/rules
Log:
merging old user-mode-linux versions - step 1 2.6.14-1um
Modified: trunk/src/user-mode-linux/config
===================================================================
--- trunk/src/user-mode-linux/config 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/config 2006-03-25 17:51:55 UTC (rev 21)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12
-# Wed Oct 26 15:04:06 2005
+# Linux kernel version: 2.6.14
+# Sat Jan 14 20:47:11 2006
#
CONFIG_GENERIC_HARDIRQS=y
CONFIG_UML=y
@@ -9,6 +9,7 @@
CONFIG_UID16=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_IRQ_RELEASE_METHOD=y
#
# UML-specific options
@@ -17,10 +18,22 @@
CONFIG_MODE_SKAS=y
CONFIG_UML_X86=y
# CONFIG_64BIT is not set
+CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_TOP_ADDR=0xc0000000
# CONFIG_3_LEVEL_PGTABLES is not set
+CONFIG_STUB_CODE=0xbfffe000
+CONFIG_STUB_DATA=0xbffff000
+CONFIG_STUB_START=0xbfffe000
CONFIG_ARCH_HAS_SC_SIGNALS=y
CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_LD_SCRIPT_STATIC=y
CONFIG_NET=y
CONFIG_BINFMT_ELF=y
@@ -50,6 +63,7 @@
# General setup
#
CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -60,6 +74,7 @@
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
@@ -90,93 +105,24 @@
CONFIG_KMOD=y
#
-# Generic Driver Options
+# Networking
#
-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_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_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_UML_WATCHDOG 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
-#
-CONFIG_BLK_DEV_UBD=y
-CONFIG_BLK_DEV_UBD_SYNC=y
-CONFIG_BLK_DEV_COW_COMMON=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=y
-CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_INITRD=y
-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
-
-#
-# 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_DAEMON=y
-CONFIG_UML_NET_MCAST=y
-CONFIG_UML_NET_PCAP=y
-CONFIG_UML_NET_SLIRP=y
-
-#
-# Networking support
-#
-
-#
# Networking options
#
CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=m
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_MULTIPATH=y
@@ -195,8 +141,10 @@
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
CONFIG_INET_TUNNEL=m
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
#
# IP: Virtual Server Configuration
@@ -241,6 +189,9 @@
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
#
# IP: Netfilter Configuration
@@ -248,11 +199,15 @@
CONFIG_IP_NF_CONNTRACK=m
# CONFIG_IP_NF_CT_ACCT is not set
# CONFIG_IP_NF_CONNTRACK_MARK is not set
+CONFIG_IP_NF_CONNTRACK_EVENTS=y
+CONFIG_IP_NF_CONNTRACK_NETLINK=m
# CONFIG_IP_NF_CT_PROTO_SCTP is not set
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_NETBIOS_NS=m
CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_AMANDA=m
+CONFIG_IP_NF_PPTP=m
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
@@ -277,13 +232,16 @@
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_REALM=m
# CONFIG_IP_NF_MATCH_SCTP is not set
+CONFIG_IP_NF_MATCH_DCCP=m
# CONFIG_IP_NF_MATCH_COMMENT is not set
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
+CONFIG_IP_NF_MATCH_STRING=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_TARGET_NFQUEUE=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -295,12 +253,14 @@
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_TFTP=m
CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_NAT_PPTP=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_CLASSIFY=m
+CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_TARGET_NOTRACK=m
CONFIG_IP_NF_ARPTABLES=m
@@ -328,8 +288,11 @@
# CONFIG_IP6_NF_MATCH_PHYSDEV is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_NFQUEUE=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_TARGET_MARK=m
+CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_RAW=m
#
@@ -360,10 +323,26 @@
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
# CONFIG_BRIDGE_EBT_ULOG is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
#
+# DCCP Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_TFRC_LIB=m
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_IP_DCCP_UNLOAD_HACK is not set
+
+#
# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IP_SCTP=m
@@ -399,10 +378,6 @@
CONFIG_ECONET_AUNUDP=y
CONFIG_ECONET_NATIVE=y
CONFIG_WAN_ROUTER=m
-
-#
-# QoS and/or fair queueing
-#
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_CLK_JIFFIES=y
# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
@@ -442,10 +417,6 @@
# 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
#
@@ -536,12 +507,98 @@
CONFIG_BT_HCIUART_BCSP=y
# CONFIG_BT_HCIUART_BCSP_TXCRC is not set
CONFIG_BT_HCIVHCI=m
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+
+#
+# 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_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_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_UML_WATCHDOG 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
+#
+CONFIG_BLK_DEV_UBD=y
+CONFIG_BLK_DEV_UBD_SYNC=y
+CONFIG_BLK_DEV_COW_COMMON=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+CONFIG_BLK_DEV_NBD=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_INITRD=y
+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
+
+#
+# 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_DAEMON=y
+CONFIG_UML_NET_MCAST=y
+# CONFIG_UML_NET_PCAP is not set
+CONFIG_UML_NET_SLIRP=y
+
+#
+# Network device support
+#
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
#
+# PHY device support
+#
+
+#
# Wan interfaces
#
CONFIG_WAN=y
@@ -579,6 +636,10 @@
CONFIG_SLIP_MODE_SLIP6=y
CONFIG_SHAPER=m
CONFIG_NETCONSOLE=m
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
#
# File systems
@@ -587,6 +648,8 @@
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_FS_XIP=y
CONFIG_EXT3_FS=m
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
@@ -604,18 +667,15 @@
# 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_QUOTA=m
CONFIG_XFS_SECURITY=y
CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
CONFIG_MINIX_FS=m
CONFIG_ROMFS_FS=m
+CONFIG_INOTIFY=y
CONFIG_QUOTA=y
CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
@@ -623,6 +683,7 @@
CONFIG_DNOTIFY=y
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
#
# CD-ROM/DVD Filesystems
@@ -652,16 +713,11 @@
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_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
+CONFIG_RELAYFS_FS=m
#
# Miscellaneous filesystems
@@ -678,17 +734,6 @@
# CONFIG_BEFS_DEBUG is not set
CONFIG_BFS_FS=m
CONFIG_EFS_FS=m
-CONFIG_JFFS_FS=m
-CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS_PROC_FS=y
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_NAND is not set
-# CONFIG_JFFS2_FS_NOR_ECC is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=y
CONFIG_VXFS_FS=m
CONFIG_HPFS_FS=m
@@ -703,15 +748,18 @@
#
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V4=y
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
@@ -735,6 +783,7 @@
# CONFIG_CODA_FS_OLD_API is not set
CONFIG_AFS_FS=m
CONFIG_RXRPC=m
+# CONFIG_9P_FS is not set
#
# Partition Types
@@ -834,6 +883,7 @@
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
@@ -854,12 +904,15 @@
# Library routines
#
CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
CONFIG_CRC32=m
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
#
# SCSI support
@@ -895,97 +948,7 @@
#
# Memory Technology Devices (MTD)
#
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_AMDSTD_RETRY=0
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_XIP is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-CONFIG_MTD_PHYSMAP_START=0x8000000
-CONFIG_MTD_PHYSMAP_LEN=0x4000000
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLKMTD=m
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-CONFIG_MTD_DOCECC=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD is not set
CONFIG_INPUT=y
#
@@ -994,6 +957,7 @@
# CONFIG_PRINTK_TIME is not set
CONFIG_DEBUG_KERNEL=y
CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DETECT_SOFTLOCKUP is not set
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_SPINLOCK is not set
@@ -1002,3 +966,4 @@
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_FRAME_POINTER is not set
+CONFIG_CMDLINE_ON_HOST=y
Modified: trunk/src/user-mode-linux/debian/README.Debian
===================================================================
--- trunk/src/user-mode-linux/debian/README.Debian 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/README.Debian 2006-03-25 17:51:55 UTC (rev 21)
@@ -46,7 +46,7 @@
5. $ cd kernel-source-KVERSION
-6. $ make config ARCH=um # etc.
+6. $ make defconf ARCH=um && make config ARCH=um # etc.
All makefile commands must include ARCH=um
Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/changelog 2006-03-25 17:51:55 UTC (rev 21)
@@ -1,6 +1,12 @@
+user-mode-linux (2.6.14-1um-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Stefano Melchior <stefano.melchior at openlabs.it> Sat, 14 Jan 2006 20:30:41 +0100
+
user-mode-linux (2.6.12-1um-1) unstable; urgency=low
- * New upstream release (Closes: #271246, Closes: #276993, Closes: #170878).
+ * 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).
Modified: trunk/src/user-mode-linux/debian/control
===================================================================
--- trunk/src/user-mode-linux/debian/control 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/control 2006-03-25 17:51:55 UTC (rev 21)
@@ -2,7 +2,7 @@
Section: misc
Priority: extra
Maintainer: Stefano Melchior <stefano.melchior at openlabs.it>
-Build-Depends: debhelper (>> 4.0.0), linux-source-2.6.12, docbook-to-man, bzip2, m4, modutils
+Build-Depends: debhelper (>> 4.0.0), linux-source-2.6.14, docbook-to-man, bzip2, m4, modutils
Uploaders: Andreas Schuldei <andreas at schuldei.org>
Standards-Version: 3.6.2
Added: trunk/src/user-mode-linux/debian/patches/crypto.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/crypto.diff 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/patches/crypto.diff 2006-03-25 17:51:55 UTC (rev 21)
@@ -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
Added: trunk/src/user-mode-linux/debian/patches/tkill.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/tkill.diff 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/patches/tkill.diff 2006-03-25 17:51:55 UTC (rev 21)
@@ -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)
Added: trunk/src/user-mode-linux/debian/patches/uml_net.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/uml_net.diff 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/patches/uml_net.diff 2006-03-25 17:51:55 UTC (rev 21)
@@ -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;
Added: trunk/src/user-mode-linux/debian/patches/uml_switch.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/uml_switch.diff 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/patches/uml_switch.diff 2006-03-25 17:51:55 UTC (rev 21)
@@ -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);
Added: trunk/src/user-mode-linux/debian/patches/x-terminal-emulator.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/x-terminal-emulator.diff 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/patches/x-terminal-emulator.diff 2006-03-25 17:51:55 UTC (rev 21)
@@ -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"
+ );
+
Modified: trunk/src/user-mode-linux/debian/rules
===================================================================
--- trunk/src/user-mode-linux/debian/rules 2006-03-25 17:46:48 UTC (rev 20)
+++ trunk/src/user-mode-linux/debian/rules 2006-03-25 17:51:55 UTC (rev 21)
@@ -9,7 +9,7 @@
export DH_COMPAT=3
config_target:=oldconfig
-kernel_version:=2.6.12
+kernel_version:=2.6.14
kernel_dir:=linux-source-$(kernel_version)
debian:=$(CURDIR)/debian
tmp:=$(debian)/user-mode-linux
More information about the Pkg-uml-commit
mailing list