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

Accepting request 851251 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/851251
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=88
This commit is contained in:
Dominique Leuenberger 2020-12-03 17:37:42 +00:00 committed by Git OBS Bridge
commit bade7b272a
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plymouth-disable-fedora-logo.patch Normal file
View File

@ -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

17
plymouth.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sat 21 14:26:51 UTC 2020 - Cliff Zhao <qzhao@suse.com>
- 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 <qzhao@suse.com>
@ -6,6 +14,11 @@ Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao <qzhao@suse.com>
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 <lnussel@suse.de>
- Update plymouth.spec: prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Wed Oct 7 14:53:06 UTC 2020 - Cliff Zhao <qzhao@suse.com>
@ -87,8 +100,8 @@ 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).
/var during shutdown period(bnc#1105688, bnc#1129386,
bnc#1134660, bnc#1166601, bnc#1171971).
-------------------------------------------------------------------
Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <qzhao@suse.com>

11
plymouth.spec
View File

@ -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.
@ -389,9 +391,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 +421,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 +523,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*
@ -599,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