summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-05-31 16:27:54 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-05-31 16:27:54 +0200
commitb866c010ac332c5449d3fc00ad89b8e329d07cae (patch)
tree51478dd507d45ff59dfce8cf318e5593d2a21393
parent00188c8c8423011828a5ef4cd36c7436ab9e0b4d (diff)
add patch series
-rw-r--r--debian/patches/docfix0001-Include-the-notify-protocol-in-gnumach.msgids.patch49
-rw-r--r--debian/patches/docfix0002-maybefixup_notify_stuff.patch29
-rw-r--r--debian/patches/docfix0003-fu.patch50
-rw-r--r--debian/patches/series3
4 files changed, 131 insertions, 0 deletions
diff --git a/debian/patches/docfix0001-Include-the-notify-protocol-in-gnumach.msgids.patch b/debian/patches/docfix0001-Include-the-notify-protocol-in-gnumach.msgids.patch
new file mode 100644
index 0000000..c723ceb
--- /dev/null
+++ b/debian/patches/docfix0001-Include-the-notify-protocol-in-gnumach.msgids.patch
@@ -0,0 +1,49 @@
+From 3949c5cb4c6f59f3aec41a99db1c074b16b7d2ba Mon Sep 17 00:00:00 2001
+From: Justus Winter <4winter@informatik.uni-hamburg.de>
+Date: Sun, 25 May 2014 16:26:42 +0200
+Subject: [PATCH gnumach 1/3] Include the notify protocol in gnumach.msgids
+
+* Makefrag.am (gnumach.msgids): Add notify.msgids as prerequisite.
+* Makerules.mig.am: Add rule to generate the list of message ids when
+neither the client nor the server stubs are required.
+---
+ Makefrag.am | 3 ++-
+ Makerules.mig.am | 8 ++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/Makefrag.am b/Makefrag.am
+index 023a4d1..1f58c6d 100644
+--- a/Makefrag.am
++++ b/Makefrag.am
+@@ -547,7 +547,8 @@ nodist_libkernel_a_SOURCES += \
+ # rpctrace can make use of that.
+ MOSTLYCLEANFILES += \
+ gnumach.msgids
+-gnumach.msgids: $(filter %.msgids,$(nodist_libkernel_a_SOURCES))
++gnumach.msgids: $(filter %.msgids,$(nodist_libkernel_a_SOURCES)) \
++ include/mach/notify.msgids
+ $(AM_V_at) cat $^ > $@.new
+ $(AM_V_GEN) mv $@.new $@
+ # `exec_' prefix, so that we don't try to build that file during when running
+diff --git a/Makerules.mig.am b/Makerules.mig.am
+index 3060984..1612e1c 100644
+--- a/Makerules.mig.am
++++ b/Makerules.mig.am
+@@ -88,6 +88,14 @@ lib_dep_tr_for_defs_a_CPPFLAGS = $(AM_CPPFLAGS) \
+ -list $*.user.msgids \
+ < $<
+
++# Stand-alone rule to generate the list of message ids when neither
++# the client nor the server stubs are required.
++%.msgids: $(top_srcdir)/%.defs
++ $(MIGCOM_V) $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -E $< \
++ | $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMSFLAGS) \
++ -sheader /dev/null -server /dev/null \
++ -list "$@"
++
+ # This is how it should be done, but this is not integrated into GNU Automake
+ # and is missing automatic inter-file dependency management because of that.
+
+--
+2.1.4
+
diff --git a/debian/patches/docfix0002-maybefixup_notify_stuff.patch b/debian/patches/docfix0002-maybefixup_notify_stuff.patch
new file mode 100644
index 0000000..aa139a3
--- /dev/null
+++ b/debian/patches/docfix0002-maybefixup_notify_stuff.patch
@@ -0,0 +1,29 @@
+From 6eaf6e5f3305c0d680850fb4ac3a27f29a9d042f Mon Sep 17 00:00:00 2001
+From: Justus Winter <4winter@informatik.uni-hamburg.de>
+Date: Mon, 26 May 2014 00:02:44 +0200
+Subject: [PATCH gnumach 2/3] maybefixup_notify_stuff
+
+---
+ Makerules.mig.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makerules.mig.am b/Makerules.mig.am
+index 1612e1c..503d657 100644
+--- a/Makerules.mig.am
++++ b/Makerules.mig.am
+@@ -88,9 +88,11 @@ lib_dep_tr_for_defs_a_CPPFLAGS = $(AM_CPPFLAGS) \
+ -list $*.user.msgids \
+ < $<
+
++vpath %.defs $(top_srcdir)
++
+ # Stand-alone rule to generate the list of message ids when neither
+ # the client nor the server stubs are required.
+-%.msgids: $(top_srcdir)/%.defs
++%.msgids: %.defs
+ $(MIGCOM_V) $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -E $< \
+ | $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMSFLAGS) \
+ -sheader /dev/null -server /dev/null \
+--
+2.1.4
+
diff --git a/debian/patches/docfix0003-fu.patch b/debian/patches/docfix0003-fu.patch
new file mode 100644
index 0000000..c9bf135
--- /dev/null
+++ b/debian/patches/docfix0003-fu.patch
@@ -0,0 +1,50 @@
+From 474fd79e296c3c77c6366c4b21ad8f8d676eb654 Mon Sep 17 00:00:00 2001
+From: Justus Winter <4winter@informatik.uni-hamburg.de>
+Date: Sun, 31 May 2015 16:27:31 +0200
+Subject: [PATCH gnumach 3/3] fu
+
+---
+ Makefrag.am | 2 +-
+ Makerules.mig.am | 2 +-
+ kern/notify.defs | 3 +++
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+ create mode 100644 kern/notify.defs
+
+diff --git a/Makefrag.am b/Makefrag.am
+index 1f58c6d..b4e4330 100644
+--- a/Makefrag.am
++++ b/Makefrag.am
+@@ -548,7 +548,7 @@ nodist_libkernel_a_SOURCES += \
+ MOSTLYCLEANFILES += \
+ gnumach.msgids
+ gnumach.msgids: $(filter %.msgids,$(nodist_libkernel_a_SOURCES)) \
+- include/mach/notify.msgids
++ kern/notify.msgids
+ $(AM_V_at) cat $^ > $@.new
+ $(AM_V_GEN) mv $@.new $@
+ # `exec_' prefix, so that we don't try to build that file during when running
+diff --git a/Makerules.mig.am b/Makerules.mig.am
+index 503d657..085b247 100644
+--- a/Makerules.mig.am
++++ b/Makerules.mig.am
+@@ -96,7 +96,7 @@ vpath %.defs $(top_srcdir)
+ $(MIGCOM_V) $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -E $< \
+ | $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMSFLAGS) \
+ -sheader /dev/null -server /dev/null \
+- -list "$@"
++ -list "$*.msgids"
+
+ # This is how it should be done, but this is not integrated into GNU Automake
+ # and is missing automatic inter-file dependency management because of that.
+diff --git a/kern/notify.defs b/kern/notify.defs
+new file mode 100644
+index 0000000..a3d5909
+--- /dev/null
++++ b/kern/notify.defs
+@@ -0,0 +1,3 @@
++/* XXX */
++
++#include <mach/notify.defs>
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 0dfc4e5..93f3a68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,6 @@ vm-cache-policy0001-VM-cache-policy-change.patch
vm-cache-policy0002-vm-keep-track-of-clean-pages.patch
vm-cache-policy0003-vm-evict-clean-pages-first.patch
fix0001-kern-fix-argument-handling.patch
+docfix0001-Include-the-notify-protocol-in-gnumach.msgids.patch
+docfix0002-maybefixup_notify_stuff.patch
+docfix0003-fu.patch