Cliff Zhao
14285f6307
- Update to version 0.9.5~git20210406.e554475:
* client: Free command parser after event loop
* script: Don't crash for scripts without input validation
functions
* script: Enforce separate lines for function parameters
* configure: Fix help string for --with-background-end-color-stop
* two-step: Make SHOW_ANIMATION_FRACTION configurable
* plugin: animation should transition to the end animation
* theme: Allow themes to configure at which percentage
* scripts: support populating from configurable theme dir
* main: refactor code for searching the theme path
* main: add ThemeDir configuration option
* Fix crash when hiding message in details splash mode
* drm: Honour screen rotation when detecting HiDPI
* main: add --ignore-serial-consoles option so we can ignore
serial consoles
- Update SPEC file:
A few minor tweaks to fix part of rpmlint error reporting.
- Drop plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch:
Upstream accompish this requirement in 11b0ce0: Look for config
in runtime dir first(jsc#SLE-11637).
- Drop source boot-duration: The source is an empty file, ghost
macro in %files section is enough to work.
OBS-URL: https://build.opensuse.org/request/show/970652
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=313
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
|