sync upstream packaging

2 files changed, 60 insertions, 41 deletions

diff --git a/debian/patches/50_initrd.patch b/debian/patches/50_initrd.patch
index c438757..626ca56 100644
--- a/debian/patches/50_initrd.patch
+++ b/debian/patches/50_initrd.patch
@@ -1,9 +1,11 @@
 Jérémie Koenig <jk@jk.fr.eu.org>
 Add ramdisk support for d-i.
 
---- a/Makefrag.am
-+++ b/Makefrag.am
-@@ -306,6 +306,8 @@ libkernel_a_SOURCES += \
+Index: gnumach-1.4+git20141107/Makefrag.am
+===================================================================
+--- gnumach-1.4+git20141107.orig/Makefrag.am
++++ gnumach-1.4+git20141107/Makefrag.am
+@@ -308,6 +308,8 @@ libkernel_a_SOURCES += \
  	device/net_io.c \
  	device/net_io.h \
  	device/param.h \
@@ -12,8 +14,10 @@ Add ramdisk support for d-i.
  	device/subrs.c \
  	device/subrs.h \
  	device/tty.h
---- a/i386/i386at/conf.c
-+++ b/i386/i386at/conf.c
+Index: gnumach-1.4+git20141107/i386/i386at/conf.c
+===================================================================
+--- gnumach-1.4+git20141107.orig/i386/i386at/conf.c
++++ gnumach-1.4+git20141107/i386/i386at/conf.c
 @@ -31,6 +31,7 @@
  #include <device/conf.h>
  #include <kern/mach_clock.h>
@@ -30,10 +34,12 @@ Add ramdisk support for d-i.
 +
  #ifdef	MACH_KMSG
          { kmsgname,     kmsgopen,       kmsgclose,       kmsgread,
-           nodev,        kmsggetstat,    nodev,           nomap,
---- a/kern/boot_script.c
-+++ b/kern/boot_script.c
-@@ -88,12 +88,20 @@ prompt_resume_task (struct cmd *cmd, lon
+           nulldev_write,        kmsggetstat,    nulldev_setstat,           nomap,
+Index: gnumach-1.4+git20141107/kern/boot_script.c
+===================================================================
+--- gnumach-1.4+git20141107.orig/kern/boot_script.c
++++ gnumach-1.4+git20141107/kern/boot_script.c
+@@ -88,12 +88,20 @@ prompt_resume_task (struct cmd *cmd, con
    return boot_script_prompt_task_resume (cmd);
  }
  
@@ -54,8 +60,10 @@ Add ramdisk support for d-i.
  };
  #define NUM_BUILTIN (sizeof (builtin_symbols) / sizeof (builtin_symbols[0]))
  
---- a/kern/bootstrap.c
-+++ b/kern/bootstrap.c
+Index: gnumach-1.4+git20141107/kern/bootstrap.c
+===================================================================
+--- gnumach-1.4+git20141107.orig/kern/bootstrap.c
++++ gnumach-1.4+git20141107/kern/bootstrap.c
 @@ -51,6 +51,7 @@
  #include <vm/vm_user.h>
  #include <vm/pmap.h>
@@ -64,7 +72,7 @@ Add ramdisk support for d-i.
  
  #if	MACH_KDB
  #include <machine/db_machdep.h>
-@@ -796,6 +797,23 @@ boot_script_free (void *ptr, unsigned in
+@@ -792,6 +793,23 @@ boot_script_free (void *ptr, unsigned in
  }
  
  int
@@ -88,8 +96,10 @@ Add ramdisk support for d-i.
  boot_script_task_create (struct cmd *cmd)
  {
    kern_return_t rc = task_create(TASK_NULL, FALSE, &cmd->task);
+Index: gnumach-1.4+git20141107/device/ramdisk.c
+===================================================================
 --- /dev/null
-+++ b/device/ramdisk.c
++++ gnumach-1.4+git20141107/device/ramdisk.c
 @@ -0,0 +1,160 @@
 +#include <mach/vm_param.h>
 +#include <machine/vm_param.h>
@@ -251,8 +261,10 @@ Add ramdisk support for d-i.
 +	return pmap_phys_to_frame(kvtophys((vm_offset_t) ramdisk[dev].data + off));
 +}
 +
+Index: gnumach-1.4+git20141107/device/ramdisk.h
+===================================================================
 --- /dev/null
-+++ b/device/ramdisk.h
++++ gnumach-1.4+git20141107/device/ramdisk.h
 @@ -0,0 +1,47 @@
 +#ifndef _KERN_RAMDISK_H_
 +#define _KERN_RAMDISK_H_
diff --git a/debian/patches/70_dde.patch b/debian/patches/70_dde.patch
index d7c477c..8d6a7fe 100644
--- a/debian/patches/70_dde.patch
+++ b/debian/patches/70_dde.patch
@@ -1,14 +1,14 @@
 --- a/Makefrag.am
 +++ b/Makefrag.am
-@@ -218,6 +218,7 @@ EXTRA_DIST += \
+@@ -220,6 +220,7 @@ EXTRA_DIST += \
  	kern/mach.srv \
  	kern/mach4.srv \
  	kern/gnumach.srv \
 +	kern/experimental.srv \
  	kern/mach_debug.srv \
- 	kern/mach_host.srv
- 
-@@ -300,6 +301,7 @@ libkernel_a_SOURCES += \
+ 	kern/mach_host.srv \
+ 	kern/task_notify.cli
+@@ -303,6 +304,7 @@ libkernel_a_SOURCES += \
  	device/device_types_kernel.h \
  	device/ds_routines.c \
  	device/ds_routines.h \
@@ -16,7 +16,15 @@
  	device/if_ether.h \
  	device/if_hdr.h \
  	device/io_req.h \
-@@ -371,6 +373,7 @@ include_mach_HEADERS = \
+@@ -353,6 +355,7 @@ include_device_HEADERS = \
+ 	include/device/device_types.defs \
+ 	include/device/device_types.h \
+ 	include/device/disk_status.h \
++	include/device/intr.h \
+ 	include/device/net_status.h \
+ 	include/device/tape_status.h \
+ 	include/device/tty_status.h
+@@ -375,6 +378,7 @@ include_mach_HEADERS = \
  	include/mach/memory_object_default.defs \
  	include/mach/notify.defs \
  	include/mach/std_types.defs \
@@ -24,7 +32,7 @@
  	include/mach/alert.h \
  	include/mach/boolean.h \
  	include/mach/boot.h \
-@@ -503,6 +506,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES +=
+@@ -523,6 +527,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES +=
  	kern/mach.server.defs.c \
  	kern/mach4.server.defs.c \
  	kern/gnumach.server.defs.c \
@@ -32,7 +40,7 @@
  	kern/mach_debug.server.defs.c \
  	kern/mach_host.server.defs.c
  nodist_libkernel_a_SOURCES += \
-@@ -515,6 +519,9 @@ nodist_libkernel_a_SOURCES += \
+@@ -535,6 +540,9 @@ nodist_libkernel_a_SOURCES += \
  	kern/gnumach.server.h \
  	kern/gnumach.server.c \
  	kern/gnumach.server.msgids \
@@ -42,7 +50,7 @@
  	kern/mach_debug.server.h \
  	kern/mach_debug.server.c \
  	kern/mach_debug.server.msgids \
-@@ -524,6 +531,7 @@ nodist_libkernel_a_SOURCES += \
+@@ -544,6 +552,7 @@ nodist_libkernel_a_SOURCES += \
  #	kern/mach.server.defs
  #	kern/mach4.server.defs
  #	kern/gnumach.server.defs
@@ -96,7 +104,7 @@
  boolean_t
  ds_notify (mach_msg_header_t *msg)
  {
-@@ -1806,6 +1843,24 @@ device_writev_trap (mach_device_t device
+@@ -1798,6 +1835,24 @@ device_writev_trap (mach_device_t device
  	return (result);
  }
  
@@ -463,16 +471,15 @@
 +#endif
 --- a/kern/startup.c
 +++ b/kern/startup.c
-@@ -76,6 +76,8 @@ boolean_t reboot_on_panic = TRUE;
- #include <kern/machine.h>
- #endif	/* NCPUS > 1 */
- 
-+extern void       intr_thread();
-+
+@@ -79,6 +79,7 @@ boolean_t reboot_on_panic = TRUE;
  /* XX */
  extern vm_offset_t phys_first_addr, phys_last_addr;
  extern char *kernel_cmdline;
-@@ -221,6 +223,9 @@ void start_kernel_threads(void)
++extern void	intr_thread();
+ 
+ /*
+  *	Running in virtual memory, on the interrupt stack.
+@@ -221,6 +222,9 @@ void start_kernel_threads(void)
  	(void) kernel_thread(kernel_task, reaper_thread, (char *) 0);
  	(void) kernel_thread(kernel_task, swapin_thread, (char *) 0);
  	(void) kernel_thread(kernel_task, sched_thread, (char *) 0);
@@ -609,7 +616,7 @@
    if (retval)
 --- a/vm/vm_user.c
 +++ b/vm/vm_user.c
-@@ -436,3 +436,117 @@ kern_return_t vm_wire(host, map, start,
+@@ -452,3 +452,117 @@ kern_return_t vm_wire(port, map, start,
  				    round_page(start+size),
  				    access);
  }
@@ -729,7 +736,7 @@
 +}
 --- a/linux/dev/drivers/block/genhd.c
 +++ b/linux/dev/drivers/block/genhd.c
-@@ -786,7 +786,9 @@ void device_setup(void)
+@@ -812,7 +812,9 @@ void device_setup(void)
  #ifdef MACH
  	linux_intr_pri = SPL6;
  #endif
@@ -742,15 +749,15 @@
  	console_map_init();
 --- a/kern/ipc_kobject.c
 +++ b/kern/ipc_kobject.c
-@@ -56,6 +56,7 @@
- #include <device/device_pager.server.h>
- #include <kern/mach4.server.h>
- #include <kern/gnumach.server.h>
-+#include <kern/experimental.server.h>
- 
- #if MACH_DEBUG
- #include <kern/mach_debug.server.h>
-@@ -173,6 +174,7 @@ ipc_kobject_server(request)
+@@ -159,6 +159,7 @@ ipc_kobject_server(request)
+ 	 * to perform the kernel function
+ 	 */
+     {
++	extern mig_routine_t	experimental_server_routine();
+ 	check_simple_locks();
+ 	if ((routine = mach_server_routine(&request->ikm_header)) != 0
+ 	 || (routine = mach_port_server_routine(&request->ikm_header)) != 0
+@@ -170,6 +171,7 @@ ipc_kobject_server(request)
  #endif	/* MACH_DEBUG */
  	 || (routine = mach4_server_routine(&request->ikm_header)) != 0
  	 || (routine = gnumach_server_routine(&request->ikm_header)) != 0