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

Accepting request 140490 from Base:System

Browse Source 
Dracut scripts (forwarded request 140489 from tittiatcoke)

OBS-URL: https://build.opensuse.org/request/show/140490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=26
This commit is contained in:
Ismail Dönmez 2012-11-08 20:52:00 +00:00 committed by Git OBS Bridge
commit 8f373ff91d
7 changed files with 140 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ply-sdunitdir.patch Normal file
View File

@ -0,0 +1,11 @@
--- configure.ac.orig
+++ configure.ac
@@ -254,7 +254,7 @@ AM_CONDITIONAL(ENABLE_SYSTEMD_INTEGRATIO
if test x$enable_systemd_integration = xyes; then
AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with systemd])
- SYSTEMD_UNIT_DIR=/lib/systemd/system
+ SYSTEMD_UNIT_DIR=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
AC_SUBST(SYSTEMD_UNIT_DIR)
fi

52
plymoith-sd-notforking.patch Normal file
View File

@ -0,0 +1,52 @@
--- systemd-units/plymouth-halt.service.in.orig
+++ systemd-units/plymouth-halt.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-kexec.service.in.orig
+++ systemd-units/plymouth-kexec.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-poweroff.service.in.orig
+++ systemd-units/plymouth-poweroff.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-reboot.service.in.orig
+++ systemd-units/plymouth-reboot.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-start.service.in.orig
+++ systemd-units/plymouth-start.service.in
@@ -7,8 +7,7 @@ Before=systemd-ask-password-plymouth.ser
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=boot --attach-to-session
ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
KillMode=none
SendSIGKILL=no

3
plymouth-0.8.7.tar.bz2
View File

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

3
plymouth-0.8.8_git201211022126.tar.xz Normal file
View File

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

13
plymouth-dracut-path.patch Normal file
View File

@ -0,0 +1,13 @@
--- scripts/plymouth-populate-initrd.in 2012-08-21 01:25:52.000000000 +0200
+++ scripts/plymouth-populate-initrd.in 2012-11-01 18:27:22.760029873 +0100
@@ -372,8 +372,8 @@
[ -z "$INITRDDIR" ] && usage error
mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd
-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
+inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd
+inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth
inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR

35
plymouth.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Tue Nov 6 18:07:29 UTC 2012 - tittiatcoke@gmail.com
- Provide the scripts to integrate Plymouth in dracut as a
separate package.
- Added patch (plymouth-dracut-path.patch) to correct the paths
inside the specific plymouth-dracut scripts
-------------------------------------------------------------------
Mon Nov 5 17:35:39 UTC 2012 - crrodriguez@opensuse.org
- Update to an slightly newer git snapshot to fix regression
from 0.8.8
-------------------------------------------------------------------
Thu Nov 1 21:36:22 UTC 2012 - crrodriguez@opensuse.org
- Version 0.8.8
* main: Try to own socket before anything else
* main: silently succeed if plymouthd is started a second time
* service: start plymouthd unconditionally
* x11: make window fullscreen by default
* x11: only create windows when necessary
-------------------------------------------------------------------
Thu Nov 1 20:35:34 UTC 2012 - crrodriguez@opensuse.org
- plymoith-sd-notforking.patch: Make plymouthd to not use
Service type "forking"
- ply-sdunitdir.patch: Must install units in %{_unitdir} as
returned by pkg-config not in a hardcoded location.
-------------------------------------------------------------------
Fri Oct 12 08:59:08 UTC 2012 - tittiatcoke@gmail.com

33
plymouth.spec
View File

@ -22,13 +22,13 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
Version: 0.8.7
Version: 0.8.8_git201211022126
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
Group: System/Base
Url: http://freedesktop.org/software/plymouth/releases
Source0: %{name}-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.xz
Source1: boot-duration
# PATCH-OPENSUSE -- Support the openSUSE initrd
Patch1: suse-initrd-support
@ -44,9 +44,13 @@ Patch5: plymouth-restore-suspend.patch
Patch7: plymouth-udevadm-path.patch
# PATCH-OPENSUSE -- Remove tag not understood by systemd v44
Patch8: systemd-no-warning.patch
# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
Patch9: plymouth-dracut-path.patch
Patch10: 0001-Some-greenish-openSUSE-colors.patch
# PATCH-FIX-UPSTREAM -- Plymouth will check itself if it is already running (bnc#780976)
Patch11: plymouth-remove-pid-file.patch
Patch12: plymoith-sd-notforking.patch
Patch13: ply-sdunitdir.patch
BuildRequires: automake
BuildRequires: kernel-headers
BuildRequires: libtool
@ -60,6 +64,7 @@ BuildRequires: pkgconfig(libdrm_intel)
BuildRequires: pkgconfig(libdrm_nouveau)
BuildRequires: pkgconfig(libdrm_radeon)
BuildRequires: pkgconfig(libkms)
BuildRequires: pkgconfig(systemd)
Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts
%ifarch %ix86 x86_64 ppc ppc64
@ -137,6 +142,15 @@ Requires: %{name} = %{version}
This package contains utilities that integrate with Plymouth
including a boot log viewing application.
%package dracut
Summary: Plymouth related utilities for dracut
Group: System/Base
Supplements: packageand(plymouth:dracut)
Requires: %{name} = %{version}
%description dracut
This package contains utilities that integrate dracut with Plymouth
%package x11-renderer
Summary: Plymouth X11 renderer
Group: System/Base
@ -308,9 +322,11 @@ plugin.
%endif
%patch7 -p1
%patch8 -p1
%patch9 -p0
%patch10 -p1
#patch11 -p1
%patch12
%patch13
# replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
@ -334,14 +350,12 @@ autoreconf -fiv
--without-gdm-autostart-file \
--with-release-file=/etc/os-release
make %{?_smp_mflags}
make %{?_smp_mflags} V=1
%install
%make_install
rm -f %{buildroot}/%{_bindir}/rhgb-client
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd
#Link the plymouth client binary also to /bin until the move to /usr is completed
mkdir %{buildroot}/bin
@ -476,7 +490,12 @@ fi
%{_localstatedir}/spool/plymouth
%{_mandir}/man?/*
%ghost %{_localstatedir}/lib/plymouth/boot-duration
/lib/systemd/system/*
%{_unitdir}/*
%files dracut
%defattr(-, root, root)
%{_libexecdir}/plymouth/plymouth-populate-initrd
%{_libexecdir}/plymouth/plymouth-generate-initrd
%files devel
%defattr(-, root, root)