diff options
| -rw-r--r-- | debian/patches/50_initrd.patch | 56 |
1 files changed, 22 insertions, 34 deletions
diff --git a/debian/patches/50_initrd.patch b/debian/patches/50_initrd.patch index 3091996..c438757 100644 --- a/debian/patches/50_initrd.patch +++ b/debian/patches/50_initrd.patch @@ -1,11 +1,9 @@ Jérémie Koenig <jk@jk.fr.eu.org> Add ramdisk support for d-i. -Index: gnumach/Makefrag.am -=================================================================== ---- gnumach.orig/Makefrag.am 2010-06-12 03:44:45.000000000 +0200 -+++ gnumach/Makefrag.am 2010-06-12 03:45:00.000000000 +0200 -@@ -275,6 +275,8 @@ +--- a/Makefrag.am ++++ b/Makefrag.am +@@ -306,6 +306,8 @@ libkernel_a_SOURCES += \ device/net_io.c \ device/net_io.h \ device/param.h \ @@ -14,19 +12,17 @@ Index: gnumach/Makefrag.am device/subrs.c \ device/subrs.h \ device/tty.h -Index: gnumach/i386/i386at/conf.c -=================================================================== ---- gnumach.orig/i386/i386at/conf.c 2010-06-12 03:44:45.000000000 +0200 -+++ gnumach/i386/i386at/conf.c 2010-06-12 03:45:00.000000000 +0200 -@@ -29,6 +29,7 @@ - - #include <mach/machine/vm_types.h> +--- a/i386/i386at/conf.c ++++ b/i386/i386at/conf.c +@@ -31,6 +31,7 @@ #include <device/conf.h> + #include <kern/mach_clock.h> + #include <i386at/model_dep.h> +#include <device/ramdisk.h> - extern int timeopen(), timeclose(); - extern vm_offset_t timemmap(); -@@ -127,6 +128,8 @@ + #define timename "time" + +@@ -129,6 +130,8 @@ struct dev_ops dev_name_list[] = nodev }, #endif /* MACH_HYP */ @@ -35,11 +31,9 @@ Index: gnumach/i386/i386at/conf.c #ifdef MACH_KMSG { kmsgname, kmsgopen, kmsgclose, kmsgread, nodev, kmsggetstat, nodev, nomap, -Index: gnumach/kern/boot_script.c -=================================================================== ---- gnumach.orig/kern/boot_script.c 2010-06-12 03:44:45.000000000 +0200 -+++ gnumach/kern/boot_script.c 2010-06-12 03:45:00.000000000 +0200 -@@ -88,12 +88,20 @@ +--- a/kern/boot_script.c ++++ b/kern/boot_script.c +@@ -88,12 +88,20 @@ prompt_resume_task (struct cmd *cmd, lon return boot_script_prompt_task_resume (cmd); } @@ -60,11 +54,9 @@ Index: gnumach/kern/boot_script.c }; #define NUM_BUILTIN (sizeof (builtin_symbols) / sizeof (builtin_symbols[0])) -Index: gnumach/kern/bootstrap.c -=================================================================== ---- gnumach.orig/kern/bootstrap.c 2010-06-12 03:44:44.000000000 +0200 -+++ gnumach/kern/bootstrap.c 2010-06-12 03:45:00.000000000 +0200 -@@ -48,6 +48,7 @@ +--- a/kern/bootstrap.c ++++ b/kern/bootstrap.c +@@ -51,6 +51,7 @@ #include <vm/vm_user.h> #include <vm/pmap.h> #include <device/device_port.h> @@ -72,7 +64,7 @@ Index: gnumach/kern/bootstrap.c #if MACH_KDB #include <machine/db_machdep.h> -@@ -776,6 +773,23 @@ +@@ -796,6 +797,23 @@ boot_script_free (void *ptr, unsigned in } int @@ -96,10 +88,8 @@ Index: gnumach/kern/bootstrap.c boot_script_task_create (struct cmd *cmd) { kern_return_t rc = task_create(TASK_NULL, FALSE, &cmd->task); -Index: gnumach/device/ramdisk.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnumach/device/ramdisk.c 2010-06-12 05:02:54.000000000 +0200 +--- /dev/null ++++ b/device/ramdisk.c @@ -0,0 +1,160 @@ +#include <mach/vm_param.h> +#include <machine/vm_param.h> @@ -261,10 +251,8 @@ Index: gnumach/device/ramdisk.c + return pmap_phys_to_frame(kvtophys((vm_offset_t) ramdisk[dev].data + off)); +} + -Index: gnumach/device/ramdisk.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnumach/device/ramdisk.h 2010-06-12 03:45:00.000000000 +0200 +--- /dev/null ++++ b/device/ramdisk.h @@ -0,0 +1,47 @@ +#ifndef _KERN_RAMDISK_H_ +#define _KERN_RAMDISK_H_ |