diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-30 17:40:35 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-30 17:40:35 +0200 |
| commit | 0f91d1f0f4eb7213ba49865870a46a7852927517 (patch) | |
| tree | e7517ccd9c7fa27a593fe9d1ac983836503e6cc1 | |
| parent | 2e75c97e06e2bb85b739b4c2ff07e1618db3ea82 (diff) | |
add 0001-i386-fix-MACHINE_SERVER_HEADER.patch
| -rw-r--r-- | debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch b/debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch new file mode 100644 index 0000000..3d05246 --- /dev/null +++ b/debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch @@ -0,0 +1,33 @@ +From 4fda696b13d2d9fdb9496b2aeee1b05a6f852836 Mon Sep 17 00:00:00 2001 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +Date: Wed, 30 Apr 2014 17:31:49 +0200 +Subject: [PATCH] i386: fix MACHINE_SERVER_HEADER + +Commit b6dab094 introduced a way to include the MIG-generated server +files for the machine specific interface in ipc_kobject.c. + +This broke out-of-tree builds. Here, 'machine' is a symlink to +'../i386/i386', it points into the source tree. The MIG-generated +files however are put in the build tree in i386/i386. + +* i386/i386/machine_routines.h (MACHINE_SERVER_HEADER): Fix path. +--- + i386/i386/machine_routines.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i386/i386/machine_routines.h b/i386/i386/machine_routines.h +index 65315e5..d9dd94b 100644 +--- a/i386/i386/machine_routines.h ++++ b/i386/i386/machine_routines.h +@@ -31,7 +31,7 @@ + * The i386 has a set of machine-dependent interfaces. + */ + #define MACHINE_SERVER mach_i386_server +-#define MACHINE_SERVER_HEADER <machine/mach_i386.server.h> ++#define MACHINE_SERVER_HEADER "i386/i386/mach_i386.server.h" + #define MACHINE_SERVER_ROUTINE mach_i386_server_routine + + #endif /* _I386_MACHINE_ROUTINES_H_ */ +-- +1.9.2 + diff --git a/debian/patches/series b/debian/patches/series index e5010ab..db94536 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ protected_payload.patch 0001-vm-make-struct-vm_map-fit-into-a-cache-line.patch 0002-Add-some-padding-to-make-objects-fit-a-single-cache-.patch +0001-i386-fix-MACHINE_SERVER_HEADER.patch |