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

- Add patch plymouth-avoid-umount-hanging-shutdown.patch:
To avoid grantpt() call nsslookup, it will hanging system unmount /var during shutdown period(bsc#1105688, bsc#1129386,  bsc#1134660).
- Update to version 0.9.5+git20190908+3abfab2:
  * two-step: Deal with buggy firmware which does not pre-rotate the bgrt image
  * configure: bump so name
  * Internationalization: Add zh_HK and zh_TW translations.
  * add delay time to 8 seconds to fit AMD graphic card.

OBS-URL: https://build.opensuse.org/request/show/730061
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=240
This commit is contained in:
Cliff Zhao 2019-09-11 08:41:16 +00:00 committed by Git OBS Bridge
parent cde496bac0
commit dd5648f4ae
5 changed files with 61 additions and 32 deletions

View File

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

View File

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

View File

@ -0,0 +1,19 @@
diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c
--- plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c 2019-09-09 07:31:37.000000000 +0000
+++ plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c 2019-09-11 07:41:17.432945317 +0000
@@ -183,6 +183,7 @@
ply_trace (" opened device '/dev/ptmx'");
+#if 0
ply_trace ("creating pseudoterminal");
if (grantpt (session->pseudoterminal_master_fd) < 0) {
ply_save_errno ();
@@ -192,6 +193,7 @@
return false;
}
ply_trace ("done creating pseudoterminal");
+#endif
ply_trace ("unlocking pseudoterminal");
if (unlockpt (session->pseudoterminal_master_fd) < 0) {

View File

@ -1,12 +1,19 @@
-------------------------------------------------------------------
Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao <qzhao@suse.com>
- Add patch plymouth-avoid-umount-hanging-shutdown.patch:
To avoid grantpt() call nsslookup, it will hanging system unmount
/var during shutdown period(bsc#1105688, bsc#1129386,
bsc#1134660).
-------------------------------------------------------------------
Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <qzhao@suse.com>
- Update to version 0.9.5-20190814+git0d0f21a:
- Update to version 0.9.5+git20190908+3abfab2:
* two-step: Deal with buggy firmware which does not pre-rotate the bgrt image
* configure: bump so name
* Internationalization: Add zh_HK and zh_TW translations.
* ply-systemd-units: Drop attach-session functions.
* fix (bsc#1105688, bsc#1129386, bsc#1134660).
* add delay time to 8 seconds to fit AMD graphic card.
-------------------------------------------------------------------
Mon Aug 5 05:58:21 UTC 2019 - Cliff Zhao <qzhao@suse.com>

View File

@ -26,8 +26,8 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
Version: 0.9.5
Release: 20190814+git0d0f21a
Version: 0.9.5+git20190908+3abfab2
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
Group: System/Base
@ -45,12 +45,15 @@ Patch2: plymouth-correct-runtime-dir.patch
Patch3: plymouth-manpages.patch
# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 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.
Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch
# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown.
Patch5: plymouth-avoid-umount-hanging-shutdown.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.
Patch5: 0001-Add-label-ft-plugin.patch
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.
Patch6: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
Patch7: 0003-fix_null_deref.patch
Patch1002: 0003-fix_null_deref.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@ -140,7 +143,7 @@ Requires: %{name}-x11-renderer = %{version}
Requires: libply-boot-client5 = %{version}
Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics5 = %{version}
Requires: libply4 = %{version}
Requires: libply5 = %{version}
Requires: pkgconfig
%description devel
@ -182,7 +185,7 @@ the system.
%package plugin-label
Summary: Plymouth label plugin
Group: System/Base
Requires: libply-splash-graphics4 = %{version}
Requires: libply-splash-graphics5 = %{version}
%description plugin-label
This package contains the label control plugin for
@ -193,7 +196,7 @@ graphical boot splashes using pango and cairo.
Summary: Plymouth FreeType label plugin
Group: System/Base
Requires: fontconfig
Requires: libply-splash-graphics4 = %{version}
Requires: libply-splash-graphics5 = %{version}
%description plugin-label-ft
This package contains the label control plugin for
@ -203,9 +206,9 @@ graphical boot splashes using FreeTyoe
%package plugin-fade-throbber
Summary: Plymouth "Fade-Throbber" plugin
Group: System/Base
Requires: libply-splash-core4 = %{version}
Requires: libply-splash-graphics4 = %{version}
Requires: libply4 = %{version}
Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics5 = %{version}
Requires: libply5 = %{version}
%description plugin-fade-throbber
This package contains the "Fade-In" boot splash plugin for
@ -216,9 +219,9 @@ while other images pulsate around during system boot up.
Summary: Plymouth "Throbgress" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
Requires: libply-splash-core4 = %{version}
Requires: libply-splash-graphics4 = %{version}
Requires: libply4 = %{version}
Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics5 = %{version}
Requires: libply5 = %{version}
%description plugin-throbgress
This package contains the "throbgress" boot splash plugin for
@ -230,9 +233,9 @@ the screen.
Summary: Plymouth "space-flares" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
Requires: libply-splash-core4 = %{version}
Requires: libply-splash-graphics4 = %{version}
Requires: libply4 = %{version}
Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics5 = %{version}
Requires: libply5 = %{version}
%description plugin-space-flares
This package contains the "space-flares" boot splash plugin for
@ -241,9 +244,9 @@ Plymouth. It features a corner image with animated flares.
%package plugin-two-step
Summary: Plymouth "two-step" plugin
Group: System/Base
Requires: libply-splash-core4 = %{version}
Requires: libply-splash-graphics4 = %{version}
Requires: libply4 = %{version}
Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics5 = %{version}
Requires: libply5 = %{version}
Requires: plymouth-plugin-label = %{version}
%description plugin-two-step
@ -255,9 +258,9 @@ short, fast one-shot animation.
%package plugin-script
Summary: Plymouth "script" plugin
Group: System/Base
Requires: libply-splash-core4 = %{version}
Requires: libply-splash-graphics4 = %{version}
Requires: libply4 = %{version}
Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics5 = %{version}
Requires: libply5 = %{version}
%description plugin-script
This package contains the "script" boot splash plugin for
@ -268,9 +271,9 @@ boot splash themes.
%package plugin-tribar
Summary: Plymouth "script" plugin
Group: System/Base
Requires: libply-splash-core4 = %{version}
Requires: libply-splash-graphics4 = %{version}
Requires: libply4 = %{version}
Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics5 = %{version}
Requires: libply5 = %{version}
%description plugin-tribar
This package contains the "tribar" boot splash plugin for