Cliff Zhao
f66b57318b
- Add plymouth-renderers-Do-not-assume-all-keyboards-have-LEDs.patch:
Plymouth does not recognize keyboards without LEDs. This leads to
a NULL-pointer deref in the input code. Fixed by this patch. The
change is commit 709f21e8 ("renderers: Do not assume all keyboards
have LEDs") in the upstrema tree. (bsc#1233532)
OBS-URL: https://build.opensuse.org/request/show/1226800
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=385
25 lines
2.0 KiB
Diff
25 lines
2.0 KiB
Diff
diff -Nura plymouth-0.9.5~git20220412.e960111/scripts/plymouth-populate-initrd.in plymouth-0.9.5~git20220412.e960111_new/scripts/plymouth-populate-initrd.in
|
|
--- plymouth-0.9.5~git20220412.e960111/scripts/plymouth-populate-initrd.in 2022-04-18 15:52:57.536599145 +0800
|
|
+++ plymouth-0.9.5~git20220412.e960111_new/scripts/plymouth-populate-initrd.in 2022-04-18 16:58:56.924364207 +0800
|
|
@@ -460,6 +460,7 @@
|
|
inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
|
|
inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
|
|
inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR
|
|
+inst ${PLYMOUTH_PLUGIN_PATH}/label.so $INITRDDIR
|
|
inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
|
|
inst @RELEASE_FILE@ $INITRDDIR
|
|
inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR
|
|
@@ -491,6 +492,12 @@
|
|
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
|
|
PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
|
|
|
|
+PLYMOUTH_Font_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^Font *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^Font *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1)
|
|
+PLYMOUTH_TitleFont_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^TitleFont *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^TitleFont *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1)
|
|
+
|
|
+[ -f "${PLYMOUTH_Font_PATH}" ] && inst ${PLYMOUTH_Font_PATH} $INITRDDIR
|
|
+[ -f "${PLYMOUTH_TitleFont_PATH}" ] && inst ${PLYMOUTH_TitleFont_PATH} $INITRDDIR
|
|
+
|
|
if [ ! -f ${PLYMOUTH_SYSROOT}${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
|
|
echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" >&2
|
|
exit 1
|