From bc922e2ffc5c0abaefad73f576d4c0301c9e25216a30f499eb6c78b46d46da8f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 17 Aug 2015 20:36:04 +0000 Subject: [PATCH] Accepting request 323109 from home:jengelh:d3 - Update to new upstream release 224 OBS-URL: https://build.opensuse.org/request/show/323109 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=892 --- insserv-generator.patch | 27 ++++++++--------- ...linker-find-libudev-for-libdevmapper.patch | 10 +++---- ...-quit-and-wait-for-emergency-service.patch | 29 +++++++++---------- systemd-222.tar.xz | 3 -- systemd-mini.changes | 9 ++++++ systemd-mini.spec | 8 ++--- systemd.changes | 9 ++++++ systemd.spec | 8 ++--- v224.tar.gz | 3 ++ 9 files changed, 60 insertions(+), 46 deletions(-) delete mode 100644 systemd-222.tar.xz create mode 100644 v224.tar.gz diff --git a/insserv-generator.patch b/insserv-generator.patch index a61fc41a..9e5afdbc 100644 --- a/insserv-generator.patch +++ b/insserv-generator.patch @@ -8,16 +8,16 @@ systemd unit drop-in files to add dependencies --- Makefile.am | 9 src/insserv-generator/Makefile | 28 ++ - src/insserv-generator/insserv-generator.c | 315 ++++++++++++++++++++++++++++++ - 3 files changed, 351 insertions(+), 1 deletion(-) + src/insserv-generator/insserv-generator.c | 316 ++++++++++++++++++++++++++++++ + 3 files changed, 352 insertions(+), 1 deletion(-) create mode 100644 src/insserv-generator/Makefile create mode 100644 src/insserv-generator/insserv-generator.c -Index: systemd-221/Makefile.am +Index: systemd-224/Makefile.am =================================================================== ---- systemd-221.orig/Makefile.am -+++ systemd-221/Makefile.am -@@ -618,7 +618,8 @@ nodist_systemunit_DATA += \ +--- systemd-224.orig/Makefile.am ++++ systemd-224/Makefile.am +@@ -617,7 +617,8 @@ nodist_systemunit_DATA += \ systemgenerator_PROGRAMS += \ systemd-sysv-generator \ @@ -27,7 +27,7 @@ Index: systemd-221/Makefile.am endif EXTRA_DIST += \ -@@ -2544,6 +2545,12 @@ $(systemd_boot): $(systemd_boot_solib) +@@ -2556,6 +2557,12 @@ $(systemd_boot): $(systemd_boot_solib) endif endif @@ -40,10 +40,10 @@ Index: systemd-221/Makefile.am # ------------------------------------------------------------------------------ stub_headers = \ src/boot/efi/util.h \ -Index: systemd-221/src/insserv-generator/Makefile +Index: systemd-224/src/insserv-generator/Makefile =================================================================== --- /dev/null -+++ systemd-221/src/insserv-generator/Makefile ++++ systemd-224/src/insserv-generator/Makefile @@ -0,0 +1,28 @@ +# This file is part of systemd. +# @@ -73,11 +73,11 @@ Index: systemd-221/src/insserv-generator/Makefile + $(MAKE) -C .. clean + +.PHONY: all clean -Index: systemd-221/src/insserv-generator/insserv-generator.c +Index: systemd-224/src/insserv-generator/insserv-generator.c =================================================================== --- /dev/null -+++ systemd-221/src/insserv-generator/insserv-generator.c -@@ -0,0 +1,315 @@ ++++ systemd-224/src/insserv-generator/insserv-generator.c +@@ -0,0 +1,316 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** @@ -253,7 +253,8 @@ Index: systemd-221/src/insserv-generator/insserv-generator.c + r = write_string_file(unit, + "# Automatically generated by systemd-insserv-generator\n\n" + "[Unit]\n" -+ "Wants=remote-fs-pre.target\n"); ++ "Wants=remote-fs-pre.target\n", ++ WRITE_STRING_FILE_CREATE); + if (r) + return r; + free (facility); diff --git a/let-linker-find-libudev-for-libdevmapper.patch b/let-linker-find-libudev-for-libdevmapper.patch index af9de7d8..274d103c 100644 --- a/let-linker-find-libudev-for-libdevmapper.patch +++ b/let-linker-find-libudev-for-libdevmapper.patch @@ -2,17 +2,17 @@ configure.ac | 4 ---- 1 file changed, 4 deletions(-) -Index: systemd-221/configure.ac +Index: systemd-224/configure.ac =================================================================== ---- systemd-221.orig/configure.ac -+++ systemd-221/configure.ac -@@ -194,10 +194,6 @@ AS_CASE([$CC], [*clang*], +--- systemd-224.orig/configure.ac ++++ systemd-224/configure.ac +@@ -199,10 +199,6 @@ AS_CASE([$CC], [*clang*], -Wno-gnu-variable-sized-type-not-at-end \ ])]) -AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], - [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -- -flto -ffat-lto-objects])], +- -flto])], - [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") diff --git a/plymouth-quit-and-wait-for-emergency-service.patch b/plymouth-quit-and-wait-for-emergency-service.patch index b0461bee..331034ec 100644 --- a/plymouth-quit-and-wait-for-emergency-service.patch +++ b/plymouth-quit-and-wait-for-emergency-service.patch @@ -1,13 +1,13 @@ --- units/console-shell.service.m4.in | 2 ++ - units/emergency.service.in | 3 ++- + units/emergency.service.in | 2 +- units/rescue.service.in | 3 ++- - 3 files changed, 6 insertions(+), 2 deletions(-) + 3 files changed, 5 insertions(+), 2 deletions(-) -Index: systemd-221/units/console-shell.service.m4.in +Index: systemd-224/units/console-shell.service.m4.in =================================================================== ---- systemd-221.orig/units/console-shell.service.m4.in -+++ systemd-221/units/console-shell.service.m4.in +--- systemd-224.orig/units/console-shell.service.m4.in ++++ systemd-224/units/console-shell.service.m4.in @@ -17,6 +17,8 @@ Before=getty.target [Service] Environment=HOME=/root @@ -17,24 +17,23 @@ Index: systemd-221/units/console-shell.service.m4.in ExecStart=-@SULOGIN@ ExecStopPost=-@SYSTEMCTL@ poweroff Type=idle -Index: systemd-221/units/emergency.service.in +Index: systemd-224/units/emergency.service.in =================================================================== ---- systemd-221.orig/units/emergency.service.in -+++ systemd-221/units/emergency.service.in -@@ -17,7 +17,8 @@ Before=shutdown.target +--- systemd-224.orig/units/emergency.service.in ++++ systemd-224/units/emergency.service.in +@@ -17,7 +17,7 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=/root --ExecStartPre=-/bin/plymouth quit -+ExecStartPre=-/usr/bin/plymouth quit -+ExecStartPre=-/usr/bin/plymouth --wait +-ExecStartPre=-/bin/plymouth --wait quit ++ExecStartPre=-/usr/bin/plymouth --wait quit ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.' ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default" Type=idle -Index: systemd-221/units/rescue.service.in +Index: systemd-224/units/rescue.service.in =================================================================== ---- systemd-221.orig/units/rescue.service.in -+++ systemd-221/units/rescue.service.in +--- systemd-224.orig/units/rescue.service.in ++++ systemd-224/units/rescue.service.in @@ -16,7 +16,8 @@ Before=shutdown.target [Service] Environment=HOME=/root diff --git a/systemd-222.tar.xz b/systemd-222.tar.xz deleted file mode 100644 index acce86d0..00000000 --- a/systemd-222.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:167325ef6a1b1bc33b27bfc0f096ba429b89845131e14e24e840527a550c66cd -size 2845992 diff --git a/systemd-mini.changes b/systemd-mini.changes index ee8a7f02..dcdf8faa 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -5,6 +5,15 @@ Tue Aug 11 09:48:26 UTC 2015 - jengelh@inai.de windows:mingw:mingw64/mingw64-cross-gcc to do the bootstrap cycle and kick out -mini afterwards. +------------------------------------------------------------------- +Tue Aug 11 05:15:09 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 224 +* systemd-networkd gained a number of new configuration options + for DHCP, tunnels and bridges +* systemd-efi-boot-generator functionality was merged into + systemd-gpt-auto-generator. + ------------------------------------------------------------------- Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 126aeb62..11baf3c7 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -47,7 +47,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 222 +Version: 224 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -129,9 +129,8 @@ Provides: systemd-analyze = %{version} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 -#Git-Clone: git://anongit.freedesktop.org/systemd/systemd -#There are no release tarballs anymore, only releases through git. -Source: systemd-%version.tar.xz +#Git-Clone: git://github.com/systemd/systemd +Source: https://github.com/systemd/systemd/archive/v%version.tar.gz %if ! 0%{?bootstrap} Source1: systemd-rpmlintrc %else @@ -1226,7 +1225,6 @@ exit 0 %{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator %if 0%{has_efi} %{_bindir}/bootctl -%{_prefix}/lib/systemd/system-generators/systemd-efi-boot-generator %endif %{_prefix}/lib/systemd/system-generators/systemd-debug-generator %{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator diff --git a/systemd.changes b/systemd.changes index be7a016d..9ef263c2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -11,6 +11,15 @@ Tue Aug 11 09:48:26 UTC 2015 - jengelh@inai.de windows:mingw:mingw64/mingw64-cross-gcc to do the bootstrap cycle and kick out -mini afterwards. +------------------------------------------------------------------- +Tue Aug 11 05:15:09 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 224 +* systemd-networkd gained a number of new configuration options + for DHCP, tunnels and bridges +* systemd-efi-boot-generator functionality was merged into + systemd-gpt-auto-generator. + ------------------------------------------------------------------- Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com diff --git a/systemd.spec b/systemd.spec index c3d8cb14..57fd231f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -45,7 +45,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 222 +Version: 224 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -125,9 +125,8 @@ Provides: systemd-analyze = %{version} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 -#Git-Clone: git://anongit.freedesktop.org/systemd/systemd -#There are no release tarballs anymore, only releases through git. -Source: systemd-%version.tar.xz +#Git-Clone: git://github.com/systemd/systemd +Source: https://github.com/systemd/systemd/archive/v%version.tar.gz %if ! 0%{?bootstrap} Source1: systemd-rpmlintrc %else @@ -1228,7 +1227,6 @@ exit 0 %{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator %if 0%{has_efi} %{_bindir}/bootctl -%{_prefix}/lib/systemd/system-generators/systemd-efi-boot-generator %endif %{_prefix}/lib/systemd/system-generators/systemd-debug-generator %{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator diff --git a/v224.tar.gz b/v224.tar.gz new file mode 100644 index 00000000..d4d491a2 --- /dev/null +++ b/v224.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc +size 3868075