forked from pool/systemd
new snapshot
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=112
This commit is contained in:
Kay Sievers
Git OBS Bridge
parent
69321d18b8
commit
f1d0c9048a
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce6db8b30923c2508bd8bcfe957399939b23f958248a6460a6207396f0023fdf
|
||||
size 755192
|
||||
oid sha256:47448a4380dcff4bfae57c306f1fac6a3d989b233efd6aff013df635a2c7dc06
|
||||
size 756049
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From: Jeff Mahoney <jeffm@suse.com>
|
||||
Subject: systemd: Allow plymouth support from other distros than Fedora
|
||||
|
||||
This patch allows plymouth support to be included when building
|
||||
on distros other than Fedora. Specifically, it allows openSUSE.
|
||||
|
||||
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
||||
---
|
||||
|
||||
Makefile.am | 27 +++++++++++++++++----------
|
||||
configure.ac | 3 +++
|
||||
2 files changed, 20 insertions(+), 10 deletions(-)
|
||||
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -331,7 +331,11 @@ if TARGET_FEDORA
|
||||
dist_systemunit_DATA += \
|
||||
units/fedora/prefdm.service \
|
||||
units/fedora/rc-local.service \
|
||||
- units/fedora/halt-local.service \
|
||||
+ units/fedora/halt-local.service
|
||||
+endif
|
||||
+
|
||||
+if HAVE_PLYMOUTH
|
||||
+dist_systemunit_DATA += \
|
||||
units/fedora/plymouth-start.service \
|
||||
units/fedora/plymouth-read-write.service \
|
||||
units/fedora/plymouth-quit.service \
|
||||
@@ -1271,20 +1275,13 @@ install-data-hook:
|
||||
( cd $(DESTDIR)$(dbussessionservicedir) && \
|
||||
rm -f org.freedesktop.systemd1.service && \
|
||||
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
|
||||
-if TARGET_FEDORA
|
||||
+if HAVE_PLYMOUTH
|
||||
$(MKDIR_P) -m 0755 \
|
||||
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
|
||||
$(DESTDIR)$(systemunitdir)/reboot.target.wants \
|
||||
$(DESTDIR)$(systemunitdir)/kexec.target.wants \
|
||||
$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
|
||||
- $(DESTDIR)$(systemunitdir)/halt.target.wants \
|
||||
- $(DESTDIR)$(systemunitdir)/final.target.wants
|
||||
- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
|
||||
- rm -f rc-local.service && \
|
||||
- $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
|
||||
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
|
||||
- rm -f halt-local.service && \
|
||||
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
|
||||
+ $(DESTDIR)$(systemunitdir)/halt.target.wants
|
||||
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
|
||||
rm -f plymouth-start.service plymouth-read-write.service && \
|
||||
$(LN_S) ../plymouth-start.service plymouth-start.service && \
|
||||
@@ -1304,6 +1301,16 @@ if TARGET_FEDORA
|
||||
( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
|
||||
rm -f plymouth-halt.service && \
|
||||
$(LN_S) ../plymouth-halt.service plymouth-halt.service )
|
||||
+endif
|
||||
+
|
||||
+if TARGET_FEDORA
|
||||
+ $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
|
||||
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
|
||||
+ rm -f rc-local.service && \
|
||||
+ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
|
||||
+ ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
|
||||
+ rm -f halt-local.service && \
|
||||
+ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
|
||||
( cd $(DESTDIR)$(systemunitdir) && \
|
||||
rm -f display-manager.service && \
|
||||
$(LN_S) prefdm.service display-manager.service )
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -321,11 +321,13 @@ case $with_distro in
|
||||
SPECIAL_SYSLOG_SERVICE=rsyslog.service
|
||||
AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
|
||||
M4_DISTRO_FLAG=-DTARGET_FEDORA=1
|
||||
+ have_plymouth=true
|
||||
;;
|
||||
suse)
|
||||
SYSTEM_SYSVRCND_PATH=/etc/init.d
|
||||
AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE])
|
||||
M4_DISTRO_FLAG=-DTARGET_SUSE=1
|
||||
+ have_plymouth=true
|
||||
;;
|
||||
debian)
|
||||
SYSTEM_SYSVRCND_PATH=/etc
|
||||
@@ -421,6 +423,7 @@ AM_CONDITIONAL(TARGET_ARCH, test x"$with
|
||||
AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
|
||||
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
|
||||
AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
|
||||
+AM_CONDITIONAL(HAVE_PLYMOUTH, test -n "$have_plymouth")
|
||||
|
||||
AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 8 19:10:06 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- plymouth: move plymouth out of TARGET_FEDORA
|
||||
- build-sys: fix AC_COMPILE_IFELSE tests
|
||||
- build-sys: ensure selinux configure check follows logic of
|
||||
other optional features
|
||||
- build-sys: autodetect and use pkg-config for libselinux
|
||||
- dbus: use ControlGroup as property name to match config option
|
||||
- pam: optionally reset cgroup memberships for login sessions
|
||||
- load-fragment: properly parse Nice= value
|
||||
- automount: use unit_pending_inactive() where appropriate
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 8 17:40:29 CET 2011 - jeffm@suse.de
|
||||
|
||||
|
||||
@ -42,8 +42,7 @@ Requires: util-linux >= 2.18.91
|
||||
Conflicts: mkinitrd < 2.6.0-5
|
||||
Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2
|
||||
Source1: systemd-rpmlintrc
|
||||
Patch1: systemd-use-plymouth
|
||||
Patch42: 0001-Add-bootsplash-handling-for-password-dialogs.patch
|
||||
Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch
|
||||
|
||||
%description
|
||||
Systemd is a system and service manager, compatible with SysV and LSB
|
||||
@ -88,7 +87,6 @@ Plymouth integration for systemd
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch42 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user