pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4e0545865e
plymouth/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch

48 lines
2.5 KiB
Diff
Raw Normal View History

Accepting request 830565 from home:qzhao:branches:Base:System 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-12090). OBS-URL: https://build.opensuse.org/request/show/830565 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=267
2020-08-30 09:03:35 +02:00
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
Accepting request 831549 from home:qzhao:branches:Base:System 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). OBS-URL: https://build.opensuse.org/request/show/831549 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=268
2020-09-03 03:29:48 +02:00
+++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-09-02 17:31:50.644198200 +0800
Accepting request 830565 from home:qzhao:branches:Base:System 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-12090). OBS-URL: https://build.opensuse.org/request/show/830565 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=267
2020-08-30 09:03:35 +02:00
@@ -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,15 @@
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 $?
Accepting request 831549 from home:qzhao:branches:Base:System 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). OBS-URL: https://build.opensuse.org/request/show/831549 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=268
2020-09-03 03:29:48 +02:00
+ 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
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts
+ exit $?
+ else
+ exit 0
+ fi
Accepting request 830565 from home:qzhao:branches:Base:System 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-12090). OBS-URL: https://build.opensuse.org/request/show/830565 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=267
2020-08-30 09:03:35 +02:00
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
Accepting request 831549 from home:qzhao:branches:Base:System 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). OBS-URL: https://build.opensuse.org/request/show/831549 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=268
2020-09-03 03:29:48 +02:00
+++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-02 17:32:57.830788642 +0800
Accepting request 830565 from home:qzhao:branches:Base:System 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-12090). OBS-URL: https://build.opensuse.org/request/show/830565 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=267
2020-08-30 09:03:35 +02:00
@@ -16,6 +16,7 @@
plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \
-rdynamic \
Accepting request 831549 from home:qzhao:branches:Base:System 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). OBS-URL: https://build.opensuse.org/request/show/831549 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=268
2020-09-03 03:29:48 +02:00
+ -DPLYMOUTH_DATADIR=\"$(PLYMOUTH_DATAPATH)\" \
Accepting request 830565 from home:qzhao:branches:Base:System 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-12090). OBS-URL: https://build.opensuse.org/request/show/830565 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=267
2020-08-30 09:03:35 +02:00
-DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\" \
-DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\" \
-DPLYMOUTH_POLICY_DIR=\"$(PLYMOUTH_POLICY_DIR)/\" \
Reference in New Issue Copy Permalink