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

Accepting request 832702 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/832702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=84
This commit is contained in:
Dominique Leuenberger 2020-09-24 14:11:50 +00:00 committed by Git OBS Bridge
commit 8f38aa67a1
3 changed files with 89 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch Normal file
View File

@ -0,0 +1,48 @@
diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme.in plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in
--- plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme.in 2019-09-09 15:31:37.000000000 +0800
+++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-09-07 16:09:51.568487811 +0800
@@ -58,7 +58,12 @@
function get_default_theme ()
{
- THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_CONFDIR}/plymouthd.conf)
+ if [ -f /etc/plymouth/plymouthd.conf ]; then
+ THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_CONFDIR}/plymouthd.conf)
+ elif [ -f /usr/share/plymouth/plymouthd.defaults ]; then
+ THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults)
+ fi
+
if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then
THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_POLICYDIR}/plymouthd.defaults)
fi
@@ -168,9 +173,16 @@
fi
if [ $DO_RESET -ne 0 ]; then
- [ -f ${PLYMOUTH_CONFDIR}/plymouthd.conf ] || exit 0
- sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
- exit $?
+ if [ -f ${PLYMOUTH_CONFDIR}/plymouthd.conf ]; then
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ exit $?
+ elif [ -f ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ]; then
+ cp ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ exit $?
+ else
+ exit 0
+ fi
fi
if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/Makefile.am plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am
--- plymouth-0.9.5+git20190908+3abfab2/src/Makefile.am 2019-09-09 15:31:37.000000000 +0800
+++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-07 10:50:57.711594680 +0800
@@ -16,6 +16,7 @@
plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \
-rdynamic \
+ -DPLYMOUTH_DATADIR=\"$(PLYMOUTH_DATAPATH)\" \
-DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\" \
-DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\" \
-DPLYMOUTH_POLICY_DIR=\"$(PLYMOUTH_POLICY_DIR)/\" \

16
plymouth.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sat Aug 29 06:13:50 UTC 2020 - Cliff Zhao <qzhao@suse.com>
- Add plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch:
plymouth will use plymouthd.defaults instead of plymouth.conf and
packge plymouthd.defaults in a seperet RPM. this can avoid change
SUSE or openSUSE branding section with is_opensuse macro in the
config file. means this modification can close the leaps gap
(jsc#SLE-11637).
-------------------------------------------------------------------
Sat Aug 28 16:11:25 UTC 2020 - Cliff Zhao <qzhao@suse.com>
- Update plymouth.spec: Dropping gdm transition because it has
alreay deprecated by upstream. Removing git build dependency.
-------------------------------------------------------------------
Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao <qzhao@suse.com>

42
plymouth.spec
View File

@ -33,7 +33,6 @@ Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
Group: System/Base
URL: http://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
@ -46,18 +45,17 @@ Patch2: plymouth-correct-runtime-dir.patch
Patch3: plymouth-manpages.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.
Patch4: plymouth-avoid-umount-hanging-shutdown.patch
# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap.
Patch5: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.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.
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.
Patch1002: 0003-fix_null_deref.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc
BuildRequires: git
BuildRequires: kernel-headers
BuildRequires: libtool
BuildRequires: libxslt
@ -78,7 +76,6 @@ BuildRequires: pkgconfig(systemd) >= 186
%if %{with x11_renderer}
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
%endif
Recommends: %{name}-lang
Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts
@ -131,6 +128,17 @@ Requires: libply-boot-client%{soversion} = %{version}
%description -n libply%{soversion}
This package contains the libply library used by Plymouth.
%package branding-upstream
Summary: default configuration file and branding from the Plymouth upstream.
Group: System/Base
Provides: %{name}-branding = %{version}-%{release}.
Conflicts: %{name}-branding
BuildArch: noarch
%description branding-upstream
This package contains the /usr/share/plymouthd.defaults which contains the basic
settings and branding from the upstream.
%package devel
Summary: Libraries and headers for writing Plymouth splash plugins
Group: Development/Libraries/C and C++
@ -364,16 +372,12 @@ This package contains the "bgrt" boot splash theme for
Plymouth.
%prep
%autosetup -S git
autoreconf -ivf -Wno-portabilty
%setup -q
%autopatch -p1
autoreconf -ivf
# replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c
# Change the default theme
%if 0%{?is_opensuse}
sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
%else
sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
%endif
%build
%configure \
@ -381,7 +385,6 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
--enable-tracing \
--disable-silent-rules \
--disable-static \
--disable-gdm-transition \
--disable-upstart-monitoring \
--disable-tests \
--disable-libkms \
@ -421,7 +424,10 @@ touch %{buildroot}%{_localstatedir}/log/boot.log
touch %{buildroot}%{_localstatedir}/spool/plymouth/boot.log
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth
cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf
# We will nolonger ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-11637).
rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf
rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf
%post
%{?regenerate_initrd_post}
@ -526,7 +532,7 @@ fi
%dir %{_libdir}/plymouth
%dir %{_libdir}/plymouth/renderers
%dir %{_sysconfdir}/plymouth
%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
%ghost %{_sysconfdir}/plymouth/plymouthd.conf
%{plymouthdaemon_execdir}/plymouthd
%{plymouthclient_execdir}/plymouth
/bin/plymouth
@ -537,7 +543,6 @@ fi
%{_datadir}/plymouth/default-boot-duration
%{_datadir}/plymouth/themes/details/details.plymouth
%{_datadir}/plymouth/themes/text/text.plymouth
%{_datadir}/plymouth/plymouthd.defaults
%{_datadir}/plymouth/bizcom.png
%ghost /run/plymouth
%{_localstatedir}/spool/plymouth
@ -547,6 +552,9 @@ fi
%ghost %{_localstatedir}/log/boot.log
/usr/share/locale/
%files branding-upstream
%{_datadir}/plymouth/plymouthd.defaults
%files dracut
%{_libexecdir}/plymouth/plymouth-populate-initrd
%{_libexecdir}/plymouth/plymouth-generate-initrd