This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit c52898c01a352def1743befeed1a467269dd6613 Author: Samuel Thibault <[email protected]> Date: Sun Sep 4 13:02:49 2016 +0000 Fix runsystem.gnu boot * patches/git-runsystem.hurd: Import upstream fix to install runsystem.hurd. * hurd.install.in: Install runsystem.hurd in /etc/hurd * patches/{libexec.patch,startup-usr-support.patch}: Update for runsystem.hurd. Closes: Bug#836529. --- debian/changelog | 4 +++ debian/hurd.install.in | 1 + debian/patches/git-runsystem.hurd | 60 ++++++++++++++++++++++++++++++++ debian/patches/libexec.patch | 40 +++++++++++++++++---- debian/patches/series | 1 + debian/patches/startup-usr-support.patch | 25 ++++++++++--- 6 files changed, 121 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index c9435eb..c583f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ hurd (1:0.8.git20160826-2) UNRELEASED; urgency=medium [ Samuel Thibault ] * Drop gcc-5 Build-Depends, we already build with gcc-6 anyway. Closes: Bug#835948. + * patches/git-runsystem.hurd: Import upstream fix to install runsystem.hurd. + * hurd.install.in: Install runsystem.hurd in /etc/hurd + * patches/{libexec.patch,startup-usr-support.patch}: Update for + runsystem.hurd. Closes: Bug#836529. [ Kalle Olavi Niemitalo ] * patches/exec_filename_rpctrace.patch: rpctrace: Pass prefixed_name to diff --git a/debian/hurd.install.in b/debian/hurd.install.in index 06ab284..ba57b0c 100755 --- a/debian/hurd.install.in +++ b/debian/hurd.install.in @@ -52,6 +52,7 @@ lib/hurd/console-run sbin lib/hurd/getty sbin lib/hurd/rc etc/hurd lib/hurd/runsystem.gnu etc/hurd +lib/hurd/runsystem.hurd etc/hurd lib/hurd/runttys sbin sbin/MAKEDEV sbin/e2os diff --git a/debian/patches/git-runsystem.hurd b/debian/patches/git-runsystem.hurd new file mode 100644 index 0000000..28318e3 --- /dev/null +++ b/debian/patches/git-runsystem.hurd @@ -0,0 +1,60 @@ +commit 9eeba20f44cc1e883606304091a03e64b8102244 +Author: Samuel Thibault <[email protected]> +Date: Sun Sep 4 14:46:02 2016 +0200 + + Fix installing runsystem.hurd + + * daemons/runsystem.hurd: Rename to daemons/runsystem.hurd.sh + * daemons/Makefile (targets): Add runsystem.hurd + (special-targets): Likewise. + (runsystem.hurd): New rule, simply depends on runsystem.hurd.sh + +diff --git a/daemons/Makefile b/daemons/Makefile +index 9d32617..289fbf6 100644 +--- a/daemons/Makefile ++++ b/daemons/Makefile +@@ -20,10 +20,10 @@ + dir := daemons + makemode := utilities + +-targets = rc getty mail.local console-run runttys runsystem +-special-targets = rc runsystem ++targets = rc getty mail.local console-run runttys runsystem runsystem.hurd ++special-targets = rc runsystem runsystem.hurd + SRCS = rc.sh runsystem.sh getty.c lmail.c console-run.c runttys.c \ +- runsystem.hurd \ ++ runsystem.hurd.sh \ + + installationdir = $(libexecdir) + +@@ -45,3 +45,4 @@ runttys: runttys.o + runttys-LDLIBS = -lutil + + runsystem: runsystem.sh ++runsystem.hurd: runsystem.hurd.sh +diff --git a/daemons/runsystem.hurd b/daemons/runsystem.hurd.sh +similarity index 100% +rename from daemons/runsystem.hurd +rename to daemons/runsystem.hurd.sh +commit 349b9c4fdcb49add63ec71cabd6e4e4dbe6b262d +Author: Samuel Thibault <[email protected]> +Date: Sun Sep 4 14:47:05 2016 +0200 + + Fix patch to runsystem.hurd + + * init/init.c (main): Run /libexec/runsystem.hurd instead of + /etc/hurd/runsystem.hurd. + +diff --git a/init/init.c b/init/init.c +index fe230da..c8078dd 100644 +--- a/init/init.c ++++ b/init/init.c +@@ -138,7 +138,7 @@ main (int argc, char **argv) + sa.sa_flags |= SA_RESTART; + sigaction (SIGCHLD, &sa, NULL); + +- char *args[] = { "/etc/hurd/runsystem.hurd", NULL }; ++ char *args[] = { "/libexec/runsystem.hurd", NULL }; + + switch (child_pid = fork ()) + { diff --git a/debian/patches/libexec.patch b/debian/patches/libexec.patch index dc901b7..bba074d 100644 --- a/debian/patches/libexec.patch +++ b/debian/patches/libexec.patch @@ -28,7 +28,7 @@ Index: hurd-debian/doc/hurd.texi =================================================================== --- hurd-debian.orig/doc/hurd.texi +++ hurd-debian/doc/hurd.texi -@@ -566,7 +566,7 @@ The @option{--multiboot-command-line} op +@@ -569,7 +569,7 @@ The @option{--multiboot-command-line} op it is a root filesystem, which triggers it to run @command{/hurd/startup} as PID 2. @command{/hurd/startup} starts the @command{/hurd/proc} and @command{/hurd/auth} servers. After the servers are launched @@ -41,7 +41,7 @@ Index: hurd-debian/startup/startup.c =================================================================== --- hurd-debian.orig/startup/startup.c +++ hurd-debian/startup/startup.c -@@ -912,7 +912,7 @@ frob_kernel_process (void) +@@ -1022,7 +1022,7 @@ frob_kernel_process (void) /** Running userland. **/ /* In the "split-init" setup, we just run a single program (usually @@ -50,7 +50,7 @@ Index: hurd-debian/startup/startup.c If it does exit (or can't be started), we go to an emergency single-user shell as a fallback. */ -@@ -980,7 +980,7 @@ process_signal (int signo) +@@ -1090,7 +1090,7 @@ process_signal (int signo) } } @@ -59,7 +59,7 @@ Index: hurd-debian/startup/startup.c with the given additional arguments. */ static int start_child (const char *prog, char **progargs) -@@ -992,7 +992,7 @@ start_child (const char *prog, char **pr +@@ -1102,7 +1102,7 @@ start_child (const char *prog, char **pr if (progargs == 0) { @@ -68,7 +68,7 @@ Index: hurd-debian/startup/startup.c err = argz_create ((char **) argv, &args, &arglen); } else -@@ -1002,7 +1002,7 @@ start_child (const char *prog, char **pr +@@ -1112,7 +1112,7 @@ start_child (const char *prog, char **pr ++argc; { const char *argv[2 + argc + 1]; @@ -77,7 +77,7 @@ Index: hurd-debian/startup/startup.c argv[1] = prog; argv[2 + argc] = 0; while (argc-- > 0) -@@ -1062,8 +1062,8 @@ launch_something (const char *why) +@@ -1175,8 +1175,8 @@ launch_something (const char *why) static unsigned int try; static const char *const tries[] = { @@ -88,3 +88,31 @@ Index: hurd-debian/startup/startup.c _PATH_BSHELL, "/bin/shd", /* XXX */ }; +Index: hurd-debian/daemons/runsystem.hurd.sh +=================================================================== +--- hurd-debian.orig/daemons/runsystem.hurd.sh ++++ hurd-debian/daemons/runsystem.hurd.sh +@@ -23,8 +23,8 @@ fallback_shells='/bin/sh /bin/bash /bin/ + SHELL=/bin/sh + + # Programs that do multi-user startup. +-RUNCOM=/libexec/rc +-RUNTTYS=/libexec/runttys ++RUNCOM=/etc/hurd/rc ++RUNTTYS=/sbin/runttys + # Signals that we should pass down to runttys. + runttys_sigs='TERM INT HUP TSTP' + +Index: hurd-debian/init/init.c +=================================================================== +--- hurd-debian.orig/init/init.c ++++ hurd-debian/init/init.c +@@ -138,7 +138,7 @@ main (int argc, char **argv) + sa.sa_flags |= SA_RESTART; + sigaction (SIGCHLD, &sa, NULL); + +- char *args[] = { "/libexec/runsystem.hurd", NULL }; ++ char *args[] = { "/etc/hurd/runsystem.hurd", NULL }; + + switch (child_pid = fork ()) + { diff --git a/debian/patches/series b/debian/patches/series index 6380222..5b8e68f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +git-runsystem.hurd diskfs_no_inherit_dir_group.patch init_try_runsystem.gnu.patch makedev.diff diff --git a/debian/patches/startup-usr-support.patch b/debian/patches/startup-usr-support.patch index c7e12d1..9e8d63a 100644 --- a/debian/patches/startup-usr-support.patch +++ b/debian/patches/startup-usr-support.patch @@ -4,8 +4,10 @@ Debian GNU/Hurd has a real /usr daemons/runsystem.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---- a/daemons/rc.sh -+++ b/daemons/rc.sh +Index: hurd-debian/daemons/rc.sh +=================================================================== +--- hurd-debian.orig/daemons/rc.sh ++++ hurd-debian/daemons/rc.sh @@ -1,6 +1,6 @@ #!/bin/bash @@ -14,8 +16,23 @@ Debian GNU/Hurd has a real /usr # Set up swap space. This will complain if no default pager is functioning. swapon -a ---- a/daemons/runsystem.sh -+++ b/daemons/runsystem.sh +Index: hurd-debian/daemons/runsystem.sh +=================================================================== +--- hurd-debian.orig/daemons/runsystem.sh ++++ hurd-debian/daemons/runsystem.sh +@@ -11,7 +11,7 @@ + ### Where to find programs, etc. + ### + +-PATH=/bin:/sbin ++PATH=/bin:/sbin:/usr/bin:/usr/sbin + export PATH + + umask 022 +Index: hurd-debian/daemons/runsystem.hurd.sh +=================================================================== +--- hurd-debian.orig/daemons/runsystem.hurd.sh ++++ hurd-debian/daemons/runsystem.hurd.sh @@ -11,7 +11,7 @@ ### Where to find programs, etc. ### -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
