rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 323109 from home:jengelh:d3

Browse Source 
- 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
This commit is contained in:
Marcus Meissner 2015-08-17 20:36:04 +00:00 committed by Git OBS Bridge
parent e1ed5fb34d
commit bc922e2ffc
9 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
insserv-generator.patch
View File

@ -8,16 +8,16 @@ systemd unit drop-in files to add dependencies
--- ---
Makefile.am | 9 Makefile.am | 9
src/insserv-generator/Makefile | 28 ++ src/insserv-generator/Makefile | 28 ++
src/insserv-generator/insserv-generator.c | 315 ++++++++++++++++++++++++++++++ src/insserv-generator/insserv-generator.c | 316 ++++++++++++++++++++++++++++++
3 files changed, 351 insertions(+), 1 deletion(-) 3 files changed, 352 insertions(+), 1 deletion(-)
create mode 100644 src/insserv-generator/Makefile create mode 100644 src/insserv-generator/Makefile
create mode 100644 src/insserv-generator/insserv-generator.c 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-224.orig/Makefile.am
+++ systemd-221/Makefile.am +++ systemd-224/Makefile.am
@@ -618,7 +618,8 @@ nodist_systemunit_DATA += \ @@ -617,7 +617,8 @@ nodist_systemunit_DATA += \
systemgenerator_PROGRAMS += \ systemgenerator_PROGRAMS += \
systemd-sysv-generator \ systemd-sysv-generator \
@ -27,7 +27,7 @@ Index: systemd-221/Makefile.am
endif endif
EXTRA_DIST += \ EXTRA_DIST += \
@@ -2544,6 +2545,12 @@ $(systemd_boot): $(systemd_boot_solib) @@ -2556,6 +2557,12 @@ $(systemd_boot): $(systemd_boot_solib)
endif endif
endif endif
@ -40,10 +40,10 @@ Index: systemd-221/Makefile.am
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
stub_headers = \ stub_headers = \
src/boot/efi/util.h \ src/boot/efi/util.h \
Index: systemd-221/src/insserv-generator/Makefile Index: systemd-224/src/insserv-generator/Makefile
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ systemd-221/src/insserv-generator/Makefile +++ systemd-224/src/insserv-generator/Makefile
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
+# This file is part of systemd. +# This file is part of systemd.
+# +#
@ -73,11 +73,11 @@ Index: systemd-221/src/insserv-generator/Makefile
+ $(MAKE) -C .. clean + $(MAKE) -C .. clean
+ +
+.PHONY: all clean +.PHONY: all clean
Index: systemd-221/src/insserv-generator/insserv-generator.c Index: systemd-224/src/insserv-generator/insserv-generator.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ systemd-221/src/insserv-generator/insserv-generator.c +++ systemd-224/src/insserv-generator/insserv-generator.c
@@ -0,0 +1,315 @@ @@ -0,0 +1,316 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +/*-*- 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, + r = write_string_file(unit,
+ "# Automatically generated by systemd-insserv-generator\n\n" + "# Automatically generated by systemd-insserv-generator\n\n"
+ "[Unit]\n" + "[Unit]\n"
+ "Wants=remote-fs-pre.target\n"); + "Wants=remote-fs-pre.target\n",
+ WRITE_STRING_FILE_CREATE);
+ if (r) + if (r)
+ return r; + return r;
+ free (facility); + free (facility);

10
let-linker-find-libudev-for-libdevmapper.patch
View File

@ -2,17 +2,17 @@
configure.ac | 4 ---- configure.ac | 4 ----
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
Index: systemd-221/configure.ac Index: systemd-224/configure.ac
=================================================================== ===================================================================
--- systemd-221.orig/configure.ac --- systemd-224.orig/configure.ac
+++ systemd-221/configure.ac +++ systemd-224/configure.ac
@@ -194,10 +194,6 @@ AS_CASE([$CC], [*clang*], @@ -199,10 +199,6 @@ AS_CASE([$CC], [*clang*],
-Wno-gnu-variable-sized-type-not-at-end \ -Wno-gnu-variable-sized-type-not-at-end \
])]) ])])
-AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], -AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
- [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ - [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
- -flto -ffat-lto-objects])], - -flto])],
- [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) - [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")

29
plymouth-quit-and-wait-for-emergency-service.patch
View File

@ -1,13 +1,13 @@
--- ---
units/console-shell.service.m4.in | 2 ++ units/console-shell.service.m4.in | 2 ++
units/emergency.service.in | 3 ++- units/emergency.service.in | 2 +-
units/rescue.service.in | 3 ++- 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-224.orig/units/console-shell.service.m4.in
+++ systemd-221/units/console-shell.service.m4.in +++ systemd-224/units/console-shell.service.m4.in
@@ -17,6 +17,8 @@ Before=getty.target @@ -17,6 +17,8 @@ Before=getty.target
[Service] [Service]
Environment=HOME=/root Environment=HOME=/root
@ -17,24 +17,23 @@ Index: systemd-221/units/console-shell.service.m4.in
ExecStart=-@SULOGIN@ ExecStart=-@SULOGIN@
ExecStopPost=-@SYSTEMCTL@ poweroff ExecStopPost=-@SYSTEMCTL@ poweroff
Type=idle Type=idle
Index: systemd-221/units/emergency.service.in Index: systemd-224/units/emergency.service.in
=================================================================== ===================================================================
--- systemd-221.orig/units/emergency.service.in --- systemd-224.orig/units/emergency.service.in
+++ systemd-221/units/emergency.service.in +++ systemd-224/units/emergency.service.in
@@ -17,7 +17,8 @@ Before=shutdown.target @@ -17,7 +17,7 @@ Before=shutdown.target
[Service] [Service]
Environment=HOME=/root Environment=HOME=/root
WorkingDirectory=/root WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth quit -ExecStartPre=-/bin/plymouth --wait quit
+ExecStartPre=-/usr/bin/plymouth quit +ExecStartPre=-/usr/bin/plymouth --wait quit
+ExecStartPre=-/usr/bin/plymouth --wait
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.' 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" ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
Type=idle Type=idle
Index: systemd-221/units/rescue.service.in Index: systemd-224/units/rescue.service.in
=================================================================== ===================================================================
--- systemd-221.orig/units/rescue.service.in --- systemd-224.orig/units/rescue.service.in
+++ systemd-221/units/rescue.service.in +++ systemd-224/units/rescue.service.in
@@ -16,7 +16,8 @@ Before=shutdown.target @@ -16,7 +16,8 @@ Before=shutdown.target
[Service] [Service]
Environment=HOME=/root Environment=HOME=/root

3
systemd-222.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:167325ef6a1b1bc33b27bfc0f096ba429b89845131e14e24e840527a550c66cd
size 2845992

9
systemd-mini.changes
View File

@ -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 windows:mingw:mingw64/mingw64-cross-gcc to do the bootstrap
cycle and kick out -mini afterwards. 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 Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com

8
systemd-mini.spec
View File

@ -47,7 +47,7 @@
Name: systemd-mini Name: systemd-mini
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 222 Version: 224
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1+ License: LGPL-2.1+
@ -129,9 +129,8 @@ Provides: systemd-analyze = %{version}
Obsoletes: pm-utils <= 1.4.1 Obsoletes: pm-utils <= 1.4.1
Obsoletes: suspend <= 1.0 Obsoletes: suspend <= 1.0
#Git-Clone: git://anongit.freedesktop.org/systemd/systemd #Git-Clone: git://github.com/systemd/systemd
#There are no release tarballs anymore, only releases through git. Source: https://github.com/systemd/systemd/archive/v%version.tar.gz
Source: systemd-%version.tar.xz
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
Source1: systemd-rpmlintrc Source1: systemd-rpmlintrc
%else %else
@ -1226,7 +1225,6 @@ exit 0
%{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator %{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator
%if 0%{has_efi} %if 0%{has_efi}
%{_bindir}/bootctl %{_bindir}/bootctl
%{_prefix}/lib/systemd/system-generators/systemd-efi-boot-generator
%endif %endif
%{_prefix}/lib/systemd/system-generators/systemd-debug-generator %{_prefix}/lib/systemd/system-generators/systemd-debug-generator
%{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator %{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator

9
systemd.changes
View File

@ -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 windows:mingw:mingw64/mingw64-cross-gcc to do the bootstrap
cycle and kick out -mini afterwards. 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 Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com

8
systemd.spec
View File

@ -45,7 +45,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 222 Version: 224
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1+ License: LGPL-2.1+
@ -125,9 +125,8 @@ Provides: systemd-analyze = %{version}
Obsoletes: pm-utils <= 1.4.1 Obsoletes: pm-utils <= 1.4.1
Obsoletes: suspend <= 1.0 Obsoletes: suspend <= 1.0
#Git-Clone: git://anongit.freedesktop.org/systemd/systemd #Git-Clone: git://github.com/systemd/systemd
#There are no release tarballs anymore, only releases through git. Source: https://github.com/systemd/systemd/archive/v%version.tar.gz
Source: systemd-%version.tar.xz
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
Source1: systemd-rpmlintrc Source1: systemd-rpmlintrc
%else %else
@ -1228,7 +1227,6 @@ exit 0
%{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator %{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator
%if 0%{has_efi} %if 0%{has_efi}
%{_bindir}/bootctl %{_bindir}/bootctl
%{_prefix}/lib/systemd/system-generators/systemd-efi-boot-generator
%endif %endif
%{_prefix}/lib/systemd/system-generators/systemd-debug-generator %{_prefix}/lib/systemd/system-generators/systemd-debug-generator
%{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator %{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator

3
v224.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc
size 3868075