diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-12 12:22:48 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-12 12:22:48 +0200 |
| commit | d28e801d18288f8f9c4f56c39d677803f5534a63 (patch) | |
| tree | c7fea9db72c327d3c8c93d9b15842d03cde82622 | |
| parent | 5b5839ab88fd7b621f2fe64f838666d428b20538 (diff) | |
rm boot_remove_ourdevice_hack.patch
| -rw-r--r-- | debian/patches/boot_remove_ourdevice_hack.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 38 deletions
diff --git a/debian/patches/boot_remove_ourdevice_hack.patch b/debian/patches/boot_remove_ourdevice_hack.patch deleted file mode 100644 index b5c6f82e..00000000 --- a/debian/patches/boot_remove_ourdevice_hack.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/boot/Makefile b/boot/Makefile -index 0d883b0..2d52f3f 100644 ---- a/boot/Makefile -+++ b/boot/Makefile -@@ -20,7 +20,7 @@ makemode := utility - - SRCS = mach-crt0.c boot.c ux.c sigvec.S syscall.S \ - boot_script.c userland-boot.c --COMMON-OBJS = notifyServer.o ourdeviceServer.o \ -+COMMON-OBJS = notifyServer.o deviceServer.o \ - ioServer.o io_replyUser.o device_replyUser.o \ - termServer.o bootstrapServer.o boot_script.o userland-boot.o - OBJS = boot.o $(COMMON-OBJS) -@@ -39,10 +39,6 @@ include ../Makeconf - - all: boot # uxboot - --ourdevice.defs: device.defs -- $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ ]*device[ ]*:[ ]*device_t/s/device_t/mach_port_send_t/' > $@ -- -- - uxboot.o: boot.c - $(COMPILE.c) -DUX $< -o $@ - -diff --git a/boot/boot.c b/boot/boot.c -index 0dbe1c2..ed29014 100644 ---- a/boot/boot.c -+++ b/boot/boot.c -@@ -42,7 +42,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <version.h> - - #include "notify_S.h" --#include "ourdevice_S.h" -+#include "device_S.h" - #include "io_S.h" - #include "device_reply_U.h" - #include "io_reply_U.h" diff --git a/debian/patches/series b/debian/patches/series index 4650ee92..65769bfb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,4 +42,3 @@ xkb-compat.patch xxx-fix-build.patch mach-defpager-protected-payload.patch #ext2fs-skip-unallocated-blocks.patch -boot_remove_ourdevice_hack.patch |