Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2022-04-22 21:52:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Fri Apr 22 21:52:26 2022 rev:99 rq:970653 version:0.9.5~git20220412.e960111 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2022-02-11 23:07:07.746559120 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new.1538/plymouth.changes 2022-04-22 21:52:34.270690926 +0200 @@ -1,0 +2,30 @@ +Tue Apr 05 01:26:27 UTC 2022 - Cliff Zhao <qz...@suse.com> + +- 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. + +------------------------------------------------------------------- Old: ---- boot-duration plymouth-0.9.5~git20210406.e554475.tar.xz plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch New: ---- plymouth-0.9.5~git20220412.e960111.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.IW27ma/_old 2022-04-22 21:52:35.130691906 +0200 +++ /var/tmp/diff_new_pack.IW27ma/_new 2022-04-22 21:52:35.138691916 +0200 @@ -23,32 +23,29 @@ %global soversion 5 Name: plymouth -Version: 0.9.5~git20210406.e554475 +Version: 0.9.5~git20220412.e960111 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later Group: System/Base URL: https://www.freedesktop.org/wiki/Software/Plymouth Source0: %{name}-%{version}.tar.xz -Source1: boot-duration # PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatc...@gmail.com -- Prefix is /usr/sbin and /usr/bin Patch0: plymouth-dracut-path.patch # PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcro...@suse.com -- To use suse colors in tribar. Patch1: plymouth-some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoen...@suse.de -- Fix man page installation Patch2: plymouth-manpages.patch -# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qz...@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap. -Patch3: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch # PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qz...@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. -Patch4: plymouth-disable-fedora-logo.patch +Patch3: plymouth-disable-fedora-logo.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fv...@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. -Patch5: plymouth-only_use_fb_for_cirrus_bochs.patch +Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch # PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qz...@suse.com -- Keep the plymouth-start.service KillMode=none. -Patch6: plymouth-keep-KillMode-none.patch +Patch5: plymouth-keep-KillMode-none.patch # PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qz...@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted. -Patch7: plymouth-install-label-library-and-font-file-to-initrd.patch +Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch # PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 qz...@suse.com -- Hide unuseful output when re-generate initrd. -Patch8: plymouth-quiet-dracut-build-info.patch +Patch7: plymouth-quiet-dracut-build-info.patch # PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 qz...@suse.com -- Add two-step water mark config support. Patch9: plymouth-watermark-config.patch # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fv...@suse.com -- add ability to output text in initrd needed for encryption. @@ -105,7 +102,6 @@ %package -n libply%{soversion} Summary: Plymouth core library Group: System/Libraries -Requires: libply-boot-client%{soversion} = %{version} %description -n libply%{soversion} This package contains the libply library used by Plymouth. @@ -135,7 +131,7 @@ used by graphical Plymouth splashes. %package branding-upstream -Summary: default configuration file and branding from the Plymouth upstream. +Summary: Default configuration file and branding from the Plymouth upstream Group: System/Base Provides: %{name}-branding = %{version}-%{release}. Conflicts: %{name}-branding @@ -394,18 +390,10 @@ %install %make_install -# Glow isn't quite ready for primetime -rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ - find %{buildroot} -type f -name "*.la" -delete -mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth -mkdir -p %{buildroot}/run/plymouth -mkdir -p %{buildroot}%{_localstatedir}/log -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 +# Glow isn't quite ready for primetime +rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ # 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 @@ -415,9 +403,6 @@ %post %{?regenerate_initrd_post} -if [ ! -e /.buildenv ]; then - [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration -fi %postun %{?regenerate_initrd_post} @@ -533,7 +518,6 @@ %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* %{_libdir}/plymouth/renderers/frame-buffer* -%{_datadir}/plymouth/default-boot-duration %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/bizcom.png @@ -567,16 +551,16 @@ %{_includedir}/plymouth-1 %files -n libply%{soversion} -%{_libdir}/libply.so.%{soversion}* +%{_libdir}/libply.so* %files -n libply-boot-client%{soversion} -%{_libdir}/libply-boot-client.so.%{soversion}* +%{_libdir}/libply-boot-client.so* %files -n libply-splash-core%{soversion} -%{_libdir}/libply-splash-core.so.%{soversion}* +%{_libdir}/libply-splash-core.so* %files -n libply-splash-graphics%{soversion} -%{_libdir}/libply-splash-graphics.so.%{soversion}* +%{_libdir}/libply-splash-graphics.so* %files scripts %dir %{_libexecdir}/plymouth @@ -610,31 +594,24 @@ %{_libdir}/plymouth/two-step.so %files theme-bgrt -%dir %{_datadir}/plymouth/themes/bgrt -%{_datadir}/plymouth/themes/bgrt/* +%{_datadir}/plymouth/themes/bgrt %files theme-fade-in -%dir %{_datadir}/plymouth/themes/fade-in -%{_datadir}/plymouth/themes/fade-in/* +%{_datadir}/plymouth/themes/fade-in %files theme-spinfinity -%dir %{_datadir}/plymouth/themes/spinfinity -%{_datadir}/plymouth/themes/spinfinity/* +%{_datadir}/plymouth/themes/spinfinity %files theme-script -%dir %{_datadir}/plymouth/themes/script/ -%{_datadir}/plymouth/themes/script/* +%{_datadir}/plymouth/themes/script %files theme-spinner -%dir %{_datadir}/plymouth/themes/spinner -%{_datadir}/plymouth/themes/spinner/* +%{_datadir}/plymouth/themes/spinner %files theme-solar -%dir %{_datadir}/plymouth/themes/solar -%{_datadir}/plymouth/themes/solar/* +%{_datadir}/plymouth/themes/solar %files theme-tribar -%dir %{_datadir}/plymouth/themes/tribar -%{_datadir}/plymouth/themes/tribar/* +%{_datadir}/plymouth/themes/tribar %changelog ++++++ plymouth-0.9.5~git20210406.e554475.tar.xz -> plymouth-0.9.5~git20220412.e960111.tar.xz ++++++ /work/SRC/openSUSE:Factory/plymouth/plymouth-0.9.5~git20210406.e554475.tar.xz /work/SRC/openSUSE:Factory/.plymouth.new.1538/plymouth-0.9.5~git20220412.e960111.tar.xz differ: char 13, line 1 ++++++ plymouth-disable-fedora-logo.patch ++++++ --- /var/tmp/diff_new_pack.IW27ma/_old 2022-04-22 21:52:35.234692025 +0200 +++ /var/tmp/diff_new_pack.IW27ma/_new 2022-04-22 21:52:35.238692029 +0200 @@ -1,9 +1,9 @@ -diff -Nura plymouth-0.9.5~git20210406.e554475/themes/spinfinity/Makefile.am plymouth-0.9.5~git20210406.e554475_new/themes/spinfinity/Makefile.am ---- plymouth-0.9.5~git20210406.e554475/themes/spinfinity/Makefile.am 2020-04-11 14:22:34.000000000 +0800 -+++ plymouth-0.9.5~git20210406.e554475_new/themes/spinfinity/Makefile.am 2020-11-26 22:11:57.472271985 +0800 +diff -Nura plymouth-0.9.5~git20220412.e960111/themes/spinfinity/Makefile.am plymouth-0.9.5~git20220412.e960111_new/themes/spinfinity/Makefile.am +--- plymouth-0.9.5~git20220412.e960111/themes/spinfinity/Makefile.am 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220412.e960111_new/themes/spinfinity/Makefile.am 2022-04-18 15:47:44.346708483 +0800 @@ -54,4 +54,3 @@ EXTRA_DIST = spinfinity.plymouth.in install-data-hook: -- ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png +- ln -sf $(logofile) $(DESTDIR)$(themedir)/header-image.png ++++++ plymouth-install-label-library-and-font-file-to-initrd.patch ++++++ --- /var/tmp/diff_new_pack.IW27ma/_old 2022-04-22 21:52:35.262692057 +0200 +++ /var/tmp/diff_new_pack.IW27ma/_new 2022-04-22 21:52:35.266692061 +0200 @@ -1,7 +1,7 @@ -diff -Nura plymouth-0.9.5+git20201026+53c83cc/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20201026+53c83cc_new/scripts/plymouth-populate-initrd.in ---- plymouth-0.9.5+git20201026+53c83cc/scripts/plymouth-populate-initrd.in 2021-06-14 01:04:23.842500337 +0800 -+++ plymouth-0.9.5+git20201026+53c83cc_new/scripts/plymouth-populate-initrd.in 2021-06-14 01:06:52.766783152 +0800 -@@ -420,6 +420,7 @@ +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 @@ -9,16 +9,17 @@ inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR inst @RELEASE_FILE@ $INITRDDIR inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR -@@ -442,6 +443,11 @@ - 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}" +@@ -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 ++++++ plymouth-only_use_fb_for_cirrus_bochs.patch ++++++ --- /var/tmp/diff_new_pack.IW27ma/_old 2022-04-22 21:52:35.290692089 +0200 +++ /var/tmp/diff_new_pack.IW27ma/_new 2022-04-22 21:52:35.294692093 +0200 @@ -1,16 +1,7 @@ -From: Fabian Vogt <fv...@suse.com> -Subject: force fb for cirrus and bochs, force drm otherwise -References: bsc#888590, bsc#980750 - -DRM does not work well with cirrus and bochs (no display) but the framebuffer driver -prevents DRM drivers from loading. -As we need to support cirrus for libvirt and bochs for QEMU, we cannot just remove support for frame-buffer. - -Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-core/ply-device-manager.c 2018-08-07 17:41:15.000000000 +0200 -+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c 2018-08-17 19:58:41.178821647 +0200 -@@ -228,13 +228,33 @@ create_devices_for_udev_device (ply_devi +diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-device-manager.c plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-device-manager.c +--- plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-device-manager.c 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-device-manager.c 2022-04-18 16:33:00.126364096 +0800 +@@ -279,13 +279,33 @@ subsystem = udev_device_get_subsystem (device); ply_trace ("device subsystem is %s", subsystem); @@ -26,7 +17,7 @@ + use_fb = strcmp("0x1111", card_device) == 0; + } + - if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) { + if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) { ply_trace ("found DRM device %s", device_path); renderer_type = PLY_RENDERER_TYPE_DRM; + if (use_fb) {
