[Pkg-uml-commit] r324 - in trunk/src/user-mode-linux: . debian debian/patches
malattia at alioth.debian.org
malattia at alioth.debian.org
Sat Aug 2 03:20:39 UTC 2008
Author: malattia
Date: 2008-08-02 03:20:39 +0000 (Sat, 02 Aug 2008)
New Revision: 324
Added:
trunk/src/user-mode-linux/debian/patches/07_vde_user_build_fix.patch
trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch
Modified:
trunk/src/user-mode-linux/config.i386
trunk/src/user-mode-linux/debian/changelog
trunk/src/user-mode-linux/debian/control
trunk/src/user-mode-linux/debian/patches/series
trunk/src/user-mode-linux/debian/rules
Log:
- update package for 2.6.26
- added build and crash fixes from upstream
Modified: trunk/src/user-mode-linux/config.i386
===================================================================
--- trunk/src/user-mode-linux/config.i386 2008-07-26 03:16:00 UTC (rev 323)
+++ trunk/src/user-mode-linux/config.i386 2008-08-02 03:20:39 UTC (rev 324)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25
-# Sat Jul 5 14:49:13 2008
+# Linux kernel version: 2.6.26
+# Thu Jul 31 23:15:44 2008
#
CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
CONFIG_GENERIC_HARDIRQS=y
@@ -53,6 +53,7 @@
# CONFIG_MCORE2 is not set
# CONFIG_GENERIC_CPU is not set
CONFIG_X86_GENERIC=y
+CONFIG_X86_CPU=y
CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_X86_XADD=y
@@ -69,7 +70,6 @@
CONFIG_X86_32=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_64BIT is not set
-CONFIG_SEMAPHORE_SLEEPERS=y
# CONFIG_3_LEVEL_PGTABLES is not set
CONFIG_ARCH_HAS_SC_SIGNALS=y
CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
@@ -83,6 +83,7 @@
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
@@ -145,6 +146,7 @@
# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_HOTPLUG=y
@@ -170,12 +172,14 @@
# CONFIG_HAVE_OPROFILE is not set
# CONFIG_HAVE_KPROBES is not set
# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODVERSIONS is not set
@@ -338,9 +342,11 @@
CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -358,6 +364,7 @@
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -438,7 +445,10 @@
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_TFTP=m
@@ -504,6 +514,7 @@
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
# CONFIG_BRIDGE_EBT_ULOG is not set
+CONFIG_BRIDGE_EBT_NFLOG=m
CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m
CONFIG_IP_DCCP_ACKVEC=y
@@ -568,7 +579,6 @@
CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RR=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
@@ -670,6 +680,7 @@
#
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
# CONFIG_WAN is not set
CONFIG_ATM_DRIVERS=y
# CONFIG_ATM_DUMMY is not set
@@ -729,13 +740,15 @@
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=y
CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
+# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_NOLOCK=m
CONFIG_GFS2_FS_LOCKING_DLM=m
CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_OCFS2_DEBUG_MASKLOG=y
# CONFIG_OCFS2_DEBUG_FS is not set
CONFIG_DNOTIFY=y
@@ -813,13 +826,11 @@
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
# CONFIG_NFS_V4 is not set
-CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
# CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
@@ -915,56 +926,85 @@
CONFIG_ASYNC_MEMCPY=m
CONFIG_ASYNC_XOR=m
CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_SEQIV=m
CONFIG_CRYPTO_HASH=m
CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
CONFIG_CRYPTO_HMAC=m
CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CCM=m
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_SERPENT=m
+
+#
+# Ciphers
+#
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SALSA20=m
CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
+#
+# Compression
+#
CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_LZO=m
# CONFIG_CRYPTO_HW is not set
@@ -972,6 +1012,8 @@
# Library routines
#
CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=y
CONFIG_CRC_ITU_T=m
@@ -1016,6 +1058,7 @@
CONFIG_DM_MULTIPATH_EMC=m
CONFIG_DM_DELAY=m
# CONFIG_DM_UEVENT is not set
+# CONFIG_NEW_LEDS is not set
# CONFIG_INPUT is not set
#
@@ -1024,6 +1067,7 @@
# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_KERNEL is not set
Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog 2008-07-26 03:16:00 UTC (rev 323)
+++ trunk/src/user-mode-linux/debian/changelog 2008-08-02 03:20:39 UTC (rev 324)
@@ -1,3 +1,12 @@
+user-mode-linux (2.6.26-1um-1) unstable; urgency=medium
+
+ * New upstream release.
+ * added two fixes from uptream:
+ debian/patches/07_vde_user_build_fix.patch
+ debian/patches/08_fix_ptrace_crash.patch (in 2.6.26.1)
+
+ -- Mattia Dongili <malattia at debian.org> Sat, 02 Aug 2008 12:17:12 +0900
+
user-mode-linux (2.6.25-1um-2) unstable; urgency=medium
* Fix build error in amd64 (Closes: #491921)
Modified: trunk/src/user-mode-linux/debian/control
===================================================================
--- trunk/src/user-mode-linux/debian/control 2008-07-26 03:16:00 UTC (rev 323)
+++ trunk/src/user-mode-linux/debian/control 2008-08-02 03:20:39 UTC (rev 324)
@@ -2,10 +2,11 @@
Section: misc
Priority: extra
Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 5.0.0), quilt, linux-source-2.6.25, docbook-to-man, bzip2, m4, module-init-tools, libvdeplug2-dev
-Uploaders: Mattia Dongili <malattia at debian.org>, Stefano Melchior <stefano.melchior at openlabs.it>
+Build-Depends: debhelper (>> 5.0.0), quilt, linux-source-2.6.26, docbook-to-man, bzip2, m4, module-init-tools, libvdeplug2-dev
+Uploaders: Mattia Dongili <malattia at debian.org>
Standards-Version: 3.7.3
+
Package: user-mode-linux
Architecture: i386 amd64
Depends: ${shlibs:Depends}, uml-utilities (>= 20040406-1)
Added: trunk/src/user-mode-linux/debian/patches/07_vde_user_build_fix.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/07_vde_user_build_fix.patch (rev 0)
+++ trunk/src/user-mode-linux/debian/patches/07_vde_user_build_fix.patch 2008-08-02 03:20:39 UTC (rev 324)
@@ -0,0 +1,41 @@
+
+Fixed this error:
+
+ CC arch/um/drivers/vde_user.o
+ /home/wangcong/Projects/linux-2.6/arch/um/drivers/vde_user.c: In
+function ‘vde_init_libstuff’:
+/home/wangcong/Projects/linux-2.6/arch/um/drivers/vde_user.c:81:
+error: implicit declaration of function ‘kmalloc’
+/home/wangcong/Projects/linux-2.6/arch/um/drivers/vde_user.c:81:
+warning: assignment makes pointer from integer without a cast
+make[2]: *** [arch/um/drivers/vde_user.o] Error 1
+make[1]: *** [arch/um/drivers/vde_user.ko] Error 2
+make: *** [sub-make] Error 2
+
+Signed-off-by: WANG Cong <wangcong at zeuux.org>
+Cc: jdike at addtoit.com
+
+---
+diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c
+index 56533db..744eacf 100644
+--- a/arch/um/drivers/vde_user.c
++++ b/arch/um/drivers/vde_user.c
+@@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
+ {
+ struct vde_open_args *args;
+
+- vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
++ vpri->args = uml_kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
+ if (vpri->args == NULL) {
+ printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
+ "allocation failed");
+
+-------------------------------------------------------------------------
+This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
+Build the coolest Linux based applications with Moblin SDK & win great prizes
+Grand prize is a trip for two to an Open Source event anywhere in the world
+http://moblin-contest.org/redirect.php?banner_id=100&url=/
+_______________________________________________
+User-mode-linux-devel mailing list
+User-mode-linux-devel at lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Added: trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch (rev 0)
+++ trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch 2008-08-02 03:20:39 UTC (rev 324)
@@ -0,0 +1,50 @@
+My copying of linux/init.h didn't go far enough. The definition of
+__used singled out gcc minor version 3, but didn't care what the major
+version was. This broke when unit-at-a-time was added and gcc started
+throwing out initcalls.
+
+This results in an early boot crash when ptrace tries to initialize a
+process with an empty, uninitialized register set.
+
+Signed-off-by: Jeff Dike <jdike at linux.intel.com>
+---
+ arch/um/include/init.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: linux-2.6.22/arch/um/include/init.h
+===================================================================
+--- linux-2.6.22.orig/arch/um/include/init.h 2008-02-18 11:53:50.000000000 -0500
++++ linux-2.6.22/arch/um/include/init.h 2008-07-20 18:06:35.000000000 -0400
+@@ -45,6 +45,8 @@ typedef void (*exitcall_t)(void);
+ # define __section(S) __attribute__ ((__section__(#S)))
+ #endif
+
++#if __GNUC__ == 3
++
+ #if __GNUC_MINOR__ >= 3
+ # define __used __attribute__((__used__))
+ #else
+@@ -52,6 +54,12 @@ typedef void (*exitcall_t)(void);
+ #endif
+
+ #else
++#if __GNUC__ == 4
++# define __used __attribute__((__used__))
++#endif
++#endif
++
++#else
+ #include <linux/compiler.h>
+ #endif
+ /* These are for everybody (although not all archs will actually
+
+-------------------------------------------------------------------------
+This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
+Build the coolest Linux based applications with Moblin SDK & win great prizes
+Grand prize is a trip for two to an Open Source event anywhere in the world
+http://moblin-contest.org/redirect.php?banner_id=100&url=/
+_______________________________________________
+User-mode-linux-devel mailing list
+User-mode-linux-devel at lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
+
Modified: trunk/src/user-mode-linux/debian/patches/series
===================================================================
--- trunk/src/user-mode-linux/debian/patches/series 2008-07-26 03:16:00 UTC (rev 323)
+++ trunk/src/user-mode-linux/debian/patches/series 2008-08-02 03:20:39 UTC (rev 324)
@@ -1,5 +1,7 @@
02_x-terminal-emulator.patch
03_uml_switch.patch
-04_workaround_gcc4.3_ICE.patch
-05_down_interruptible_asmregparam.patch
-06_conditionally_export_memcpy.patch
+#04_workaround_gcc4.3_ICE.patch
+#05_down_interruptible_asmregparam.patch
+#06_conditionally_export_memcpy.patch
+07_vde_user_build_fix.patch
+08_fix_ptrace_crash.patch
Modified: trunk/src/user-mode-linux/debian/rules
===================================================================
--- trunk/src/user-mode-linux/debian/rules 2008-07-26 03:16:00 UTC (rev 323)
+++ trunk/src/user-mode-linux/debian/rules 2008-08-02 03:20:39 UTC (rev 324)
@@ -6,7 +6,7 @@
#export DH_VERBOSE=1
config_target:=oldconfig
-kernel_version:=2.6.25
+kernel_version:=2.6.26
kernel_dir:=linux-source-$(kernel_version)
debian:=$(CURDIR)/debian
tmp:=$(debian)/user-mode-linux
More information about the Pkg-uml-commit
mailing list