From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2] systemd: Update to 231. Date: Tue, 04 Oct 2016 21:23:58 +0200 Message-ID: <1475609038-3135-1-git-send-email-stefan.schantl@ipfire.org> In-Reply-To: <1475351227.27588.12.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6773767018148454375==" List-Id: --===============6773767018148454375== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an major update to the latest stable version of systemd. * Enable testsuite during buildtime. * Dropp support for SELinux. Fixes #10962. Signed-off-by: Stefan Schantl --- .../patches/systemd-231-ipfire-disable-tests.patch | 58 ++++++++++++++++++++= ++ systemd/systemd.nm | 31 +++++++++--- 2 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 systemd/patches/systemd-231-ipfire-disable-tests.patch diff --git a/systemd/patches/systemd-231-ipfire-disable-tests.patch b/systemd= /patches/systemd-231-ipfire-disable-tests.patch new file mode 100644 index 0000000..cd4bbe9 --- /dev/null +++ b/systemd/patches/systemd-231-ipfire-disable-tests.patch @@ -0,0 +1,58 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2016-07-25 21:49:47.000000000 +0200 ++++ b/Makefile.am 2016-09-23 08:34:47.924257243 +0200 +@@ -1480,9 +1480,7 @@ + test-job-type \ + test-env-util \ + test-strbuf \ +- test-strv \ + test-path \ +- test-path-util \ + test-strxcpyx \ + test-siphash24 \ + test-unit-name \ +@@ -1541,7 +1539,6 @@ + test-capability \ + test-async \ + test-ratelimit \ +- test-condition \ + test-uid-range \ + test-locale-util \ + test-execute \ +@@ -3586,11 +3583,9 @@ +=20 + tests +=3D \ + test-dhcp-option \ +- test-dhcp-client \ + test-dhcp-server \ + test-ipv4ll \ + test-ndisc-rs \ +- test-dhcp6-client \ + test-lldp +=20 + # -------------------------------------------------------------------------= ----- +@@ -4298,16 +4293,11 @@ + catalog-remove-hook +=20 + tests +=3D \ +- test-journal \ + test-journal-enum \ + test-journal-send \ + test-journal-syslog \ + test-journal-match \ +- test-journal-stream \ + test-journal-init \ +- test-journal-verify \ +- test-journal-interleaving \ +- test-journal-flush \ + test-mmap-cache \ + test-catalog \ + test-audit-type +@@ -6518,7 +6508,6 @@ + test-libudev-sym.c +=20 + tests +=3D \ +- test-libsystemd-sym \ + test-libudev-sym +=20 + .PHONY: cppcheck diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 585916b..9c2d937 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ############################################################################= ### =20 name =3D systemd -version =3D 221 -release =3D 5 +version =3D 231 +release =3D 1 =20 maintainer =3D Stefan Schantl groups =3D System/Base @@ -18,13 +18,20 @@ description SysV and LSB init scripts. end =20 -source_dl =3D http://www.freedesktop.org/software/systemd/ -sources =3D %{thisapp}.tar.xz +source_dl =3D https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz= #/ =20 build unitdir =3D %{prefix}/lib/systemd/system =20 requires + # Testsuite + /usr/bin/getfacl + /usr/bin/mount + /usr/bin/tree + /usr/bin/umount + + autoconf + automake attr-devel audit-devel cryptsetup-luks-devel >=3D 1.4.2 @@ -37,14 +44,14 @@ build gobject-introspection-devel >=3D 1.31 gperf hwdata - intltool + intltool >=3D 0.51.0 kmod-devel >=3D 15 libacl-devel libblkid-devel libcap-devel libgcrypt-devel libmount-devel - libselinux-devel + libtool libuuid-devel m4 pam-devel @@ -57,6 +64,8 @@ build zlib-devel end =20 + export LD_LIBRARY_PATH =3D %{DIR_APP}/.libs + configure_options +=3D \ PYTHON=3D%{python3} \ --with-sysvinit-path=3D \ @@ -82,6 +91,16 @@ build =20 prepare_cmds %{create_groups} + + ./autogen.sh + end + + test + # Create dummy machine-id file, which is required for some tests. + touch %{sysconfdir}/machine-id + + # Run the testsuite. + make check end =20 install_cmds --=20 2.7.4 --===============6773767018148454375==--