diff options
Diffstat (limited to 'systemd/NuTyX.patch')
| -rw-r--r-- | systemd/NuTyX.patch | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/systemd/NuTyX.patch b/systemd/NuTyX.patch index 0a7e4c155..4a4d83428 100644 --- a/systemd/NuTyX.patch +++ b/systemd/NuTyX.patch @@ -1,15 +1,16 @@ ---- configure.ac.old 2012-07-15 18:38:50.961999995 +0200 -+++ configure.ac 2012-07-15 18:41:44.681999995 +0200 -@@ -500,7 +500,7 @@ +diff -u -r systemd-187.old/configure.ac systemd-187/configure.ac +--- systemd-187.old/configure.ac 2012-08-04 12:40:15.415217549 +0200 ++++ systemd-187/configure.ac 2012-08-04 12:43:10.653014512 +0200 +@@ -504,7 +504,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc]) AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) --AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other])) -+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom, nutyx or other])) +-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) ++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom, nutyx or other])) if test "z$with_distro" = "z"; then if test "$cross_compiling" = yes; then AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) -@@ -589,6 +589,12 @@ +@@ -587,6 +587,12 @@ AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia]) M4_DEFINES=-DTARGET_MAGEIA=1 ;; @@ -22,17 +23,18 @@ other) ;; *) -@@ -642,6 +648,7 @@ - AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) +@@ -639,6 +645,7 @@ + AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) +AM_CONDITIONAL(TARGET_NUTYX, test x"$with_distro" = xnutyx) AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") ---- Makefile.am.old 2012-07-17 01:24:28.502999995 +0200 -+++ Makefile.am 2012-07-17 01:24:21.946999995 +0200 -@@ -191,6 +191,12 @@ +diff -u -r systemd-187.old/Makefile.am systemd-187/Makefile.am +--- systemd-187.old/Makefile.am 2012-08-04 12:40:15.345218430 +0200 ++++ systemd-187/Makefile.am 2012-08-04 12:44:24.922080822 +0200 +@@ -189,6 +189,12 @@ -DKBD_SETFONT=\"/bin/setfont\" \ -DDEFAULT_FONT=\"LatArCyrHeb-16\" else @@ -45,7 +47,7 @@ AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ -DKBD_SETFONT=\"/bin/setfont\" \ -@@ -202,6 +208,7 @@ +@@ -199,6 +205,7 @@ endif endif endif @@ -53,7 +55,7 @@ # ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ -@@ -426,6 +433,11 @@ +@@ -423,6 +430,11 @@ systemd-rc-local-generator endif @@ -65,9 +67,10 @@ dist_doc_DATA = \ README \ NEWS \ ---- src/journal/journalctl.c.old 2012-07-15 20:18:05.227999996 +0200 -+++ src/journal/journalctl.c 2012-07-15 20:18:39.341999995 +0200 -@@ -229,8 +229,8 @@ +diff -u -r systemd-187.old/src/journal/journalctl.c systemd-187/src/journal/journalctl.c +--- systemd-187.old/src/journal/journalctl.c 2012-08-04 12:40:15.355218304 +0200 ++++ systemd-187/src/journal/journalctl.c 2012-08-04 12:44:52.461734604 +0200 +@@ -327,8 +327,8 @@ } #ifdef HAVE_ACL @@ -77,10 +80,11 @@ + log_warning("Showing user generated messages only. Users in the group 'admin' can see all messages. Pass -q to turn this message off."); #endif - r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0); ---- src/journal/journald.c.old 2012-07-15 20:18:11.107999996 +0200 -+++ src/journal/journald.c 2012-07-15 20:18:23.791999995 +0200 -@@ -209,7 +209,7 @@ + if (arg_directory) +diff -u -r systemd-187.old/src/journal/journald.c systemd-187/src/journal/journald.c +--- systemd-187.old/src/journal/journald.c 2012-08-04 12:40:15.355218304 +0200 ++++ systemd-187/src/journal/journald.c 2012-08-04 12:45:22.681354690 +0200 +@@ -205,7 +205,7 @@ } static void server_read_file_gid(Server *s) { @@ -89,7 +93,7 @@ int r; assert(s); -@@ -219,7 +219,7 @@ +@@ -215,7 +215,7 @@ r = get_group_creds(&adm, &s->file_gid); if (r < 0) |