[Pkg-uml-commit] [SCM] Debian packaging for the Usermode Linux kernel branch, master, updated. 2.6.32-1um-3-12-g29f5b05

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit a2983f263a817051f0ffd9e9232f79485296643b
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Mon Apr 2 19:56:53 2012 +0530

    Add patch from upstream to fix build failure on i386 arch

diff --git a/debian/patches/06-fix-linkage-on-386-arch.patch b/debian/patches/06-fix-linkage-on-386-arch.patch
new file mode 100644
index 0000000..447aefc
--- /dev/null
+++ b/debian/patches/06-fix-linkage-on-386-arch.patch
@@ -0,0 +1,14 @@
+diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
+index 8fb5840..f322503 100644
+--- a/arch/x86/um/Makefile
++++ b/arch/x86/um/Makefile
+@@ -19,7 +19,8 @@ ifeq ($(CONFIG_X86_32),y)
+ obj-y += checksum_32.o
+ obj-$(CONFIG_BINFMT_ELF) += elfcore.o
+ 
+-subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
++subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o \
++	../lib/atomic64_386_32.o ../lib/cmpxchg8b_emu.o
+ subarch-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += ../lib/rwsem.o
+ subarch-$(CONFIG_HIGHMEM) += ../mm/highmem_32.o
+
diff --git a/debian/patches/series b/debian/patches/series
index a44d2f1..e6c7f51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03_uml_switch.patch
 04_remove_irqf_disabled.patch
 05_fix_static_build.patch
+06-fix-linkage-on-386-arch.patch

-- 
Debian packaging for the Usermode Linux kernel