summaryrefslogtreecommitdiff
path: root/debian/patches/50_initrd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/50_initrd.patch')
-rw-r--r--debian/patches/50_initrd.patch40
1 files changed, 26 insertions, 14 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_