pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 915281 from home:qzhao:branches:Base:System

Browse Source 
1. Add plymouth-keep-KillMode-none.patch: Keep the plymouth-start.service KillMode=none. The new mothod of mixed KillMode could not work with current edition of systemd and will block system boot (bsc#1177082 bsc#1184087 boo#1182145). 2. Update plymouth-dracut-path.patch: Make it could apply to prior update edition.

OBS-URL: https://build.opensuse.org/request/show/915281
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=304
This commit is contained in:
Cliff Zhao 2021-08-31 14:32:59 +00:00 committed by Git OBS Bridge
parent 16048bbdfd
commit 0b1ec851de
4 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plymouth-dracut-path.patch
View File

@ -1,7 +1,7 @@
diff -Nura plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in
--- plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in 2020-04-11 14:22:34.000000000 +0800
+++ plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in 2020-10-02 21:34:54.588764052 +0800
@@ -414,8 +414,8 @@
diff -Nura plymouth-0.9.5~git20210406.e554475/scripts/plymouth-populate-initrd.in plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-populate-initrd.in
--- plymouth-0.9.5~git20210406.e554475/scripts/plymouth-populate-initrd.in 2021-08-31 21:58:26.153527871 +0800
+++ plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-populate-initrd.in 2021-08-31 22:25:36.360335610 +0800
@@ -415,8 +415,8 @@
ddebug "Running with PLYMOUTH_LDD_PATH=$PLYMOUTH_LDD_PATH"
mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
@ -9,6 +9,6 @@ diff -Nura plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.i
-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
+inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd
+inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth
inst ${PLYMOUTH_DRM_ESCROW_PATH} $INITRDDIR
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

17
plymouth-keep-KillMode-none.patch Normal file
View File

@ -0,0 +1,17 @@
diff -Nura plymouth-0.9.5~git20210406.e554475/systemd-units/plymouth-start.service.in plymouth-0.9.5~git20210406.e554475_new/systemd-units/plymouth-start.service.in
--- plymouth-0.9.5~git20210406.e554475/systemd-units/plymouth-start.service.in 2021-04-06 19:53:40.000000000 +0800
+++ plymouth-0.9.5~git20210406.e554475_new/systemd-units/plymouth-start.service.in 2021-08-31 22:00:17.133637877 +0800
@@ -6,12 +6,11 @@
Before=systemd-ask-password-plymouth.service
ConditionKernelCommandLine=!plymouth.enable=0
ConditionVirtualization=!container
-IgnoreOnIsolate=true
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
Type=forking
RemainAfterExit=yes
-KillMode=mixed
+KillMode=none
SendSIGKILL=no

10
plymouth.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Aug 31 14:13:20 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Add plymouth-keep-KillMode-none.patch: Keep the plymouth-start.service
KillMode=none. The new mothod of "mixed" KillMode could not work
with current edition of systemd and will block system boot
(bsc#1177082 bsc#1184087 boo#1182145).
- Update plymouth-dracut-path.patch: Make it could apply to prior
update edition.
-------------------------------------------------------------------
Wed Aug 18 07:52:38 UTC 2021 - pandom79@gmail.com

4
plymouth.spec
View File

@ -36,7 +36,7 @@ URL: https://www.freedesktop.org/wiki/Software/Plymouth
Source0: %{name}-%{version}.tar.xz
Source1: boot-duration
# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com -- Prefix is /usr/sbin and /usr/bin
#Patch0: plymouth-dracut-path.patch
Patch0: plymouth-dracut-path.patch
# PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
Patch1: plymouth-some-greenish-openSUSE-colors.patch
# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- Make sure the runtime directory is /run and not /var/run
@ -49,6 +49,8 @@ Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch
Patch6: plymouth-disable-fedora-logo.patch
# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
Patch7: plymouth-only_use_fb_for_cirrus_bochs.patch
# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none.
Patch8: plymouth-keep-KillMode-none.patch
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
Patch1000: 0001-Add-label-ft-plugin.patch
# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.