From bf63c2ee8ee66457b95f03ca489b981c9f6acea65e6ccab4bfd2abfe7da5a37c Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Tue, 21 Jul 2020 16:08:56 +0000 Subject: [PATCH 1/6] Accepting request 822130 from home:qzhao:branches:Base:System Update to version plymouth-0.9.5+git20200709+ab986a9: main: Don't bail out of load_settings if Theme is missing; main: switch log file when switching mode; two-step: Center message text within labels if labels are centered; Add CI pipeline for Plymouth; Apply suggestion to .gitlab-ci.yml; configure: bump to 0.9.6; configure: quiet a warning; po: drop intltool usage; docs: fix man page cross-reference; Rename 'percent_done' to 'fraction_done' OBS-URL: https://build.opensuse.org/request/show/822130 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=264 --- 0001-Add-label-ft-plugin.patch | 90 +-- ...l-ft-plugin-into-initrd-if-available.patch | 12 +- boot-duration | 0 plymouth-0.9.5+git20190908+3abfab2.tar.xz | 3 - plymouth-0.9.5+git20200709+ab986a9.tar.xz | 3 + plymouth-avoid-umount-hanging-shutdown.patch | 19 - plymouth-correct-runtime-dir.patch | 13 - plymouth-disable-fedora-bizcom-theme.patch | 14 + plymouth-disable-fedora-logo.patch | 9 + plymouth-dracut-path.patch | 15 - plymouth-ignore-serial-console.patch | 13 + plymouth-only_use_fb_for_cirrus_bochs.patch | 47 ++ plymouth.changes | 97 ++- plymouth.spec | 583 +++++++++--------- 14 files changed, 499 insertions(+), 419 deletions(-) delete mode 100644 boot-duration delete mode 100644 plymouth-0.9.5+git20190908+3abfab2.tar.xz create mode 100644 plymouth-0.9.5+git20200709+ab986a9.tar.xz delete mode 100644 plymouth-avoid-umount-hanging-shutdown.patch delete mode 100644 plymouth-correct-runtime-dir.patch create mode 100644 plymouth-disable-fedora-bizcom-theme.patch create mode 100644 plymouth-disable-fedora-logo.patch delete mode 100644 plymouth-dracut-path.patch create mode 100644 plymouth-ignore-serial-console.patch create mode 100644 plymouth-only_use_fb_for_cirrus_bochs.patch diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index 3a403d5..78f8863 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -1,30 +1,7 @@ -From 04fd53750abc1f792ab6d5bdf7416bd7c42451b2 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Mon, 25 Jan 2016 08:58:03 +0100 -Subject: [PATCH 1/2] Add label-ft plugin - -This adds a FreeType-based label plugin with minimal dependencies. -Is is a replacement for the label plugin, except that it lacks support for -Unicode and different fonts families. -It's purpose is to be included in the initrd, which isn't easily possible -with the label plugin due to it's massive dependency list. - -Signed-off-by: Fabian Vogt ---- - configure.ac | 10 + - src/libply-splash-graphics/ply-label.c | 5 + - src/plugins/controls/Makefile.am | 6 +- - src/plugins/controls/label-ft/Makefile.am | 22 ++ - src/plugins/controls/label-ft/plugin.c | 501 ++++++++++++++++++++++++++++++ - 5 files changed, 543 insertions(+), 1 deletion(-) - create mode 100644 src/plugins/controls/label-ft/Makefile.am - create mode 100644 src/plugins/controls/label-ft/plugin.c - -Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-17 19:58:07.106444425 +0200 -+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:59.703026810 +0200 -@@ -69,6 +69,15 @@ if test x$enable_pango = xyes; then +diff -Nura plymouth-0.9.5+git20191101+d18086e/configure.ac plymouth-0.9.5+git20191101+d18086e_new/configure.ac +--- plymouth-0.9.5+git20191101+d18086e/configure.ac 2019-11-06 10:19:50.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/configure.ac 2019-12-14 17:27:03.730000000 +0800 +@@ -76,6 +76,15 @@ AC_SUBST(PANGO_LIBS) fi @@ -40,50 +17,31 @@ Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes) AM_CONDITIONAL(ENABLE_GTK, [test "$enable_gtk" = yes]) -@@ -308,6 +317,7 @@ AC_CONFIG_FILES([Makefile +@@ -318,6 +327,7 @@ src/plugins/splash/script/Makefile src/plugins/controls/Makefile src/plugins/controls/label/Makefile -+ src/plugins/controls/label-ft/Makefile ++ src/plugins/controls/label-ft/Makefile src/Makefile src/client/ply-boot-client.pc src/client/Makefile -Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c 2018-08-07 17:41:15.000000000 +0200 -+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200 -@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *labe +diff -Nura plymouth-0.9.5+git20191101+d18086e/src/libply-splash-graphics/ply-label.c plymouth-0.9.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c +--- plymouth-0.9.5+git20191101+d18086e/src/libply-splash-graphics/ply-label.c 2019-10-22 15:31:17.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c 2019-12-14 17:23:10.796000000 +0800 +@@ -98,6 +98,10 @@ - get_plugin_interface_function_t get_label_plugin_interface; - -+ /* Try the pango/cairo based label plugin first... */ label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label.so"); + /* ...and the FreeType based one after that, it is not a complete substitute (yet). */ + if (label->module_handle == NULL) + label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label-ft.so"); -+ ++ if (label->module_handle == NULL) return false; -Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/controls/Makefile.am 2018-08-07 17:41:15.000000000 +0200 -+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am 2018-08-17 19:58:59.703026810 +0200 -@@ -1,4 +1,8 @@ -+SUBDIRS = - if ENABLE_PANGO --SUBDIRS = label -+SUBDIRS += label -+endif -+if ENABLE_FREETYPE -+SUBDIRS += label-ft - endif - MAINTAINERCLEANFILES = Makefile.in -Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am 2018-08-17 19:58:59.703026810 +0200 +diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/Makefile.am plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am +--- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/Makefile.am 1970-01-01 08:00:00.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am 2019-12-14 17:17:26.473000000 +0800 @@ -0,0 +1,22 @@ +AM_CPPFLAGS = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ @@ -107,10 +65,9 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile +label_ft_la_SOURCES = $(srcdir)/plugin.c + +MAINTAINERCLEANFILES = Makefile.in -Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c 2018-08-17 19:58:59.703026810 +0200 +diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/plugin.c plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c +--- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/plugin.c 1970-01-01 08:00:00.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c 2019-12-14 17:17:26.475000000 +0800 @@ -0,0 +1,507 @@ +/* ply-label.c - label control + * @@ -619,3 +576,16 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c +} + +/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */ +diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/Makefile.am plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/Makefile.am +--- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/Makefile.am 2019-10-22 15:31:17.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/Makefile.am 2019-12-14 17:20:38.575000000 +0800 +@@ -1,4 +1,8 @@ ++SUBDIRS = + if ENABLE_PANGO +-SUBDIRS = label ++SUBDIRS += label ++endif ++if ENABLE_FREETYPE ++SUBDIRS += label-ft + endif + MAINTAINERCLEANFILES = Makefile.in diff --git a/0002-Install-label-ft-plugin-into-initrd-if-available.patch b/0002-Install-label-ft-plugin-into-initrd-if-available.patch index 4b4b3d3..575b78e 100644 --- a/0002-Install-label-ft-plugin-into-initrd-if-available.patch +++ b/0002-Install-label-ft-plugin-into-initrd-if-available.patch @@ -1,7 +1,7 @@ -diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in ---- plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in 2019-03-12 20:11:18.845236943 +0800 -+++ plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in 2019-03-12 20:25:34.933746928 +0800 -@@ -433,6 +433,15 @@ +diff -Nura plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in +--- plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in 2019-11-06 10:19:50.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in 2019-12-14 18:28:06.448000000 +0800 +@@ -461,6 +461,15 @@ inst_recur "${PLYMOUTH_IMAGE_DIR}" fi @@ -14,6 +14,6 @@ diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.i + ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf +fi + - if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then - cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes + if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then + cp -a ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes fi diff --git a/boot-duration b/boot-duration deleted file mode 100644 index 473a0f4..0000000 diff --git a/plymouth-0.9.5+git20190908+3abfab2.tar.xz b/plymouth-0.9.5+git20190908+3abfab2.tar.xz deleted file mode 100644 index 3350a4e..0000000 --- a/plymouth-0.9.5+git20190908+3abfab2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15e017611ca3181c4d5b50510628b62c9c97009cf10f3a38fb6ba960429cfd09 -size 5774076 diff --git a/plymouth-0.9.5+git20200709+ab986a9.tar.xz b/plymouth-0.9.5+git20200709+ab986a9.tar.xz new file mode 100644 index 0000000..9183c85 --- /dev/null +++ b/plymouth-0.9.5+git20200709+ab986a9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:245140dd9f072f8e4ebdc816facd4d050f8fe411d9afc06f7fde728857e95d26 +size 6581548 diff --git a/plymouth-avoid-umount-hanging-shutdown.patch b/plymouth-avoid-umount-hanging-shutdown.patch deleted file mode 100644 index f6bc871..0000000 --- a/plymouth-avoid-umount-hanging-shutdown.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c ---- plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c 2019-09-09 07:31:37.000000000 +0000 -+++ plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c 2019-09-11 07:41:17.432945317 +0000 -@@ -183,6 +183,7 @@ - - ply_trace (" opened device '/dev/ptmx'"); - -+#if 0 - ply_trace ("creating pseudoterminal"); - if (grantpt (session->pseudoterminal_master_fd) < 0) { - ply_save_errno (); -@@ -192,6 +193,7 @@ - return false; - } - ply_trace ("done creating pseudoterminal"); -+#endif - - ply_trace ("unlocking pseudoterminal"); - if (unlockpt (session->pseudoterminal_master_fd) < 0) { diff --git a/plymouth-correct-runtime-dir.patch b/plymouth-correct-runtime-dir.patch deleted file mode 100644 index 2292f28..0000000 --- a/plymouth-correct-runtime-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-07 17:41:15.000000000 +0200 -+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:07.106444425 +0200 -@@ -150,7 +150,7 @@ if test x$with_system_root_install = xye - else - plymouthclientdir=$bindir - plymouthdaemondir=$sbindir -- plymouthruntimedir=$localstatedir/run/plymouth -+ plymouthruntimedir=/run/plymouth - fi - AC_SUBST(plymouthclientdir) - AC_SUBST(plymouthdaemondir) diff --git a/plymouth-disable-fedora-bizcom-theme.patch b/plymouth-disable-fedora-bizcom-theme.patch new file mode 100644 index 0000000..f529af5 --- /dev/null +++ b/plymouth-disable-fedora-bizcom-theme.patch @@ -0,0 +1,14 @@ +diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am +--- plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am 2020-01-02 17:03:18.000000000 +0800 ++++ plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am 2020-04-10 22:35:52.759365963 +0800 +@@ -1,2 +1,2 @@ +-SUBDIRS = fade-throbber text details space-flares two-step script tribar ++SUBDIRS = text details two-step script tribar + MAINTAINERCLEANFILES = Makefile.in +diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am +--- plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am 2020-01-02 17:03:18.000000000 +0800 ++++ plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am 2020-04-10 21:07:15.395978166 +0800 +@@ -1,2 +1,2 @@ +-SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt ++SUBDIRS = spinfinity text details script spinner tribar bgrt + MAINTAINERCLEANFILES = Makefile.in diff --git a/plymouth-disable-fedora-logo.patch b/plymouth-disable-fedora-logo.patch new file mode 100644 index 0000000..20b6e90 --- /dev/null +++ b/plymouth-disable-fedora-logo.patch @@ -0,0 +1,9 @@ +diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am +--- plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am 2020-01-02 17:03:18.000000000 +0800 ++++ plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am 2020-04-06 10:15:05.040164493 +0800 +@@ -54,4 +54,4 @@ + EXTRA_DIST = spinfinity.plymouth.in + + install-data-hook: +- ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png ++ diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch deleted file mode 100644 index 9b95e4b..0000000 --- a/plymouth-dracut-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/scripts/plymouth-populate-initrd.in 2018-08-07 17:41:15.000000000 +0200 -+++ plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in 2018-08-17 19:57:27.334004329 +0200 -@@ -386,8 +386,8 @@ done - [ -z "$INITRDDIR" ] && usage error - - mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes --inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR --inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR -+inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd -+inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth - inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR - inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR - inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR diff --git a/plymouth-ignore-serial-console.patch b/plymouth-ignore-serial-console.patch new file mode 100644 index 0000000..f62f17f --- /dev/null +++ b/plymouth-ignore-serial-console.patch @@ -0,0 +1,13 @@ +diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/main.c plymouth-0.9.5+git20191224+d7c737d_new/src/main.c +--- plymouth-0.9.5+git20191224+d7c737d/src/main.c 2020-01-02 17:03:18.000000000 +0800 ++++ plymouth-0.9.5+git20191224+d7c737d_new/src/main.c 2020-04-11 12:34:22.295210835 +0800 +@@ -2241,8 +2241,7 @@ + find_system_default_splash (&state); + find_distribution_default_splash (&state); + +- if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles")) +- device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; ++ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; + + if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") || + (getenv ("DISPLAY") != NULL)) diff --git a/plymouth-only_use_fb_for_cirrus_bochs.patch b/plymouth-only_use_fb_for_cirrus_bochs.patch new file mode 100644 index 0000000..b535cbc --- /dev/null +++ b/plymouth-only_use_fb_for_cirrus_bochs.patch @@ -0,0 +1,47 @@ +From: Fabian Vogt +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 + subsystem = udev_device_get_subsystem (device); + ply_trace ("device subsystem is %s", subsystem); + ++ const char *card_vendor = udev_device_get_sysattr_value (device, "device/vendor"); ++ const char *card_device = udev_device_get_sysattr_value (device, "device/device"); ++ bool use_fb = false; ++ if (card_vendor) { ++ /* Cirrus */ ++ if (strcmp ("0x1013", card_vendor) == 0) ++ use_fb = true; ++ /* "Technical Corp", also used by bochs */ ++ else if (strcmp ("0x1234", card_vendor) == 0) ++ use_fb = strcmp("0x1111", card_device) == 0; ++ } ++ + if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) { + ply_trace ("found DRM device %s", device_path); + renderer_type = PLY_RENDERER_TYPE_DRM; ++ if (use_fb) { ++ ply_trace ("forcing use of framebuffer for cirrusdrmfb"); ++ renderer_type = PLY_RENDERER_TYPE_NONE; ++ } + } else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) { + ply_trace ("found frame buffer device %s", device_path); +- if (!fb_device_has_drm_device (manager, device)) ++ if (use_fb) { + renderer_type = PLY_RENDERER_TYPE_FRAME_BUFFER; ++ } ++ else if (!fb_device_has_drm_device (manager, device)) { ++ ply_trace ("avoiding use of framebuffer to not block DRM drivers from working"); ++ } + else + ply_trace ("ignoring, since there's a DRM device associated with it"); + } diff --git a/plymouth.changes b/plymouth.changes index 10f3602..80c1455 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,11 +1,99 @@ ------------------------------------------------------------------- +Sun Jul 19 15:51:56 UTC 2020 - Cliff Zhao + +- Update to version plymouth-0.9.5+git20200709+ab986a9: + main: Don't bail out of load_settings if "Theme" is missing + main: switch log file when switching mode + two-step: Center message text within labels if labels are centered + Add CI pipeline for Plymouth + Apply suggestion to .gitlab-ci.yml + configure: bump to 0.9.6 + configure: quiet a warning + po: drop intltool usage + docs: fix man page cross-reference + Rename 'percent_done' to 'fraction_done' + +------------------------------------------------------------------ Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao -- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user - are using emu-5.0.0 on MacOS-X with HVF acceleration, the - Plymouth theme with script module fails to go to graphic mode +- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user + are using emu-5.0.0 on MacOS-X with HVF acceleration, the + Plymouth theme with script module fails to go to graphic mode with this patch(boo#1172028). +------------------------------------------------------------------- +Fri Apr 24 07:39:59 UTC 2020 - Cliff Zhao + +- Update to version 0.9.5+git20200418+14e91cc: + Don't bail out of load_settings if "Theme" is missing. + +------------------------------------------------------------------- +Sat Apr 11 05:11:27 UTC 2020 - Cliff Zhao + +- Update to version plymouth-0.9.5+git20200407+6ca4b5b: + plymouthd: fix mode changing before splash is shown. + two-step: Center message text within labels if labels are + centered. + drm: Do not unnecessarily get output info twice. + ply-device-manager: Only consume one udev event at a time. + two-step: Do not jump to end-animation on halt/reboot if it is + disabled + two-step: Add UseEndAnimation setting. +- Add plymouth-ignore-serial-console.patch: + Don't output in serial console for openQA need to take serial in + the test, and yast-installation prgram has a feature to install + system through it (bnc#1164123). +- Add plymouth-disable-fedora-bizcom-theme.patch: + Will not compile fedora related theme packages, which openSUSE + don't need. +- Drop plymouth-avoid-umount-hanging-shutdown.patch: + Already merged to upstream. +- Drop boot-duration: + this is an empty file which can generated after package building. + +------------------------------------------------------------------- +Thu Feb 13 19:25:54 UTC 2020 - Stefan Brüns + +- Remove gnu-unifont-bitmap-font runtime dependency, it is not + used anywhere. +- Replace autosetup -S git by setup + autopatch, remove git + build dependency. +- Remove unused kernel-headers and module-init-tools build deps. +- Make plymouth-scripts noarch (installed in /usr/lib), adjust + its runtime dependencies. + +------------------------------------------------------------------- +Sun Jan 5 04:01:42 UTC 2020 - Stefan Brüns + +- Fix spinfinity Requires, throbgress is no longer available, + but the two-step plugin has gained the required capabilities. + +------------------------------------------------------------------- +Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao + +- Update to version plymouth-0.9.5+git20191224+d7c737d: + * drm: Keep hw-rotation on devices with upside down LCD panels + * themes: spinner/bgrt: Modify password dialog to match gnome + 3.34 changes + * two-step: Change keyboard-indicator positioning to fixed + offset below dialog + * two-step: Fix wrong horizontal position of bgrt logo on + left-side-up LCD panels + * drm: Mark buffer as clean in ply_renderer_head_new() + * throbgress: Remove the throbgress plugin + * boot-splash: fix memory leak in error path. +- Add plymouth-disable-fedora-logo.patch: + Disable the logo file which links to fedora custom position, + and openSUSE don't have it. +- Drop plymouth-dracut-path.patch: + Nolonger needed for the latest update. +- Drop plymouth-correct-runtime-dir.patch: + Nolonger needed for the latest update. +- Porting old patches to fit the latest update. + 0001-Add-label-ft-plugin.patch + 0002-Install-label-ft-plugin-into-initrd-if-available.patch +- Upstream dropped theme throbgress, So we nolonger build it. + ------------------------------------------------------------------- Wed Oct 30 19:21:08 UTC 2019 - Stefan Brüns @@ -17,8 +105,7 @@ Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao - Add patch plymouth-avoid-umount-hanging-shutdown.patch: To avoid grantpt() call nsslookup, it will hanging system unmount - /var during shutdown period(bsc#1105688, bsc#1129386, - bsc#1134660). + /var during shutdown period(bsc#1105688,bsc#1129386,bsc#1134660). ------------------------------------------------------------------- Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 6ddd22c..93123b5 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -16,56 +16,43 @@ # -# plymouth's X11 renderer adds many GTK3 packages to the build cycle, -# it is not used in the production environment. %bcond_with x11_renderer +%bcond_with fedora_theme -%global soversion 5 -%define plymouthdaemon_execdir %{_sbindir} -%define plymouthclient_execdir %{_bindir} -%define plymouth_libdir %{_libdir} -%define plymouth_initrd_file /boot/initrd-plymouth.img +%global git_version 20200709+ab986a9 +%global so_version 5 Name: plymouth -Version: 0.9.5+git20190908+3abfab2 +Version: 0.9.5+git%{git_version} Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later Group: System/Base -URL: http://www.freedesktop.org/wiki/Software/Plymouth - +URL: https://www.freedesktop.org/wiki/Software/Plymouth Source0: %{name}-%{version}.tar.xz -Source1: boot-duration -# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@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 fcrozat@suse.com -- To use suse colors in tribar. -Patch1: plymouth-some-greenish-openSUSE-colors.patch -# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- Make sure the runtime directory is /run and not /var/run -Patch2: plymouth-correct-runtime-dir.patch -# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation -Patch3: plymouth-manpages.patch -# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown. -Patch4: plymouth-avoid-umount-hanging-shutdown.patch - +Patch0: plymouth-some-greenish-openSUSE-colors.patch +# PATCH-FIX-OPENSUSE plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation +Patch1: plymouth-manpages.patch +# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. +Patch2: plymouth-disable-fedora-logo.patch +# PATCH-FIX-OPENSUSE plymouth-disable-fedora-bizcom-theme.patch qzhao@opensuse.org -- Disable to compile fedora related themes. +Patch3: plymouth-disable-fedora-bizcom-theme.patch +# PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1164123 -- Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it. +Patch4: plymouth-ignore-serial-console.patch # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1000: 0001-Add-label-ft-plugin.patch # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch # PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1002: 0003-fix_null_deref.patch - BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc -BuildRequires: git -BuildRequires: kernel-headers +BuildRequires: intltool BuildRequires: libtool BuildRequires: libxslt -BuildRequires: module-init-tools BuildRequires: pkgconfig -BuildRequires: suse-module-tools -# needed for systemd-tty-ask-password-agent -BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(cairo) @@ -78,15 +65,18 @@ BuildRequires: pkgconfig(systemd) >= 186 %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif - +%if 0%{suse_version} >= 1550 +# regenerate_initrd_post moved to rpm-config-SUSE:initrd.macros +BuildRequires: rpm-config-SUSE >= 0.g11 +%else +BuildRequires: suse-module-tools +%endif Recommends: %{name}-lang Requires: %{name}-branding -Requires: gnu-unifont-bitmap-fonts Requires: systemd >= 186 Requires(post): coreutils Requires(post): plymouth-scripts = %{version} Requires(postun): coreutils -Recommends: plymouth-plugin-label-ft Suggests: plymouth-plugin-label Provides: bootsplash = 3.5 Obsoletes: bootsplash < 3.5 @@ -99,36 +89,50 @@ place of the text messages that normally get shown. Text messages are instead redirected to a log file for viewing after boot. -%package -n libply-boot-client%{soversion} +%package -n plymouth-branding-upstream +Summary: Plymouth core library +Group: System/Base +Requires: %{name} = %{version} +Provides: %{name}-branding = %{version} +Conflicts: otherproviders(%{name}-branding) +Supplements: packageand(%{name}:branding-upstream) +BuildArch: noarch + +%description -n plymouth-branding-upstream +Plymouth provides an attractive graphical boot animation in +place of the text messages that normally get shown. This +package provides the upstream default configuration for plymouth. + +%package -n libply-boot-client%{so_version} Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description -n libply-boot-client%{soversion} +%description -n libply-boot-client%{so_version} This package contains the libply-boot-client library used by Plymouth. -%package -n libply-splash-core%{soversion} +%package -n libply-splash-core%{so_version} Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description -n libply-splash-core%{soversion} +%description -n libply-splash-core%{so_version} This package contains the libply-splash-core library used by graphical Plymouth splashes. -%package -n libply-splash-graphics%{soversion} +%package -n libply-splash-graphics%{so_version} Summary: Plymouth graphics libraries Group: Development/Libraries/C and C++ BuildRequires: libpng-devel -%description -n libply-splash-graphics%{soversion} +%description -n libply-splash-graphics%{so_version} This package contains the libply-splash-graphics library used by graphical Plymouth splashes. -%package -n libply%{soversion} +%package -n libply%{so_version} Summary: Plymouth core library Group: Development/Libraries/C and C++ -Requires: libply-boot-client%{soversion} = %{version} +Requires: libply-boot-client%{so_version} = %{version} -%description -n libply%{soversion} +%description -n libply%{so_version} This package contains the libply library used by Plymouth. %package devel @@ -138,10 +142,10 @@ Requires: %{name} = %{version} %if %{with x11_renderer} Requires: %{name}-x11-renderer = %{version} %endif -Requires: libply%{soversion} = %{version} -Requires: libply-boot-client%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-boot-client%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} Requires: pkgconfig %description devel @@ -157,24 +161,15 @@ Supplements: packageand(plymouth:dracut) %description dracut This package contains utilities that integrate dracut with Plymouth -%package x11-renderer -Summary: Plymouth X11 renderer -Group: System/Base -Requires: %{name} = %{version} - -%description x11-renderer -This package provides the X11 renderer which allows to test plymouth -behavior on environments with a valid DISPLAY. - %package scripts Summary: Plymouth related scripts Group: System/Base -Requires: coreutils -Requires: cpio +Requires: awk Requires: dracut -Requires: findutils -Requires: gzip +Requires: grep +Requires: sed Requires(pre): %{name} = %{version} +BuildArch: noarch %description scripts This package contains scripts that help integrate Plymouth with @@ -183,7 +178,7 @@ the system. %package plugin-label Summary: Plymouth label plugin Group: System/Base -Requires: libply-splash-graphics%{soversion} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-label This package contains the label control plugin for @@ -194,71 +189,19 @@ graphical boot splashes using pango and cairo. Summary: Plymouth FreeType label plugin Group: System/Base Requires: fontconfig -Requires: libply-splash-graphics%{soversion} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-label-ft This package contains the label control plugin for Plymouth. It provides the ability to render text on -graphical boot splashes using FreeTyoe - -%package plugin-fade-throbber -Summary: Plymouth "Fade-Throbber" plugin -Group: System/Base -Requires: libply%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} - -%description plugin-fade-throbber -This package contains the "Fade-In" boot splash plugin for -Plymouth. It features a centered image that fades in and out -while other images pulsate around during system boot up. - -%package plugin-throbgress -Summary: Plymouth "Throbgress" plugin -Group: System/Base -Requires: %{name}-plugin-label = %{version} -Requires: libply%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} - -%description plugin-throbgress -This package contains the "throbgress" boot splash plugin for -Plymouth. It features a centered logo and animated spinner that -spins repeatedly while a progress bar advances at the bottom of -the screen. - -%package plugin-space-flares -Summary: Plymouth "space-flares" plugin -Group: System/Base -Requires: %{name}-plugin-label = %{version} -Requires: libply%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} - -%description plugin-space-flares -This package contains the "space-flares" boot splash plugin for -Plymouth. It features a corner image with animated flares. - -%package plugin-two-step -Summary: Plymouth "two-step" plugin -Group: System/Base -Requires: libply%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: plymouth-plugin-label = %{version} - -%description plugin-two-step -This package contains the "two-step" boot splash plugin for -Plymouth. It features a two phased boot process that starts with -a progressing animation synced to boot time and finishes with a -short, fast one-shot animation. +graphical boot splashes using FreeType %package plugin-script Summary: Plymouth "script" plugin Group: System/Base -Requires: libply%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-script This package contains the "script" boot splash plugin for @@ -269,9 +212,9 @@ boot splash themes. %package plugin-tribar Summary: Plymouth "script" plugin Group: System/Base -Requires: libply%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-tribar This package contains the "tribar" boot splash plugin for @@ -279,23 +222,48 @@ Plymouth. It features an extensible, scriptable boot splash language that simplifies the process of designing custom boot splash themes. -%package theme-fade-in -Summary: Plymouth "Fade-In" theme +%package plugin-two-step +Summary: Plymouth "two-step" plugin Group: System/Base -Requires: %{name}-plugin-fade-throbber = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} Requires: plymouth-plugin-label = %{version} + +%description plugin-two-step +This package contains the "two-step" boot splash plugin for +Plymouth. It features a two phased boot process that starts with +a progressing animation synced to boot time and finishes with a +short, fast one-shot animation. + +%package theme-bgrt +Summary: Plymouth "bgrt" theme +Group: System/Base +Requires: %{name}-plugin-two-step = %{version} +Requires: %{name}-theme-spinner = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-fade-in -This package contains the "Fade-In" boot splash theme for -Plymouth. It features a centered logo that fades in and out -while stars twinkle around the logo during system boot up. +%description theme-bgrt +This package contains the "bgrt" boot splash theme for +Plymouth. + +%package theme-script +Summary: Plymouth "Script" theme +Group: System/Base +Requires: %{name}-plugin-script = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-script +This package contains the "script" boot splash theme for +Plymouth. It is a simple example theme the uses the "script" +plugin. %package theme-spinfinity Summary: Plymouth "Spinfinity" theme Group: System/Base -Requires: %{name}-plugin-throbgress = %{version} +Requires: %{name}-plugin-two-step = %{version} Requires(post): %{name}-scripts Requires(pre): %{name} BuildArch: noarch @@ -316,17 +284,6 @@ BuildArch: noarch This package contains the "spinner" boot splash theme for Plymouth. -%package theme-solar -Summary: Plymouth "Solar" theme -Group: System/Base -Requires: %{name}-plugin-space-flares = %{version} -Requires(post): %{name}-scripts -BuildArch: noarch - -%description theme-solar -This package contains the "Solar" boot splash theme for -Plymouth. It features a blue flamed sun with animated solar flares. - %package theme-tribar Summary: Plymouth "Tribar" theme Group: System/Base @@ -338,42 +295,82 @@ BuildArch: noarch This package contains the "Tribar" boot splash theme for Plymouth -%package theme-script -Summary: Plymouth "Script" theme +%if %{with x11_renderer} +%package x11-renderer +Summary: Plymouth X11 renderer Group: System/Base -Requires: %{name}-plugin-script = %{version} +Requires: %{name} = %{version} + +%description x11-renderer +This package provides the X11 renderer which allows to test Plymouth +behavior on environments with a valid DISPLAY. +%endif + +%if %{with fedora_theme} +%package plugin-fade-throbber +Summary: Plymouth "Fade-Throbber" plugin +Group: System/Base +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} + +%description plugin-fade-throbber +This package contains the "Fade-In" boot splash plugin for +Plymouth. It features a centered image that fades in and out +while other images pulsate around during system boot up. + +%package theme-fade-in +Summary: Plymouth "Fade-In" theme +Group: System/Base +Requires: %{name}-plugin-fade-throbber = %{version} +Requires: plymouth-plugin-label = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-script -This package contains the "script" boot splash theme for -Plymouth. It is a simple example theme the uses the "script" -plugin. +%description theme-fade-in +This package contains the "Fade-In" boot splash theme for +Plymouth. It features a centered logo that fades in and out +while stars twinkle around the logo during system boot up. -%package theme-bgrt -Summary: Plymouth "bgrt" theme -# Uses images from spinner theme +%package theme-glow +Summary: Plymouth "glow" theme Group: System/Base -Requires: %{name}-plugin-two-step = %{version} -Requires: %{name}-theme-spinner = %{version} +Requires: %{name}-plugin-tribar = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-bgrt -This package contains the "bgrt" boot splash theme for -Plymouth. +%description theme-glow +This package contains the "glow" boot splash theme for +Plymouth + +%package plugin-space-flares +Summary: Plymouth "space-flares" plugin +Group: System/Base +Requires: %{name}-plugin-label = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} + +%description plugin-space-flares +This package contains the "space-flares" boot splash plugin for +Plymouth. It features a corner image with animated flares. + +%package theme-solar +Summary: Plymouth "Solar" theme +Group: System/Base +Requires: %{name}-plugin-space-flares = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-solar +This package contains the "Solar" boot splash theme for +Plymouth. It features a blue flamed sun with animated solar flares. +%endif %prep -%autosetup -S git -autoreconf -ivf -Wno-portabilty -# replace builddate with patch0date -sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c -# Change the default theme -%if 0%{?is_opensuse} -sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults -%else -sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults -%endif +%setup -q +%autopatch -p1 +autoreconf -ivf %build %configure \ @@ -381,13 +378,7 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --enable-tracing \ --disable-silent-rules \ --disable-static \ - --disable-gdm-transition \ --disable-upstart-monitoring \ - --disable-tests \ - --disable-libkms \ -%if %{without x11_renderer} - --disable-gtk \ -%endif --with-release-file=%{_sysconfdir}/os-release \ --with-boot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty1 \ @@ -395,34 +386,36 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --with-background-end-color-stop=0x4EA65C \ --with-background-color=0x3391cd \ --without-rhgb-compat-link \ - --without-system-root-install + --without-logo \ + --without-system-root-install \ +%if %{without x11_renderer} + --disable-gtk +%endif make %{?_smp_mflags} %install %make_install -rm -f %{buildroot}/%{_bindir}/rhgb-client - -#Link the plymouth client binary also to /bin until the move to /usr is completed -mkdir %{buildroot}/bin -(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth) - -# Glow isn't quite ready for primetime -rm -rf %{buildroot}%{_datadir}/plymouth/glow/ -rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ -rm -f %{buildroot}%{_libdir}/plymouth/glow.so - -find %{buildroot} -type f -name "*.la" -delete -print +# Create necessary directories: 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 + +# Copy upstream's default config file to system and change release settings: cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf +# Link the plymouth client binary to /bin to fit display and emergency service requirement: +mkdir %{buildroot}/bin +(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth) + +# Create boot-duration file for recording boot info: +touch %{buildroot}%{_datadir}/plymouth/default-boot-duration +touch %{buildroot}%{_localstatedir}/lib/plymouth + +# Remove temp files which produced during the compilation: +find $RPM_BUILD_ROOT -name '*.la' -delete + %post %{?regenerate_initrd_post} if [ ! -e /.buildenv ]; then @@ -441,26 +434,29 @@ fi %posttrans %{?regenerate_initrd_posttrans} -%post -n libply-boot-client%{soversion} -p /sbin/ldconfig -%postun -n libply-boot-client%{soversion} -p /sbin/ldconfig -%post -n libply-splash-core%{soversion} -p /sbin/ldconfig -%postun -n libply-splash-core%{soversion} -p /sbin/ldconfig -%post -n libply-splash-graphics%{soversion} -p /sbin/ldconfig -%postun -n libply-splash-graphics%{soversion} -p /sbin/ldconfig -%post -n libply%{soversion} -p /sbin/ldconfig -%postun -n libply%{soversion} -p /sbin/ldconfig -%post theme-spinfinity -if [ $1 -eq 1 ]; then - set -x - export LIB=%{_libdir} - OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" - if [ "$OTHEME" = "text" ]; then - if [ ! -e /.buildenv ]; then - %{_sbindir}/plymouth-set-default-theme -R spinfinity - else - %{_sbindir}/plymouth-set-default-theme spinfinity - fi - fi +%post -n libply-boot-client%{so_version} -p /sbin/ldconfig +%postun -n libply-boot-client%{so_version} -p /sbin/ldconfig +%post -n libply-splash-core%{so_version} -p /sbin/ldconfig +%postun -n libply-splash-core%{so_version} -p /sbin/ldconfig +%post -n libply-splash-graphics%{so_version} -p /sbin/ldconfig +%postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig +%post -n libply%{so_version} -p /sbin/ldconfig +%postun -n libply%{so_version} -p /sbin/ldconfig + +%postun theme-bgrt +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "bgrt" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi +fi + +%postun theme-script +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "script" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi fi %postun theme-spinfinity @@ -471,20 +467,23 @@ if [ $1 -eq 0 ]; then fi fi -%post theme-fade-in -if [ $1 -eq 1 ]; then - set -x - export LIB=%{_libdir} - OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" - if [ "$OTHEME" = "text" ]; then - if [ ! -e /.buildenv ]; then - %{_sbindir}/plymouth-set-default-theme -R fade-in - else - %{_sbindir}/plymouth-set-default-theme fade-in - fi - fi +%postun theme-spinner +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "spinner" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi fi +%postun theme-tribar +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "tribar" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi +fi + +%if %{with fedora_theme} %postun theme-fade-in if [ $1 -eq 0 ]; then export LIB=%{_libdir} @@ -493,18 +492,12 @@ if [ $1 -eq 0 ]; then fi fi -%post theme-solar -if [ $1 -eq 1 ]; then - set -x - export LIB=%{_libdir} - OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" - if [ "$OTHEME" = "text" ]; then - if [ ! -e /.buildenv ]; then - %{_sbindir}/plymouth-set-default-theme -R solar - else - %{_sbindir}/plymouth-set-default-theme solar - fi - fi +%postun theme-glow +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "glow" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi fi %postun theme-solar @@ -514,10 +507,9 @@ if [ $1 -eq 0 ]; then %{_sbindir}/plymouth-set-default-theme -R --reset fi fi +%endif %files -%license COPYING -%doc AUTHORS NEWS README %dir %{_datadir}/plymouth %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details @@ -526,10 +518,10 @@ fi %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf -%{plymouthdaemon_execdir}/plymouthd -%{plymouthclient_execdir}/plymouth /bin/plymouth +%{_bindir}/plymouth +%{_sbindir}/plymouthd +%config(noreplace) %{_sysconfdir}/logrotate.d/bootlog %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* @@ -538,22 +530,26 @@ fi %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/plymouthd.defaults -%{_datadir}/plymouth/bizcom.png -%ghost /run/plymouth %{_localstatedir}/spool/plymouth -%{_mandir}/man?/* -%ghost %{_localstatedir}/lib/plymouth/boot-duration %{_unitdir}/* +%ghost /run/plymouth +%ghost %{_localstatedir}/lib/plymouth/boot-duration %ghost %{_localstatedir}/log/boot.log +%{_mandir}/man?/* +%doc AUTHORS NEWS README +%license COPYING /usr/share/locale/ +%files branding-upstream +%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf + %files dracut %{_libexecdir}/plymouth/plymouth-populate-initrd %{_libexecdir}/plymouth/plymouth-generate-initrd %files devel -%{plymouth_libdir}/libply.so -%{plymouth_libdir}/libply-splash-core.so +%{_libdir}/libply.so +%{_libdir}/libply-splash-core.so %{_libdir}/libply-boot-client.so %{_libdir}/libply-splash-graphics.so %{_libdir}/pkgconfig/ply-splash-core.pc @@ -561,90 +557,81 @@ fi %{_libdir}/pkgconfig/ply-boot-client.pc %{_includedir}/plymouth-1 -%files -n libply-boot-client%{soversion} -%{_libdir}/libply-boot-client.so.%{soversion}* +%files -n libply-boot-client%{so_version} +%{_libdir}/libply-boot-client.so.%{so_version}* -%files -n libply-splash-core%{soversion} -%{plymouth_libdir}/libply-splash-core.so.%{soversion}* +%files -n libply-splash-core%{so_version} +%{_libdir}/libply-splash-core.so.%{so_version}* -%files -n libply-splash-graphics%{soversion} -%{_libdir}/libply-splash-graphics.so.%{soversion}* +%files -n libply-splash-graphics%{so_version} +%{_libdir}/libply-splash-graphics.so.%{so_version}* -%files -n libply%{soversion} -%{plymouth_libdir}/libply.so.%{soversion}* +%files -n libply%{so_version} +%{_libdir}/libply.so.%{so_version}* %files scripts %dir %{_libexecdir}/plymouth %{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd -%if %{with x11_renderer} -%files x11-renderer -%{_libdir}/plymouth/renderers/x11* -%endif - %files plugin-label %{_libdir}/plymouth/label.so %files plugin-label-ft %{_libdir}/plymouth/label-ft.so +%files plugin-script +%{_libdir}/plymouth/script.so + +%files plugin-tribar +%{_libdir}/plymouth/tribar.so + +%files plugin-two-step +%{_libdir}/plymouth/two-step.so + +%files theme-bgrt +%dir %{_datadir}/plymouth/themes/bgrt +%{_datadir}/plymouth/themes/bgrt/* + +%files theme-script +%dir %{_datadir}/plymouth/themes/script/ +%{_datadir}/plymouth/themes/script/* + +%files theme-spinfinity +%dir %{_datadir}/plymouth/themes/spinfinity +%{_datadir}/plymouth/themes/spinfinity/* + +%files theme-spinner +%dir %{_datadir}/plymouth/themes/spinner +%{_datadir}/plymouth/themes/spinner/* + +%files theme-tribar +%dir %{_datadir}/plymouth/themes/tribar +%{_datadir}/plymouth/themes/tribar/* + +%if %{with x11_renderer} +%files x11-renderer +%{_libdir}/plymouth/renderers/x11* +%endif + +%if %{with fedora_theme} %files plugin-fade-throbber %{_libdir}/plymouth/fade-throbber.so %files theme-fade-in %dir %{_datadir}/plymouth/themes/fade-in -%{_datadir}/plymouth/themes/fade-in/bullet.png -%{_datadir}/plymouth/themes/fade-in/entry.png -%{_datadir}/plymouth/themes/fade-in/lock.png -%{_datadir}/plymouth/themes/fade-in/star.png -%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth +%{_datadir}/plymouth/themes/fade-in/* -%files plugin-throbgress -%{_libdir}/plymouth/throbgress.so - -%files theme-spinfinity -%dir %{_datadir}/plymouth/themes/spinfinity -%{_datadir}/plymouth/themes/spinfinity/box.png -%{_datadir}/plymouth/themes/spinfinity/bullet.png -%{_datadir}/plymouth/themes/spinfinity/entry.png -%{_datadir}/plymouth/themes/spinfinity/lock.png -%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png -%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth +%files theme-glow +%dir %{_datadir}/plymouth/themes/glow +%{_datadir}/plymouth/themes/glow/* %files plugin-space-flares %{_libdir}/plymouth/space-flares.so -%files theme-spinner -%dir %{_datadir}/plymouth/themes/spinner -%{_datadir}/plymouth/themes/spinner/*.* - %files theme-solar %dir %{_datadir}/plymouth/themes/solar -%{_datadir}/plymouth/themes/solar/*.png -%{_datadir}/plymouth/themes/solar/solar.plymouth - -%files theme-tribar -%dir %{_datadir}/plymouth/themes/tribar -%{_datadir}/plymouth/themes/tribar/*.* - -%files plugin-two-step -%{_libdir}/plymouth/two-step.so - -%files plugin-tribar -%{_libdir}/plymouth/tribar.so - -%files plugin-script -%{_libdir}/plymouth/script.so - -%files theme-script -%dir %{_datadir}/plymouth/themes/script/ -%{_datadir}/plymouth/themes/script/*.png -%{_datadir}/plymouth/themes/script/script.script -%{_datadir}/plymouth/themes/script/script.plymouth - -%files theme-bgrt -%dir %{_datadir}/plymouth/themes/bgrt -%{_datadir}/plymouth/themes/bgrt/*.* +%{_datadir}/plymouth/themes/solar/* +%endif %changelog From 1e08709fc485a0f89e7bd6cb484863765853f96dd38aac3ea1e8b8f021f914a4 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Tue, 21 Jul 2020 16:23:30 +0000 Subject: [PATCH 2/6] Accepting request 822132 from home:qzhao:branches:Base:System Update to version plymouth-0.9.5+git20200709+ab986a9: main: Don't bail out of load_settings if Theme is missing; main: switch log file when switching mode; two-step: Center message text within labels if labels are centered; Add CI pipeline for Plymouth; Apply suggestion to .gitlab-ci.yml; configure: bump to 0.9.6; configure: quiet a warning; po: drop intltool usage; docs: fix man page cross-reference; Rename 'percent_done' to 'fraction_done' OBS-URL: https://build.opensuse.org/request/show/822132 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=265 --- plymouth-only_use_fb_for_cirrus_bochs.patch | 47 --------------------- 1 file changed, 47 deletions(-) delete mode 100644 plymouth-only_use_fb_for_cirrus_bochs.patch diff --git a/plymouth-only_use_fb_for_cirrus_bochs.patch b/plymouth-only_use_fb_for_cirrus_bochs.patch deleted file mode 100644 index b535cbc..0000000 --- a/plymouth-only_use_fb_for_cirrus_bochs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Fabian Vogt -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 - subsystem = udev_device_get_subsystem (device); - ply_trace ("device subsystem is %s", subsystem); - -+ const char *card_vendor = udev_device_get_sysattr_value (device, "device/vendor"); -+ const char *card_device = udev_device_get_sysattr_value (device, "device/device"); -+ bool use_fb = false; -+ if (card_vendor) { -+ /* Cirrus */ -+ if (strcmp ("0x1013", card_vendor) == 0) -+ use_fb = true; -+ /* "Technical Corp", also used by bochs */ -+ else if (strcmp ("0x1234", card_vendor) == 0) -+ use_fb = strcmp("0x1111", card_device) == 0; -+ } -+ - if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) { - ply_trace ("found DRM device %s", device_path); - renderer_type = PLY_RENDERER_TYPE_DRM; -+ if (use_fb) { -+ ply_trace ("forcing use of framebuffer for cirrusdrmfb"); -+ renderer_type = PLY_RENDERER_TYPE_NONE; -+ } - } else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) { - ply_trace ("found frame buffer device %s", device_path); -- if (!fb_device_has_drm_device (manager, device)) -+ if (use_fb) { - renderer_type = PLY_RENDERER_TYPE_FRAME_BUFFER; -+ } -+ else if (!fb_device_has_drm_device (manager, device)) { -+ ply_trace ("avoiding use of framebuffer to not block DRM drivers from working"); -+ } - else - ply_trace ("ignoring, since there's a DRM device associated with it"); - } From 7df34974733402507a740eed7d2cfd7816d0a8206c88bfe713d860cc085a7f06 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Sat, 29 Aug 2020 05:13:18 +0000 Subject: [PATCH 3/6] Accepting request 830386 from openSUSE:Factory sync OBS-URL: https://build.opensuse.org/request/show/830386 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=266 --- 0001-Add-label-ft-plugin.patch | 90 ++- ...l-ft-plugin-into-initrd-if-available.patch | 12 +- boot-duration | 0 plymouth-0.9.5+git20190908+3abfab2.tar.xz | 3 + plymouth-0.9.5+git20200709+ab986a9.tar.xz | 3 - plymouth-avoid-umount-hanging-shutdown.patch | 19 + plymouth-correct-runtime-dir.patch | 13 + plymouth-disable-fedora-bizcom-theme.patch | 14 - plymouth-disable-fedora-logo.patch | 9 - plymouth-dracut-path.patch | 15 + plymouth-ignore-serial-console.patch | 13 - plymouth.changes | 97 +-- plymouth.spec | 585 +++++++++--------- 13 files changed, 420 insertions(+), 453 deletions(-) create mode 100644 boot-duration create mode 100644 plymouth-0.9.5+git20190908+3abfab2.tar.xz delete mode 100644 plymouth-0.9.5+git20200709+ab986a9.tar.xz create mode 100644 plymouth-avoid-umount-hanging-shutdown.patch create mode 100644 plymouth-correct-runtime-dir.patch delete mode 100644 plymouth-disable-fedora-bizcom-theme.patch delete mode 100644 plymouth-disable-fedora-logo.patch create mode 100644 plymouth-dracut-path.patch delete mode 100644 plymouth-ignore-serial-console.patch diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index 78f8863..3a403d5 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -1,7 +1,30 @@ -diff -Nura plymouth-0.9.5+git20191101+d18086e/configure.ac plymouth-0.9.5+git20191101+d18086e_new/configure.ac ---- plymouth-0.9.5+git20191101+d18086e/configure.ac 2019-11-06 10:19:50.000000000 +0800 -+++ plymouth-0.9.5+git20191101+d18086e_new/configure.ac 2019-12-14 17:27:03.730000000 +0800 -@@ -76,6 +76,15 @@ +From 04fd53750abc1f792ab6d5bdf7416bd7c42451b2 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Mon, 25 Jan 2016 08:58:03 +0100 +Subject: [PATCH 1/2] Add label-ft plugin + +This adds a FreeType-based label plugin with minimal dependencies. +Is is a replacement for the label plugin, except that it lacks support for +Unicode and different fonts families. +It's purpose is to be included in the initrd, which isn't easily possible +with the label plugin due to it's massive dependency list. + +Signed-off-by: Fabian Vogt +--- + configure.ac | 10 + + src/libply-splash-graphics/ply-label.c | 5 + + src/plugins/controls/Makefile.am | 6 +- + src/plugins/controls/label-ft/Makefile.am | 22 ++ + src/plugins/controls/label-ft/plugin.c | 501 ++++++++++++++++++++++++++++++ + 5 files changed, 543 insertions(+), 1 deletion(-) + create mode 100644 src/plugins/controls/label-ft/Makefile.am + create mode 100644 src/plugins/controls/label-ft/plugin.c + +Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac +=================================================================== +--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-17 19:58:07.106444425 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:59.703026810 +0200 +@@ -69,6 +69,15 @@ if test x$enable_pango = xyes; then AC_SUBST(PANGO_LIBS) fi @@ -17,31 +40,50 @@ diff -Nura plymouth-0.9.5+git20191101+d18086e/configure.ac plymouth-0.9.5+git201 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes) AM_CONDITIONAL(ENABLE_GTK, [test "$enable_gtk" = yes]) -@@ -318,6 +327,7 @@ +@@ -308,6 +317,7 @@ AC_CONFIG_FILES([Makefile src/plugins/splash/script/Makefile src/plugins/controls/Makefile src/plugins/controls/label/Makefile -+ src/plugins/controls/label-ft/Makefile ++ src/plugins/controls/label-ft/Makefile src/Makefile src/client/ply-boot-client.pc src/client/Makefile -diff -Nura plymouth-0.9.5+git20191101+d18086e/src/libply-splash-graphics/ply-label.c plymouth-0.9.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c ---- plymouth-0.9.5+git20191101+d18086e/src/libply-splash-graphics/ply-label.c 2019-10-22 15:31:17.000000000 +0800 -+++ plymouth-0.9.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c 2019-12-14 17:23:10.796000000 +0800 -@@ -98,6 +98,10 @@ +Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c +=================================================================== +--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c 2018-08-07 17:41:15.000000000 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200 +@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *labe + get_plugin_interface_function_t get_label_plugin_interface; + ++ /* Try the pango/cairo based label plugin first... */ label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label.so"); + /* ...and the FreeType based one after that, it is not a complete substitute (yet). */ + if (label->module_handle == NULL) + label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label-ft.so"); -+ ++ if (label->module_handle == NULL) return false; -diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/Makefile.am plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am ---- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/Makefile.am 1970-01-01 08:00:00.000000000 +0800 -+++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am 2019-12-14 17:17:26.473000000 +0800 +Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am +=================================================================== +--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/controls/Makefile.am 2018-08-07 17:41:15.000000000 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am 2018-08-17 19:58:59.703026810 +0200 +@@ -1,4 +1,8 @@ ++SUBDIRS = + if ENABLE_PANGO +-SUBDIRS = label ++SUBDIRS += label ++endif ++if ENABLE_FREETYPE ++SUBDIRS += label-ft + endif + MAINTAINERCLEANFILES = Makefile.in +Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am 2018-08-17 19:58:59.703026810 +0200 @@ -0,0 +1,22 @@ +AM_CPPFLAGS = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ @@ -65,9 +107,10 @@ diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/Make +label_ft_la_SOURCES = $(srcdir)/plugin.c + +MAINTAINERCLEANFILES = Makefile.in -diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/plugin.c plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c ---- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/plugin.c 1970-01-01 08:00:00.000000000 +0800 -+++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c 2019-12-14 17:17:26.475000000 +0800 +Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c 2018-08-17 19:58:59.703026810 +0200 @@ -0,0 +1,507 @@ +/* ply-label.c - label control + * @@ -576,16 +619,3 @@ diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/plug +} + +/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */ -diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/Makefile.am plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/Makefile.am ---- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/Makefile.am 2019-10-22 15:31:17.000000000 +0800 -+++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/Makefile.am 2019-12-14 17:20:38.575000000 +0800 -@@ -1,4 +1,8 @@ -+SUBDIRS = - if ENABLE_PANGO --SUBDIRS = label -+SUBDIRS += label -+endif -+if ENABLE_FREETYPE -+SUBDIRS += label-ft - endif - MAINTAINERCLEANFILES = Makefile.in diff --git a/0002-Install-label-ft-plugin-into-initrd-if-available.patch b/0002-Install-label-ft-plugin-into-initrd-if-available.patch index 575b78e..4b4b3d3 100644 --- a/0002-Install-label-ft-plugin-into-initrd-if-available.patch +++ b/0002-Install-label-ft-plugin-into-initrd-if-available.patch @@ -1,7 +1,7 @@ -diff -Nura plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in ---- plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in 2019-11-06 10:19:50.000000000 +0800 -+++ plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in 2019-12-14 18:28:06.448000000 +0800 -@@ -461,6 +461,15 @@ +diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in +--- plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in 2019-03-12 20:11:18.845236943 +0800 ++++ plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in 2019-03-12 20:25:34.933746928 +0800 +@@ -433,6 +433,15 @@ inst_recur "${PLYMOUTH_IMAGE_DIR}" fi @@ -14,6 +14,6 @@ diff -Nura plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.i + ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf +fi + - if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then - cp -a ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes + if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then + cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes fi diff --git a/boot-duration b/boot-duration new file mode 100644 index 0000000..473a0f4 diff --git a/plymouth-0.9.5+git20190908+3abfab2.tar.xz b/plymouth-0.9.5+git20190908+3abfab2.tar.xz new file mode 100644 index 0000000..3350a4e --- /dev/null +++ b/plymouth-0.9.5+git20190908+3abfab2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15e017611ca3181c4d5b50510628b62c9c97009cf10f3a38fb6ba960429cfd09 +size 5774076 diff --git a/plymouth-0.9.5+git20200709+ab986a9.tar.xz b/plymouth-0.9.5+git20200709+ab986a9.tar.xz deleted file mode 100644 index 9183c85..0000000 --- a/plymouth-0.9.5+git20200709+ab986a9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:245140dd9f072f8e4ebdc816facd4d050f8fe411d9afc06f7fde728857e95d26 -size 6581548 diff --git a/plymouth-avoid-umount-hanging-shutdown.patch b/plymouth-avoid-umount-hanging-shutdown.patch new file mode 100644 index 0000000..f6bc871 --- /dev/null +++ b/plymouth-avoid-umount-hanging-shutdown.patch @@ -0,0 +1,19 @@ +diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c +--- plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c 2019-09-09 07:31:37.000000000 +0000 ++++ plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c 2019-09-11 07:41:17.432945317 +0000 +@@ -183,6 +183,7 @@ + + ply_trace (" opened device '/dev/ptmx'"); + ++#if 0 + ply_trace ("creating pseudoterminal"); + if (grantpt (session->pseudoterminal_master_fd) < 0) { + ply_save_errno (); +@@ -192,6 +193,7 @@ + return false; + } + ply_trace ("done creating pseudoterminal"); ++#endif + + ply_trace ("unlocking pseudoterminal"); + if (unlockpt (session->pseudoterminal_master_fd) < 0) { diff --git a/plymouth-correct-runtime-dir.patch b/plymouth-correct-runtime-dir.patch new file mode 100644 index 0000000..2292f28 --- /dev/null +++ b/plymouth-correct-runtime-dir.patch @@ -0,0 +1,13 @@ +Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac +=================================================================== +--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-07 17:41:15.000000000 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:07.106444425 +0200 +@@ -150,7 +150,7 @@ if test x$with_system_root_install = xye + else + plymouthclientdir=$bindir + plymouthdaemondir=$sbindir +- plymouthruntimedir=$localstatedir/run/plymouth ++ plymouthruntimedir=/run/plymouth + fi + AC_SUBST(plymouthclientdir) + AC_SUBST(plymouthdaemondir) diff --git a/plymouth-disable-fedora-bizcom-theme.patch b/plymouth-disable-fedora-bizcom-theme.patch deleted file mode 100644 index f529af5..0000000 --- a/plymouth-disable-fedora-bizcom-theme.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am ---- plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am 2020-01-02 17:03:18.000000000 +0800 -+++ plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am 2020-04-10 22:35:52.759365963 +0800 -@@ -1,2 +1,2 @@ --SUBDIRS = fade-throbber text details space-flares two-step script tribar -+SUBDIRS = text details two-step script tribar - MAINTAINERCLEANFILES = Makefile.in -diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am ---- plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am 2020-01-02 17:03:18.000000000 +0800 -+++ plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am 2020-04-10 21:07:15.395978166 +0800 -@@ -1,2 +1,2 @@ --SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt -+SUBDIRS = spinfinity text details script spinner tribar bgrt - MAINTAINERCLEANFILES = Makefile.in diff --git a/plymouth-disable-fedora-logo.patch b/plymouth-disable-fedora-logo.patch deleted file mode 100644 index 20b6e90..0000000 --- a/plymouth-disable-fedora-logo.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am ---- plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am 2020-01-02 17:03:18.000000000 +0800 -+++ plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am 2020-04-06 10:15:05.040164493 +0800 -@@ -54,4 +54,4 @@ - EXTRA_DIST = spinfinity.plymouth.in - - install-data-hook: -- ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png -+ diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch new file mode 100644 index 0000000..9b95e4b --- /dev/null +++ b/plymouth-dracut-path.patch @@ -0,0 +1,15 @@ +Index: plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in +=================================================================== +--- plymouth-0.9.3+git20180807.7663b0c.orig/scripts/plymouth-populate-initrd.in 2018-08-07 17:41:15.000000000 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in 2018-08-17 19:57:27.334004329 +0200 +@@ -386,8 +386,8 @@ done + [ -z "$INITRDDIR" ] && usage error + + mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes +-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR +-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR ++inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd ++inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth + inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR + inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR + inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR diff --git a/plymouth-ignore-serial-console.patch b/plymouth-ignore-serial-console.patch deleted file mode 100644 index f62f17f..0000000 --- a/plymouth-ignore-serial-console.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/main.c plymouth-0.9.5+git20191224+d7c737d_new/src/main.c ---- plymouth-0.9.5+git20191224+d7c737d/src/main.c 2020-01-02 17:03:18.000000000 +0800 -+++ plymouth-0.9.5+git20191224+d7c737d_new/src/main.c 2020-04-11 12:34:22.295210835 +0800 -@@ -2241,8 +2241,7 @@ - find_system_default_splash (&state); - find_distribution_default_splash (&state); - -- if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles")) -- device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; -+ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; - - if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") || - (getenv ("DISPLAY") != NULL)) diff --git a/plymouth.changes b/plymouth.changes index 80c1455..10f3602 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,99 +1,11 @@ ------------------------------------------------------------------- -Sun Jul 19 15:51:56 UTC 2020 - Cliff Zhao - -- Update to version plymouth-0.9.5+git20200709+ab986a9: - main: Don't bail out of load_settings if "Theme" is missing - main: switch log file when switching mode - two-step: Center message text within labels if labels are centered - Add CI pipeline for Plymouth - Apply suggestion to .gitlab-ci.yml - configure: bump to 0.9.6 - configure: quiet a warning - po: drop intltool usage - docs: fix man page cross-reference - Rename 'percent_done' to 'fraction_done' - ------------------------------------------------------------------- Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao -- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user - are using emu-5.0.0 on MacOS-X with HVF acceleration, the - Plymouth theme with script module fails to go to graphic mode +- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user + are using emu-5.0.0 on MacOS-X with HVF acceleration, the + Plymouth theme with script module fails to go to graphic mode with this patch(boo#1172028). -------------------------------------------------------------------- -Fri Apr 24 07:39:59 UTC 2020 - Cliff Zhao - -- Update to version 0.9.5+git20200418+14e91cc: - Don't bail out of load_settings if "Theme" is missing. - -------------------------------------------------------------------- -Sat Apr 11 05:11:27 UTC 2020 - Cliff Zhao - -- Update to version plymouth-0.9.5+git20200407+6ca4b5b: - plymouthd: fix mode changing before splash is shown. - two-step: Center message text within labels if labels are - centered. - drm: Do not unnecessarily get output info twice. - ply-device-manager: Only consume one udev event at a time. - two-step: Do not jump to end-animation on halt/reboot if it is - disabled - two-step: Add UseEndAnimation setting. -- Add plymouth-ignore-serial-console.patch: - Don't output in serial console for openQA need to take serial in - the test, and yast-installation prgram has a feature to install - system through it (bnc#1164123). -- Add plymouth-disable-fedora-bizcom-theme.patch: - Will not compile fedora related theme packages, which openSUSE - don't need. -- Drop plymouth-avoid-umount-hanging-shutdown.patch: - Already merged to upstream. -- Drop boot-duration: - this is an empty file which can generated after package building. - -------------------------------------------------------------------- -Thu Feb 13 19:25:54 UTC 2020 - Stefan Brüns - -- Remove gnu-unifont-bitmap-font runtime dependency, it is not - used anywhere. -- Replace autosetup -S git by setup + autopatch, remove git - build dependency. -- Remove unused kernel-headers and module-init-tools build deps. -- Make plymouth-scripts noarch (installed in /usr/lib), adjust - its runtime dependencies. - -------------------------------------------------------------------- -Sun Jan 5 04:01:42 UTC 2020 - Stefan Brüns - -- Fix spinfinity Requires, throbgress is no longer available, - but the two-step plugin has gained the required capabilities. - -------------------------------------------------------------------- -Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao - -- Update to version plymouth-0.9.5+git20191224+d7c737d: - * drm: Keep hw-rotation on devices with upside down LCD panels - * themes: spinner/bgrt: Modify password dialog to match gnome - 3.34 changes - * two-step: Change keyboard-indicator positioning to fixed - offset below dialog - * two-step: Fix wrong horizontal position of bgrt logo on - left-side-up LCD panels - * drm: Mark buffer as clean in ply_renderer_head_new() - * throbgress: Remove the throbgress plugin - * boot-splash: fix memory leak in error path. -- Add plymouth-disable-fedora-logo.patch: - Disable the logo file which links to fedora custom position, - and openSUSE don't have it. -- Drop plymouth-dracut-path.patch: - Nolonger needed for the latest update. -- Drop plymouth-correct-runtime-dir.patch: - Nolonger needed for the latest update. -- Porting old patches to fit the latest update. - 0001-Add-label-ft-plugin.patch - 0002-Install-label-ft-plugin-into-initrd-if-available.patch -- Upstream dropped theme throbgress, So we nolonger build it. - ------------------------------------------------------------------- Wed Oct 30 19:21:08 UTC 2019 - Stefan Brüns @@ -105,7 +17,8 @@ Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao - Add patch plymouth-avoid-umount-hanging-shutdown.patch: To avoid grantpt() call nsslookup, it will hanging system unmount - /var during shutdown period(bsc#1105688,bsc#1129386,bsc#1134660). + /var during shutdown period(bsc#1105688, bsc#1129386, + bsc#1134660). ------------------------------------------------------------------- Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 93123b5..6ddd22c 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -16,43 +16,56 @@ # +# plymouth's X11 renderer adds many GTK3 packages to the build cycle, +# it is not used in the production environment. %bcond_with x11_renderer -%bcond_with fedora_theme -%global git_version 20200709+ab986a9 -%global so_version 5 +%global soversion 5 +%define plymouthdaemon_execdir %{_sbindir} +%define plymouthclient_execdir %{_bindir} +%define plymouth_libdir %{_libdir} +%define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.5+git%{git_version} +Version: 0.9.5+git20190908+3abfab2 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 +URL: http://www.freedesktop.org/wiki/Software/Plymouth + Source0: %{name}-%{version}.tar.xz +Source1: boot-duration +# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@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 fcrozat@suse.com -- To use suse colors in tribar. -Patch0: plymouth-some-greenish-openSUSE-colors.patch -# PATCH-FIX-OPENSUSE plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation -Patch1: plymouth-manpages.patch -# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. -Patch2: plymouth-disable-fedora-logo.patch -# PATCH-FIX-OPENSUSE plymouth-disable-fedora-bizcom-theme.patch qzhao@opensuse.org -- Disable to compile fedora related themes. -Patch3: plymouth-disable-fedora-bizcom-theme.patch -# PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1164123 -- Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it. -Patch4: plymouth-ignore-serial-console.patch +Patch1: plymouth-some-greenish-openSUSE-colors.patch +# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- Make sure the runtime directory is /run and not /var/run +Patch2: plymouth-correct-runtime-dir.patch +# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation +Patch3: plymouth-manpages.patch +# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown. +Patch4: plymouth-avoid-umount-hanging-shutdown.patch + # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1000: 0001-Add-label-ft-plugin.patch # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch # PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1002: 0003-fix_null_deref.patch + BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc -BuildRequires: intltool +BuildRequires: git +BuildRequires: kernel-headers BuildRequires: libtool BuildRequires: libxslt +BuildRequires: module-init-tools BuildRequires: pkgconfig +BuildRequires: suse-module-tools +# needed for systemd-tty-ask-password-agent +BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(cairo) @@ -65,18 +78,15 @@ BuildRequires: pkgconfig(systemd) >= 186 %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif -%if 0%{suse_version} >= 1550 -# regenerate_initrd_post moved to rpm-config-SUSE:initrd.macros -BuildRequires: rpm-config-SUSE >= 0.g11 -%else -BuildRequires: suse-module-tools -%endif + Recommends: %{name}-lang Requires: %{name}-branding +Requires: gnu-unifont-bitmap-fonts Requires: systemd >= 186 Requires(post): coreutils Requires(post): plymouth-scripts = %{version} Requires(postun): coreutils +Recommends: plymouth-plugin-label-ft Suggests: plymouth-plugin-label Provides: bootsplash = 3.5 Obsoletes: bootsplash < 3.5 @@ -89,50 +99,36 @@ place of the text messages that normally get shown. Text messages are instead redirected to a log file for viewing after boot. -%package -n plymouth-branding-upstream -Summary: Plymouth core library -Group: System/Base -Requires: %{name} = %{version} -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(%{name}-branding) -Supplements: packageand(%{name}:branding-upstream) -BuildArch: noarch - -%description -n plymouth-branding-upstream -Plymouth provides an attractive graphical boot animation in -place of the text messages that normally get shown. This -package provides the upstream default configuration for plymouth. - -%package -n libply-boot-client%{so_version} +%package -n libply-boot-client%{soversion} Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description -n libply-boot-client%{so_version} +%description -n libply-boot-client%{soversion} This package contains the libply-boot-client library used by Plymouth. -%package -n libply-splash-core%{so_version} +%package -n libply-splash-core%{soversion} Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description -n libply-splash-core%{so_version} +%description -n libply-splash-core%{soversion} This package contains the libply-splash-core library used by graphical Plymouth splashes. -%package -n libply-splash-graphics%{so_version} +%package -n libply-splash-graphics%{soversion} Summary: Plymouth graphics libraries Group: Development/Libraries/C and C++ BuildRequires: libpng-devel -%description -n libply-splash-graphics%{so_version} +%description -n libply-splash-graphics%{soversion} This package contains the libply-splash-graphics library used by graphical Plymouth splashes. -%package -n libply%{so_version} +%package -n libply%{soversion} Summary: Plymouth core library Group: Development/Libraries/C and C++ -Requires: libply-boot-client%{so_version} = %{version} +Requires: libply-boot-client%{soversion} = %{version} -%description -n libply%{so_version} +%description -n libply%{soversion} This package contains the libply library used by Plymouth. %package devel @@ -142,10 +138,10 @@ Requires: %{name} = %{version} %if %{with x11_renderer} Requires: %{name}-x11-renderer = %{version} %endif -Requires: libply%{so_version} = %{version} -Requires: libply-boot-client%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} +Requires: libply%{soversion} = %{version} +Requires: libply-boot-client%{soversion} = %{version} +Requires: libply-splash-core%{soversion} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} Requires: pkgconfig %description devel @@ -161,15 +157,24 @@ Supplements: packageand(plymouth:dracut) %description dracut This package contains utilities that integrate dracut with Plymouth +%package x11-renderer +Summary: Plymouth X11 renderer +Group: System/Base +Requires: %{name} = %{version} + +%description x11-renderer +This package provides the X11 renderer which allows to test plymouth +behavior on environments with a valid DISPLAY. + %package scripts Summary: Plymouth related scripts Group: System/Base -Requires: awk +Requires: coreutils +Requires: cpio Requires: dracut -Requires: grep -Requires: sed +Requires: findutils +Requires: gzip Requires(pre): %{name} = %{version} -BuildArch: noarch %description scripts This package contains scripts that help integrate Plymouth with @@ -178,7 +183,7 @@ the system. %package plugin-label Summary: Plymouth label plugin Group: System/Base -Requires: libply-splash-graphics%{so_version} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} %description plugin-label This package contains the label control plugin for @@ -189,19 +194,71 @@ graphical boot splashes using pango and cairo. Summary: Plymouth FreeType label plugin Group: System/Base Requires: fontconfig -Requires: libply-splash-graphics%{so_version} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} %description plugin-label-ft This package contains the label control plugin for Plymouth. It provides the ability to render text on -graphical boot splashes using FreeType +graphical boot splashes using FreeTyoe + +%package plugin-fade-throbber +Summary: Plymouth "Fade-Throbber" plugin +Group: System/Base +Requires: libply%{soversion} = %{version} +Requires: libply-splash-core%{soversion} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} + +%description plugin-fade-throbber +This package contains the "Fade-In" boot splash plugin for +Plymouth. It features a centered image that fades in and out +while other images pulsate around during system boot up. + +%package plugin-throbgress +Summary: Plymouth "Throbgress" plugin +Group: System/Base +Requires: %{name}-plugin-label = %{version} +Requires: libply%{soversion} = %{version} +Requires: libply-splash-core%{soversion} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} + +%description plugin-throbgress +This package contains the "throbgress" boot splash plugin for +Plymouth. It features a centered logo and animated spinner that +spins repeatedly while a progress bar advances at the bottom of +the screen. + +%package plugin-space-flares +Summary: Plymouth "space-flares" plugin +Group: System/Base +Requires: %{name}-plugin-label = %{version} +Requires: libply%{soversion} = %{version} +Requires: libply-splash-core%{soversion} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} + +%description plugin-space-flares +This package contains the "space-flares" boot splash plugin for +Plymouth. It features a corner image with animated flares. + +%package plugin-two-step +Summary: Plymouth "two-step" plugin +Group: System/Base +Requires: libply%{soversion} = %{version} +Requires: libply-splash-core%{soversion} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} +Requires: plymouth-plugin-label = %{version} + +%description plugin-two-step +This package contains the "two-step" boot splash plugin for +Plymouth. It features a two phased boot process that starts with +a progressing animation synced to boot time and finishes with a +short, fast one-shot animation. %package plugin-script Summary: Plymouth "script" plugin Group: System/Base -Requires: libply%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} +Requires: libply%{soversion} = %{version} +Requires: libply-splash-core%{soversion} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} %description plugin-script This package contains the "script" boot splash plugin for @@ -212,9 +269,9 @@ boot splash themes. %package plugin-tribar Summary: Plymouth "script" plugin Group: System/Base -Requires: libply%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} +Requires: libply%{soversion} = %{version} +Requires: libply-splash-core%{soversion} = %{version} +Requires: libply-splash-graphics%{soversion} = %{version} %description plugin-tribar This package contains the "tribar" boot splash plugin for @@ -222,48 +279,23 @@ Plymouth. It features an extensible, scriptable boot splash language that simplifies the process of designing custom boot splash themes. -%package plugin-two-step -Summary: Plymouth "two-step" plugin +%package theme-fade-in +Summary: Plymouth "Fade-In" theme Group: System/Base -Requires: libply%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} +Requires: %{name}-plugin-fade-throbber = %{version} Requires: plymouth-plugin-label = %{version} - -%description plugin-two-step -This package contains the "two-step" boot splash plugin for -Plymouth. It features a two phased boot process that starts with -a progressing animation synced to boot time and finishes with a -short, fast one-shot animation. - -%package theme-bgrt -Summary: Plymouth "bgrt" theme -Group: System/Base -Requires: %{name}-plugin-two-step = %{version} -Requires: %{name}-theme-spinner = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-bgrt -This package contains the "bgrt" boot splash theme for -Plymouth. - -%package theme-script -Summary: Plymouth "Script" theme -Group: System/Base -Requires: %{name}-plugin-script = %{version} -Requires(post): %{name}-scripts -BuildArch: noarch - -%description theme-script -This package contains the "script" boot splash theme for -Plymouth. It is a simple example theme the uses the "script" -plugin. +%description theme-fade-in +This package contains the "Fade-In" boot splash theme for +Plymouth. It features a centered logo that fades in and out +while stars twinkle around the logo during system boot up. %package theme-spinfinity Summary: Plymouth "Spinfinity" theme Group: System/Base -Requires: %{name}-plugin-two-step = %{version} +Requires: %{name}-plugin-throbgress = %{version} Requires(post): %{name}-scripts Requires(pre): %{name} BuildArch: noarch @@ -284,6 +316,17 @@ BuildArch: noarch This package contains the "spinner" boot splash theme for Plymouth. +%package theme-solar +Summary: Plymouth "Solar" theme +Group: System/Base +Requires: %{name}-plugin-space-flares = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-solar +This package contains the "Solar" boot splash theme for +Plymouth. It features a blue flamed sun with animated solar flares. + %package theme-tribar Summary: Plymouth "Tribar" theme Group: System/Base @@ -295,82 +338,42 @@ BuildArch: noarch This package contains the "Tribar" boot splash theme for Plymouth -%if %{with x11_renderer} -%package x11-renderer -Summary: Plymouth X11 renderer +%package theme-script +Summary: Plymouth "Script" theme Group: System/Base -Requires: %{name} = %{version} - -%description x11-renderer -This package provides the X11 renderer which allows to test Plymouth -behavior on environments with a valid DISPLAY. -%endif - -%if %{with fedora_theme} -%package plugin-fade-throbber -Summary: Plymouth "Fade-Throbber" plugin -Group: System/Base -Requires: libply%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} - -%description plugin-fade-throbber -This package contains the "Fade-In" boot splash plugin for -Plymouth. It features a centered image that fades in and out -while other images pulsate around during system boot up. - -%package theme-fade-in -Summary: Plymouth "Fade-In" theme -Group: System/Base -Requires: %{name}-plugin-fade-throbber = %{version} -Requires: plymouth-plugin-label = %{version} +Requires: %{name}-plugin-script = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-fade-in -This package contains the "Fade-In" boot splash theme for -Plymouth. It features a centered logo that fades in and out -while stars twinkle around the logo during system boot up. +%description theme-script +This package contains the "script" boot splash theme for +Plymouth. It is a simple example theme the uses the "script" +plugin. -%package theme-glow -Summary: Plymouth "glow" theme +%package theme-bgrt +Summary: Plymouth "bgrt" theme +# Uses images from spinner theme Group: System/Base -Requires: %{name}-plugin-tribar = %{version} +Requires: %{name}-plugin-two-step = %{version} +Requires: %{name}-theme-spinner = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-glow -This package contains the "glow" boot splash theme for -Plymouth - -%package plugin-space-flares -Summary: Plymouth "space-flares" plugin -Group: System/Base -Requires: %{name}-plugin-label = %{version} -Requires: libply%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} - -%description plugin-space-flares -This package contains the "space-flares" boot splash plugin for -Plymouth. It features a corner image with animated flares. - -%package theme-solar -Summary: Plymouth "Solar" theme -Group: System/Base -Requires: %{name}-plugin-space-flares = %{version} -Requires(post): %{name}-scripts -BuildArch: noarch - -%description theme-solar -This package contains the "Solar" boot splash theme for -Plymouth. It features a blue flamed sun with animated solar flares. -%endif +%description theme-bgrt +This package contains the "bgrt" boot splash theme for +Plymouth. %prep -%setup -q -%autopatch -p1 -autoreconf -ivf +%autosetup -S git +autoreconf -ivf -Wno-portabilty +# replace builddate with patch0date +sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c +# Change the default theme +%if 0%{?is_opensuse} +sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults +%else +sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults +%endif %build %configure \ @@ -378,7 +381,13 @@ autoreconf -ivf --enable-tracing \ --disable-silent-rules \ --disable-static \ + --disable-gdm-transition \ --disable-upstart-monitoring \ + --disable-tests \ + --disable-libkms \ +%if %{without x11_renderer} + --disable-gtk \ +%endif --with-release-file=%{_sysconfdir}/os-release \ --with-boot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty1 \ @@ -386,35 +395,33 @@ autoreconf -ivf --with-background-end-color-stop=0x4EA65C \ --with-background-color=0x3391cd \ --without-rhgb-compat-link \ - --without-logo \ - --without-system-root-install \ -%if %{without x11_renderer} - --disable-gtk -%endif + --without-system-root-install make %{?_smp_mflags} %install %make_install +rm -f %{buildroot}/%{_bindir}/rhgb-client -# Create necessary directories: -mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth -mkdir -p %{buildroot}/run/plymouth -mkdir -p %{buildroot}%{_localstatedir}/log - -# Copy upstream's default config file to system and change release settings: -cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf - -# Link the plymouth client binary to /bin to fit display and emergency service requirement: +#Link the plymouth client binary also to /bin until the move to /usr is completed mkdir %{buildroot}/bin (cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth) -# Create boot-duration file for recording boot info: -touch %{buildroot}%{_datadir}/plymouth/default-boot-duration -touch %{buildroot}%{_localstatedir}/lib/plymouth +# Glow isn't quite ready for primetime +rm -rf %{buildroot}%{_datadir}/plymouth/glow/ +rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ +rm -f %{buildroot}%{_libdir}/plymouth/glow.so -# Remove temp files which produced during the compilation: -find $RPM_BUILD_ROOT -name '*.la' -delete +find %{buildroot} -type f -name "*.la" -delete -print + +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 +cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf %post %{?regenerate_initrd_post} @@ -434,29 +441,26 @@ fi %posttrans %{?regenerate_initrd_posttrans} -%post -n libply-boot-client%{so_version} -p /sbin/ldconfig -%postun -n libply-boot-client%{so_version} -p /sbin/ldconfig -%post -n libply-splash-core%{so_version} -p /sbin/ldconfig -%postun -n libply-splash-core%{so_version} -p /sbin/ldconfig -%post -n libply-splash-graphics%{so_version} -p /sbin/ldconfig -%postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig -%post -n libply%{so_version} -p /sbin/ldconfig -%postun -n libply%{so_version} -p /sbin/ldconfig - -%postun theme-bgrt -if [ $1 -eq 0 ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "bgrt" ]; then - %{_sbindir}/plymouth-set-default-theme -R --reset - fi -fi - -%postun theme-script -if [ $1 -eq 0 ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "script" ]; then - %{_sbindir}/plymouth-set-default-theme -R --reset - fi +%post -n libply-boot-client%{soversion} -p /sbin/ldconfig +%postun -n libply-boot-client%{soversion} -p /sbin/ldconfig +%post -n libply-splash-core%{soversion} -p /sbin/ldconfig +%postun -n libply-splash-core%{soversion} -p /sbin/ldconfig +%post -n libply-splash-graphics%{soversion} -p /sbin/ldconfig +%postun -n libply-splash-graphics%{soversion} -p /sbin/ldconfig +%post -n libply%{soversion} -p /sbin/ldconfig +%postun -n libply%{soversion} -p /sbin/ldconfig +%post theme-spinfinity +if [ $1 -eq 1 ]; then + set -x + export LIB=%{_libdir} + OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" + if [ "$OTHEME" = "text" ]; then + if [ ! -e /.buildenv ]; then + %{_sbindir}/plymouth-set-default-theme -R spinfinity + else + %{_sbindir}/plymouth-set-default-theme spinfinity + fi + fi fi %postun theme-spinfinity @@ -467,23 +471,20 @@ if [ $1 -eq 0 ]; then fi fi -%postun theme-spinner -if [ $1 -eq 0 ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "spinner" ]; then - %{_sbindir}/plymouth-set-default-theme -R --reset - fi +%post theme-fade-in +if [ $1 -eq 1 ]; then + set -x + export LIB=%{_libdir} + OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" + if [ "$OTHEME" = "text" ]; then + if [ ! -e /.buildenv ]; then + %{_sbindir}/plymouth-set-default-theme -R fade-in + else + %{_sbindir}/plymouth-set-default-theme fade-in + fi + fi fi -%postun theme-tribar -if [ $1 -eq 0 ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "tribar" ]; then - %{_sbindir}/plymouth-set-default-theme -R --reset - fi -fi - -%if %{with fedora_theme} %postun theme-fade-in if [ $1 -eq 0 ]; then export LIB=%{_libdir} @@ -492,12 +493,18 @@ if [ $1 -eq 0 ]; then fi fi -%postun theme-glow -if [ $1 -eq 0 ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "glow" ]; then - %{_sbindir}/plymouth-set-default-theme -R --reset - fi +%post theme-solar +if [ $1 -eq 1 ]; then + set -x + export LIB=%{_libdir} + OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" + if [ "$OTHEME" = "text" ]; then + if [ ! -e /.buildenv ]; then + %{_sbindir}/plymouth-set-default-theme -R solar + else + %{_sbindir}/plymouth-set-default-theme solar + fi + fi fi %postun theme-solar @@ -507,9 +514,10 @@ if [ $1 -eq 0 ]; then %{_sbindir}/plymouth-set-default-theme -R --reset fi fi -%endif %files +%license COPYING +%doc AUTHORS NEWS README %dir %{_datadir}/plymouth %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details @@ -518,10 +526,10 @@ fi %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth +%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf +%{plymouthdaemon_execdir}/plymouthd +%{plymouthclient_execdir}/plymouth /bin/plymouth -%{_bindir}/plymouth -%{_sbindir}/plymouthd -%config(noreplace) %{_sysconfdir}/logrotate.d/bootlog %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* @@ -530,26 +538,22 @@ fi %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/plymouthd.defaults -%{_localstatedir}/spool/plymouth -%{_unitdir}/* +%{_datadir}/plymouth/bizcom.png %ghost /run/plymouth -%ghost %{_localstatedir}/lib/plymouth/boot-duration -%ghost %{_localstatedir}/log/boot.log +%{_localstatedir}/spool/plymouth %{_mandir}/man?/* -%doc AUTHORS NEWS README -%license COPYING +%ghost %{_localstatedir}/lib/plymouth/boot-duration +%{_unitdir}/* +%ghost %{_localstatedir}/log/boot.log /usr/share/locale/ -%files branding-upstream -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf - %files dracut %{_libexecdir}/plymouth/plymouth-populate-initrd %{_libexecdir}/plymouth/plymouth-generate-initrd %files devel -%{_libdir}/libply.so -%{_libdir}/libply-splash-core.so +%{plymouth_libdir}/libply.so +%{plymouth_libdir}/libply-splash-core.so %{_libdir}/libply-boot-client.so %{_libdir}/libply-splash-graphics.so %{_libdir}/pkgconfig/ply-splash-core.pc @@ -557,81 +561,90 @@ fi %{_libdir}/pkgconfig/ply-boot-client.pc %{_includedir}/plymouth-1 -%files -n libply-boot-client%{so_version} -%{_libdir}/libply-boot-client.so.%{so_version}* +%files -n libply-boot-client%{soversion} +%{_libdir}/libply-boot-client.so.%{soversion}* -%files -n libply-splash-core%{so_version} -%{_libdir}/libply-splash-core.so.%{so_version}* +%files -n libply-splash-core%{soversion} +%{plymouth_libdir}/libply-splash-core.so.%{soversion}* -%files -n libply-splash-graphics%{so_version} -%{_libdir}/libply-splash-graphics.so.%{so_version}* +%files -n libply-splash-graphics%{soversion} +%{_libdir}/libply-splash-graphics.so.%{soversion}* -%files -n libply%{so_version} -%{_libdir}/libply.so.%{so_version}* +%files -n libply%{soversion} +%{plymouth_libdir}/libply.so.%{soversion}* %files scripts %dir %{_libexecdir}/plymouth %{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd +%if %{with x11_renderer} +%files x11-renderer +%{_libdir}/plymouth/renderers/x11* +%endif + %files plugin-label %{_libdir}/plymouth/label.so %files plugin-label-ft %{_libdir}/plymouth/label-ft.so -%files plugin-script -%{_libdir}/plymouth/script.so - -%files plugin-tribar -%{_libdir}/plymouth/tribar.so - -%files plugin-two-step -%{_libdir}/plymouth/two-step.so - -%files theme-bgrt -%dir %{_datadir}/plymouth/themes/bgrt -%{_datadir}/plymouth/themes/bgrt/* - -%files theme-script -%dir %{_datadir}/plymouth/themes/script/ -%{_datadir}/plymouth/themes/script/* - -%files theme-spinfinity -%dir %{_datadir}/plymouth/themes/spinfinity -%{_datadir}/plymouth/themes/spinfinity/* - -%files theme-spinner -%dir %{_datadir}/plymouth/themes/spinner -%{_datadir}/plymouth/themes/spinner/* - -%files theme-tribar -%dir %{_datadir}/plymouth/themes/tribar -%{_datadir}/plymouth/themes/tribar/* - -%if %{with x11_renderer} -%files x11-renderer -%{_libdir}/plymouth/renderers/x11* -%endif - -%if %{with fedora_theme} %files plugin-fade-throbber %{_libdir}/plymouth/fade-throbber.so %files theme-fade-in %dir %{_datadir}/plymouth/themes/fade-in -%{_datadir}/plymouth/themes/fade-in/* +%{_datadir}/plymouth/themes/fade-in/bullet.png +%{_datadir}/plymouth/themes/fade-in/entry.png +%{_datadir}/plymouth/themes/fade-in/lock.png +%{_datadir}/plymouth/themes/fade-in/star.png +%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth -%files theme-glow -%dir %{_datadir}/plymouth/themes/glow -%{_datadir}/plymouth/themes/glow/* +%files plugin-throbgress +%{_libdir}/plymouth/throbgress.so + +%files theme-spinfinity +%dir %{_datadir}/plymouth/themes/spinfinity +%{_datadir}/plymouth/themes/spinfinity/box.png +%{_datadir}/plymouth/themes/spinfinity/bullet.png +%{_datadir}/plymouth/themes/spinfinity/entry.png +%{_datadir}/plymouth/themes/spinfinity/lock.png +%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png +%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth %files plugin-space-flares %{_libdir}/plymouth/space-flares.so +%files theme-spinner +%dir %{_datadir}/plymouth/themes/spinner +%{_datadir}/plymouth/themes/spinner/*.* + %files theme-solar %dir %{_datadir}/plymouth/themes/solar -%{_datadir}/plymouth/themes/solar/* -%endif +%{_datadir}/plymouth/themes/solar/*.png +%{_datadir}/plymouth/themes/solar/solar.plymouth + +%files theme-tribar +%dir %{_datadir}/plymouth/themes/tribar +%{_datadir}/plymouth/themes/tribar/*.* + +%files plugin-two-step +%{_libdir}/plymouth/two-step.so + +%files plugin-tribar +%{_libdir}/plymouth/tribar.so + +%files plugin-script +%{_libdir}/plymouth/script.so + +%files theme-script +%dir %{_datadir}/plymouth/themes/script/ +%{_datadir}/plymouth/themes/script/*.png +%{_datadir}/plymouth/themes/script/script.script +%{_datadir}/plymouth/themes/script/script.plymouth + +%files theme-bgrt +%dir %{_datadir}/plymouth/themes/bgrt +%{_datadir}/plymouth/themes/bgrt/*.* %changelog From 78b0a1d73d14d5dbbb72d12aa283b74df129b095e58c277c6a778f056259a1a2 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Sun, 30 Aug 2020 07:03:35 +0000 Subject: [PATCH 4/6] 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 --- ...modify-conf-to-drop-isopensuse-macro.patch | 151 ++++ plymouth.changes | 10 + plymouth.spec | 810 +++++++++++++++++- 3 files changed, 957 insertions(+), 14 deletions(-) create mode 100644 plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch diff --git a/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch b/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch new file mode 100644 index 0000000..9361a5c --- /dev/null +++ b/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch @@ -0,0 +1,151 @@ +diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-populate-initrd.in +--- plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-populate-initrd.in 2020-08-29 16:43:14.303181545 +0800 ++++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-populate-initrd.in 2020-08-29 23:07:23.332595874 +0800 +@@ -396,6 +396,8 @@ + inst @RELEASE_FILE@ $INITRDDIR + inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR + inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR ++inst ${PLYMOUTH_DATADIR}/plymouth/plymouthd.conf $INITRDDIR ++ + + if [ -z "$PLYMOUTH_THEME_NAME" ]; then + echo "No default plymouth plugin is set" >&2 +@@ -403,8 +405,12 @@ + fi + + if [ $THEME_OVERRIDE ]; then +- conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf +- echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" >&2 ++ if [ -f /etc/plymouth/plymouthd.conf ]; then ++ conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf ++ elif [ -f /usr/share/plymouth/plymouthd.defaults ]; then ++ conf=$INITRDDIR/${PLYMOUTH_DATADIR}/plymouth/plymouthd.conf ++ fi ++ echo "modifying plymouthd config file: Theme=$PLYMOUTH_THEME_NAME" >&2 + # make sure the section and key exist so we can modify them + grep -q "^ *\[Daemon\]" $conf || echo "[Daemon]" >> $conf + grep -q "^ *Theme *=" $conf || echo "Theme=fade-in" >> $conf +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 ++++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-08-30 12:47:49.602316219 +0800 +@@ -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 $? ++ 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 + fi + + if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then +@@ -187,10 +198,10 @@ + + [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ] && rm -f ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth + +-[ -d ${PLYMOUTH_CONFDIR} ] || mkdir -p ${PLYMOUTH_CONFDIR} +-grep -q '^[[]Daemon[]]' ${PLYMOUTH_CONFDIR}/plymouthd.conf 2> /dev/null || echo '[Daemon]' >> ${PLYMOUTH_CONFDIR}/plymouthd.conf +-sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf +-sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf ++[ -d ${PLYMOUTH_DATADIR} ] || mkdir -p ${PLYMOUTH_DATADIR} ++grep -q '^[[]Daemon[]]' ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults 2> /dev/null || echo '[Daemon]' >> ${PLYMOUTH_DATADIR}/plymouthd.defaults ++sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults ++sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults + + [ $DO_INITRD_REBUILD -ne 0 ] && (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd) + exit 0 +diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/main.c plymouth-0.9.5+git20190908+3abfab2_new/src/main.c +--- plymouth-0.9.5+git20190908+3abfab2/src/main.c 2020-08-29 16:43:22.589272043 +0800 ++++ plymouth-0.9.5+git20190908+3abfab2_new/src/main.c 2020-08-29 16:47:35.607035410 +0800 +@@ -424,8 +424,8 @@ + if (state->distribution_default_splash_path != NULL) + return; + +- if (!load_settings (state, PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults", &state->distribution_default_splash_path)) { +- ply_trace ("failed to load " PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults, trying " PLYMOUTH_POLICY_DIR); ++ if (!load_settings (state, PLYMOUTH_DATADIR "/plymouthd.defaults", &state->distribution_default_splash_path)) { ++ ply_trace ("failed to load " PLYMOUTH_DATADIR "/plymouthd.defaults, trying " PLYMOUTH_DATADIR); + if (!load_settings (state, PLYMOUTH_POLICY_DIR "plymouthd.defaults", &state->distribution_default_splash_path)) { + ply_trace ("failed to load " PLYMOUTH_POLICY_DIR "plymouthd.defaults"); + return; +@@ -447,16 +447,21 @@ + state->boot_splash = show_theme (state, state->override_splash_path); + } + +- if (state->boot_splash == NULL && +- state->system_default_splash_path != NULL) { +- ply_trace ("Trying system default splash"); +- state->boot_splash = show_theme (state, state->system_default_splash_path); +- } +- +- if (state->boot_splash == NULL && +- state->distribution_default_splash_path != NULL) { +- ply_trace ("Trying distribution default splash"); +- state->boot_splash = show_theme (state, state->distribution_default_splash_path); ++ if (access("/etc/plymouth/plymouthd.conf", F_OK ) != -1) ++ { ++ if ( state->boot_splash == NULL && ++ state->system_default_splash_path != NULL) { ++ ply_trace ("Trying system default splash"); ++ state->boot_splash = show_theme (state, state->system_default_splash_path); ++ } ++ } ++ else if (access("/usr/share/plymouth/plymouthd.defaults", F_OK ) != -1) ++ { ++ if (state->boot_splash == NULL && ++ state->distribution_default_splash_path != NULL) { ++ ply_trace ("Trying distribution default splash"); ++ state->boot_splash = show_theme (state, state->distribution_default_splash_path); ++ } + } + + if (state->boot_splash == NULL) { +@@ -2254,9 +2259,13 @@ + return EX_UNAVAILABLE; + } + ++ + find_override_splash (&state); +- find_system_default_splash (&state); +- find_distribution_default_splash (&state); ++ ++ if( access("/etc/plymouth/plymouthd.conf", F_OK ) != -1 ) ++ find_system_default_splash (&state); ++ else if( access("/usr/share/plymouth/plymouthd.defaults", F_OK ) != -1 ) ++ find_distribution_default_splash (&state); + + if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles")) + device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; +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 ++++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-08-29 16:48:03.959297800 +0800 +@@ -16,6 +16,7 @@ + + plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \ + -rdynamic \ ++ -DPLYMOUTH_DATADIR=\"$(PLYMOUTH_DATAPATH)\" \ + -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\" \ + -DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\" \ + -DPLYMOUTH_POLICY_DIR=\"$(PLYMOUTH_POLICY_DIR)/\" \ diff --git a/plymouth.changes b/plymouth.changes index 10f3602..995593d 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Aug 29 06:13:50 UTC 2020 - Cliff Zhao + +- 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). + ------------------------------------------------------------------- Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 6ddd22c..ecca944 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -46,7 +46,8 @@ Patch2: plymouth-correct-runtime-dir.patch Patch3: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown. Patch4: plymouth-avoid-umount-hanging-shutdown.patch - +# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-12090 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap. +Patch5: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1000: 0001-Add-label-ft-plugin.patch # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. @@ -57,7 +58,6 @@ Patch1002: 0003-fix_null_deref.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc -BuildRequires: git BuildRequires: kernel-headers BuildRequires: libtool BuildRequires: libxslt @@ -131,6 +131,19 @@ Requires: libply-boot-client%{soversion} = %{version} %description -n libply%{soversion} This package contains the libply library used by Plymouth. +%package branding-upstream +Summary: default configuration file and branding from the Plymouth upstream. +Group: System/Base +Requires: %{name} = %{version} +Conflicts: %{name}-branding +BuildArch: noarch + +%description branding-upstream +This package contains the /usr/share/plymouthd.defaults which contains the basic +settings and branding from the upstream. the Plymouth in SLE and openSUSE will +nolonger /etc/plymouth/plymouthd.conf at all, and it will read plymouthd.defaults +if /etc/plymouth/plymouthd.conf doesn't exist. + %package devel Summary: Libraries and headers for writing Plymouth splash plugins Group: Development/Libraries/C and C++ @@ -364,16 +377,12 @@ This package contains the "bgrt" boot splash theme for Plymouth. %prep -%autosetup -S git -autoreconf -ivf -Wno-portabilty +%setup -q +%autopatch -p1 +autoreconf -ivf + # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c -# Change the default theme -%if 0%{?is_opensuse} -sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults -%else -sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults -%endif %build %configure \ @@ -381,7 +390,6 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --enable-tracing \ --disable-silent-rules \ --disable-static \ - --disable-gdm-transition \ --disable-upstart-monitoring \ --disable-tests \ --disable-libkms \ @@ -421,7 +429,10 @@ 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 -cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf + +# We will not ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-12090). +rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf +rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf %post %{?regenerate_initrd_post} @@ -526,7 +537,7 @@ fi %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf +%config(noreplace) %ghost %{_sysconfdir}/plymouth/plymouthd.conf %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth /bin/plymouth @@ -537,7 +548,6 @@ fi %{_datadir}/plymouth/default-boot-duration %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth -%{_datadir}/plymouth/plymouthd.defaults %{_datadir}/plymouth/bizcom.png %ghost /run/plymouth %{_localstatedir}/spool/plymouth @@ -547,6 +557,9 @@ fi %ghost %{_localstatedir}/log/boot.log /usr/share/locale/ +%files branding-upstream +%{_datadir}/plymouth/plymouthd.defaults + %files dracut %{_libexecdir}/plymouth/plymouth-populate-initrd %{_libexecdir}/plymouth/plymouth-generate-initrd @@ -648,3 +661,772 @@ fi %{_datadir}/plymouth/themes/bgrt/*.* %changelog +* Sat Aug 29 2020 Cliff Zhao +- 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). +* Mon Jun 15 2020 Cliff Zhao +- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user + are using emu-5.0.0 on MacOS-X with HVF acceleration, the + Plymouth theme with script module fails to go to graphic mode + with this patch(boo#1172028). +* Wed Oct 30 2019 Stefan Brüns +- Avoid inconsistencies in library package names causing unresolvable + dependencies, replace all soversion occurences with a macro. +* Wed Sep 11 2019 Cliff Zhao +- Add patch plymouth-avoid-umount-hanging-shutdown.patch: + To avoid grantpt() call nsslookup, it will hanging system unmount + /var during shutdown period(bsc#1105688, bsc#1129386, + bsc#1134660). +* Thu Aug 15 2019 Cliff Zhao +- Update to version 0.9.5+git20190908+3abfab2: + * two-step: Deal with buggy firmware which does not pre-rotate the bgrt image + * configure: bump so name + * Internationalization: Add zh_HK and zh_TW translations. + * add delay time to 8 seconds to fit AMD graphic card. +* Mon Aug 5 2019 Cliff Zhao +- Update plymouth.spec: Disable upstart-monitor compile because it + only used in Ubuntu/Debian. +* Sun Aug 4 2019 Stefan Brüns +- Update plymouth.spec: Use bcond_with for X11 renderer, cleanup + syntax. +* Wed Jul 31 2019 Cliff Zhao +- Update plymouth.spec: obsolete plymouth render plugin for + Xwindows, Since this plugin will not be used in the production + environment, and this modify will highly decrease the compilation + of build requirements. +* Mon Jul 8 2019 Cliff Zhao +- Update to version 0.9.4+git20190612+9359382: + * two-step: Add support for firmware-splashes with rotation + status bits set + * Regenerate plymouth.pot to add the strings for the new + firmware-upgrade mode. +* Fri Jun 14 2019 Cliff Zhao +- Add dependency to dracut for plymouth-scripts(bnc#1138248). +* Tue Jun 11 2019 Dominique Leuenberger +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini +* Tue Apr 2 2019 Stasiek Michalski +- Change default openSUSE theme to bgrt +* Wed Mar 27 2019 Cliff Zhao +- Update to version 0.9.4+git20190325+b9f2aac: + * themes: Update spinner and bgrt background settings + * Translations: Sync translations with zanata +* Sun Mar 24 2019 Stasiek Michalski +- Fix theme-bgrt dependencies + (based on plugin-two-step with images from theme-spinner) +* Tue Mar 12 2019 qzhao@suse.com +- Update to version 0.9.4+git20181219.c8f1256: + * ply-pixel-buffer: Fix right and bottom edge rendering of + scaled buffers. + * Add support for translating the user visible strings in some + themes + * Prefix Title and Subtitle theme config keywords with an + underscore + * Add new reboot and system-upgrade modes + * main: Remove private ply_mode_t + * two-step: Make ProgressBarShowPercentComplete a per mode + setting + * plymouthd.defaults: Change default ShowDelay to 0 + * ply-boot-splash: Do not add ply_boot_splash_update_progress + timeout multiple times + * logging: Minor log-message fixes. + Improve logging format. + * themes: Update spinner and bgrt theme offline updates mode + * two-step: Add a per mode setting to suppress messages. + Add progress-bar support. + Add MessageBelowAnimation option. + Add per mode settings. + Drop background_is_bgrt view_t member + * ply-progress-bar: Allow caller to specify the widgets width and + height. + Allow choosing fore- and back-ground color. + Redraw on percentage update. + * boot-server: fix type confusion when allocating connection object + * ply-device-manager: Handle change events for monitor hotplugging. + Consume all events in one go. + * drm: Stop limiting preferred-mode picking to UEFI systems. + Reset mode on display-port connected outputs with a bad + link-status. + Implement handle_change_event. + Ensure heads are mapped before flushing them. + Allow calling create_heads_for_active_connectors multiple + times. + Allow calling ply_renderer_head_add_connector with existing + connector_id. + Limit backend->resources lifetime to within query_device. + Store and keep all the outputs in the backend. + Add get_output_info helper function + Stop storing a pointer to drmModeConnector in ply_output_t + Stop keeing a drmModeConnector instance around. + Refactor ply_renderer_head_add_connector and + ply_renderer_head_new +- Rebase 0002-Install-label-ft-plugin-into-initrd-if-available.patch +* Wed Jan 2 2019 qzhao@suse.com +- Update to version 0.9.4+git20181219.c8f1256: + * two-step: Use plymouth_strtod + Use the locale agnostic plymouth_strtod helper which always + uses a "." as decimal seperator. This fixes the various + Alignment options not working with some locales. +* Wed Dec 12 2018 qzhao@suse.com +- Update to version 0.9.4+git20181209.f7d5bb1: + * ply-keyboard: Fix compiler warning + * When a renderer goes away on a udev remove event, free + keyboards associated with the renderer, before freeing the + renderer. + * device-manager: free keyboards when deactivating a renderer + * keyboard: add helper to get the keyboard's renderer, if + applicable. +* Wed Dec 5 2018 qzhao@suse.com +- Update to version 0.9.4+git20181204.0cd0613: + * drm: Pick a controller for unconfigured connectors + * drm: Drop crtcs for clones for which we've picked different + modes + * drm: More connector enumeration refactoring + * drm: Store tiled and rotation in ply_output_t + * drm: Refactor create_heads_for_active_connectors + * drm: Directly store the mode instead of the mode_index + * drm: Drop unused encoder_id +* Thu Nov 29 2018 qzhao@suse.com +- Update to version 0.9.4+git20181129.a7ec3e6: + * Add new BGRT theme, using the firmware boot splash as background + * two-step: bgrt: Deal with quirky firmwares, Add ACPI BGRT + extension support, Speed up background-tile drawing on HiDPI + screens, Use a pixel-buffer instead of an image for the view's + background + * ply-pixel-buffer: Add ply_pixel_buffer_rotate_upright helper, + Add ply_pixel_buffer_get/set_device_rotation helpers, Fix marking + buffers as opaque when doing a solid fill, Fix fill_with_buffer + fastpath when device_scale != 1. +* Fri Nov 23 2018 qzhao@suse.com +- Update to version 0.9.4+git20181122.aaa140b: + Add a separator between different boot logs + Fix race causing undesired creation of non-gfx devs + Fix animation not starting on later added heads +* Mon Nov 12 2018 qzhao@suse.com +- Update to version 0.9.4+git20181111.118c5ca: + Modify systemd-units: Add "ConditionVirtualization=!container" in + all plymouth-*.service, also systemd-ask-password-plymouth.path. +* Tue Nov 6 2018 qzhao@suse.com +- Update to version 0.9.4+git20181105.f898586: + bump to 0.9.4 +* Wed Oct 31 2018 qzhao@suse.com +- Update to version 0.9.3+git20181031.025ce59: + drm: use preferred mode for outputs + drm: Refactor ply_renderer_connector_get_rotation + drm: Reset LUT/gamma table before the first drmModeSetCrtc call + libply: Move kernel commandline parsing functions to libply/ply-utils + throbber: Don't skip last frame when waiting for end. +- Drop plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch + * Upstream has already accept Michal's modification. +* Tue Oct 23 2018 msrb@suse.com +- plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch + * Make sure plymouthd stops throbber animation at the first + opportunity after receiving quit command, instead of looping + multiple times. (boo#1110199) +* Thu Oct 18 2018 qzhao@suse.com +- Update to version 0.9.3+git20180827.0a66272: + * boot-server: free the argument and triggers + * event-loop: fix leak in error path + * script: fix various memory leaks + * key-file: ply_key_file_get_value returns duplicated memory, fix + memory leaks. + * event-loop: fix leak in error path + * boot-splash: fix memory leak in error path + * populate-initrd: drop unused local variable +* Tue Aug 28 2018 qzhao@suse.com +- Update to version 0.9.3+git20180827.0a66272: + ensure tty is closed on deactivate + If plymouth doesn't get explicitly "activated" then when + GDM tries to deactivate it, the deactivation request is + a noop. + One aspect of being active, though is having ownership and + control of the terminal. This happens immediately, even + before a splash is shown. + The `deactivate` request needs to relinguish such control, + unconditionally, since some display server is about to use + the tty. +- Update patch name base on quilt standerd + Remove only_use_fb_for_cirrus_bochs.patch + Add plymouth-only_use_fb_for_cirrus_bochs.patch + Remove 0001-Some-greenish-openSUSE-colors.patch + Add plymouth-some-greenish-openSUSE-colors.patch +* Fri Aug 17 2018 bjorn.lie@gmail.com +- Update to version 0.9.3+git20180807.7663b0c: + * systemd-units: Add "ConditionVirtualization=!container" + * README: add link to Code of Conduct + * two-step: add unhandled splash mode case to switch + * main: fix build + * Fix miscellaneous compiler warnings + * configure: Pass -Wno-cast-function-type if available + * main: Fix getting detailed logs from systemd + * main: Show details when ESC is pressed during splash_delay + * drm: Remove unnecessary reset_scan_out_buffer_if_needed() call + from ply_renderer_head_map() + * main: Only activate renderers if the splash uses pixel-displays +- Switch to new gitlab home in _service. +- Refresh patches with quilt. +- Use autosetup macro. +* Sat Aug 4 2018 qzhao@suse.com +- Drop plymouth-fix-window-size: The use of the smallest screen + size is deliberate (boo#804607 bsc#894051). +* Wed Apr 11 2018 oholecek@suse.com +- Modify 0001-Add-label-ft-plugin.patch to fix problems with + multiline text (bsc#1083695) + * to prevent infinite loop newline characters need to be skipped +- Use %%license instead of %%doc (bsc#1082318) +* Sat Jan 13 2018 zaitor@opensuse.org +- Update to version 0.9.3+git20171220.6e9e95d: + * device-manager: drop superfluous + create_pixel_displays_for_renderer call + * x11: don't call gdk_display_get_name before gtk_init +* Mon Dec 4 2017 zaitor@opensuse.org +- Update to version 0.9.3+git20171130.fa66a5b: + * INSTALL: Fix a spelling error in the command example + * populate-initrd: handle themes with subdirs + * device-manager: fall back to text mode if graphical devices + fail + * scripts: Use >&2 instead of /dev/stderr + * terminal: add include for sysmacros.h + * configure: bump to 0.9.4 + * terminal-session: don't delete boot.log + * Revert "Make boot.log world readable by default" +- Rebase 0002-Install-label-ft-plugin-into-initrd-if-available.patch +* Wed Nov 29 2017 qzhao@suse.com +- Drop stop-graphical.patch: There are no conflicting these days, + obsolete this patch to enable auto switch to TTY when display + server not exist (boo#1066510). +* Wed Jun 14 2017 qzhao@suse.com +- Update plymouth.spec: Add COPYING file in plymouth package file + list, This is for the law requirement (bsc#1043834). +* Mon May 8 2017 antoine.belvire@opensuse.org +- Update to version 0.9.2+git20170424.6fd5c6b: + * main: Look for config in runtime dir first + * main: Look for theme in runtime dir first + * Revert "Recreate boot log at each boot instead of appending" + * x11: implement get_display_name + * drm: implement get_display_name + * configure: don't look for libudev when --without-udev is passed + * renderer: export device name from plugin + * device-manager: handle NULL renderer better +- Remove 0001-device-manager-handle-NULL-renderer-better.patch + (upstreamed). +* Thu Jan 26 2017 zaitor@opensuse.org +- Drop use-mkinitrd.patch: No longer needed, mkinitrd is just a + wrapper for dracut now any way, hence this patch is currently + pointless. +* Wed Jan 25 2017 fvogt@suse.com +- Remove patch which causes breakage with systemd-vconsole-setup (bsc#1020327): + * 0001-let-it-become-a-real-daemon.patch +- Add upstream patch to fix crash on boot: + * 0001-device-manager-handle-NULL-renderer-better.patch +- Replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch + with single patch: + * only_use_fb_for_cirrus_bochs.patch +* Mon Jan 9 2017 zaitor@opensuse.org +- Update to version 0.9.2+git20161215.18dd755: + * terminal: refresh geometry after drm device arrives + * logger: stop using carriage returns + * build-goo: don't install systemd units during distcheck + * systemd-units: Fix uninstall script + * configure: switch to tar.xz instead tar.bz2 + * libply: fix HiDPI detection + * libply, main: Add device scale setting + * main: support plymouth.force-scale on the kernel command line + * build-goo: make udev support build time optional + * device-manager: dont pass terminal as renderer device +* Tue Sep 6 2016 tchvatal@suse.com +- Update to version 0.9.2+git20160823.e4b7e49: + * libply: fix HiDPI detection + * libply, main: Add device scale setting + * main: support plymouth.force-scale on the kernel command line +- Refresh patch: + * 0001-let-it-become-a-real-daemon.patch +* Tue Sep 6 2016 tchvatal@suse.com +- Add systemd to buildrequires to properly detect systemd-ask-password +* Thu Aug 4 2016 tchvatal@suse.com +- Sort out with spec-cleaner and move all buildrequires to main scope + not to subpkgs, sometimes interpreted wrongly by rpm if it is split +* Thu Aug 4 2016 tchvatal@suse.com +- Reduce patches list removing merged upstream (bit differently tho): + * 0001-seats-guard-against-NULL-terminal.patch + * fix-serial-consoles.patch + * plymouth-boot-vga-framebuffer.patch +- Refresh patches: + * 0001-let-it-become-a-real-daemon.patch +- Update to version 0.9.2+git20160620.0e65b86: + * configure: tweak defaults to be more systemd friendly + * text: don't draw if not animating + * terminal: always open terminal in non-blocking mode + * device-manager: probe existing DRM devices at startup + * drm: don't pick up drm master implicitly + * terminal: refresh geometry after drm device arrives + * logger: stop using carriage returns + * build-goo: don't install systemd units during distcheck + * systemd-units: Fix uninstall script + * configure: switch to tar.xz instead tar.bz2 +* Wed Jun 1 2016 idonmez@suse.com +- Remove framebuffer support bsc#980750 and bsc#982226 +* Mon Feb 8 2016 fvogt@suse.com +- Add 0003-fix_null_deref.patch as well + - Avoid potential SEGV if label plugin fails to load +* Wed Jan 20 2016 fvogt@suse.com +- Add 0001-Add-label-ft-plugin.patch and + 0002-Install-label-ft-plugin-into-initrd-if-available.patch: + - Ability to output text in initrd, needed for encryption + - boo#959986 +* Mon Dec 28 2015 dimstar@opensuse.org +- Update to version 0.9.2: + + two-step: Add separate startup / shutdown animations. + + device-manager: try fb device if drm device failed. + + Port to GTK+ 3.0. + + script support system update events. + + Drop the obsolete log-viewer +- Rebase patches: + + plymouth-fix-window-size + + stop-graphical.patch + + 0001-Some-greenish-openSUSE-colors.patch + + fix-serial-consoles.patch + + 0001-seats-guard-against-NULL-terminal.patch + + plymouth-ignore-cirrusdrm.patch + + plymouth-boot-vga-framebuffer.patch + + 0001-let-it-become-a-real-daemon.patch +- Drop upstream fixed patches: + + 0001-device-manager-only-call-ply_terminal_free.patch + + 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch + + 0001-splash-do-not-process-display-lists-if-it-is-empty.patch + + 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch + + 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch + + 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch +- Replace pkgconfig(gtk+-2.0) BuildRequires with + pkgconfig(gtk+-3.0), following upstreams port to GTK+ 3.0. +- Rename library subpackage from *2 to *4, followings upstreams + soname bump. +- Drop utils subpackage: the log-viewer, which was the only tool + left, has been dropped. +* Thu Dec 10 2015 tiwai@suse.de +- Fix missing dependency on coreutils for initrd macros (boo#958562) +- Call missing initrd macro at postun (boo#958562) +* Mon Sep 21 2015 idonmez@suse.com +- Use is_opensuse to simplify if/else block +* Fri Sep 4 2015 idonmez@suse.com +- Add a direct dependency on systemd, since we need to know the + path to systemd-tty-ask-password-agent, fixes part of bsc#943312 +* Sat Nov 8 2014 Led +- fix bashisms in post/postun scripts +* Thu Sep 25 2014 idonmez@suse.com +- Update 0001-let-it-become-a-real-daemon.patch to call setsid + only from the child process. +* Fri Sep 12 2014 idonmez@suse.com +- Add 0001-let-it-become-a-real-daemon.patch to make plymouth + a real daemon, fixes part of bnc#889757. Patch by Werner. +* Thu Sep 4 2014 idonmez@suse.com +- Add plymouth-boot-vga-framebuffer.patch to fix boot_vga + problem with framebuffer devices. (bnc#886211) +* Mon Aug 11 2014 idonmez@suse.com +- Modify plymouth-ignore-cirrusdrm.patch to return as + early as possible. Patch by glin@suse.com +* Thu Aug 7 2014 idonmez@suse.com +- Invert the logic in plymouth-ignore-cirrusdrm.patch bnc#890516 +* Mon Jul 28 2014 fcrozat@suse.com +- Add + 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch: + fix incorrect UTF-8 code used for square (bnc#886148). +* Fri Jul 25 2014 fcrozat@suse.com +- Add plymouth-ignore-cirrusdrm.patch: ignore cirrus drm and use fb + instead (bnc#888590) +* Thu Jul 24 2014 fcrozat@suse.com +- Add + 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch: + Be more forgiving with empty seat. +* Tue Jul 8 2014 fcrozat@suse.com +- Update 0001-Some-greenish-openSUSE-colors.patch to also use SUSE + colors on tribar (bnc#886148) +* Fri Jun 27 2014 fcrozat@suse.com +- Add + 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch: + handle new udev behaviour in seqnum removal. +* Fri Jun 20 2014 fcrozat@suse.com +- Add + 0001-splash-do-not-process-display-lists-if-it-is-empty.patch: + fix crash when calling plymouth quit +- Add 0001-seats-guard-against-NULL-terminal.patch: guard against + NULL terminal. +- Update stop-graphical.patch: add RemainAfterExit=true to + plymouth-start.service, ensuring plymouthd is not restarted when + switching between runlevels. +* Thu Jun 19 2014 fcrozat@suse.com +- Add + 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch: + fix crash when pixel_display is removed. +- Add 0001-device-manager-only-call-ply_terminal_free.patch: fix + crash. +- Add use-mkinitrd.patch: call mkinitrd -B, not dracut for now, + otherwise initramfs is being created by plymouth-update-initrd, + not initrd file. +- Ensure we don't rebuild initrd twice when updating plymouth. +- Ensure default theme is SLE/openSUSE (based on %%suse_version) +* Fri Jun 6 2014 fcrozat@suse.com +- Release 0.9.0 (3 additional fixes compared to previously packaged + git snapshot): + + Use udev for graphics device enumeration + + Add new text plugin to replace the tribar one + + Add background tiling and watermark support to two-step + + Make various plymouth commands that change state be resilient + to being called multiple times + + Support going back to the initrd at shutdown + + Keyfile parser improvements + + Make plymouthd use better defaults when running on top of X11 + + Fixes for systems using QXL + + minor two-step plugin fixes + + Use /sys/class/tty/console/active instead of parsing + /proc/cmdline for consoles. + + Documentation improvements + + Drop driver specific renderers and use generic driver across the + board. + + Better debug message output + + systemd integration fixes + + upstart integration fixes + + initrd scripts fixes + + Misc fixes +* Thu Jun 5 2014 idonmez@suse.com +- Update fix-serial-consoles.patch to fix a crash in some rare + cases. +* Wed May 21 2014 idonmez@suse.com +- Add fix-serial-consoles.patch to fix binary garbage on serial + consoles. This is bnc#873859 +* Mon May 5 2014 fcrozat@suse.com +- Remove plymouth-restore-suspend.patch: suspend package is being + dropped, no longer needs to provide this old API. +- Remove requires on suspend package. +* Thu Apr 17 2014 idonmez@suse.com +- Update to git snapshot as of 20140327 + * Fixes bnc#872502 and bnc#872428 +* Wed Apr 16 2014 trenn@suse.de +- Kill all mkinitrd stuff + Remove suse-initrd-support +- Tell zypper to regenerate initrd on installation/update via %%post and + %%posttrans scripts +* Thu Apr 10 2014 idonmez@suse.com +- Add plymouth-manpages.patch to fix manpage installation (bnc#871419) +* Thu Feb 20 2014 fcrozat@suse.com +- Drop plymouth.conf, it is no longer used, plymouthd.conf is + nowadays. +* Sat Feb 15 2014 kigurame@opensuse.org +- Updated from git +- carried over patches +- Dropped 0001-Make-plymouthd-real-daemon-and-save-old-log.patch + Because it is really not necesary +* Wed Feb 12 2014 werner@suse.de +- Add patch + 0001-Make-plymouthd-real-daemon-and-save-old-log.patch + all daemons should call setsid(2) to become a real daemons without + controlling terminal. Beside this the old boot log will help for + debugging and for support. +* Thu Dec 12 2013 uweigand@de.ibm.com +- Add powerpc64le-linux support. +* Thu Sep 26 2013 lnussel@suse.de +- disable plymouth in initrd if the root volume is encrypted. This + is a workaround until plymouth is able to handle the prompt + correctly (bnc#834063). +* Wed Sep 11 2013 crrodriguez@opensuse.org +- version 0.8.8_git201309032142 +- All device specific code has been removed because the kernel + has been fixed in the meanwhile so plymouth no longer requires + libdrm_intel, libdrm_radeon, libdrm_nouveau and can use the generic + interface. + This commit does not add any new features or bugfixes but removes + a huge chunk of unnecessary code. +* Fri Aug 16 2013 lmuelle@suse.com +- Pre require plymouth from plymouth-scripts; (bnc#806388). +* Thu Aug 1 2013 tittiatcoke@gmail.com +- Update to version 0.8.8_git201308011340 + - Drop patch plymouth-correct-systemd-prefix.patch + - Drop patch plymouth-close.patch + - Drop patch plymouth-close-unredirect.patch + - Drop patch plymouth-redirect-null.patch + - Drop patch plymouth-exit-code.patch + - Drop patch plymouth-terminal-session-close.patch +* Mon Jul 29 2013 tittiatcoke@gmail.com +- Add upstream patch plymouth-correct-systemd-prefix.patch to + correct the systemd prefixes in some systemd files. This replaces + the sed string. +* Thu Jun 27 2013 crrodriguez@opensuse.org +- Require pigz instead of gzip +- ensure plugin requires are versioned. +* Sun Jun 16 2013 crrodriguez@opensuse.org +- own %%{_localstatedir}/log/boot.log + and %%{_localstatedir}/spool/plymouth/boot.log (as %%ghost s) +* Tue Jun 11 2013 fcrozat@suse.com +- Add plymouth-close: do not try to close negative fd. +- Add plymouth-close-unredirect.patch: do not leak fd when stopping + redirection of /dev/console (bnc#811185) +- Add plymouth-redirect-null.patch: redirect plymouth standard io + to /dev/null (bnc#811185) +- Add plymouth-exit-code.patch: ignore exit code in ExecStartPost. +- Add plymouth-terminal-session-close.patch: do no try to close + terminal session fd if already closed. +* Sun May 12 2013 crrodriguez@opensuse.org +- Not only reboot.service is prefixed with systemd- currently + but also kexec,halt,poweroff. +* Mon Apr 22 2013 crrodriguez@opensuse.org +- Also ensure we express rpm dependencies correctly + this package is not gonna work on systemd < 186. +* Mon Apr 22 2013 crrodriguez@opensuse.org +- Update to version 0.8.8_git201304161248 +- drop plymouth-change-service-name.patch, replaced by + a sed script that will account for all service files' future changes +- drop patch plymouth-trace-lines, in upstream now +- drop plymouth-udevadm-path.patch, generic solution in upstream now. +- drop ply-sdunitdir.patch likewise. +- drop plymouth-systemd-in-usr.patch likewise. +- drop systemd-no-warning.patch, not needed with newer systemd +- drop plymouth-sd-notforking.patch , not really needed anymore. +* Thu Feb 28 2013 tittiatcoke@gmail.com +- Changed %%post scripts so only the rebuild of the initrd is + omitted within the build environment +* Fri Feb 22 2013 tittiatcoke@gmail.com +- Added patch plymouth-correct-runtime-dir.patch to make the + plymouthruntimedir equal to /run/plymouth and not /var/run/plymouth +* Wed Feb 6 2013 fcrozat@suse.com +- Rename plymouth-sd-notforking.patch to fix typo in patch name +- Add plymouth-change-service-name.patch: fix incorrect service + names used for dependencies. Now use systemd-reboot.service + (replacing reboot.service) and display-manager.service (replacing + prefdm.service). +* Tue Dec 18 2012 tittiatcoke@gmail.com +- Make sure that the right version of the scripts is required by + the main package. This to prevent that an update of the scripts + is not installed (bnc#793400) +- Removed obsolete patch plymouth-remove-pid-file.patch. Issue + has been resolved upstream +* Wed Nov 14 2012 seife+obs@b1-systems.com +- fix path to systemd-tty-ask-password-agent for newer systemd +- create the pid file again during boot, the existence of this is + a condition for systemd-ask-password-plymouth.service. A proper + fix might look different but that get's it going again. +* Tue Nov 6 2012 tittiatcoke@gmail.com +- Provide the scripts to integrate Plymouth in dracut as a + separate package. +- Added patch (plymouth-dracut-path.patch) to correct the paths + inside the specific plymouth-dracut scripts +* Mon Nov 5 2012 crrodriguez@opensuse.org +- Update to an slightly newer git snapshot to fix regression + from 0.8.8 +* Thu Nov 1 2012 crrodriguez@opensuse.org +- Version 0.8.8 + * main: Try to own socket before anything else + * main: silently succeed if plymouthd is started a second time + * service: start plymouthd unconditionally + * x11: make window fullscreen by default + * x11: only create windows when necessary +* Thu Nov 1 2012 crrodriguez@opensuse.org +- plymoith-sd-notforking.patch: Make plymouthd to not use + Service type "forking" +- ply-sdunitdir.patch: Must install units in %%{_unitdir} as + returned by pkg-config not in a hardcoded location. +* Fri Oct 12 2012 tittiatcoke@gmail.com +- Remove the non required font file in /etc/fonts/conf.avail/ . +* Thu Oct 11 2012 tittiatcoke@gmail.com +- Adjusted the upstream patch to remove the pid file. The original + one seems to cause issues with the DM killing plymouth +* Thu Oct 11 2012 tittiatcoke@gmail.com +- Fix the Pango installation within the initrd. This would + resolve the error message that Pango cannot find any fonts +* Thu Sep 27 2012 tittiatcoke@gmail.com +- fix the libdir path in plymouth-set-default-theme (bnc#780085) +* Thu Sep 20 2012 tittiatcoke@gmail.com +- Update to version 0.8.7 + + fix plymouth race at bootup breaking efi/vesa handoff + + Systemd fixes +- Add plymouth-remove-pid-file.patch: remove PID file usage + (bnc#780976) (Thanks to fcrozat) +- Remove upstream patches: plymouth-systemd-target.patch, + 0001-ply-text-progress-bar-strip-quotes-if-present,patch, + plymouth-fix-systemd-service.patch, plymouth-after-udev-settle + due to upstream inclusion. +* Wed Aug 22 2012 fcrozat@suse.com +- Add plymouth-after-udev-settle.patch: ensure plymouth is started + after udev triggers has been started (git + name change due to + systemd < 183 in openSUSE 12.2). +* Wed Aug 22 2012 tittiatcoke@gmail.com +- Ensure that the right Pango version is used for copying one of + the pango modules +* Wed Aug 8 2012 fcrozat@suse.com +- Add plymouth-fix-systemd-service.patch: remove dashes next to + semi-colons, it confuses systemd. (bnc#774400) +- Update suse-initrd-support to not start plymouth if kernel + cmdline contains "shell" or "plymouth.enable=0" or + "rd.plymouth=0". +* Mon Aug 6 2012 dmueller@suse.com +- remove suspend dependency on ARM +* Sun Jul 29 2012 jengelh@inai.de +- Ship /etc/os-release in the initrd so that the pretty name is + displayed in text-splash mode +- Give the text-splash some SUSE-typical green coloring +* Sun Jul 29 2012 dmueller@suse.com +- fix build for ARM +* Thu Jul 26 2012 tittiatcoke@gmail.com +- Move the openSUSE branding to its rightful place +* Fri Jul 20 2012 fcrozat@suse.com +- Update to 0.8.6.1: + + Fix systemd path file generation +- Changes from 0.8.6: + + fix flush_area fast-path + + seed random number generator by default for script plugins + + allow plymouth to be built without gtk dependency + + cope with lack of /etc/os-release better + + pull in systemd unit files (bnc#770890) + + add support for new "updates" mode for doing package updates + (only available for some plugins at the moment) +- Add plymouth-restore-suspend.patch: revert commit removing + suspend/resume support, needed for suspend package. +- Add plymouth-systemd-target.patch: add missing symlinks to start + plymouth on shutdown / reboot / kexec (bnc#770764). +- Add plymouth-udevadm-path.patch: adapt to udevadm path on + openSUSE. +- Ensure systemctl daemon-reload is called in post / postun +- Add systemd-no-warning.patch: remove Documentation tag not + handled by systemd v44. +- Update stop-graphical.patch to correct prevent plymouth.quit to + start under runlevel 5 (handled by xdm initscript directly). +* Fri Jul 6 2012 dvaleev@suse.com +- don't require intel_drm on ppc +* Wed Jul 4 2012 meissner@suse.com +- run "/sbin/mkinitrd" and let it figure out by itself + what initrds to update. bnc#769812 +* Mon Jul 2 2012 fcrozat@suse.com +- Provides systemd units, instead of relying on systemd to ship + them (bnc#769397). +- Ensure plymouth--wait-quit.service conflicts with + graphical.target. +* Fri Jun 29 2012 tittiatcoke@gmail.com +- Update to 0.8.5.1 + + two-step splash plugin quit fixes + + add generic driver to drm renderer plugin + This allows new modesetting drivers to work with plymouth + automatically + + fixes for video cards that don't support 32bpp + + add alignment and width features to label controls + + new documentation + + event loop fix + + more serial console fixes + + better systemd integration + + new flush api to client library + + Allow plymouth to build the drm renderer without the driver + dependent libdrm_* libraries. +* Thu Jun 21 2012 lnussel@suse.de +- disable plymouth if init is not systemd (could be e.g. /bin/sh or + sysvinit then) +* Mon Jun 11 2012 coolo@suse.com +- if we provide bootsplash, we should also make sure to obsolete + its version +* Mon Jun 4 2012 tittiatcoke@gmail.com +- Ensure that the openSUSE theme is default. (bnc#765277) +- Remove unnecessary changes to the kernel options. Plymouth also + accepts splash=silent. +* Wed May 30 2012 vuntz@opensuse.org +- Add plymouth-scripts Requires(post) to branding-openSUSE + subpackage, to make sure that the %%post scriptlet will work. +- Make sure we export LIB and not lib in the %%postun scriptlets of + theme-solar and branding-openSUSE subpackages. +* Tue May 29 2012 tittiatcoke@gmail.com +- Ensure that label.so is being installed for the openSUSE branding + (bnc#763574) +* Mon May 21 2012 tittiatcoke@gmail.com +- Update the installation/update from plymouth in a way that the + initrd file for the current running kernel is updated. +- Corrected a typo with regards to the location of a pango module + when setting up the initrd. +* Tue May 15 2012 tittiatcoke@gmail.com +- Added a patch for openSUSE to enable the rebuild of the initrd + with the plymouth-set-default-theme script. (bnc#757284) +* Sun May 13 2012 tittiatcoke@gmail.com +- Added plymouth to the requires of plymouth-scripts. This + should resolve bug (bnc#757284) +* Fri May 11 2012 nmo.marques@gmail.com +- Split x11 renderer into his own package; the x11 renderer allows + users to test plymouth themes; having it available on the devel + package will force people who just want to test a theme to + install a lot of unwanted dependencies. Being on it's own package + without explicit dependencies provides extra functionality to + users who want to test themes without having to rebuild initrd + and rebooting for testing. +- bnc#761403 +* Sat Apr 28 2012 tittiatcoke@gmail.com +- Reduce the number of fonts that are included in the initrd. Also + let mkinitrd sort out the dependencies for the required libs. +- Use the same font as that grub2 is currently using for it's + graphics mode. +* Tue Apr 17 2012 glin@suse.com +- Correct the theme name in the post install script of + plymouth-branding-openSUSE +* Thu Apr 5 2012 tittiatcoke@gmail.com +- Updated the initrd patch to include the necessary files to have + text support (e.g. LUKS passphrase question, etc) +- Temporarily added a openSUSE plymouth theme + (plymouth-branding-openSUSE) to have a better integration with + 12.2. +* Thu Mar 29 2012 tittiatcoke@gmail.com +- Ensure that both grub and grub2 are adjusted with regards to the + splash parameter. Running grub2-mkconfig to have the right + configuration. +- Installation of themes are not causing any reset of the selected + default theme anymore. Now this only happens when a theme is + installed and the default theme is set to TEXT. +* Sun Mar 25 2012 tittiatcoke@gmail.com +- Update to the official release of 0.8.4 + * Bugfix: Use /dev/fb0 instead of /dev/fb, this resolves the + issue of not showing the splash during shutdown +* Fri Mar 9 2012 tittiatcoke@gmail.com +- Add a small change in order to have plymouth activated with Grub2 +* Thu Feb 23 2012 tittiatcoke@gmail.com +- Make sure that the package libply-boot-client is always + installed to prevent a system that will not boot +* Thu Feb 23 2012 saschpe@suse.de +- Replaced package core-libs with individual packages for each shared + library (SLPP) +- Proper provides/obsoletes pair for bootsplash +- Could not resist to run spec-cleaner ;-) +* Tue Feb 21 2012 tittiatcoke@gmail.com +- Changed the parameters to plymouthd in the initrd to create + the necessary pid-file for the systemd integration +* Fri Feb 17 2012 tittiatcoke@gmail.com +- Ensure that /bin/plymouth still is available as that the + displaymanagers (KDM/GDM) are expecting this. This needs to be + in place until the migration to /usr is completed. +* Fri Feb 17 2012 tittiatcoke@gmail.com +- Finalize the Plymouth integration on openSUSE. + * Current default theme is Solar with the openSUSE Geecko + * Plymouth bootsplash will run on tty7 during boot. + * Install all files in /usr +* Tue Dec 27 2011 crrodriguez@opensuse.org +- Update to current git +* Wed Mar 23 2011 jeffm@suse.de +- Update to git snapshot from 12 Mar 2011. + - Mostly minor fixes. +* Sat Feb 5 2011 jeffm@suse.de +- Updated to latest snapshot. + - boot-server: improve debug output + - pixel-buffer: Fix overflow in blend_two_pixel_values + - boot-server: fix debug output when message is from init +- Fixed an issue with the script plugin's Window attributes returning + the size of the smallest display when multiple displays are used. +* Wed Dec 29 2010 jeffm@suse.de +- Fixed location of text.so and details.so in plymouth-scripts +* Wed Dec 22 2010 seife+obs@b1-systems.com +- fix the build failure: + - own additional directories +- fix rpmlint failures: + - fix up package groups - those are just guessed sometimes + - rename plymouth-graphics-libs to libply-splash-graphics2 + (this one was fatal) + - do not own /var/run/plymouth - probably still needs fixing + (this was almost fatal) + - do not include build date in binary, use mtime of source + patchfile instead +* Wed Dec 8 2010 jeffm@suse.de +- Initial packaging. From 4e0545865e9c0b469716978cdd0ad25ed2d62db17f00a7d4f2de28797eee36f6 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 3 Sep 2020 01:29:48 +0000 Subject: [PATCH 5/6] 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 --- ...modify-conf-to-drop-isopensuse-macro.patch | 128 +-- plymouth.changes | 2 +- plymouth.spec | 776 +----------------- 3 files changed, 15 insertions(+), 891 deletions(-) diff --git a/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch b/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch index 9361a5c..a861045 100644 --- a/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch +++ b/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch @@ -1,33 +1,6 @@ -diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-populate-initrd.in ---- plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-populate-initrd.in 2020-08-29 16:43:14.303181545 +0800 -+++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-populate-initrd.in 2020-08-29 23:07:23.332595874 +0800 -@@ -396,6 +396,8 @@ - inst @RELEASE_FILE@ $INITRDDIR - inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR - inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR -+inst ${PLYMOUTH_DATADIR}/plymouth/plymouthd.conf $INITRDDIR -+ - - if [ -z "$PLYMOUTH_THEME_NAME" ]; then - echo "No default plymouth plugin is set" >&2 -@@ -403,8 +405,12 @@ - fi - - if [ $THEME_OVERRIDE ]; then -- conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf -- echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" >&2 -+ if [ -f /etc/plymouth/plymouthd.conf ]; then -+ conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf -+ elif [ -f /usr/share/plymouth/plymouthd.defaults ]; then -+ conf=$INITRDDIR/${PLYMOUTH_DATADIR}/plymouth/plymouthd.conf -+ fi -+ echo "modifying plymouthd config file: Theme=$PLYMOUTH_THEME_NAME" >&2 - # make sure the section and key exist so we can modify them - grep -q "^ *\[Daemon\]" $conf || echo "[Daemon]" >> $conf - grep -q "^ *Theme *=" $conf || echo "Theme=fade-in" >> $conf 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 -+++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-08-30 12:47:49.602316219 +0800 ++++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-09-02 17:31:50.644198200 +0800 @@ -58,7 +58,12 @@ function get_default_theme () @@ -49,103 +22,26 @@ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme - [ -f ${PLYMOUTH_CONFDIR}/plymouthd.conf ] || exit 0 - sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf - exit $? -+ 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 ++ 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 fi if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then -@@ -187,10 +198,10 @@ - - [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ] && rm -f ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth - --[ -d ${PLYMOUTH_CONFDIR} ] || mkdir -p ${PLYMOUTH_CONFDIR} --grep -q '^[[]Daemon[]]' ${PLYMOUTH_CONFDIR}/plymouthd.conf 2> /dev/null || echo '[Daemon]' >> ${PLYMOUTH_CONFDIR}/plymouthd.conf --sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf --sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf -+[ -d ${PLYMOUTH_DATADIR} ] || mkdir -p ${PLYMOUTH_DATADIR} -+grep -q '^[[]Daemon[]]' ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults 2> /dev/null || echo '[Daemon]' >> ${PLYMOUTH_DATADIR}/plymouthd.defaults -+sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults -+sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults - - [ $DO_INITRD_REBUILD -ne 0 ] && (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd) - exit 0 -diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/main.c plymouth-0.9.5+git20190908+3abfab2_new/src/main.c ---- plymouth-0.9.5+git20190908+3abfab2/src/main.c 2020-08-29 16:43:22.589272043 +0800 -+++ plymouth-0.9.5+git20190908+3abfab2_new/src/main.c 2020-08-29 16:47:35.607035410 +0800 -@@ -424,8 +424,8 @@ - if (state->distribution_default_splash_path != NULL) - return; - -- if (!load_settings (state, PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults", &state->distribution_default_splash_path)) { -- ply_trace ("failed to load " PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults, trying " PLYMOUTH_POLICY_DIR); -+ if (!load_settings (state, PLYMOUTH_DATADIR "/plymouthd.defaults", &state->distribution_default_splash_path)) { -+ ply_trace ("failed to load " PLYMOUTH_DATADIR "/plymouthd.defaults, trying " PLYMOUTH_DATADIR); - if (!load_settings (state, PLYMOUTH_POLICY_DIR "plymouthd.defaults", &state->distribution_default_splash_path)) { - ply_trace ("failed to load " PLYMOUTH_POLICY_DIR "plymouthd.defaults"); - return; -@@ -447,16 +447,21 @@ - state->boot_splash = show_theme (state, state->override_splash_path); - } - -- if (state->boot_splash == NULL && -- state->system_default_splash_path != NULL) { -- ply_trace ("Trying system default splash"); -- state->boot_splash = show_theme (state, state->system_default_splash_path); -- } -- -- if (state->boot_splash == NULL && -- state->distribution_default_splash_path != NULL) { -- ply_trace ("Trying distribution default splash"); -- state->boot_splash = show_theme (state, state->distribution_default_splash_path); -+ if (access("/etc/plymouth/plymouthd.conf", F_OK ) != -1) -+ { -+ if ( state->boot_splash == NULL && -+ state->system_default_splash_path != NULL) { -+ ply_trace ("Trying system default splash"); -+ state->boot_splash = show_theme (state, state->system_default_splash_path); -+ } -+ } -+ else if (access("/usr/share/plymouth/plymouthd.defaults", F_OK ) != -1) -+ { -+ if (state->boot_splash == NULL && -+ state->distribution_default_splash_path != NULL) { -+ ply_trace ("Trying distribution default splash"); -+ state->boot_splash = show_theme (state, state->distribution_default_splash_path); -+ } - } - - if (state->boot_splash == NULL) { -@@ -2254,9 +2259,13 @@ - return EX_UNAVAILABLE; - } - -+ - find_override_splash (&state); -- find_system_default_splash (&state); -- find_distribution_default_splash (&state); -+ -+ if( access("/etc/plymouth/plymouthd.conf", F_OK ) != -1 ) -+ find_system_default_splash (&state); -+ else if( access("/usr/share/plymouth/plymouthd.defaults", F_OK ) != -1 ) -+ find_distribution_default_splash (&state); - - if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles")) - device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; 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 -+++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-08-29 16:48:03.959297800 +0800 ++++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-02 17:32:57.830788642 +0800 @@ -16,6 +16,7 @@ plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \ -rdynamic \ -+ -DPLYMOUTH_DATADIR=\"$(PLYMOUTH_DATAPATH)\" \ ++ -DPLYMOUTH_DATADIR=\"$(PLYMOUTH_DATAPATH)\" \ -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\" \ -DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\" \ -DPLYMOUTH_POLICY_DIR=\"$(PLYMOUTH_POLICY_DIR)/\" \ diff --git a/plymouth.changes b/plymouth.changes index 995593d..3a965d5 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -6,7 +6,7 @@ Sat Aug 29 06:13:50 UTC 2020 - Cliff Zhao 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). + (jsc#SLE-11637). ------------------------------------------------------------------- Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index ecca944..54929e3 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -33,7 +33,6 @@ Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later Group: System/Base URL: http://www.freedesktop.org/wiki/Software/Plymouth - Source0: %{name}-%{version}.tar.xz Source1: boot-duration # PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com -- Prefix is /usr/sbin and /usr/bin @@ -46,7 +45,7 @@ Patch2: plymouth-correct-runtime-dir.patch Patch3: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown. Patch4: plymouth-avoid-umount-hanging-shutdown.patch -# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-12090 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap. +# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap. Patch5: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1000: 0001-Add-label-ft-plugin.patch @@ -54,7 +53,6 @@ Patch1000: 0001-Add-label-ft-plugin.patch Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch # PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1002: 0003-fix_null_deref.patch - BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc @@ -78,7 +76,6 @@ BuildRequires: pkgconfig(systemd) >= 186 %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif - Recommends: %{name}-lang Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts @@ -430,7 +427,7 @@ 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 -# We will not ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-12090). +# 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 rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf @@ -661,772 +658,3 @@ fi %{_datadir}/plymouth/themes/bgrt/*.* %changelog -* Sat Aug 29 2020 Cliff Zhao -- 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). -* Mon Jun 15 2020 Cliff Zhao -- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user - are using emu-5.0.0 on MacOS-X with HVF acceleration, the - Plymouth theme with script module fails to go to graphic mode - with this patch(boo#1172028). -* Wed Oct 30 2019 Stefan Brüns -- Avoid inconsistencies in library package names causing unresolvable - dependencies, replace all soversion occurences with a macro. -* Wed Sep 11 2019 Cliff Zhao -- Add patch plymouth-avoid-umount-hanging-shutdown.patch: - To avoid grantpt() call nsslookup, it will hanging system unmount - /var during shutdown period(bsc#1105688, bsc#1129386, - bsc#1134660). -* Thu Aug 15 2019 Cliff Zhao -- Update to version 0.9.5+git20190908+3abfab2: - * two-step: Deal with buggy firmware which does not pre-rotate the bgrt image - * configure: bump so name - * Internationalization: Add zh_HK and zh_TW translations. - * add delay time to 8 seconds to fit AMD graphic card. -* Mon Aug 5 2019 Cliff Zhao -- Update plymouth.spec: Disable upstart-monitor compile because it - only used in Ubuntu/Debian. -* Sun Aug 4 2019 Stefan Brüns -- Update plymouth.spec: Use bcond_with for X11 renderer, cleanup - syntax. -* Wed Jul 31 2019 Cliff Zhao -- Update plymouth.spec: obsolete plymouth render plugin for - Xwindows, Since this plugin will not be used in the production - environment, and this modify will highly decrease the compilation - of build requirements. -* Mon Jul 8 2019 Cliff Zhao -- Update to version 0.9.4+git20190612+9359382: - * two-step: Add support for firmware-splashes with rotation - status bits set - * Regenerate plymouth.pot to add the strings for the new - firmware-upgrade mode. -* Fri Jun 14 2019 Cliff Zhao -- Add dependency to dracut for plymouth-scripts(bnc#1138248). -* Tue Jun 11 2019 Dominique Leuenberger -- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to - shortcut the build queues by allowing usage of systemd-mini -* Tue Apr 2 2019 Stasiek Michalski -- Change default openSUSE theme to bgrt -* Wed Mar 27 2019 Cliff Zhao -- Update to version 0.9.4+git20190325+b9f2aac: - * themes: Update spinner and bgrt background settings - * Translations: Sync translations with zanata -* Sun Mar 24 2019 Stasiek Michalski -- Fix theme-bgrt dependencies - (based on plugin-two-step with images from theme-spinner) -* Tue Mar 12 2019 qzhao@suse.com -- Update to version 0.9.4+git20181219.c8f1256: - * ply-pixel-buffer: Fix right and bottom edge rendering of - scaled buffers. - * Add support for translating the user visible strings in some - themes - * Prefix Title and Subtitle theme config keywords with an - underscore - * Add new reboot and system-upgrade modes - * main: Remove private ply_mode_t - * two-step: Make ProgressBarShowPercentComplete a per mode - setting - * plymouthd.defaults: Change default ShowDelay to 0 - * ply-boot-splash: Do not add ply_boot_splash_update_progress - timeout multiple times - * logging: Minor log-message fixes. - Improve logging format. - * themes: Update spinner and bgrt theme offline updates mode - * two-step: Add a per mode setting to suppress messages. - Add progress-bar support. - Add MessageBelowAnimation option. - Add per mode settings. - Drop background_is_bgrt view_t member - * ply-progress-bar: Allow caller to specify the widgets width and - height. - Allow choosing fore- and back-ground color. - Redraw on percentage update. - * boot-server: fix type confusion when allocating connection object - * ply-device-manager: Handle change events for monitor hotplugging. - Consume all events in one go. - * drm: Stop limiting preferred-mode picking to UEFI systems. - Reset mode on display-port connected outputs with a bad - link-status. - Implement handle_change_event. - Ensure heads are mapped before flushing them. - Allow calling create_heads_for_active_connectors multiple - times. - Allow calling ply_renderer_head_add_connector with existing - connector_id. - Limit backend->resources lifetime to within query_device. - Store and keep all the outputs in the backend. - Add get_output_info helper function - Stop storing a pointer to drmModeConnector in ply_output_t - Stop keeing a drmModeConnector instance around. - Refactor ply_renderer_head_add_connector and - ply_renderer_head_new -- Rebase 0002-Install-label-ft-plugin-into-initrd-if-available.patch -* Wed Jan 2 2019 qzhao@suse.com -- Update to version 0.9.4+git20181219.c8f1256: - * two-step: Use plymouth_strtod - Use the locale agnostic plymouth_strtod helper which always - uses a "." as decimal seperator. This fixes the various - Alignment options not working with some locales. -* Wed Dec 12 2018 qzhao@suse.com -- Update to version 0.9.4+git20181209.f7d5bb1: - * ply-keyboard: Fix compiler warning - * When a renderer goes away on a udev remove event, free - keyboards associated with the renderer, before freeing the - renderer. - * device-manager: free keyboards when deactivating a renderer - * keyboard: add helper to get the keyboard's renderer, if - applicable. -* Wed Dec 5 2018 qzhao@suse.com -- Update to version 0.9.4+git20181204.0cd0613: - * drm: Pick a controller for unconfigured connectors - * drm: Drop crtcs for clones for which we've picked different - modes - * drm: More connector enumeration refactoring - * drm: Store tiled and rotation in ply_output_t - * drm: Refactor create_heads_for_active_connectors - * drm: Directly store the mode instead of the mode_index - * drm: Drop unused encoder_id -* Thu Nov 29 2018 qzhao@suse.com -- Update to version 0.9.4+git20181129.a7ec3e6: - * Add new BGRT theme, using the firmware boot splash as background - * two-step: bgrt: Deal with quirky firmwares, Add ACPI BGRT - extension support, Speed up background-tile drawing on HiDPI - screens, Use a pixel-buffer instead of an image for the view's - background - * ply-pixel-buffer: Add ply_pixel_buffer_rotate_upright helper, - Add ply_pixel_buffer_get/set_device_rotation helpers, Fix marking - buffers as opaque when doing a solid fill, Fix fill_with_buffer - fastpath when device_scale != 1. -* Fri Nov 23 2018 qzhao@suse.com -- Update to version 0.9.4+git20181122.aaa140b: - Add a separator between different boot logs - Fix race causing undesired creation of non-gfx devs - Fix animation not starting on later added heads -* Mon Nov 12 2018 qzhao@suse.com -- Update to version 0.9.4+git20181111.118c5ca: - Modify systemd-units: Add "ConditionVirtualization=!container" in - all plymouth-*.service, also systemd-ask-password-plymouth.path. -* Tue Nov 6 2018 qzhao@suse.com -- Update to version 0.9.4+git20181105.f898586: - bump to 0.9.4 -* Wed Oct 31 2018 qzhao@suse.com -- Update to version 0.9.3+git20181031.025ce59: - drm: use preferred mode for outputs - drm: Refactor ply_renderer_connector_get_rotation - drm: Reset LUT/gamma table before the first drmModeSetCrtc call - libply: Move kernel commandline parsing functions to libply/ply-utils - throbber: Don't skip last frame when waiting for end. -- Drop plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch - * Upstream has already accept Michal's modification. -* Tue Oct 23 2018 msrb@suse.com -- plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch - * Make sure plymouthd stops throbber animation at the first - opportunity after receiving quit command, instead of looping - multiple times. (boo#1110199) -* Thu Oct 18 2018 qzhao@suse.com -- Update to version 0.9.3+git20180827.0a66272: - * boot-server: free the argument and triggers - * event-loop: fix leak in error path - * script: fix various memory leaks - * key-file: ply_key_file_get_value returns duplicated memory, fix - memory leaks. - * event-loop: fix leak in error path - * boot-splash: fix memory leak in error path - * populate-initrd: drop unused local variable -* Tue Aug 28 2018 qzhao@suse.com -- Update to version 0.9.3+git20180827.0a66272: - ensure tty is closed on deactivate - If plymouth doesn't get explicitly "activated" then when - GDM tries to deactivate it, the deactivation request is - a noop. - One aspect of being active, though is having ownership and - control of the terminal. This happens immediately, even - before a splash is shown. - The `deactivate` request needs to relinguish such control, - unconditionally, since some display server is about to use - the tty. -- Update patch name base on quilt standerd - Remove only_use_fb_for_cirrus_bochs.patch - Add plymouth-only_use_fb_for_cirrus_bochs.patch - Remove 0001-Some-greenish-openSUSE-colors.patch - Add plymouth-some-greenish-openSUSE-colors.patch -* Fri Aug 17 2018 bjorn.lie@gmail.com -- Update to version 0.9.3+git20180807.7663b0c: - * systemd-units: Add "ConditionVirtualization=!container" - * README: add link to Code of Conduct - * two-step: add unhandled splash mode case to switch - * main: fix build - * Fix miscellaneous compiler warnings - * configure: Pass -Wno-cast-function-type if available - * main: Fix getting detailed logs from systemd - * main: Show details when ESC is pressed during splash_delay - * drm: Remove unnecessary reset_scan_out_buffer_if_needed() call - from ply_renderer_head_map() - * main: Only activate renderers if the splash uses pixel-displays -- Switch to new gitlab home in _service. -- Refresh patches with quilt. -- Use autosetup macro. -* Sat Aug 4 2018 qzhao@suse.com -- Drop plymouth-fix-window-size: The use of the smallest screen - size is deliberate (boo#804607 bsc#894051). -* Wed Apr 11 2018 oholecek@suse.com -- Modify 0001-Add-label-ft-plugin.patch to fix problems with - multiline text (bsc#1083695) - * to prevent infinite loop newline characters need to be skipped -- Use %%license instead of %%doc (bsc#1082318) -* Sat Jan 13 2018 zaitor@opensuse.org -- Update to version 0.9.3+git20171220.6e9e95d: - * device-manager: drop superfluous - create_pixel_displays_for_renderer call - * x11: don't call gdk_display_get_name before gtk_init -* Mon Dec 4 2017 zaitor@opensuse.org -- Update to version 0.9.3+git20171130.fa66a5b: - * INSTALL: Fix a spelling error in the command example - * populate-initrd: handle themes with subdirs - * device-manager: fall back to text mode if graphical devices - fail - * scripts: Use >&2 instead of /dev/stderr - * terminal: add include for sysmacros.h - * configure: bump to 0.9.4 - * terminal-session: don't delete boot.log - * Revert "Make boot.log world readable by default" -- Rebase 0002-Install-label-ft-plugin-into-initrd-if-available.patch -* Wed Nov 29 2017 qzhao@suse.com -- Drop stop-graphical.patch: There are no conflicting these days, - obsolete this patch to enable auto switch to TTY when display - server not exist (boo#1066510). -* Wed Jun 14 2017 qzhao@suse.com -- Update plymouth.spec: Add COPYING file in plymouth package file - list, This is for the law requirement (bsc#1043834). -* Mon May 8 2017 antoine.belvire@opensuse.org -- Update to version 0.9.2+git20170424.6fd5c6b: - * main: Look for config in runtime dir first - * main: Look for theme in runtime dir first - * Revert "Recreate boot log at each boot instead of appending" - * x11: implement get_display_name - * drm: implement get_display_name - * configure: don't look for libudev when --without-udev is passed - * renderer: export device name from plugin - * device-manager: handle NULL renderer better -- Remove 0001-device-manager-handle-NULL-renderer-better.patch - (upstreamed). -* Thu Jan 26 2017 zaitor@opensuse.org -- Drop use-mkinitrd.patch: No longer needed, mkinitrd is just a - wrapper for dracut now any way, hence this patch is currently - pointless. -* Wed Jan 25 2017 fvogt@suse.com -- Remove patch which causes breakage with systemd-vconsole-setup (bsc#1020327): - * 0001-let-it-become-a-real-daemon.patch -- Add upstream patch to fix crash on boot: - * 0001-device-manager-handle-NULL-renderer-better.patch -- Replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch - with single patch: - * only_use_fb_for_cirrus_bochs.patch -* Mon Jan 9 2017 zaitor@opensuse.org -- Update to version 0.9.2+git20161215.18dd755: - * terminal: refresh geometry after drm device arrives - * logger: stop using carriage returns - * build-goo: don't install systemd units during distcheck - * systemd-units: Fix uninstall script - * configure: switch to tar.xz instead tar.bz2 - * libply: fix HiDPI detection - * libply, main: Add device scale setting - * main: support plymouth.force-scale on the kernel command line - * build-goo: make udev support build time optional - * device-manager: dont pass terminal as renderer device -* Tue Sep 6 2016 tchvatal@suse.com -- Update to version 0.9.2+git20160823.e4b7e49: - * libply: fix HiDPI detection - * libply, main: Add device scale setting - * main: support plymouth.force-scale on the kernel command line -- Refresh patch: - * 0001-let-it-become-a-real-daemon.patch -* Tue Sep 6 2016 tchvatal@suse.com -- Add systemd to buildrequires to properly detect systemd-ask-password -* Thu Aug 4 2016 tchvatal@suse.com -- Sort out with spec-cleaner and move all buildrequires to main scope - not to subpkgs, sometimes interpreted wrongly by rpm if it is split -* Thu Aug 4 2016 tchvatal@suse.com -- Reduce patches list removing merged upstream (bit differently tho): - * 0001-seats-guard-against-NULL-terminal.patch - * fix-serial-consoles.patch - * plymouth-boot-vga-framebuffer.patch -- Refresh patches: - * 0001-let-it-become-a-real-daemon.patch -- Update to version 0.9.2+git20160620.0e65b86: - * configure: tweak defaults to be more systemd friendly - * text: don't draw if not animating - * terminal: always open terminal in non-blocking mode - * device-manager: probe existing DRM devices at startup - * drm: don't pick up drm master implicitly - * terminal: refresh geometry after drm device arrives - * logger: stop using carriage returns - * build-goo: don't install systemd units during distcheck - * systemd-units: Fix uninstall script - * configure: switch to tar.xz instead tar.bz2 -* Wed Jun 1 2016 idonmez@suse.com -- Remove framebuffer support bsc#980750 and bsc#982226 -* Mon Feb 8 2016 fvogt@suse.com -- Add 0003-fix_null_deref.patch as well - - Avoid potential SEGV if label plugin fails to load -* Wed Jan 20 2016 fvogt@suse.com -- Add 0001-Add-label-ft-plugin.patch and - 0002-Install-label-ft-plugin-into-initrd-if-available.patch: - - Ability to output text in initrd, needed for encryption - - boo#959986 -* Mon Dec 28 2015 dimstar@opensuse.org -- Update to version 0.9.2: - + two-step: Add separate startup / shutdown animations. - + device-manager: try fb device if drm device failed. - + Port to GTK+ 3.0. - + script support system update events. - + Drop the obsolete log-viewer -- Rebase patches: - + plymouth-fix-window-size - + stop-graphical.patch - + 0001-Some-greenish-openSUSE-colors.patch - + fix-serial-consoles.patch - + 0001-seats-guard-against-NULL-terminal.patch - + plymouth-ignore-cirrusdrm.patch - + plymouth-boot-vga-framebuffer.patch - + 0001-let-it-become-a-real-daemon.patch -- Drop upstream fixed patches: - + 0001-device-manager-only-call-ply_terminal_free.patch - + 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch - + 0001-splash-do-not-process-display-lists-if-it-is-empty.patch - + 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch - + 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch - + 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch -- Replace pkgconfig(gtk+-2.0) BuildRequires with - pkgconfig(gtk+-3.0), following upstreams port to GTK+ 3.0. -- Rename library subpackage from *2 to *4, followings upstreams - soname bump. -- Drop utils subpackage: the log-viewer, which was the only tool - left, has been dropped. -* Thu Dec 10 2015 tiwai@suse.de -- Fix missing dependency on coreutils for initrd macros (boo#958562) -- Call missing initrd macro at postun (boo#958562) -* Mon Sep 21 2015 idonmez@suse.com -- Use is_opensuse to simplify if/else block -* Fri Sep 4 2015 idonmez@suse.com -- Add a direct dependency on systemd, since we need to know the - path to systemd-tty-ask-password-agent, fixes part of bsc#943312 -* Sat Nov 8 2014 Led -- fix bashisms in post/postun scripts -* Thu Sep 25 2014 idonmez@suse.com -- Update 0001-let-it-become-a-real-daemon.patch to call setsid - only from the child process. -* Fri Sep 12 2014 idonmez@suse.com -- Add 0001-let-it-become-a-real-daemon.patch to make plymouth - a real daemon, fixes part of bnc#889757. Patch by Werner. -* Thu Sep 4 2014 idonmez@suse.com -- Add plymouth-boot-vga-framebuffer.patch to fix boot_vga - problem with framebuffer devices. (bnc#886211) -* Mon Aug 11 2014 idonmez@suse.com -- Modify plymouth-ignore-cirrusdrm.patch to return as - early as possible. Patch by glin@suse.com -* Thu Aug 7 2014 idonmez@suse.com -- Invert the logic in plymouth-ignore-cirrusdrm.patch bnc#890516 -* Mon Jul 28 2014 fcrozat@suse.com -- Add - 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch: - fix incorrect UTF-8 code used for square (bnc#886148). -* Fri Jul 25 2014 fcrozat@suse.com -- Add plymouth-ignore-cirrusdrm.patch: ignore cirrus drm and use fb - instead (bnc#888590) -* Thu Jul 24 2014 fcrozat@suse.com -- Add - 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch: - Be more forgiving with empty seat. -* Tue Jul 8 2014 fcrozat@suse.com -- Update 0001-Some-greenish-openSUSE-colors.patch to also use SUSE - colors on tribar (bnc#886148) -* Fri Jun 27 2014 fcrozat@suse.com -- Add - 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch: - handle new udev behaviour in seqnum removal. -* Fri Jun 20 2014 fcrozat@suse.com -- Add - 0001-splash-do-not-process-display-lists-if-it-is-empty.patch: - fix crash when calling plymouth quit -- Add 0001-seats-guard-against-NULL-terminal.patch: guard against - NULL terminal. -- Update stop-graphical.patch: add RemainAfterExit=true to - plymouth-start.service, ensuring plymouthd is not restarted when - switching between runlevels. -* Thu Jun 19 2014 fcrozat@suse.com -- Add - 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch: - fix crash when pixel_display is removed. -- Add 0001-device-manager-only-call-ply_terminal_free.patch: fix - crash. -- Add use-mkinitrd.patch: call mkinitrd -B, not dracut for now, - otherwise initramfs is being created by plymouth-update-initrd, - not initrd file. -- Ensure we don't rebuild initrd twice when updating plymouth. -- Ensure default theme is SLE/openSUSE (based on %%suse_version) -* Fri Jun 6 2014 fcrozat@suse.com -- Release 0.9.0 (3 additional fixes compared to previously packaged - git snapshot): - + Use udev for graphics device enumeration - + Add new text plugin to replace the tribar one - + Add background tiling and watermark support to two-step - + Make various plymouth commands that change state be resilient - to being called multiple times - + Support going back to the initrd at shutdown - + Keyfile parser improvements - + Make plymouthd use better defaults when running on top of X11 - + Fixes for systems using QXL - + minor two-step plugin fixes - + Use /sys/class/tty/console/active instead of parsing - /proc/cmdline for consoles. - + Documentation improvements - + Drop driver specific renderers and use generic driver across the - board. - + Better debug message output - + systemd integration fixes - + upstart integration fixes - + initrd scripts fixes - + Misc fixes -* Thu Jun 5 2014 idonmez@suse.com -- Update fix-serial-consoles.patch to fix a crash in some rare - cases. -* Wed May 21 2014 idonmez@suse.com -- Add fix-serial-consoles.patch to fix binary garbage on serial - consoles. This is bnc#873859 -* Mon May 5 2014 fcrozat@suse.com -- Remove plymouth-restore-suspend.patch: suspend package is being - dropped, no longer needs to provide this old API. -- Remove requires on suspend package. -* Thu Apr 17 2014 idonmez@suse.com -- Update to git snapshot as of 20140327 - * Fixes bnc#872502 and bnc#872428 -* Wed Apr 16 2014 trenn@suse.de -- Kill all mkinitrd stuff - Remove suse-initrd-support -- Tell zypper to regenerate initrd on installation/update via %%post and - %%posttrans scripts -* Thu Apr 10 2014 idonmez@suse.com -- Add plymouth-manpages.patch to fix manpage installation (bnc#871419) -* Thu Feb 20 2014 fcrozat@suse.com -- Drop plymouth.conf, it is no longer used, plymouthd.conf is - nowadays. -* Sat Feb 15 2014 kigurame@opensuse.org -- Updated from git -- carried over patches -- Dropped 0001-Make-plymouthd-real-daemon-and-save-old-log.patch - Because it is really not necesary -* Wed Feb 12 2014 werner@suse.de -- Add patch - 0001-Make-plymouthd-real-daemon-and-save-old-log.patch - all daemons should call setsid(2) to become a real daemons without - controlling terminal. Beside this the old boot log will help for - debugging and for support. -* Thu Dec 12 2013 uweigand@de.ibm.com -- Add powerpc64le-linux support. -* Thu Sep 26 2013 lnussel@suse.de -- disable plymouth in initrd if the root volume is encrypted. This - is a workaround until plymouth is able to handle the prompt - correctly (bnc#834063). -* Wed Sep 11 2013 crrodriguez@opensuse.org -- version 0.8.8_git201309032142 -- All device specific code has been removed because the kernel - has been fixed in the meanwhile so plymouth no longer requires - libdrm_intel, libdrm_radeon, libdrm_nouveau and can use the generic - interface. - This commit does not add any new features or bugfixes but removes - a huge chunk of unnecessary code. -* Fri Aug 16 2013 lmuelle@suse.com -- Pre require plymouth from plymouth-scripts; (bnc#806388). -* Thu Aug 1 2013 tittiatcoke@gmail.com -- Update to version 0.8.8_git201308011340 - - Drop patch plymouth-correct-systemd-prefix.patch - - Drop patch plymouth-close.patch - - Drop patch plymouth-close-unredirect.patch - - Drop patch plymouth-redirect-null.patch - - Drop patch plymouth-exit-code.patch - - Drop patch plymouth-terminal-session-close.patch -* Mon Jul 29 2013 tittiatcoke@gmail.com -- Add upstream patch plymouth-correct-systemd-prefix.patch to - correct the systemd prefixes in some systemd files. This replaces - the sed string. -* Thu Jun 27 2013 crrodriguez@opensuse.org -- Require pigz instead of gzip -- ensure plugin requires are versioned. -* Sun Jun 16 2013 crrodriguez@opensuse.org -- own %%{_localstatedir}/log/boot.log - and %%{_localstatedir}/spool/plymouth/boot.log (as %%ghost s) -* Tue Jun 11 2013 fcrozat@suse.com -- Add plymouth-close: do not try to close negative fd. -- Add plymouth-close-unredirect.patch: do not leak fd when stopping - redirection of /dev/console (bnc#811185) -- Add plymouth-redirect-null.patch: redirect plymouth standard io - to /dev/null (bnc#811185) -- Add plymouth-exit-code.patch: ignore exit code in ExecStartPost. -- Add plymouth-terminal-session-close.patch: do no try to close - terminal session fd if already closed. -* Sun May 12 2013 crrodriguez@opensuse.org -- Not only reboot.service is prefixed with systemd- currently - but also kexec,halt,poweroff. -* Mon Apr 22 2013 crrodriguez@opensuse.org -- Also ensure we express rpm dependencies correctly - this package is not gonna work on systemd < 186. -* Mon Apr 22 2013 crrodriguez@opensuse.org -- Update to version 0.8.8_git201304161248 -- drop plymouth-change-service-name.patch, replaced by - a sed script that will account for all service files' future changes -- drop patch plymouth-trace-lines, in upstream now -- drop plymouth-udevadm-path.patch, generic solution in upstream now. -- drop ply-sdunitdir.patch likewise. -- drop plymouth-systemd-in-usr.patch likewise. -- drop systemd-no-warning.patch, not needed with newer systemd -- drop plymouth-sd-notforking.patch , not really needed anymore. -* Thu Feb 28 2013 tittiatcoke@gmail.com -- Changed %%post scripts so only the rebuild of the initrd is - omitted within the build environment -* Fri Feb 22 2013 tittiatcoke@gmail.com -- Added patch plymouth-correct-runtime-dir.patch to make the - plymouthruntimedir equal to /run/plymouth and not /var/run/plymouth -* Wed Feb 6 2013 fcrozat@suse.com -- Rename plymouth-sd-notforking.patch to fix typo in patch name -- Add plymouth-change-service-name.patch: fix incorrect service - names used for dependencies. Now use systemd-reboot.service - (replacing reboot.service) and display-manager.service (replacing - prefdm.service). -* Tue Dec 18 2012 tittiatcoke@gmail.com -- Make sure that the right version of the scripts is required by - the main package. This to prevent that an update of the scripts - is not installed (bnc#793400) -- Removed obsolete patch plymouth-remove-pid-file.patch. Issue - has been resolved upstream -* Wed Nov 14 2012 seife+obs@b1-systems.com -- fix path to systemd-tty-ask-password-agent for newer systemd -- create the pid file again during boot, the existence of this is - a condition for systemd-ask-password-plymouth.service. A proper - fix might look different but that get's it going again. -* Tue Nov 6 2012 tittiatcoke@gmail.com -- Provide the scripts to integrate Plymouth in dracut as a - separate package. -- Added patch (plymouth-dracut-path.patch) to correct the paths - inside the specific plymouth-dracut scripts -* Mon Nov 5 2012 crrodriguez@opensuse.org -- Update to an slightly newer git snapshot to fix regression - from 0.8.8 -* Thu Nov 1 2012 crrodriguez@opensuse.org -- Version 0.8.8 - * main: Try to own socket before anything else - * main: silently succeed if plymouthd is started a second time - * service: start plymouthd unconditionally - * x11: make window fullscreen by default - * x11: only create windows when necessary -* Thu Nov 1 2012 crrodriguez@opensuse.org -- plymoith-sd-notforking.patch: Make plymouthd to not use - Service type "forking" -- ply-sdunitdir.patch: Must install units in %%{_unitdir} as - returned by pkg-config not in a hardcoded location. -* Fri Oct 12 2012 tittiatcoke@gmail.com -- Remove the non required font file in /etc/fonts/conf.avail/ . -* Thu Oct 11 2012 tittiatcoke@gmail.com -- Adjusted the upstream patch to remove the pid file. The original - one seems to cause issues with the DM killing plymouth -* Thu Oct 11 2012 tittiatcoke@gmail.com -- Fix the Pango installation within the initrd. This would - resolve the error message that Pango cannot find any fonts -* Thu Sep 27 2012 tittiatcoke@gmail.com -- fix the libdir path in plymouth-set-default-theme (bnc#780085) -* Thu Sep 20 2012 tittiatcoke@gmail.com -- Update to version 0.8.7 - + fix plymouth race at bootup breaking efi/vesa handoff - + Systemd fixes -- Add plymouth-remove-pid-file.patch: remove PID file usage - (bnc#780976) (Thanks to fcrozat) -- Remove upstream patches: plymouth-systemd-target.patch, - 0001-ply-text-progress-bar-strip-quotes-if-present,patch, - plymouth-fix-systemd-service.patch, plymouth-after-udev-settle - due to upstream inclusion. -* Wed Aug 22 2012 fcrozat@suse.com -- Add plymouth-after-udev-settle.patch: ensure plymouth is started - after udev triggers has been started (git + name change due to - systemd < 183 in openSUSE 12.2). -* Wed Aug 22 2012 tittiatcoke@gmail.com -- Ensure that the right Pango version is used for copying one of - the pango modules -* Wed Aug 8 2012 fcrozat@suse.com -- Add plymouth-fix-systemd-service.patch: remove dashes next to - semi-colons, it confuses systemd. (bnc#774400) -- Update suse-initrd-support to not start plymouth if kernel - cmdline contains "shell" or "plymouth.enable=0" or - "rd.plymouth=0". -* Mon Aug 6 2012 dmueller@suse.com -- remove suspend dependency on ARM -* Sun Jul 29 2012 jengelh@inai.de -- Ship /etc/os-release in the initrd so that the pretty name is - displayed in text-splash mode -- Give the text-splash some SUSE-typical green coloring -* Sun Jul 29 2012 dmueller@suse.com -- fix build for ARM -* Thu Jul 26 2012 tittiatcoke@gmail.com -- Move the openSUSE branding to its rightful place -* Fri Jul 20 2012 fcrozat@suse.com -- Update to 0.8.6.1: - + Fix systemd path file generation -- Changes from 0.8.6: - + fix flush_area fast-path - + seed random number generator by default for script plugins - + allow plymouth to be built without gtk dependency - + cope with lack of /etc/os-release better - + pull in systemd unit files (bnc#770890) - + add support for new "updates" mode for doing package updates - (only available for some plugins at the moment) -- Add plymouth-restore-suspend.patch: revert commit removing - suspend/resume support, needed for suspend package. -- Add plymouth-systemd-target.patch: add missing symlinks to start - plymouth on shutdown / reboot / kexec (bnc#770764). -- Add plymouth-udevadm-path.patch: adapt to udevadm path on - openSUSE. -- Ensure systemctl daemon-reload is called in post / postun -- Add systemd-no-warning.patch: remove Documentation tag not - handled by systemd v44. -- Update stop-graphical.patch to correct prevent plymouth.quit to - start under runlevel 5 (handled by xdm initscript directly). -* Fri Jul 6 2012 dvaleev@suse.com -- don't require intel_drm on ppc -* Wed Jul 4 2012 meissner@suse.com -- run "/sbin/mkinitrd" and let it figure out by itself - what initrds to update. bnc#769812 -* Mon Jul 2 2012 fcrozat@suse.com -- Provides systemd units, instead of relying on systemd to ship - them (bnc#769397). -- Ensure plymouth--wait-quit.service conflicts with - graphical.target. -* Fri Jun 29 2012 tittiatcoke@gmail.com -- Update to 0.8.5.1 - + two-step splash plugin quit fixes - + add generic driver to drm renderer plugin - This allows new modesetting drivers to work with plymouth - automatically - + fixes for video cards that don't support 32bpp - + add alignment and width features to label controls - + new documentation - + event loop fix - + more serial console fixes - + better systemd integration - + new flush api to client library - + Allow plymouth to build the drm renderer without the driver - dependent libdrm_* libraries. -* Thu Jun 21 2012 lnussel@suse.de -- disable plymouth if init is not systemd (could be e.g. /bin/sh or - sysvinit then) -* Mon Jun 11 2012 coolo@suse.com -- if we provide bootsplash, we should also make sure to obsolete - its version -* Mon Jun 4 2012 tittiatcoke@gmail.com -- Ensure that the openSUSE theme is default. (bnc#765277) -- Remove unnecessary changes to the kernel options. Plymouth also - accepts splash=silent. -* Wed May 30 2012 vuntz@opensuse.org -- Add plymouth-scripts Requires(post) to branding-openSUSE - subpackage, to make sure that the %%post scriptlet will work. -- Make sure we export LIB and not lib in the %%postun scriptlets of - theme-solar and branding-openSUSE subpackages. -* Tue May 29 2012 tittiatcoke@gmail.com -- Ensure that label.so is being installed for the openSUSE branding - (bnc#763574) -* Mon May 21 2012 tittiatcoke@gmail.com -- Update the installation/update from plymouth in a way that the - initrd file for the current running kernel is updated. -- Corrected a typo with regards to the location of a pango module - when setting up the initrd. -* Tue May 15 2012 tittiatcoke@gmail.com -- Added a patch for openSUSE to enable the rebuild of the initrd - with the plymouth-set-default-theme script. (bnc#757284) -* Sun May 13 2012 tittiatcoke@gmail.com -- Added plymouth to the requires of plymouth-scripts. This - should resolve bug (bnc#757284) -* Fri May 11 2012 nmo.marques@gmail.com -- Split x11 renderer into his own package; the x11 renderer allows - users to test plymouth themes; having it available on the devel - package will force people who just want to test a theme to - install a lot of unwanted dependencies. Being on it's own package - without explicit dependencies provides extra functionality to - users who want to test themes without having to rebuild initrd - and rebooting for testing. -- bnc#761403 -* Sat Apr 28 2012 tittiatcoke@gmail.com -- Reduce the number of fonts that are included in the initrd. Also - let mkinitrd sort out the dependencies for the required libs. -- Use the same font as that grub2 is currently using for it's - graphics mode. -* Tue Apr 17 2012 glin@suse.com -- Correct the theme name in the post install script of - plymouth-branding-openSUSE -* Thu Apr 5 2012 tittiatcoke@gmail.com -- Updated the initrd patch to include the necessary files to have - text support (e.g. LUKS passphrase question, etc) -- Temporarily added a openSUSE plymouth theme - (plymouth-branding-openSUSE) to have a better integration with - 12.2. -* Thu Mar 29 2012 tittiatcoke@gmail.com -- Ensure that both grub and grub2 are adjusted with regards to the - splash parameter. Running grub2-mkconfig to have the right - configuration. -- Installation of themes are not causing any reset of the selected - default theme anymore. Now this only happens when a theme is - installed and the default theme is set to TEXT. -* Sun Mar 25 2012 tittiatcoke@gmail.com -- Update to the official release of 0.8.4 - * Bugfix: Use /dev/fb0 instead of /dev/fb, this resolves the - issue of not showing the splash during shutdown -* Fri Mar 9 2012 tittiatcoke@gmail.com -- Add a small change in order to have plymouth activated with Grub2 -* Thu Feb 23 2012 tittiatcoke@gmail.com -- Make sure that the package libply-boot-client is always - installed to prevent a system that will not boot -* Thu Feb 23 2012 saschpe@suse.de -- Replaced package core-libs with individual packages for each shared - library (SLPP) -- Proper provides/obsoletes pair for bootsplash -- Could not resist to run spec-cleaner ;-) -* Tue Feb 21 2012 tittiatcoke@gmail.com -- Changed the parameters to plymouthd in the initrd to create - the necessary pid-file for the systemd integration -* Fri Feb 17 2012 tittiatcoke@gmail.com -- Ensure that /bin/plymouth still is available as that the - displaymanagers (KDM/GDM) are expecting this. This needs to be - in place until the migration to /usr is completed. -* Fri Feb 17 2012 tittiatcoke@gmail.com -- Finalize the Plymouth integration on openSUSE. - * Current default theme is Solar with the openSUSE Geecko - * Plymouth bootsplash will run on tty7 during boot. - * Install all files in /usr -* Tue Dec 27 2011 crrodriguez@opensuse.org -- Update to current git -* Wed Mar 23 2011 jeffm@suse.de -- Update to git snapshot from 12 Mar 2011. - - Mostly minor fixes. -* Sat Feb 5 2011 jeffm@suse.de -- Updated to latest snapshot. - - boot-server: improve debug output - - pixel-buffer: Fix overflow in blend_two_pixel_values - - boot-server: fix debug output when message is from init -- Fixed an issue with the script plugin's Window attributes returning - the size of the smallest display when multiple displays are used. -* Wed Dec 29 2010 jeffm@suse.de -- Fixed location of text.so and details.so in plymouth-scripts -* Wed Dec 22 2010 seife+obs@b1-systems.com -- fix the build failure: - - own additional directories -- fix rpmlint failures: - - fix up package groups - those are just guessed sometimes - - rename plymouth-graphics-libs to libply-splash-graphics2 - (this one was fatal) - - do not own /var/run/plymouth - probably still needs fixing - (this was almost fatal) - - do not include build date in binary, use mtime of source - patchfile instead -* Wed Dec 8 2010 jeffm@suse.de -- Initial packaging. From be2eb18f69c1a295ee9a5fa1838755f0eb52c5595c21dc10a1c6d4f788632b4c Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Mon, 7 Sep 2020 09:08:38 +0000 Subject: [PATCH 6/6] Accepting request 832700 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/832700 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=269 --- ...-no-longer-modify-conf-to-drop-isopensuse-macro.patch | 9 +++++---- plymouth.changes | 6 ++++++ plymouth.spec | 8 +++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch b/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch index a861045..1f6131a 100644 --- a/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch +++ b/plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch @@ -1,6 +1,6 @@ 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 -+++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-09-02 17:31:50.644198200 +0800 ++++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-09-07 16:09:51.568487811 +0800 @@ -58,7 +58,12 @@ function get_default_theme () @@ -15,7 +15,7 @@ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme 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 @@ +@@ -168,9 +173,16 @@ fi if [ $DO_RESET -ne 0 ]; then @@ -26,7 +26,8 @@ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme + 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 ++ cp ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ${PLYMOUTH_CONFDIR}/plymouthd.conf ++ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf + exit $? + else + exit 0 @@ -36,7 +37,7 @@ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme 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 -+++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-02 17:32:57.830788642 +0800 ++++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-07 10:50:57.711594680 +0800 @@ -16,6 +16,7 @@ plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \ diff --git a/plymouth.changes b/plymouth.changes index 3a965d5..971b41d 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -8,6 +8,12 @@ Sat Aug 29 06:13:50 UTC 2020 - Cliff Zhao config file. means this modification can close the leaps gap (jsc#SLE-11637). +------------------------------------------------------------------- +Sat Aug 28 16:11:25 UTC 2020 - Cliff Zhao + +- Update plymouth.spec: Dropping gdm transition because it has + alreay deprecated by upstream. Removing git build dependency. + ------------------------------------------------------------------- Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 54929e3..a1e1777 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -131,15 +131,13 @@ This package contains the libply library used by Plymouth. %package branding-upstream Summary: default configuration file and branding from the Plymouth upstream. Group: System/Base -Requires: %{name} = %{version} +Provides: %{name}-branding = %{version}-%{release}. Conflicts: %{name}-branding BuildArch: noarch %description branding-upstream This package contains the /usr/share/plymouthd.defaults which contains the basic -settings and branding from the upstream. the Plymouth in SLE and openSUSE will -nolonger /etc/plymouth/plymouthd.conf at all, and it will read plymouthd.defaults -if /etc/plymouth/plymouthd.conf doesn't exist. +settings and branding from the upstream. %package devel Summary: Libraries and headers for writing Plymouth splash plugins @@ -534,7 +532,7 @@ fi %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth -%config(noreplace) %ghost %{_sysconfdir}/plymouth/plymouthd.conf +%ghost %{_sysconfdir}/plymouth/plymouthd.conf %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth /bin/plymouth