systemd: Update to 187.

Permanently disable testsuite, because it isn't working
in our chroot environment.

diff --git a/systemd/patches/systemd-44-ipfire.patch b/systemd/patches/systemd-187-ipfire.patch
similarity index 60%
rename from systemd/patches/systemd-44-ipfire.patch
rename to systemd/patches/systemd-187-ipfire.patch
index 6dca550f8dcb06b1fcd035e60ed5afd1d8da10db..fbd8ea69bd1b33c4329dc279ea37d0c891354fb7 100644 (file)
--- a/systemd/patches/systemd-44-ipfire.patch
+++ b/systemd/patches/systemd-187-ipfire.patch
@@ -1,34 +1,33 @@
 diff -Nur a/configure.ac b/configure.ac
---- a/configure.ac     2012-03-16 01:46:57.000000000 +0100
-+++ b/configure.ac     2012-03-24 20:43:33.723789319 +0100
-@@ -396,7 +396,7 @@
+--- a/configure.ac     2012-07-20 00:40:32.000000000 +0200
++++ b/configure.ac     2012-07-26 21:01:58.319135633 +0200
+@@ -504,7 +504,7 @@
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
  
- AC_PATH_PROG([M4], [m4])
- 
--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, ipfire 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, ipfire 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)])
-@@ -492,6 +492,13 @@
-                 M4_DISTRO_FLAG=-DTARGET_MAGEIA=1
-                 have_plymouth=yes
+@@ -587,6 +587,12 @@
+                 AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia])
+                 M4_DEFINES=-DTARGET_MAGEIA=1
                  ;;
 +      ipfire)
 +              SYSTEM_SYSVINIT_PATH=
 +              SYSTEM_SYSVRCND_PATH=
 +              AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire])
-+              M4_DEFINES=-DTARGET_IPFIRE=1
-+              have_plymouth=yes
++                M4_DEFINES=-DTARGET_IPFIRE=1
 +              ;;
          other)
                  ;;
          *)
-@@ -550,6 +557,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_IPFIRE, test x"$with_distro" = xipfire)
  
- AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes")
  AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")
+ 

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 30e72e1078887c80972d3ba1d0d13a799f7db03b..0b6b5cb85ca2e7d283794761e544fc8c391c9b9e 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = systemd
-version    = 186
+version    = 187
 release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -58,10 +58,6 @@ build
                ./autogen.sh ac
        end
 
-       test
-               make check
-       end
-
        install_cmds
                # Create sysv compatible symlinks.
                mkdir -pv %{BUILDROOT}%{sbindir}