From defc9e6e16002dc0c16a8163383564b83f0f0500a9091484d91bb5a2d3d039d6 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 12 Nov 2020 17:01:03 +0000 Subject: [PATCH 1/3] Accepting request 848184 from home:qzhao:branches:Base:System update bug numbers in changelog. OBS-URL: https://build.opensuse.org/request/show/848184 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=280 --- plymouth.changes | 4 ++-- plymouth.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 0432f53..44ded5a 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -87,8 +87,8 @@ Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao - 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). + /var during shutdown period(bnc#1105688, bnc#1129386, + bnc#1134660, bnc#1166601, bnc#1171971). ------------------------------------------------------------------- Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index fbb2b85..351250c 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From b7bad2cbeaba173045d82b1f9855e9242ad8c3d6f77194f5207aaedc59ce45b5 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Sat, 21 Nov 2020 09:59:37 +0000 Subject: [PATCH 2/3] Accepting request 849666 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/849666 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=281 --- plymouth.changes | 5 +++++ plymouth.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 44ded5a..c07d06b 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -6,6 +6,11 @@ Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao the test, and yast-installation prgram has a feature to install system through it (bnc#1051692 bnc#1164123 bnc#1170906). +------------------------------------------------------------------- +Fri Oct 16 10:16:39 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Wed Oct 7 14:53:06 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 351250c..3423121 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -389,9 +389,11 @@ make %{?_smp_mflags} %make_install rm -f %{buildroot}/%{_bindir}/rhgb-client +%if !0%{?usrmerged} #Link the plymouth client binary also to /bin until the move to /usr is completed mkdir %{buildroot}/bin (cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth) +%endif # Glow isn't quite ready for primetime rm -rf %{buildroot}%{_datadir}/plymouth/glow/ @@ -417,14 +419,14 @@ rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf if [ ! -e /.buildenv ]; then [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration fi -[ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : +%service_add_post %postun %{?regenerate_initrd_post} +%service_del_postun if [ $1 -eq 0 ]; then rm -f %{_libdir}/plymouth/default.so rm -f /boot/initrd-plymouth.img - [ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %posttrans @@ -519,7 +521,9 @@ fi /etc/logrotate.d/bootlog %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth +%if !0%{?usrmerged} /bin/plymouth +%endif %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* From 431292c3c0743c6bdb6d75170c7b4f0c4065a20f76bf95a02b2db0e8553fe0ec Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Fri, 27 Nov 2020 08:24:41 +0000 Subject: [PATCH 3/3] Accepting request 851248 from home:qzhao:branches:Base:System Add plymouth-disable-fedora-logo.patch: Disable the image link which point to the fedora logo. this modification will also avoid the failure report from build checker. OBS-URL: https://build.opensuse.org/request/show/851248 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=282 --- plymouth-disable-fedora-logo.patch | 8 ++++++++ plymouth.changes | 10 +++++++++- plymouth.spec | 5 +++-- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 plymouth-disable-fedora-logo.patch diff --git a/plymouth-disable-fedora-logo.patch b/plymouth-disable-fedora-logo.patch new file mode 100644 index 0000000..5577ede --- /dev/null +++ b/plymouth-disable-fedora-logo.patch @@ -0,0 +1,8 @@ +diff -Nura plymouth-0.9.5+git20200921+20778f2/themes/spinfinity/Makefile.am plymouth-0.9.5+git20200921+20778f2_new/themes/spinfinity/Makefile.am +--- plymouth-0.9.5+git20200921+20778f2/themes/spinfinity/Makefile.am 2020-04-11 14:22:34.000000000 +0800 ++++ plymouth-0.9.5+git20200921+20778f2_new/themes/spinfinity/Makefile.am 2020-11-26 22:11:57.472271985 +0800 +@@ -54,4 +54,3 @@ + EXTRA_DIST = spinfinity.plymouth.in + + install-data-hook: +- ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png diff --git a/plymouth.changes b/plymouth.changes index c07d06b..07181f5 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sat 21 14:26:51 UTC 2020 - Cliff Zhao + +- Add plymouth-disable-fedora-logo.patch: + Disable the image link which point to the fedora logo. this + modification will also avoid the failure report from build + checker. + ------------------------------------------------------------------- Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao @@ -9,7 +17,7 @@ Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao ------------------------------------------------------------------- Fri Oct 16 10:16:39 UTC 2020 - Ludwig Nussel -- prepare usrmerge (boo#1029961) +- Update plymouth.spec: prepare usrmerge (boo#1029961) ------------------------------------------------------------------- Wed Oct 7 14:53:06 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 3423121..3e6bd81 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -47,6 +47,8 @@ Patch3: plymouth-manpages.patch Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch # PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1051692 bnc#1164123 bnc#1170906 -- Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it. Patch5: plymouth-ignore-serial-console.patch +# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. +Patch6: plymouth-disable-fedora-logo.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. @@ -603,7 +605,6 @@ fi %{_datadir}/plymouth/themes/spinfinity/entry.png %{_datadir}/plymouth/themes/spinfinity/lock.png %{_datadir}/plymouth/themes/spinfinity/capslock.png -%{_datadir}/plymouth/themes/spinfinity/header-image.png %{_datadir}/plymouth/themes/spinfinity/keyboard.png %{_datadir}/plymouth/themes/spinfinity/keymap-render.png %{_datadir}/plymouth/themes/spinfinity/animation-0001.png