rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 849666 from home:lnussel:usrmove

Browse Source 
- 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
This commit is contained in:
Cliff Zhao 2020-11-21 09:59:37 +00:00 committed by Git OBS Bridge
parent defc9e6e16
commit b7bad2cbea
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plymouth.changes
View File

@ -6,6 +6,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>
- prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Wed Oct 7 14:53:06 UTC 2020 - Cliff Zhao <qzhao@suse.com>

8
plymouth.spec
View File

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