Accepting request 172912 from home:elvigia:branches:Base:System
- Also ensure we express rpm dependencies correctly this package is not gonna work on systemd < 186. - Update to version 0.8.8_git201304161248 - drop plymouth-change-service-name.patch, replaced by a sed script that will account for all service files' future changes - drop patch plymouth-trace-lines, in upstream now - drop plymouth-udevadm-path.patch, generic solution in upstream now. - drop ply-sdunitdir.patch likewise. - drop plymouth-systemd-in-usr.patch likewise. - drop systemd-no-warning.patch, not needed with newer systemd - drop plymouth-sd-notforking.patch , not really needed anymore. OBS-URL: https://build.opensuse.org/request/show/172912 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=103
This commit is contained in:
Raymond Wooninck
Git OBS Bridge
parent
612dfcf6db
commit
635cec0fdb
@ -1,11 +0,0 @@
|
||||
--- 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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:333fced6dc5d061db6d71903256ff1d9366bb8687fc829539ddb027e4693f6df
|
||||
size 791860
|
||||
3
plymouth-0.8.8_git201304161248.tar.xz
Normal file
3
plymouth-0.8.8_git201304161248.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9edd55b792972325b2596520b75e07dd27655ee066ce483e2ec0cb000ddae5bd
|
||||
size 792324
|
||||
@ -1,50 +0,0 @@
|
||||
Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-halt.service.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-halt.service.in
|
||||
+++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-halt.service.in
|
||||
@@ -1,6 +1,6 @@
|
||||
[Unit]
|
||||
Description=Show Plymouth Halt Screen
|
||||
-After=getty@tty1.service prefdm.service plymouth-start.service
|
||||
+After=getty@tty1.service display-manager.service plymouth-start.service
|
||||
Before=halt.service
|
||||
DefaultDependencies=no
|
||||
ConditionKernelCommandLine=!plymouth.enable=0
|
||||
Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-kexec.service.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-kexec.service.in
|
||||
+++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-kexec.service.in
|
||||
@@ -1,6 +1,6 @@
|
||||
[Unit]
|
||||
Description=Show Plymouth Reboot with kexec Screen
|
||||
-After=getty@tty1.service prefdm.service plymouth-start.service
|
||||
+After=getty@tty1.service display-manager.service plymouth-start.service
|
||||
Before=kexec.service
|
||||
DefaultDependencies=no
|
||||
ConditionKernelCommandLine=!plymouth.enable=0
|
||||
Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-poweroff.service.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-poweroff.service.in
|
||||
+++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-poweroff.service.in
|
||||
@@ -1,6 +1,6 @@
|
||||
[Unit]
|
||||
Description=Show Plymouth Power Off Screen
|
||||
-After=getty@tty1.service prefdm.service plymouth-start.service
|
||||
+After=getty@tty1.service display-manager.service plymouth-start.service
|
||||
Before=poweroff.service
|
||||
DefaultDependencies=no
|
||||
ConditionKernelCommandLine=!plymouth.enable=0
|
||||
Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-reboot.service.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-reboot.service.in
|
||||
+++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-reboot.service.in
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Show Plymouth Reboot Screen
|
||||
-After=getty@tty1.service prefdm.service plymouth-start.service
|
||||
-Before=reboot.service
|
||||
+After=getty@tty1.service display-manager.service plymouth-start.service
|
||||
+Before=systemd-reboot.service
|
||||
DefaultDependencies=no
|
||||
ConditionKernelCommandLine=!plymouth.enable=0
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
--- systemd-units/plymouth-halt.service.in.orig
|
||||
+++ systemd-units/plymouth-halt.service.in
|
||||
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
|
||||
Before=halt.service
|
||||
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
|
||||
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
|
||||
Before=kexec.service
|
||||
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
|
||||
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
|
||||
Before=poweroff.service
|
||||
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
|
||||
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
|
||||
Before=reboot.service
|
||||
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
|
||||
@@ -5,10 +5,9 @@ Wants=systemd-ask-password-plymouth.path
|
||||
After=systemd-vconsole-setup.service systemd-udev-trigger.service
|
||||
Before=systemd-ask-password-plymouth.service
|
||||
ConditionKernelCommandLine=!plymouth.enable=0
|
||||
|
||||
[Service]
|
||||
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
|
||||
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --no-daemon --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
|
||||
@ -1,12 +0,0 @@
|
||||
Index: b/systemd-units/systemd-ask-password-plymouth.service.in
|
||||
===================================================================
|
||||
--- a/systemd-units/systemd-ask-password-plymouth.service.in
|
||||
+++ b/systemd-units/systemd-ask-password-plymouth.service.in
|
||||
@@ -6,6 +6,6 @@ After=plymouth-start.service
|
||||
Before=shutdown.target
|
||||
ConditionKernelCommandLine=!plymouth.enable=0
|
||||
ConditionPathExists=/run/plymouth/pid
|
||||
|
||||
[Service]
|
||||
-ExecStart=/bin/systemd-tty-ask-password-agent --watch --plymouth
|
||||
+ExecStart=/usr/bin/systemd-tty-ask-password-agent --watch --plymouth
|
||||
@ -1,26 +0,0 @@
|
||||
From: Jeff Mahoney <jeffm@suse.com>
|
||||
Subject: plymouth: Add line numbers to tracing output
|
||||
|
||||
The plymouth tracing output lists the function but there are many
|
||||
cases in which the same message is issued from multiple places in the same
|
||||
function, which makes debugging more difficult. This patch adds the line
|
||||
number to the output to uniquely identify each site.
|
||||
|
||||
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
||||
---
|
||||
src/libply/ply-logger.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/src/libply/ply-logger.h
|
||||
+++ b/src/libply/ply-logger.h
|
||||
@@ -91,8 +91,8 @@ do
|
||||
ply_logger_flush (logger); \
|
||||
errno = _old_errno; \
|
||||
ply_logger_inject (logger, \
|
||||
- "[%s] %45.45s:" format "\r\n", \
|
||||
- __FILE__, __func__, ##args); \
|
||||
+ "[%s:%d] %45.45s:" format "\r\n", \
|
||||
+ __FILE__, __LINE__, __func__, ##args); \
|
||||
ply_logger_flush (logger); \
|
||||
errno = _old_errno; \
|
||||
} \
|
||||
@ -1,13 +0,0 @@
|
||||
Index: plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.6.1.orig/systemd-units/plymouth-start.service.in
|
||||
+++ plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
|
||||
@@ -9,7 +9,7 @@ ConditionPathExists=!@plymouthruntimedir
|
||||
|
||||
[Service]
|
||||
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
|
||||
-ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash
|
||||
+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
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 22 19:47:44 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
- Also ensure we express rpm dependencies correctly
|
||||
this package is not gonna work on systemd < 186.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 22 19:32:40 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
- Update to version 0.8.8_git201304161248
|
||||
- drop plymouth-change-service-name.patch, replaced by
|
||||
a sed script that will account for all service files' future changes
|
||||
- drop patch plymouth-trace-lines, in upstream now
|
||||
- drop plymouth-udevadm-path.patch, generic solution in upstream now.
|
||||
- drop ply-sdunitdir.patch likewise.
|
||||
- drop plymouth-systemd-in-usr.patch likewise.
|
||||
- drop systemd-no-warning.patch, not needed with newer systemd
|
||||
- drop plymouth-sd-notforking.patch , not really needed anymore.
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 21:13:14 UTC 2013 - tittiatcoke@gmail.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
%define plymouth_initrd_file /boot/initrd-plymouth.img
|
||||
|
||||
Name: plymouth
|
||||
Version: 0.8.8_git201211022126
|
||||
Version: 0.8.8_git201304161248
|
||||
Release: 0
|
||||
Summary: Graphical Boot Animation and Logger
|
||||
License: GPL-2.0+
|
||||
@ -32,27 +32,15 @@ Source0: %{name}-%{version}.tar.xz
|
||||
Source1: boot-duration
|
||||
# PATCH-OPENSUSE -- Support the openSUSE initrd
|
||||
Patch1: suse-initrd-support
|
||||
# PATCH-OPENSUSE -- Add line numbers to tracing output
|
||||
Patch2: plymouth-trace-lines
|
||||
# PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
|
||||
Patch3: plymouth-fix-window-size
|
||||
# PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service
|
||||
Patch4: stop-graphical.patch
|
||||
# PATCH-OPENSUSE -- Restore suspend / resume state (needed for suspend package)
|
||||
Patch5: plymouth-restore-suspend.patch
|
||||
# PATCH-OPENSUSE -- Change udevadm path
|
||||
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
|
||||
Patch12: plymouth-sd-notforking.patch
|
||||
Patch13: ply-sdunitdir.patch
|
||||
# PATCH-OPENSUSE -- systemd-tty-ask-password-agent is in /usr/bin now.
|
||||
Patch14: plymouth-systemd-in-usr.patch
|
||||
# PATCH-FIX-UPSTREAM plymouth-change-service-name.patch fcrozaŧ@suse.com -- ensure correct service names are used
|
||||
Patch15: plymouth-change-service-name.patch
|
||||
# PATCH-OPENSUSE -- plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- make sure the runtime directory is /run and not /var/run
|
||||
Patch16: plymouth-correct-runtime-dir.patch
|
||||
BuildRequires: automake
|
||||
@ -68,13 +56,13 @@ BuildRequires: pkgconfig(libdrm_intel)
|
||||
BuildRequires: pkgconfig(libdrm_nouveau)
|
||||
BuildRequires: pkgconfig(libdrm_radeon)
|
||||
BuildRequires: pkgconfig(libkms)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(systemd) >= 186
|
||||
Requires: %{name}-branding
|
||||
Requires: gnu-unifont-bitmap-fonts
|
||||
%ifarch %ix86 x86_64 ppc ppc64
|
||||
Requires: suspend >= 0.80.20100129.1
|
||||
%endif
|
||||
Requires: systemd >= 44
|
||||
Requires: systemd >= 186
|
||||
Requires(post): plymouth-scripts = %{version}
|
||||
Requires(post): mkinitrd
|
||||
Suggests: plymouth-plugin-label
|
||||
@ -318,23 +306,13 @@ plugin.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%ifarch %ix86 x86_64 ppc ppc64
|
||||
%patch5 -p1
|
||||
%endif
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p0
|
||||
%patch10 -p1
|
||||
%patch12
|
||||
%patch13
|
||||
# haha, evil condition... :-)
|
||||
%if "0%(type -p systemd-tty-ask-password-agent)" == "0/usr/bin/systemd-tty-ask-password-agent"
|
||||
%patch14 -p1
|
||||
%endif
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
# replace builddate with patch0date
|
||||
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
|
||||
@ -387,6 +365,7 @@ cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfd
|
||||
mkdir -p %{buildroot}/lib/mkinitrd/scripts
|
||||
install -t %{buildroot}/lib/mkinitrd/scripts \
|
||||
scripts/{setup,boot}-plymouth*.sh
|
||||
find %{buildroot} -type f -name "*.service" -print -exec sed -i -e 's@prefdm.service@display-manager.service@g' -e 's@reboot.service@systemd-reboot.service@g' {} +
|
||||
|
||||
%post
|
||||
if [ ! -e /.buildenv ]; then
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
Index: plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.path.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.6.1.orig/systemd-units/systemd-ask-password-plymouth.path.in
|
||||
+++ plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.path.in
|
||||
@@ -1,6 +1,5 @@
|
||||
[Unit]
|
||||
Description=Forward Password Requests to Plymouth Directory Watch
|
||||
-Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target
|
||||
After=plymouth-start.service
|
||||
Index: plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.service.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.6.1.orig/systemd-units/systemd-ask-password-plymouth.service.in
|
||||
+++ plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.service.in
|
||||
@@ -1,6 +1,5 @@
|
||||
[Unit]
|
||||
Description=Forward Password Requests to Plymouth
|
||||
-Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target
|
||||
After=plymouth-start.service
|
||||
Loading…
Reference in New Issue
Block a user