[Pkg-uml-commit] r128 - in trunk/src/user-mode-linux: . debian debian/patches

Mattia Dongili malattia at costa.debian.org
Sat Jun 24 16:00:21 UTC 2006 

Author: malattia
Date: 2006-06-24 16:00:14 +0000 (Sat, 24 Jun 2006)
New Revision: 128

Modified:
   trunk/src/user-mode-linux/config
   trunk/src/user-mode-linux/debian/changelog
   trunk/src/user-mode-linux/debian/control
   trunk/src/user-mode-linux/debian/patches/00list
   trunk/src/user-mode-linux/debian/rules
Log:
prepare 2.6.17 upload, log merged stuff and close bugs resolved upastream

Modified: trunk/src/user-mode-linux/config
===================================================================
--- trunk/src/user-mode-linux/config	2006-06-24 15:58:26 UTC (rev 127)
+++ trunk/src/user-mode-linux/config	2006-06-24 16:00:14 UTC (rev 128)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16
-# Wed May 31 18:05:17 2006
+# Linux kernel version: 2.6.17.1
+# Sat Jun 24 12:38:27 2006
 #
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_UML=y
@@ -57,13 +57,15 @@
 CONFIG_UML_X86=y
 # CONFIG_64BIT is not set
 CONFIG_SEMAPHORE_SLEEPERS=y
-CONFIG_TOP_ADDR=0xc0000000
+CONFIG_HOST_2G_2G=y
+CONFIG_TOP_ADDR=0x80000000
 # CONFIG_3_LEVEL_PGTABLES is not set
-CONFIG_STUB_CODE=0xbfffe000
-CONFIG_STUB_DATA=0xbffff000
-CONFIG_STUB_START=0xbfffe000
+CONFIG_STUB_CODE=0x7fffe000
+CONFIG_STUB_DATA=0x7ffff000
+CONFIG_STUB_START=0x7fffe000
 CONFIG_ARCH_HAS_SC_SIGNALS=y
 CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -106,6 +108,7 @@
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -121,10 +124,6 @@
 CONFIG_FUTEX=y
 CONFIG_EPOLL=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_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -136,7 +135,6 @@
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
@@ -145,6 +143,8 @@
 # Block layer
 #
 CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -251,7 +251,8 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=y
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
@@ -274,9 +275,11 @@
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
@@ -299,11 +302,14 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -326,20 +332,19 @@
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_PPTP=m
+# CONFIG_IP_NF_H323 is not set
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
@@ -377,12 +382,10 @@
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_REJECT=m
@@ -435,6 +438,9 @@
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
 
 #
 # UML Network Devices
@@ -462,6 +468,11 @@
 #
 
 #
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
 # Wan interfaces
 #
 CONFIG_WAN=y
@@ -560,7 +571,6 @@
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -568,7 +578,6 @@
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set
@@ -745,6 +754,7 @@
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID5=m
+# CONFIG_MD_RAID5_RESHAPE is not set
 CONFIG_MD_RAID6=m
 CONFIG_MD_MULTIPATH=m
 # CONFIG_MD_FAULTY is not set
@@ -766,6 +776,7 @@
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB_LEAK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -774,6 +785,7 @@
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
 CONFIG_FRAME_POINTER=y
+CONFIG_UNWIND_INFO=y
 # CONFIG_FORCED_INLINING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_GPROF is not set

Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog	2006-06-24 15:58:26 UTC (rev 127)
+++ trunk/src/user-mode-linux/debian/changelog	2006-06-24 16:00:14 UTC (rev 128)
@@ -1,3 +1,13 @@
+user-mode-linux (2.6.17-1um-1) unstable; urgency=low
+
+  * New upstream release:
+    - includes TLS support (Closes: #312562) (Closes: #265486)
+    - merged 01_uml_net patch (hence dropped from the package)
+  * Build with HOST_2G_2G as the kernel team doesn't seem to care about setting
+    a decent PAGE_OFFSET (hopefully closes: #366915).
+
+ -- Mattia Dongili <malattia at debian.org>  Sat, 24 Jun 2006 11:57:45 +0200
+
 user-mode-linux (2.6.16-2um-1) unstable; urgency=low
 
   [Mattia Dongili]:

Modified: trunk/src/user-mode-linux/debian/control
===================================================================
--- trunk/src/user-mode-linux/debian/control	2006-06-24 15:58:26 UTC (rev 127)
+++ trunk/src/user-mode-linux/debian/control	2006-06-24 16:00:14 UTC (rev 128)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch, linux-source-2.6.16, docbook-to-man, bzip2, m4, module-init-tools
+Build-Depends: debhelper (>> 4.0.0), dpatch, linux-source-2.6.17, docbook-to-man, bzip2, m4, module-init-tools
 Uploaders: Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>, Stefano Melchior <stefano.melchior at openlabs.it>
 Standards-Version: 3.7.2
 

Modified: trunk/src/user-mode-linux/debian/patches/00list
===================================================================
--- trunk/src/user-mode-linux/debian/patches/00list	2006-06-24 15:58:26 UTC (rev 127)
+++ trunk/src/user-mode-linux/debian/patches/00list	2006-06-24 16:00:14 UTC (rev 128)
@@ -1,3 +1,2 @@
-01_uml_net.dpatch
 02_x-terminal-emulator.dpatch
 03_uml_switch.diff

Modified: trunk/src/user-mode-linux/debian/rules
===================================================================
--- trunk/src/user-mode-linux/debian/rules	2006-06-24 15:58:26 UTC (rev 127)
+++ trunk/src/user-mode-linux/debian/rules	2006-06-24 16:00:14 UTC (rev 128)
@@ -9,7 +9,7 @@
 export DH_COMPAT=4
 
 config_target:=oldconfig
-kernel_version:=2.6.16
+kernel_version:=2.6.17
 kernel_dir:=linux-source-$(kernel_version)
 debian:=$(CURDIR)/debian
 tmp:=$(debian)/user-mode-linux

More information about the Pkg-uml-commit mailing list