Accepting request 548021 from Base:System

OBS-URL: https://build.opensuse.org/request/show/548021
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger 2017-12-08 20:46:18 +00:00 committed by Git OBS Bridge
commit e580ba0906
3 changed files with 7 additions and 27 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 29 07:59:40 UTC 2017 - qzhao@suse.com
- Drop stop-graphical.patch: There are no conflicting these days,
obsolete this patch to enable auto switch to TTY when display
server not exist (boo#1066510).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 14 06:16:48 UTC 2017 - qzhao@suse.com Wed Jun 14 06:16:48 UTC 2017 - qzhao@suse.com

View File

@ -32,8 +32,6 @@ Source0: %{name}-%{version}.tar.xz
Source1: boot-duration Source1: boot-duration
# PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes # PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
Patch3: plymouth-fix-window-size Patch3: plymouth-fix-window-size
# PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service
Patch4: stop-graphical.patch
# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin # PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
Patch9: plymouth-dracut-path.patch Patch9: plymouth-dracut-path.patch
Patch10: 0001-Some-greenish-openSUSE-colors.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch
@ -337,7 +335,6 @@ plugin.
%prep %prep
%setup -q %setup -q
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch9 %patch9
%patch10 -p1 %patch10 -p1
%patch16 -p1 %patch16 -p1

View File

@ -1,24 +0,0 @@
Index: plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in
===================================================================
--- plymouth-0.9.2.orig/systemd-units/plymouth-quit-wait.service.in
+++ plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in
@@ -1,6 +1,7 @@
[Unit]
Description=Hold until boot process finishes up
After=rc-local.service plymouth-start.service systemd-user-sessions.service
+Conflicts=graphical.target
[Service]
ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait
Index: plymouth-0.9.2/systemd-units/plymouth-quit.service.in
===================================================================
--- plymouth-0.9.2.orig/systemd-units/plymouth-quit.service.in
+++ plymouth-0.9.2/systemd-units/plymouth-quit.service.in
@@ -1,6 +1,7 @@
[Unit]
Description=Terminate Plymouth Boot Screen
After=rc-local.service plymouth-start.service systemd-user-sessions.service
+Conflicts=graphical.target
[Service]
ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit