From 1e387b28be33f9da8fc2756eed90418a8c026a39e488f97e42a10296c80d7eae Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Sat, 18 Aug 2018 14:07:40 +0000 Subject: [PATCH 1/4] Accepting request 630078 from home:iznogood:branches:Base:System Should build now at least. OBS-URL: https://build.opensuse.org/request/show/630078 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=198 --- 0001-Add-label-ft-plugin.patch | 51 ++++++++-------- ...l-ft-plugin-into-initrd-if-available.patch | 13 ++--- 0003-fix_null_deref.patch | 6 +- ...tch => Some-greenish-openSUSE-colors.patch | 12 ++-- _service | 2 +- _servicedata | 4 +- only_use_fb_for_cirrus_bochs.patch | 8 +-- plymouth-0.9.3+git20171220.6e9e95d.tar.xz | 3 - plymouth-0.9.3+git20180807.7663b0c.tar.xz | 3 + plymouth-correct-runtime-dir.patch | 8 ++- plymouth-dracut-path.patch | 8 ++- plymouth-manpages.patch | 6 +- plymouth.changes | 23 +++++++- plymouth.spec | 58 ++++++------------- 14 files changed, 101 insertions(+), 104 deletions(-) rename 0001-Some-greenish-openSUSE-colors.patch => Some-greenish-openSUSE-colors.patch (77%) delete mode 100644 plymouth-0.9.3+git20171220.6e9e95d.tar.xz create mode 100644 plymouth-0.9.3+git20180807.7663b0c.tar.xz diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index 9bf8078..3a403d5 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -20,11 +20,11 @@ Signed-off-by: Fabian Vogt create mode 100644 src/plugins/controls/label-ft/Makefile.am create mode 100644 src/plugins/controls/label-ft/plugin.c -diff --git a/configure.ac b/configure.ac -index 445034d..13b8c3e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,6 +60,15 @@ if test x$enable_pango = xyes; then +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 @@ -40,7 +40,7 @@ index 445034d..13b8c3e 100644 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]) -@@ -295,6 +304,7 @@ AC_CONFIG_FILES([Makefile +@@ -308,6 +317,7 @@ AC_CONFIG_FILES([Makefile src/plugins/splash/script/Makefile src/plugins/controls/Makefile src/plugins/controls/label/Makefile @@ -48,11 +48,11 @@ index 445034d..13b8c3e 100644 src/Makefile src/client/ply-boot-client.pc src/client/Makefile -diff --git a/src/libply-splash-graphics/ply-label.c b/src/libply-splash-graphics/ply-label.c -index ba1f7b1..7c65708 100644 ---- a/src/libply-splash-graphics/ply-label.c -+++ b/src/libply-splash-graphics/ply-label.c -@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *label) +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; @@ -66,10 +66,10 @@ index ba1f7b1..7c65708 100644 if (label->module_handle == NULL) return false; -diff --git a/src/plugins/controls/Makefile.am b/src/plugins/controls/Makefile.am -index f1621f9..284b206 100644 ---- a/src/plugins/controls/Makefile.am -+++ b/src/plugins/controls/Makefile.am +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 @@ -80,11 +80,10 @@ index f1621f9..284b206 100644 +SUBDIRS += label-ft endif MAINTAINERCLEANFILES = Makefile.in -diff --git a/src/plugins/controls/label-ft/Makefile.am b/src/plugins/controls/label-ft/Makefile.am -new file mode 100644 -index 0000000..2ff864d ---- /dev/null -+++ b/src/plugins/controls/label-ft/Makefile.am +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 \ @@ -108,11 +107,10 @@ index 0000000..2ff864d +label_ft_la_SOURCES = $(srcdir)/plugin.c + +MAINTAINERCLEANFILES = Makefile.in -diff --git a/src/plugins/controls/label-ft/plugin.c b/src/plugins/controls/label-ft/plugin.c -new file mode 100644 -index 0000000..06fe73e ---- /dev/null -+++ b/src/plugins/controls/label-ft/plugin.c +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 + * @@ -621,6 +619,3 @@ index 0000000..06fe73e +} + +/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */ --- -2.7.0 - 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 130065c..6cc5d7a 100644 --- a/0002-Install-label-ft-plugin-into-initrd-if-available.patch +++ b/0002-Install-label-ft-plugin-into-initrd-if-available.patch @@ -10,11 +10,11 @@ Signed-off-by: Fabian Vogt scripts/plymouth-populate-initrd.in | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in -index 43c7f22..a109c59 100755 ---- a/scripts/plymouth-populate-initrd.in -+++ b/scripts/plymouth-populate-initrd.in -@@ -427,6 +427,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-17 19:57:27.334004329 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in 2018-08-17 19:59:15.535202195 +0200 +@@ -427,6 +427,15 @@ if [ -d ${PLYMOUTH_DATADIR}/plymouth/the inst_recur "${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}" fi @@ -30,6 +30,3 @@ index 43c7f22..a109c59 100755 if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes fi --- -2.7.0 - diff --git a/0003-fix_null_deref.patch b/0003-fix_null_deref.patch index 931b24d..cc18049 100644 --- a/0003-fix_null_deref.patch +++ b/0003-fix_null_deref.patch @@ -12,10 +12,10 @@ Signed-off-by: Fabian Vogt src/libply-splash-graphics/ply-label.c | 8 ++++++++ 1 file changed, 8 insertions(+) -Index: plymouth-0.9.2/src/libply-splash-graphics/ply-label.c +Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c =================================================================== ---- plymouth-0.9.2.orig/src/libply-splash-graphics/ply-label.c -+++ plymouth-0.9.2/src/libply-splash-graphics/ply-label.c +--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:59:33.203397962 +0200 @@ -130,6 +130,15 @@ ply_label_load_plugin (ply_label_t *labe label->control = label->plugin_interface->create_control (); diff --git a/0001-Some-greenish-openSUSE-colors.patch b/Some-greenish-openSUSE-colors.patch similarity index 77% rename from 0001-Some-greenish-openSUSE-colors.patch rename to Some-greenish-openSUSE-colors.patch index 5918819..a17b7c3 100644 --- a/0001-Some-greenish-openSUSE-colors.patch +++ b/Some-greenish-openSUSE-colors.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Some greenish openSUSE colors src/plugins/splash/text/plugin.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -Index: plymouth-0.9.2/src/plugins/splash/text/plugin.c +Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/text/plugin.c =================================================================== ---- plymouth-0.9.2.orig/src/plugins/splash/text/plugin.c -+++ plymouth-0.9.2/src/plugins/splash/text/plugin.c +--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/splash/text/plugin.c 2018-08-07 17:41:15.000000000 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/text/plugin.c 2018-08-17 19:57:50.786263802 +0200 @@ -174,10 +174,10 @@ view_start_animation (view_t *view) 0x2e3436); ply_terminal_set_color_hex_value (terminal, @@ -24,10 +24,10 @@ Index: plymouth-0.9.2/src/plugins/splash/text/plugin.c ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_BLACK); -Index: plymouth-0.9.2/src/plugins/splash/tribar/plugin.c +Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/tribar/plugin.c =================================================================== ---- plymouth-0.9.2.orig/src/plugins/splash/tribar/plugin.c -+++ plymouth-0.9.2/src/plugins/splash/tribar/plugin.c +--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/splash/tribar/plugin.c 2018-08-07 17:41:15.000000000 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/tribar/plugin.c 2018-08-17 19:57:50.786263802 +0200 @@ -177,13 +177,13 @@ view_start_animation (view_t *view) 0x000000); ply_terminal_set_color_hex_value (terminal, diff --git a/_service b/_service index e3ee2cb..a3bd7ed 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - git://anongit.freedesktop.org/plymouth + https://gitlab.freedesktop.org/plymouth/plymouth.git git enable plymouth diff --git a/_servicedata b/_servicedata index 5ed826e..3517cdd 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,6 @@ git://anongit.freedesktop.org/plymouth - 6e9e95dc0fe89a3c52f50e44ff0096a6e65e46a6 \ No newline at end of file + 6e9e95dc0fe89a3c52f50e44ff0096a6e65e46a6 + https://gitlab.freedesktop.org/plymouth/plymouth.git + 9ed2a0c55be8ee9919953efbacedc079a7428358 \ No newline at end of file diff --git a/only_use_fb_for_cirrus_bochs.patch b/only_use_fb_for_cirrus_bochs.patch index af8a88e..b535cbc 100644 --- a/only_use_fb_for_cirrus_bochs.patch +++ b/only_use_fb_for_cirrus_bochs.patch @@ -6,11 +6,11 @@ DRM does not work well with cirrus and bochs (no display) but the framebuffer dr 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.2+git20161215.18dd755/src/libply-splash-core/ply-device-manager.c +Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c =================================================================== ---- plymouth-0.9.2+git20161215.18dd755.orig/src/libply-splash-core/ply-device-manager.c -+++ plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-device-manager.c -@@ -227,13 +227,33 @@ create_devices_for_udev_device (ply_devi +--- 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); diff --git a/plymouth-0.9.3+git20171220.6e9e95d.tar.xz b/plymouth-0.9.3+git20171220.6e9e95d.tar.xz deleted file mode 100644 index 375ead1..0000000 --- a/plymouth-0.9.3+git20171220.6e9e95d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b656593d1fbb35208a588fcb1c60a25f3b938ab688cee9a434259ec5f213168 -size 871648 diff --git a/plymouth-0.9.3+git20180807.7663b0c.tar.xz b/plymouth-0.9.3+git20180807.7663b0c.tar.xz new file mode 100644 index 0000000..77d61ee --- /dev/null +++ b/plymouth-0.9.3+git20180807.7663b0c.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0829cfec077c49b686dacfffd9cd18d9b9326308ddc6704986c12e53a55b5de5 +size 871108 diff --git a/plymouth-correct-runtime-dir.patch b/plymouth-correct-runtime-dir.patch index d5cd1ec..2292f28 100644 --- a/plymouth-correct-runtime-dir.patch +++ b/plymouth-correct-runtime-dir.patch @@ -1,6 +1,8 @@ ---- a/configure.ac 2012-11-02 22:26:41.000000000 +0100 -+++ b/configure.ac 2013-02-22 17:15:58.300689336 +0100 -@@ -268,7 +268,7 @@ +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 diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch index 7be318a..9b95e4b 100644 --- a/plymouth-dracut-path.patch +++ b/plymouth-dracut-path.patch @@ -1,6 +1,8 @@ ---- scripts/plymouth-populate-initrd.in 2012-08-21 01:25:52.000000000 +0200 -+++ scripts/plymouth-populate-initrd.in 2012-11-01 18:27:22.760029873 +0100 -@@ -372,8 +372,8 @@ +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 diff --git a/plymouth-manpages.patch b/plymouth-manpages.patch index e1b02f6..50d52fe 100644 --- a/plymouth-manpages.patch +++ b/plymouth-manpages.patch @@ -1,7 +1,7 @@ -Index: plymouth-0.8.8_git20140207/docs/Makefile.am +Index: plymouth-0.9.3+git20180807.7663b0c/docs/Makefile.am =================================================================== ---- plymouth-0.8.8_git20140207.orig/docs/Makefile.am -+++ plymouth-0.8.8_git20140207/docs/Makefile.am +--- plymouth-0.9.3+git20180807.7663b0c.orig/docs/Makefile.am 2018-08-07 17:41:15.000000000 +0200 ++++ plymouth-0.9.3+git20180807.7663b0c/docs/Makefile.am 2018-08-17 19:58:25.330646165 +0200 @@ -16,12 +16,14 @@ plymouth.1: plymouth1.xml %.1: %.xml $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< diff --git a/plymouth.changes b/plymouth.changes index d8ed9ac..232daa9 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Aug 17 17:36:09 UTC 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 06:15:14 UTC 2018 - qzhao@suse.com @@ -169,7 +188,7 @@ Mon Dec 28 14:48:48 UTC 2015 - dimstar@opensuse.org - Rebase patches: + plymouth-fix-window-size + stop-graphical.patch - + 0001-Some-greenish-openSUSE-colors.patch + + Some-greenish-openSUSE-colors.patch + fix-serial-consoles.patch + 0001-seats-guard-against-NULL-terminal.patch + plymouth-ignore-cirrusdrm.patch @@ -263,7 +282,7 @@ Thu Jul 24 16:30:43 UTC 2014 - fcrozat@suse.com ------------------------------------------------------------------- Tue Jul 8 16:04:38 UTC 2014 - fcrozat@suse.com -- Update 0001-Some-greenish-openSUSE-colors.patch to also use SUSE +- Update Some-greenish-openSUSE-colors.patch to also use SUSE colors on tribar (bnc#886148) ------------------------------------------------------------------- diff --git a/plymouth.spec b/plymouth.spec index fd72dfd..d26c9f2 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -22,43 +22,31 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.3+git20171220.6e9e95d +Version: 0.9.3+git20180807.7663b0c Release: 0 Summary: Graphical Boot Animation and Logger -License: GPL-2.0+ +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 -Patch9: plymouth-dracut-path.patch -# PATCH-FIX-OPENSUSE 0001-Some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -# -- to use suse colors in tribar. -Patch10: 0001-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 -Patch16: plymouth-correct-runtime-dir.patch -# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -# -- Fix man page installation -Patch17: plymouth-manpages.patch -# PATCH-FIX-UPSTREAM plymouth-ignore-cirrusdrm.patch bnc#888590 fcrozat@suse.com -# -- ignore cirrusdrm, use fb instead -# Patch26: plymouth-ignore-cirrusdrm.patch -# PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -# -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer -# -- driver and plymouth-ignore-cirrusdrm.patch with single patch. -Patch26: only_use_fb_for_cirrus_bochs.patch -# PATCH-FIX-UPSTREAM -# 0001-Add-label-ft-plugin.patch -# 0002-Install-label-ft-plugin-into-initrd-if-available.patch -# 0003-fix_null_deref.patch -# boo#959986 fvogt@suse.com -# -- add ability to output text in initrd needed for encryption. -Patch30: 0001-Add-label-ft-plugin.patch -Patch31: 0002-Install-label-ft-plugin-into-initrd-if-available.patch -Patch32: 0003-fix_null_deref.patch +# 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 Some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar. +Patch1: 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 only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. +Patch4: only_use_fb_for_cirrus_bochs.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. +Patch5: 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. +Patch6: 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. +Patch7: 0003-fix_null_deref.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets @@ -349,15 +337,7 @@ Plymouth. It it is a simple example theme the uses the "script" plugin. %prep -%setup -q -%patch9 -%patch10 -p1 -%patch16 -p1 -%patch17 -p1 -%patch26 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 +%autosetup -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c From 517b9bb8f7a60c3f93bb76dc4c14c19afa54dbbf5e55187a94d7af1a8ca1278c Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Wed, 29 Aug 2018 02:39:53 +0000 Subject: [PATCH 2/4] Accepting request 631911 from home:qzhao:branches:Base:System 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. OBS-URL: https://build.opensuse.org/request/show/631911 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=199 --- plymouth-0.9.3+git20180807.7663b0c.tar.xz | 3 --- plymouth-0.9.3+git20180827.0a66272.tar.xz | 3 +++ ...lymouth-only_use_fb_for_cirrus_bochs.patch | 0 ...ymouth-some-greenish-openSUSE-colors.patch | 0 plymouth.changes | 23 ++++++++++++++++--- plymouth.spec | 10 ++++---- 6 files changed, 28 insertions(+), 11 deletions(-) delete mode 100644 plymouth-0.9.3+git20180807.7663b0c.tar.xz create mode 100644 plymouth-0.9.3+git20180827.0a66272.tar.xz rename only_use_fb_for_cirrus_bochs.patch => plymouth-only_use_fb_for_cirrus_bochs.patch (100%) rename Some-greenish-openSUSE-colors.patch => plymouth-some-greenish-openSUSE-colors.patch (100%) diff --git a/plymouth-0.9.3+git20180807.7663b0c.tar.xz b/plymouth-0.9.3+git20180807.7663b0c.tar.xz deleted file mode 100644 index 77d61ee..0000000 --- a/plymouth-0.9.3+git20180807.7663b0c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0829cfec077c49b686dacfffd9cd18d9b9326308ddc6704986c12e53a55b5de5 -size 871108 diff --git a/plymouth-0.9.3+git20180827.0a66272.tar.xz b/plymouth-0.9.3+git20180827.0a66272.tar.xz new file mode 100644 index 0000000..677c36a --- /dev/null +++ b/plymouth-0.9.3+git20180827.0a66272.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89f426e5eb12aeea105a9748a62dc9d87282c50f560882ef08b4dee69aacc044 +size 874016 diff --git a/only_use_fb_for_cirrus_bochs.patch b/plymouth-only_use_fb_for_cirrus_bochs.patch similarity index 100% rename from only_use_fb_for_cirrus_bochs.patch rename to plymouth-only_use_fb_for_cirrus_bochs.patch diff --git a/Some-greenish-openSUSE-colors.patch b/plymouth-some-greenish-openSUSE-colors.patch similarity index 100% rename from Some-greenish-openSUSE-colors.patch rename to plymouth-some-greenish-openSUSE-colors.patch diff --git a/plymouth.changes b/plymouth.changes index 232daa9..879754b 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Aug 28 07:32:03 UTC 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. + ------------------------------------------------------------------- Fri Aug 17 17:36:09 UTC 2018 - bjorn.lie@gmail.com @@ -98,7 +115,7 @@ Wed Jan 25 14:38:09 UTC 2017 - fvogt@suse.com * 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 + * plymouth-only_use_fb_for_cirrus_bochs.patch ------------------------------------------------------------------- Mon Jan 09 17:01:44 UTC 2017 - zaitor@opensuse.org @@ -188,7 +205,7 @@ Mon Dec 28 14:48:48 UTC 2015 - dimstar@opensuse.org - Rebase patches: + plymouth-fix-window-size + stop-graphical.patch - + Some-greenish-openSUSE-colors.patch + + plymouth-some-greenish-openSUSE-colors.patch + fix-serial-consoles.patch + 0001-seats-guard-against-NULL-terminal.patch + plymouth-ignore-cirrusdrm.patch @@ -282,7 +299,7 @@ Thu Jul 24 16:30:43 UTC 2014 - fcrozat@suse.com ------------------------------------------------------------------- Tue Jul 8 16:04:38 UTC 2014 - fcrozat@suse.com -- Update Some-greenish-openSUSE-colors.patch to also use SUSE +- Update plymouth-some-greenish-openSUSE-colors.patch to also use SUSE colors on tribar (bnc#886148) ------------------------------------------------------------------- diff --git a/plymouth.spec b/plymouth.spec index d26c9f2..3ca6c7b 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -22,7 +22,7 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.3+git20180807.7663b0c +Version: 0.9.3+git20180827.0a66272 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later @@ -33,14 +33,14 @@ 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 Some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar. -Patch1: Some-greenish-openSUSE-colors.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 only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. -Patch4: only_use_fb_for_cirrus_bochs.patch +# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. +Patch4: plymouth-only_use_fb_for_cirrus_bochs.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. Patch5: 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. From 5f1e86c18b4f578a5e6d7d6accb5a8b15806c3d5427679e18c18a621e9c254b4 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 30 Aug 2018 03:45:25 +0000 Subject: [PATCH 3/4] Accepting request 632212 from home:qzhao:branches:Base:System 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. OBS-URL: https://build.opensuse.org/request/show/632212 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=200 --- plymouth.changes | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 879754b..5d823a5 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -6,14 +6,15 @@ Tue Aug 28 07:32:03 UTC 2018 - qzhao@suse.com 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 + only_use_fb_for_cirrus_bochs.patch + 0001-Some-greenish-openSUSE-colors.patch ------------------------------------------------------------------- Fri Aug 17 17:36:09 UTC 2018 - bjorn.lie@gmail.com @@ -115,7 +116,7 @@ Wed Jan 25 14:38:09 UTC 2017 - fvogt@suse.com * 0001-device-manager-handle-NULL-renderer-better.patch - Replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch: - * plymouth-only_use_fb_for_cirrus_bochs.patch + * only_use_fb_for_cirrus_bochs.patch ------------------------------------------------------------------- Mon Jan 09 17:01:44 UTC 2017 - zaitor@opensuse.org @@ -205,7 +206,7 @@ Mon Dec 28 14:48:48 UTC 2015 - dimstar@opensuse.org - Rebase patches: + plymouth-fix-window-size + stop-graphical.patch - + plymouth-some-greenish-openSUSE-colors.patch + + 0001-Some-greenish-openSUSE-colors.patch + fix-serial-consoles.patch + 0001-seats-guard-against-NULL-terminal.patch + plymouth-ignore-cirrusdrm.patch @@ -299,7 +300,7 @@ Thu Jul 24 16:30:43 UTC 2014 - fcrozat@suse.com ------------------------------------------------------------------- Tue Jul 8 16:04:38 UTC 2014 - fcrozat@suse.com -- Update plymouth-some-greenish-openSUSE-colors.patch to also use SUSE +- Update 0001-Some-greenish-openSUSE-colors.patch to also use SUSE colors on tribar (bnc#886148) ------------------------------------------------------------------- From 54388355dc657e8b99b86ccaaaea885198a7ba2bdd4c1abef85596800d8ad283 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 30 Aug 2018 03:59:08 +0000 Subject: [PATCH 4/4] Accepting request 632214 from home:qzhao:branches:Base:System 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. OBS-URL: https://build.opensuse.org/request/show/632214 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=201 --- plymouth.changes | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 5d823a5..ab75705 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -12,9 +12,11 @@ Tue Aug 28 07:32:03 UTC 2018 - qzhao@suse.com 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 - only_use_fb_for_cirrus_bochs.patch - 0001-Some-greenish-openSUSE-colors.patch +- 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 17:36:09 UTC 2018 - bjorn.lie@gmail.com