[Pkg-uml-commit] [SCM] Debian packaging for the Usermode Linux kernel branch, master, updated. 30f8329f2464c792dcb91293fee1ddcd63cc5317

[Mattia Dongili]

The following commit has been merged in the master branch:
commit 0614e4208c28719988fbc1fcc264ba1d537572b5
Author: Mattia Dongili <malattia at linux.it>
Date:   Tue Jul 7 21:27:51 2009 +0900

    Fix symbol clash between libc and the kernel
    
    debian/patches/05_fix_static_build.patch see http://bugs.debian.org/494995
    
    Signed-off-by: Mattia Dongili <malattia at linux.it>

diff --git a/debian/changelog b/debian/changelog
index 2308c38..16ab67e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ user-mode-linux (2.6.30-1um-1) unstable; urgency=low
   * Stop suggesting linux-patch-skas, not in the repository anymore
     (Closes: #495651).
   * Suggest: vde2 for the vde UML network driver.
+  * Fix strrchr symbol clash on forced static builds (Closes: #494995).
 
  -- Mattia Dongili <malattia at debian.org>  Sun, 05 Jul 2009 11:07:28 +0900
 
diff --git a/debian/patches/05_fix_static_build.patch b/debian/patches/05_fix_static_build.patch
new file mode 100644
index 0000000..90e03f2
--- /dev/null
+++ b/debian/patches/05_fix_static_build.patch
@@ -0,0 +1,17 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494995
+Fix symbol clash between libc and the kernel.
+
+Index: linux-source-2.6.30/arch/um/Makefile
+===================================================================
+--- linux-source-2.6.30.orig/arch/um/Makefile	2009-07-07 21:18:57.964418085 +0900
++++ linux-source-2.6.30/arch/um/Makefile	2009-07-07 21:19:34.828766443 +0900
+@@ -66,7 +66,8 @@
+ # defines more robust
+ 
+ KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
+-			 -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
++			 -Dmktime=kernel_mktime -Dstrrchr=kernel_strrchr \
++			 $(ARCH_KERNEL_DEFINES))
+ KBUILD_CFLAGS += $(KERNEL_DEFINES)
+ 
+ PHONY += linux
diff --git a/debian/patches/series b/debian/patches/series
index 5278125..a44d2f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02_x-terminal-emulator.patch
 03_uml_switch.patch
 04_remove_irqf_disabled.patch
+05_fix_static_build.patch

-- 
Debian packaging for the Usermode Linux kernel