[Pkg-uml-commit] r243 - trunk/src/user-mode-linux/debian/patches

Mattia Dongili malattia at alioth.debian.org
Sat Nov 4 21:28:57 CET 2006


Author: malattia
Date: 2006-11-04 21:28:57 +0100 (Sat, 04 Nov 2006)
New Revision: 243

Added:
   trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch
Modified:
   trunk/src/user-mode-linux/debian/patches/00list
Log:
allow UML to build against sid libc6

Modified: trunk/src/user-mode-linux/debian/patches/00list
===================================================================
--- trunk/src/user-mode-linux/debian/patches/00list	2006-11-04 18:29:22 UTC (rev 242)
+++ trunk/src/user-mode-linux/debian/patches/00list	2006-11-04 20:28:57 UTC (rev 243)
@@ -1,2 +1,3 @@
 02_x-terminal-emulator.dpatch
 03_uml_switch.diff
+04_include_PAGESHIFT_definition.patch

Added: trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch	2006-11-04 18:29:22 UTC (rev 242)
+++ trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch	2006-11-04 20:28:57 UTC (rev 243)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_include_PAGESHIFT_definition - Mattia Dongili <malattia at debian.org>
+## as per file name
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Debian's standard location for uml_net helper
+
+ at DPATCH@
+
+# Author: malattia
+# Status: none
+
+--- linux-source-2.6.18/arch/um/os-Linux/skas/process.c	2006-09-20 05:42:06.000000000 +0200
++++ linux-source-2.6.18/arch/um/os-Linux/skas/process.c.clean	2006-11-04 20:20:41.764186563 +0100
+@@ -16,6 +16,7 @@
+ #include <sys/user.h>
+ #include <sys/time.h>
+ #include <asm/unistd.h>
++#include <asm/page.h>
+ #include <asm/types.h>
+ #include "user.h"
+ #include "sysdep/ptrace.h"


Property changes on: trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch
___________________________________________________________________
Name: svn:executable
   + *




More information about the Pkg-uml-commit mailing list