[Pkg-uml-commit] r311 - in trunk/src/user-mode-linux/debian: . patches
malattia at alioth.debian.org
malattia at alioth.debian.org
Sat Jul 5 05:56:37 UTC 2008
Author: malattia
Date: 2008-07-05 05:56:36 +0000 (Sat, 05 Jul 2008)
New Revision: 311
Added:
trunk/src/user-mode-linux/debian/patches/01_uml_net.patch
trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.patch
trunk/src/user-mode-linux/debian/patches/03_uml_switch.patch
trunk/src/user-mode-linux/debian/patches/series
Removed:
trunk/src/user-mode-linux/debian/patches/00list
trunk/src/user-mode-linux/debian/patches/01_uml_net.dpatch
trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.dpatch
trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff
Modified:
trunk/src/user-mode-linux/debian/control
trunk/src/user-mode-linux/debian/rules
Log:
Use quilt instead of dpatch:
- migrate pathces
- add a series file
- change dependency from dpatch to quilt
- update debian/rules to use quilt
Modified: trunk/src/user-mode-linux/debian/control
===================================================================
--- trunk/src/user-mode-linux/debian/control 2008-07-05 05:51:35 UTC (rev 310)
+++ trunk/src/user-mode-linux/debian/control 2008-07-05 05:56:36 UTC (rev 311)
@@ -2,7 +2,7 @@
Section: misc
Priority: extra
Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 5.0.0), dpatch, linux-source-2.6.25, docbook-to-man, bzip2, m4, module-init-tools, libvdeplug2-dev
+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>
Standards-Version: 3.7.3
Deleted: trunk/src/user-mode-linux/debian/patches/00list
===================================================================
--- trunk/src/user-mode-linux/debian/patches/00list 2008-07-05 05:51:35 UTC (rev 310)
+++ trunk/src/user-mode-linux/debian/patches/00list 2008-07-05 05:56:36 UTC (rev 311)
@@ -1,2 +0,0 @@
-02_x-terminal-emulator.dpatch
-03_uml_switch.diff
Deleted: trunk/src/user-mode-linux/debian/patches/01_uml_net.dpatch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/01_uml_net.dpatch 2008-07-05 05:51:35 UTC (rev 310)
+++ trunk/src/user-mode-linux/debian/patches/01_uml_net.dpatch 2008-07-05 05:56:36 UTC (rev 311)
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_uml_net - Mattia Dongili <malattia at debian.org>
-##
-## 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
-
---- ./arch/um/os-Linux/main.c
-+++ ./arch/um/os-Linux/main.c
-@@ -74,6 +74,33 @@ static void last_ditch_exit(int sig)
- exit(1);
- }
-
-+#define UML_LIB_PATH ":/usr/lib/uml"
-+
-+static void setup_env_path(void) {
-+ char *new_path = NULL;
-+ char *old_path = NULL;
-+ int path_len = 0;
-+
-+ old_path = getenv("PATH");
-+ /* if no PATH variable is set or it has an empty value
-+ * just use the default + /usr/lib/uml
-+ */
-+ if (!old_path || (path_len = strlen(old_path)) == 0) {
-+ putenv("PATH=:/bin:/usr/bin/" UML_LIB_PATH);
-+ return;
-+ }
-+
-+ /* append /usr/lib/uml to the existing path */
-+ path_len += strlen("PATH=" UML_LIB_PATH) + 1;
-+ new_path = malloc(path_len);
-+ if (!new_path) {
-+ perror("coudn't malloc to set a new PATH");
-+ return;
-+ }
-+ snprintf(new_path, path_len, "PATH=%s" UML_LIB_PATH, old_path);
-+ putenv(new_path);
-+}
-+
- extern int uml_exitcode;
-
- extern void scan_elf_aux( char **envp);
-@@ -114,6 +141,8 @@ int main(int argc, char **argv, char **e
-
- set_stklim();
-
-+ setup_env_path();
-+
- new_argv = malloc((argc + 1) * sizeof(char *));
- if(new_argv == NULL){
- perror("Mallocing argv");
Copied: trunk/src/user-mode-linux/debian/patches/01_uml_net.patch (from rev 297, trunk/src/user-mode-linux/debian/patches/01_uml_net.dpatch)
===================================================================
--- trunk/src/user-mode-linux/debian/patches/01_uml_net.patch (rev 0)
+++ trunk/src/user-mode-linux/debian/patches/01_uml_net.patch 2008-07-05 05:56:36 UTC (rev 311)
@@ -0,0 +1,47 @@
+# Mattia Dongili <malattia at debian.org>
+# Use Debian's standard location for uml_net helper
+--- a/arch/um/os-Linux/main.c
++++ b/arch/um/os-Linux/main.c
+@@ -74,6 +74,33 @@ static void last_ditch_exit(int sig)
+ exit(1);
+ }
+
++#define UML_LIB_PATH ":/usr/lib/uml"
++
++static void setup_env_path(void) {
++ char *new_path = NULL;
++ char *old_path = NULL;
++ int path_len = 0;
++
++ old_path = getenv("PATH");
++ /* if no PATH variable is set or it has an empty value
++ * just use the default + /usr/lib/uml
++ */
++ if (!old_path || (path_len = strlen(old_path)) == 0) {
++ putenv("PATH=:/bin:/usr/bin/" UML_LIB_PATH);
++ return;
++ }
++
++ /* append /usr/lib/uml to the existing path */
++ path_len += strlen("PATH=" UML_LIB_PATH) + 1;
++ new_path = malloc(path_len);
++ if (!new_path) {
++ perror("coudn't malloc to set a new PATH");
++ return;
++ }
++ snprintf(new_path, path_len, "PATH=%s" UML_LIB_PATH, old_path);
++ putenv(new_path);
++}
++
+ extern int uml_exitcode;
+
+ extern void scan_elf_aux( char **envp);
+@@ -114,6 +141,8 @@ int main(int argc, char **argv, char **e
+
+ set_stklim();
+
++ setup_env_path();
++
+ new_argv = malloc((argc + 1) * sizeof(char *));
+ if(new_argv == NULL){
+ perror("Mallocing argv");
Deleted: trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.dpatch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.dpatch 2008-07-05 05:51:35 UTC (rev 310)
+++ trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.dpatch 2008-07-05 05:56:36 UTC (rev 311)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_x-terminal-emulator - Mattia Dongili <malattia at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Debian's x-terminal-emulator
-
- at DPATCH@
-
-# Author: malattia
-# Status: none
-
---- ./arch/um/drivers/xterm.c~clean 2006-04-02 16:43:32.797702685 +0200
-+++ ./arch/um/drivers/xterm.c 2006-04-02 16:43:41.034217435 +0200
-@@ -48,7 +48,7 @@ void *xterm_init(char *str, int device,
- }
-
- /* Only changed by xterm_setup, which is a setup */
--static char *terminal_emulator = "xterm";
-+static char *terminal_emulator = "x-terminal-emulator";
- static char *title_switch = "-T";
- static char *exec_switch = "-e";
-
-@@ -79,7 +79,7 @@ __uml_setup("xterm=", xterm_setup,
- " respectively. The title switch must have the form '<switch> title',\n"
- " not '<switch>=title'. Similarly, the exec switch must have the form\n"
- " '<switch> command arg1 arg2 ...'.\n"
--" The default values are 'xterm=xterm,-T,-e'. Values for gnome-terminal\n"
-+" The default values are 'xterm=x-terminal-emulator,-T,-e'. Values for gnome-terminal\n"
- " are 'xterm=gnome-terminal,-t,-x'.\n\n"
- );
-
Copied: trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.patch (from rev 297, trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.dpatch)
===================================================================
--- trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.patch (rev 0)
+++ trunk/src/user-mode-linux/debian/patches/02_x-terminal-emulator.patch 2008-07-05 05:56:36 UTC (rev 311)
@@ -0,0 +1,25 @@
+# Mattia Dongili <malattia at debian.org>
+# Matt Zimmermannn <mdz at debian.org>
+# Use Debian's x-terminal-emulator
+Index: linux-source-2.6.25/arch/um/drivers/xterm.c
+===================================================================
+--- linux-source-2.6.25.orig/arch/um/drivers/xterm.c 2008-07-05 11:16:50.444754992 +0900
++++ linux-source-2.6.25/arch/um/drivers/xterm.c 2008-07-05 11:17:17.624764233 +0900
+@@ -42,7 +42,7 @@ static void *xterm_init(char *str, int d
+ }
+
+ /* Only changed by xterm_setup, which is a setup */
+-static char *terminal_emulator = "xterm";
++static char *terminal_emulator = "x-terminal-emulator";
+ static char *title_switch = "-T";
+ static char *exec_switch = "-e";
+
+@@ -79,7 +79,7 @@ __uml_setup("xterm=", xterm_setup,
+ " respectively. The title switch must have the form '<switch> title',\n"
+ " not '<switch>=title'. Similarly, the exec switch must have the form\n"
+ " '<switch> command arg1 arg2 ...'.\n"
+-" The default values are 'xterm=xterm,-T,-e'. Values for gnome-terminal\n"
++" The default values are 'xterm=x-terminal-emulator,-T,-e'. Values for gnome-terminal\n"
+ " are 'xterm=gnome-terminal,-t,-x'.\n\n"
+ );
+
Deleted: trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff 2008-07-05 05:51:35 UTC (rev 310)
+++ trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff 2008-07-05 05:56:36 UTC (rev 311)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_uml_switch - Mattia Dongili <malattia at debian.org>
-## rediffed from previous mdz patch
-##
-## 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.24/arch/um/drivers/daemon_kern.c.old 2008-02-03 15:09:48.497911268 +0900
-+++ linux-source-2.6.24/arch/um/drivers/daemon_kern.c 2008-02-03 15:13:05.546916771 +0900
-@@ -65,7 +65,7 @@
-
- *init = ((struct daemon_init)
- { .sock_type = "unix",
-- .ctl_sock = "/tmp/uml.ctl" });
-+ .ctl_sock = "/var/run/uml-utilities/uml_switch.ctl" });
-
- remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,
- NULL);
Copied: trunk/src/user-mode-linux/debian/patches/03_uml_switch.patch (from rev 307, trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff)
===================================================================
--- trunk/src/user-mode-linux/debian/patches/03_uml_switch.patch (rev 0)
+++ trunk/src/user-mode-linux/debian/patches/03_uml_switch.patch 2008-07-05 05:56:36 UTC (rev 311)
@@ -0,0 +1,14 @@
+# Mattia Dongili <malattia at debian.org>
+# Matt Zimmermannn <mdz at debian.org>
+# Use Debian's standard location for uml_net helper
+--- a/arch/um/drivers/daemon_kern.c 2008-02-03 15:09:48.497911268 +0900
++++ b/arch/um/drivers/daemon_kern.c 2008-02-03 15:13:05.546916771 +0900
+@@ -65,7 +65,7 @@
+
+ *init = ((struct daemon_init)
+ { .sock_type = "unix",
+- .ctl_sock = "/tmp/uml.ctl" });
++ .ctl_sock = "/var/run/uml-utilities/uml_switch.ctl" });
+
+ remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,
+ NULL);
Copied: trunk/src/user-mode-linux/debian/patches/series (from rev 300, trunk/src/user-mode-linux/debian/patches/00list)
===================================================================
--- trunk/src/user-mode-linux/debian/patches/series (rev 0)
+++ trunk/src/user-mode-linux/debian/patches/series 2008-07-05 05:56:36 UTC (rev 311)
@@ -0,0 +1,3 @@
+02_x-terminal-emulator.patch
+03_uml_switch.patch
+04_workaround_gcc4.3_ICE.patch
Modified: trunk/src/user-mode-linux/debian/rules
===================================================================
--- trunk/src/user-mode-linux/debian/rules 2008-07-05 05:51:35 UTC (rev 310)
+++ trunk/src/user-mode-linux/debian/rules 2008-07-05 05:56:36 UTC (rev 311)
@@ -43,7 +43,7 @@
patch: patch-stamp
patch-stamp: unpack-stamp
- dpatch --workdir $(kernel_dir) apply-all
+ (cd $(kernel_dir) && QUILT_PATCHES=$(debian)/patches quilt push -a)
touch $@
$(kernel_dir)/.config: config.$(DEB_HOST_ARCH) unpack
@@ -77,8 +77,8 @@
dh_clean
unpatch:
- dpatch --workdir $(kernel_dir) deapply-all
- rm -rf patch-stamp $(kernel_dir)/debian
+ (cd $(kernel_dir) && QUILT_PATCHES=$(debian)/patches quilt pop -a || /bin/true)
+ rm -rf patch-stamp $(kernel_dir)/.pc
install: build
dh_testdir
More information about the Pkg-uml-commit
mailing list