[Pkg-uml-commit] [SCM] Debian packaging for the Usermode Linux kernel branch, master, updated. 30f8329f2464c792dcb91293fee1ddcd63cc5317
Mattia Dongili
malattia at linux.it
Tue Jul 7 23:56:57 UTC 2009
The following commit has been merged in the master branch:
commit 3a1412279936dc028d9cbc3f8d577c8f771eaddc
Author: Mattia Dongili <malattia at linux.it>
Date: Tue Jul 7 15:54:45 2009 +0900
Remove 07_vde_user_build_fix
This patch was merged upstream.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index 6397ed3..c7738e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
user-mode-linux (2.6.30-1um-1) unstable; urgency=low
* New upstream release.
+ * Remove 07_vde_user_build_fix which has been merged upstream.
-- Mattia Dongili <malattia at debian.org> Sun, 05 Jul 2009 11:07:28 +0900
diff --git a/debian/patches/07_vde_user_build_fix.patch b/debian/patches/07_vde_user_build_fix.patch
deleted file mode 100644
index ece3d26..0000000
--- a/debian/patches/07_vde_user_build_fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-
-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
diff --git a/debian/patches/series b/debian/patches/series
index 4853852..3d228dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
02_x-terminal-emulator.patch
03_uml_switch.patch
-07_vde_user_build_fix.patch
--
Debian packaging for the Usermode Linux kernel
More information about the Pkg-uml-commit
mailing list