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

Accepting request 953317 from Base:System

Browse Source 
- update plymouth-install-label-library-and-font-file-to-initrd.patch: 
  avoid aborting on multiple font path match, pick the first one

OBS-URL: https://build.opensuse.org/request/show/953317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=98
This commit is contained in:
Dominique Leuenberger 2022-02-11 22:06:42 +00:00 committed by Git OBS Bridge
commit 282112b808
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plymouth-install-label-library-and-font-file-to-initrd.patch
View File

@ -13,11 +13,11 @@ diff -Nura plymouth-0.9.5+git20201026+53c83cc/scripts/plymouth-populate-initrd.i
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//') PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
PLYMOUTH_THEME_DIR="${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}" PLYMOUTH_THEME_DIR="${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}"
PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//') 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'}) +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'}) +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_Font_PATH}" ] && inst ${PLYMOUTH_Font_PATH} $INITRDDIR
+[ -f ${PLYMOUTH_TitleFont_PATH} ] && inst ${PLYMOUTH_TitleFont_PATH} $INITRDDIR +[ -f "${PLYMOUTH_TitleFont_PATH}" ] && inst ${PLYMOUTH_TitleFont_PATH} $INITRDDIR
if [ ! -f ${PLYMOUTH_SYSROOT}${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then if [ ! -f ${PLYMOUTH_SYSROOT}${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" >&2 echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" >&2

6
plymouth.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 10 22:09:16 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update plymouth-install-label-library-and-font-file-to-initrd.patch:
avoid aborting on multiple font path match, pick the first one
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 30 05:12:13 UTC 2022 - Cliff Zhao <qzhao@suse.com> Sun Jan 30 05:12:13 UTC 2022 - Cliff Zhao <qzhao@suse.com>