pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 792896 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/792896
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2020-04-14 13:09:06 +00:00 committed by Git OBS Bridge
commit 9b49b20318
9 changed files with 197 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
0001-Add-label-ft-plugin.patch
View File

@ -1,30 +1,7 @@
From 04fd53750abc1f792ab6d5bdf7416bd7c42451b2 Mon Sep 17 00:00:00 2001 diff -Nura plymouth-0.9.5+git20191101+d18086e/configure.ac plymouth-0.9.5+git20191101+d18086e_new/configure.ac
From: Fabian Vogt <fvogt@suse.com> --- plymouth-0.9.5+git20191101+d18086e/configure.ac 2019-11-06 10:19:50.000000000 +0800
Date: Mon, 25 Jan 2016 08:58:03 +0100 +++ plymouth-0.9.5+git20191101+d18086e_new/configure.ac 2019-12-14 17:27:03.730000000 +0800
Subject: [PATCH 1/2] Add label-ft plugin @@ -76,6 +76,15 @@
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 <fvogt@suse.com>
---
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) AC_SUBST(PANGO_LIBS)
fi fi
@ -40,23 +17,19 @@ 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) 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]) 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/splash/script/Makefile
src/plugins/controls/Makefile src/plugins/controls/Makefile
src/plugins/controls/label/Makefile src/plugins/controls/label/Makefile
+ src/plugins/controls/label-ft/Makefile + src/plugins/controls/label-ft/Makefile
src/Makefile src/Makefile
src/client/ply-boot-client.pc src/client/ply-boot-client.pc
src/client/Makefile src/client/Makefile
Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 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.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c 2018-08-07 17:41:15.000000000 +0200 +++ plymouth-0.9.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c 2019-12-14 17:23:10.796000000 +0800
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200 @@ -98,6 +98,10 @@
@@ -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"); 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). */ + /* ...and the FreeType based one after that, it is not a complete substitute (yet). */
@ -66,24 +39,9 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
if (label->module_handle == NULL) if (label->module_handle == NULL)
return false; return false;
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am 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.3+git20180807.7663b0c.orig/src/plugins/controls/Makefile.am 2018-08-07 17:41:15.000000000 +0200 +++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am 2019-12-14 17:17:26.473000000 +0800
+++ 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 @@ @@ -0,0 +1,22 @@
+AM_CPPFLAGS = -I$(top_srcdir) \ +AM_CPPFLAGS = -I$(top_srcdir) \
+ -I$(srcdir)/../../../libply \ + -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 +label_ft_la_SOURCES = $(srcdir)/plugin.c
+ +
+MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c 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
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c 2019-12-14 17:17:26.475000000 +0800
+++ 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 @@ @@ -0,0 +1,507 @@
+/* ply-label.c - label control +/* 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: */ +/* 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

12
0002-Install-label-ft-plugin-into-initrd-if-available.patch
View File

@ -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 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.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in 2019-03-12 20:11:18.845236943 +0800 --- plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in 2019-11-06 10:19:50.000000000 +0800
+++ plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in 2019-03-12 20:25:34.933746928 +0800 +++ plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in 2019-12-14 18:28:06.448000000 +0800
@@ -433,6 +433,15 @@ @@ -461,6 +461,15 @@
inst_recur "${PLYMOUTH_IMAGE_DIR}" inst_recur "${PLYMOUTH_IMAGE_DIR}"
fi 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 + ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf
+fi +fi
+ +
if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes cp -a ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
fi fi

3
plymouth-0.9.5+git20190908+3abfab2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15e017611ca3181c4d5b50510628b62c9c97009cf10f3a38fb6ba960429cfd09
size 5774076

3
plymouth-0.9.5+git20191224+d7c737d.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e608b5e72dd721167d1ea348ee3fd06ca69479c19f5c1c589f05c280720b57e
size 6006168

13
plymouth-correct-runtime-dir.patch
View File

@ -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)

9
plymouth-disable-fedora-logo.patch Normal file
View File

@ -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
+

15
plymouth-dracut-path.patch
View File

@ -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

46
plymouth.changes
View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Thu Feb 13 19:25:54 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <stefan.bruens@rwth-aachen.de>
- 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 <qzhao@suse.com>
- 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 <stefan.bruens@rwth-aachen.de> Wed Oct 30 19:21:08 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
@ -9,8 +52,7 @@ Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao <qzhao@suse.com>
- Add patch plymouth-avoid-umount-hanging-shutdown.patch: - Add patch plymouth-avoid-umount-hanging-shutdown.patch:
To avoid grantpt() call nsslookup, it will hanging system unmount To avoid grantpt() call nsslookup, it will hanging system unmount
/var during shutdown period(bsc#1105688, bsc#1129386, /var during shutdown period(bsc#1105688,bsc#1129386,bsc#1134660).
bsc#1134660).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <qzhao@suse.com> Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <qzhao@suse.com>

292
plymouth.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package plymouth # spec file for package plymouth
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,54 +20,47 @@
# it is not used in the production environment. # it is not used in the production environment.
%bcond_with x11_renderer %bcond_with x11_renderer
%global soversion 5 %global git_version git20191224+d7c737d
%define plymouthdaemon_execdir %{_sbindir} %global so_version 5
%define plymouthclient_execdir %{_bindir}
%define plymouth_libdir %{_libdir}
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth Name: plymouth
Version: 0.9.5+git20190908+3abfab2 Version: 0.9.5+%{git_version}
Release: 0 Release: 0
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Base Group: System/Base
Url: http://www.freedesktop.org/wiki/Software/Plymouth URL: https://www.freedesktop.org/wiki/Software/Plymouth
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source1: boot-duration 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. # 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 Patch0: 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 # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
Patch3: plymouth-manpages.patch Patch1: plymouth-manpages.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. # 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 Patch2: plymouth-only_use_fb_for_cirrus_bochs.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. # 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.
Patch5: plymouth-avoid-umount-hanging-shutdown.patch Patch3: plymouth-avoid-umount-hanging-shutdown.patch
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
Patch4: plymouth-disable-fedora-logo.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. # 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 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. # 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 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. # 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 Patch1002: 0003-fix_null_deref.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc BuildRequires: gcc
BuildRequires: git BuildRequires: intltool
BuildRequires: kernel-headers
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: module-init-tools
BuildRequires: pkgconfig BuildRequires: pkgconfig
%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 BuildRequires: suse-module-tools
# needed for systemd-tty-ask-password-agent %endif
BuildRequires: intltool
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo)
@ -80,15 +73,12 @@ BuildRequires: pkgconfig(systemd) >= 186
%if %{with x11_renderer} %if %{with x11_renderer}
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
%endif %endif
Recommends: %{name}-lang Recommends: %{name}-lang
Requires: %{name}-branding Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts
Requires: systemd >= 186 Requires: systemd >= 186
Requires(post): coreutils Requires(post): coreutils
Requires(post): plymouth-scripts = %{version} Requires(post): plymouth-scripts = %{version}
Requires(postun): coreutils Requires(postun): coreutils
Recommends: plymouth-plugin-label-ft
Suggests: plymouth-plugin-label Suggests: plymouth-plugin-label
Provides: bootsplash = 3.5 Provides: bootsplash = 3.5
Obsoletes: bootsplash < 3.5 Obsoletes: bootsplash < 3.5
@ -101,36 +91,37 @@ place of the text messages that normally get shown. Text
messages are instead redirected to a log file for viewing messages are instead redirected to a log file for viewing
after boot. after boot.
%package -n libply-boot-client%{soversion} %package -n libply-boot-client%{so_version}
Summary: Plymouth core library Summary: Plymouth core library
Group: Development/Libraries/C and C++ 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. 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 Summary: Plymouth core library
Group: Development/Libraries/C and C++ 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 This package contains the libply-splash-core library
used by graphical Plymouth splashes. used by graphical Plymouth splashes.
%package -n libply-splash-graphics%{soversion} %package -n libply-splash-graphics%{so_version}
Summary: Plymouth graphics libraries Summary: Plymouth graphics libraries
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
BuildRequires: libpng-devel BuildRequires: libpng-devel
%description -n libply-splash-graphics%{soversion} %description -n libply-splash-graphics%{so_version}
This package contains the libply-splash-graphics library This package contains the libply-splash-graphics library
used by graphical Plymouth splashes. used by graphical Plymouth splashes.
%package -n libply%{soversion} %package -n libply%{so_version}
Summary: Plymouth core library Summary: Plymouth core library
Group: Development/Libraries/C and C++ 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. This package contains the libply library used by Plymouth.
%package devel %package devel
@ -140,10 +131,10 @@ Requires: %{name} = %{version}
%if %{with x11_renderer} %if %{with x11_renderer}
Requires: %{name}-x11-renderer = %{version} Requires: %{name}-x11-renderer = %{version}
%endif %endif
Requires: libply-boot-client%{soversion} = %{version} Requires: libply%{so_version} = %{version}
Requires: libply-splash-core%{soversion} = %{version} Requires: libply-boot-client%{so_version} = %{version}
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-core%{so_version} = %{version}
Requires: libply%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
Requires: pkgconfig Requires: pkgconfig
%description devel %description devel
@ -171,12 +162,12 @@ behavior on environments with a valid DISPLAY.
%package scripts %package scripts
Summary: Plymouth related scripts Summary: Plymouth related scripts
Group: System/Base Group: System/Base
Requires: coreutils Requires: awk
Requires: cpio
Requires: dracut Requires: dracut
Requires: findutils Requires: grep
Requires: gzip Requires: sed
Requires(pre): %{name} = %{version} Requires(pre): %{name} = %{version}
BuildArch: noarch
%description scripts %description scripts
This package contains scripts that help integrate Plymouth with This package contains scripts that help integrate Plymouth with
@ -185,7 +176,7 @@ the system.
%package plugin-label %package plugin-label
Summary: Plymouth label plugin Summary: Plymouth label plugin
Group: System/Base Group: System/Base
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-label %description plugin-label
This package contains the label control plugin for This package contains the label control plugin for
@ -196,46 +187,32 @@ graphical boot splashes using pango and cairo.
Summary: Plymouth FreeType label plugin Summary: Plymouth FreeType label plugin
Group: System/Base Group: System/Base
Requires: fontconfig Requires: fontconfig
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-label-ft %description plugin-label-ft
This package contains the label control plugin for This package contains the label control plugin for
Plymouth. It provides the ability to render text on Plymouth. It provides the ability to render text on
graphical boot splashes using FreeTyoe graphical boot splashes using FreeType
%package plugin-fade-throbber %package plugin-fade-throbber
Summary: Plymouth "Fade-Throbber" plugin Summary: Plymouth "Fade-Throbber" plugin
Group: System/Base Group: System/Base
Requires: libply-splash-core%{soversion} = %{version} Requires: libply%{so_version} = %{version}
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-core%{so_version} = %{version}
Requires: libply%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-fade-throbber %description plugin-fade-throbber
This package contains the "Fade-In" boot splash plugin for This package contains the "Fade-In" boot splash plugin for
Plymouth. It features a centered image that fades in and out Plymouth. It features a centered image that fades in and out
while other images pulsate around during system boot up. 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-splash-core%{soversion} = %{version}
Requires: libply-splash-graphics%{soversion} = %{version}
Requires: libply%{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 %package plugin-space-flares
Summary: Plymouth "space-flares" plugin Summary: Plymouth "space-flares" plugin
Group: System/Base Group: System/Base
Requires: %{name}-plugin-label = %{version} Requires: %{name}-plugin-label = %{version}
Requires: libply-splash-core%{soversion} = %{version} Requires: libply%{so_version} = %{version}
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-core%{so_version} = %{version}
Requires: libply%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-space-flares %description plugin-space-flares
This package contains the "space-flares" boot splash plugin for This package contains the "space-flares" boot splash plugin for
@ -244,9 +221,9 @@ Plymouth. It features a corner image with animated flares.
%package plugin-two-step %package plugin-two-step
Summary: Plymouth "two-step" plugin Summary: Plymouth "two-step" plugin
Group: System/Base Group: System/Base
Requires: libply-splash-core%{soversion} = %{version} Requires: libply%{so_version} = %{version}
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-core%{so_version} = %{version}
Requires: libply%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
Requires: plymouth-plugin-label = %{version} Requires: plymouth-plugin-label = %{version}
%description plugin-two-step %description plugin-two-step
@ -258,9 +235,9 @@ short, fast one-shot animation.
%package plugin-script %package plugin-script
Summary: Plymouth "script" plugin Summary: Plymouth "script" plugin
Group: System/Base Group: System/Base
Requires: libply-splash-core%{soversion} = %{version} Requires: libply%{so_version} = %{version}
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-core%{so_version} = %{version}
Requires: libply%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-script %description plugin-script
This package contains the "script" boot splash plugin for This package contains the "script" boot splash plugin for
@ -271,9 +248,9 @@ boot splash themes.
%package plugin-tribar %package plugin-tribar
Summary: Plymouth "script" plugin Summary: Plymouth "script" plugin
Group: System/Base Group: System/Base
Requires: libply-splash-core%{soversion} = %{version} Requires: libply%{so_version} = %{version}
Requires: libply-splash-graphics%{soversion} = %{version} Requires: libply-splash-core%{so_version} = %{version}
Requires: libply%{soversion} = %{version} Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-tribar %description plugin-tribar
This package contains the "tribar" boot splash plugin for This package contains the "tribar" boot splash plugin for
@ -297,7 +274,7 @@ while stars twinkle around the logo during system boot up.
%package theme-spinfinity %package theme-spinfinity
Summary: Plymouth "Spinfinity" theme Summary: Plymouth "Spinfinity" theme
Group: System/Base Group: System/Base
Requires: %{name}-plugin-throbgress = %{version} Requires: %{name}-plugin-two-step = %{version}
Requires(post): %{name}-scripts Requires(post): %{name}-scripts
Requires(pre): %{name} Requires(pre): %{name}
BuildArch: noarch BuildArch: noarch
@ -354,7 +331,6 @@ plugin.
%package theme-bgrt %package theme-bgrt
Summary: Plymouth "bgrt" theme Summary: Plymouth "bgrt" theme
# Uses images from spinner theme
Group: System/Base Group: System/Base
Requires: %{name}-plugin-two-step = %{version} Requires: %{name}-plugin-two-step = %{version}
Requires: %{name}-theme-spinner = %{version} Requires: %{name}-theme-spinner = %{version}
@ -366,10 +342,10 @@ This package contains the "bgrt" boot splash theme for
Plymouth. Plymouth.
%prep %prep
%autosetup -S git %setup -q
autoreconf -ivf -Wno-portabilty %autopatch -p1
# replace builddate with patch0date autoreconf -ivf
sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c
# Change the default theme # Change the default theme
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
@ -383,13 +359,7 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
--enable-tracing \ --enable-tracing \
--disable-silent-rules \ --disable-silent-rules \
--disable-static \ --disable-static \
--disable-gdm-transition \
--disable-upstart-monitoring \ --disable-upstart-monitoring \
--disable-tests \
--disable-libkms \
%if %{without x11_renderer}
--disable-gtk \
%endif
--with-release-file=%{_sysconfdir}/os-release \ --with-release-file=%{_sysconfdir}/os-release \
--with-boot-tty=/dev/tty7 \ --with-boot-tty=/dev/tty7 \
--with-shutdown-tty=/dev/tty1 \ --with-shutdown-tty=/dev/tty1 \
@ -397,7 +367,10 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
--with-background-end-color-stop=0x4EA65C \ --with-background-end-color-stop=0x4EA65C \
--with-background-color=0x3391cd \ --with-background-color=0x3391cd \
--without-rhgb-compat-link \ --without-rhgb-compat-link \
--without-system-root-install --without-system-root-install \
%if %{without x11_renderer}
--disable-gtk
%endif
make %{?_smp_mflags} make %{?_smp_mflags}
@ -443,27 +416,14 @@ fi
%posttrans %posttrans
%{?regenerate_initrd_posttrans} %{?regenerate_initrd_posttrans}
%post -n libply-boot-client%{soversion} -p /sbin/ldconfig %post -n libply-boot-client%{so_version} -p /sbin/ldconfig
%postun -n libply-boot-client%{soversion} -p /sbin/ldconfig %postun -n libply-boot-client%{so_version} -p /sbin/ldconfig
%post -n libply-splash-core%{soversion} -p /sbin/ldconfig %post -n libply-splash-core%{so_version} -p /sbin/ldconfig
%postun -n libply-splash-core%{soversion} -p /sbin/ldconfig %postun -n libply-splash-core%{so_version} -p /sbin/ldconfig
%post -n libply-splash-graphics%{soversion} -p /sbin/ldconfig %post -n libply-splash-graphics%{so_version} -p /sbin/ldconfig
%postun -n libply-splash-graphics%{soversion} -p /sbin/ldconfig %postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig
%post -n libply%{soversion} -p /sbin/ldconfig %post -n libply%{so_version} -p /sbin/ldconfig
%postun -n libply%{soversion} -p /sbin/ldconfig %postun -n libply%{so_version} -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 %postun theme-spinfinity
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
@ -473,20 +433,6 @@ if [ $1 -eq 0 ]; then
fi fi
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
fi
%postun theme-fade-in %postun theme-fade-in
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
@ -495,20 +441,6 @@ if [ $1 -eq 0 ]; then
fi fi
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
fi
%postun theme-solar %postun theme-solar
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
@ -529,8 +461,9 @@ fi
%dir %{_libdir}/plymouth/renderers %dir %{_libdir}/plymouth/renderers
%dir %{_sysconfdir}/plymouth %dir %{_sysconfdir}/plymouth
%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
%{plymouthdaemon_execdir}/plymouthd %config(noreplace) %{_sysconfdir}/logrotate.d/bootlog
%{plymouthclient_execdir}/plymouth %{_sbindir}/plymouthd
%{_bindir}/plymouth
/bin/plymouth /bin/plymouth
%{_libdir}/plymouth/details.so %{_libdir}/plymouth/details.so
%{_libdir}/plymouth/text.so %{_libdir}/plymouth/text.so
@ -554,8 +487,8 @@ fi
%{_libexecdir}/plymouth/plymouth-generate-initrd %{_libexecdir}/plymouth/plymouth-generate-initrd
%files devel %files devel
%{plymouth_libdir}/libply.so %{_libdir}/libply.so
%{plymouth_libdir}/libply-splash-core.so %{_libdir}/libply-splash-core.so
%{_libdir}/libply-boot-client.so %{_libdir}/libply-boot-client.so
%{_libdir}/libply-splash-graphics.so %{_libdir}/libply-splash-graphics.so
%{_libdir}/pkgconfig/ply-splash-core.pc %{_libdir}/pkgconfig/ply-splash-core.pc
@ -563,17 +496,17 @@ fi
%{_libdir}/pkgconfig/ply-boot-client.pc %{_libdir}/pkgconfig/ply-boot-client.pc
%{_includedir}/plymouth-1 %{_includedir}/plymouth-1
%files -n libply-boot-client%{soversion} %files -n libply-boot-client%{so_version}
%{_libdir}/libply-boot-client.so.%{soversion}* %{_libdir}/libply-boot-client.so.%{so_version}*
%files -n libply-splash-core%{soversion} %files -n libply-splash-core%{so_version}
%{plymouth_libdir}/libply-splash-core.so.%{soversion}* %{_libdir}/libply-splash-core.so.%{so_version}*
%files -n libply-splash-graphics%{soversion} %files -n libply-splash-graphics%{so_version}
%{_libdir}/libply-splash-graphics.so.%{soversion}* %{_libdir}/libply-splash-graphics.so.%{so_version}*
%files -n libply%{soversion} %files -n libply%{so_version}
%{plymouth_libdir}/libply.so.%{soversion}* %{_libdir}/libply.so.%{so_version}*
%files scripts %files scripts
%dir %{_libexecdir}/plymouth %dir %{_libexecdir}/plymouth
@ -594,42 +527,9 @@ fi
%files plugin-fade-throbber %files plugin-fade-throbber
%{_libdir}/plymouth/fade-throbber.so %{_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
%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 %files plugin-space-flares
%{_libdir}/plymouth/space-flares.so %{_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 %files plugin-two-step
%{_libdir}/plymouth/two-step.so %{_libdir}/plymouth/two-step.so
@ -639,14 +539,32 @@ fi
%files plugin-script %files plugin-script
%{_libdir}/plymouth/script.so %{_libdir}/plymouth/script.so
%files theme-fade-in
%dir %{_datadir}/plymouth/themes/fade-in
%{_datadir}/plymouth/themes/fade-in/*
%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-solar
%dir %{_datadir}/plymouth/themes/solar
%{_datadir}/plymouth/themes/solar/*
%files theme-tribar
%dir %{_datadir}/plymouth/themes/tribar
%{_datadir}/plymouth/themes/tribar/*
%files theme-script %files theme-script
%dir %{_datadir}/plymouth/themes/script/ %dir %{_datadir}/plymouth/themes/script/
%{_datadir}/plymouth/themes/script/*.png %{_datadir}/plymouth/themes/script/*
%{_datadir}/plymouth/themes/script/script.script
%{_datadir}/plymouth/themes/script/script.plymouth
%files theme-bgrt %files theme-bgrt
%dir %{_datadir}/plymouth/themes/bgrt %dir %{_datadir}/plymouth/themes/bgrt
%{_datadir}/plymouth/themes/bgrt/*.* %{_datadir}/plymouth/themes/bgrt/*
%changelog %changelog