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

Accepting request 1226916 from openSUSE:Factory

Browse Source 
Plenty of bugs came with the latest updates. Revert to 129, which is the last know stable revision.
https://bugzilla.suse.com/show_bug.cgi?id=1233532
https://bugzilla.suse.com/show_bug.cgi?id=1233675

OBS-URL: https://build.opensuse.org/request/show/1226916
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=132
This commit is contained in:
Ana Guerrero 2024-11-27 21:10:45 +00:00 committed by Git OBS Bridge
parent b77b9ae0ee
commit 15fffefb57
8 changed files with 225 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
plymouth-22.02.122+94.4bd41a3.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

13
plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
View File

@ -1,6 +1,6 @@
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply-splash-core/ply-keyboard.c plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-core/ply-keyboard.c diff -Nura plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c
--- plymouth-22.02.122+180.b1d5aa9/src/libply-splash-core/ply-keyboard.c 2023-06-08 10:49:58.000000000 +0800 --- plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c 2022-04-15 16:39:24.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-core/ply-keyboard.c 2023-07-12 22:52:25.011378645 +0800 +++ plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c 2022-07-29 14:19:35.951346564 +0800
@@ -522,6 +522,8 @@ @@ -522,6 +522,8 @@
assert (keyboard != NULL); assert (keyboard != NULL);
@ -18,10 +18,3 @@ diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply-splash-core/ply-keyboard.c
} }
void void
@@ -666,4 +669,4 @@
}
return NULL;
-}
\ 文件尾没有换行符
+}

20
plymouth-disable-fedora-logo.patch
View File

@ -1,12 +1,8 @@
diff -Nura plymouth-22.02.122+180.b1d5aa9/themes/spinfinity/meson.build plymouth-22.02.122+180.b1d5aa9_new/themes/spinfinity/meson.build diff -Nura plymouth-0.9.5~git20220412.e960111/themes/spinfinity/Makefile.am plymouth-0.9.5~git20220412.e960111_new/themes/spinfinity/Makefile.am
--- plymouth-22.02.122+180.b1d5aa9/themes/spinfinity/meson.build 2022-11-27 00:45:52.000000000 +0800 --- plymouth-0.9.5~git20220412.e960111/themes/spinfinity/Makefile.am 2022-04-15 16:39:24.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/themes/spinfinity/meson.build 2023-07-12 18:00:50.140486797 +0800 +++ plymouth-0.9.5~git20220412.e960111_new/themes/spinfinity/Makefile.am 2022-04-18 15:47:44.346708483 +0800
@@ -53,8 +53,3 @@ @@ -54,4 +54,3 @@
'throbber-33.png', EXTRA_DIST = spinfinity.plymouth.in
install_dir: plymouth_theme_path / 'spinfinity',
) install-data-hook:
- - ln -sf $(logofile) $(DESTDIR)$(themedir)/header-image.png
-install_symlink('header-image.png',
- install_dir: plymouth_theme_path / 'spinfinity',
- pointing_to: plymouth_logo_file,
-)

140
plymouth-log-on-default.patch
View File

@ -1,6 +1,6 @@
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.c plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.c diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.c plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.c
--- plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.c 2022-11-28 18:33:06.000000000 +0800 --- plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.c 2022-04-15 16:39:24.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.c 2023-07-12 22:25:31.095721303 +0800 +++ plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.c 2022-08-04 16:27:35.810694440 +0800
@@ -46,6 +46,10 @@ @@ -46,6 +46,10 @@
#define PLY_BUFFER_MAX_BUFFER_CAPACITY (255 * 4096) #define PLY_BUFFER_MAX_BUFFER_CAPACITY (255 * 4096)
#endif #endif
@ -33,11 +33,11 @@ diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.c plymouth-22.02
void void
ply_buffer_remove_bytes (ply_buffer_t *buffer, ply_buffer_remove_bytes (ply_buffer_t *buffer,
size_t bytes_to_remove) size_t bytes_to_remove)
@@ -206,6 +224,37 @@ @@ -205,6 +223,38 @@
buffer->data[buffer->size] = '\0';
} }
+void ply_buffer_append_log_bytes (ply_buffer_t *buffer, void
+ply_buffer_append_log_bytes (ply_buffer_t *buffer,
+ const void *bytes_in, + const void *bytes_in,
+ size_t length) + size_t length)
+{ +{
@ -68,12 +68,13 @@ diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.c plymouth-22.02
+ buffer->data[buffer->size] = '\0'; + buffer->data[buffer->size] = '\0';
+} +}
+ +
void +void
ply_buffer_append_from_fd (ply_buffer_t *buffer, ply_buffer_append_from_fd (ply_buffer_t *buffer,
int fd) int fd)
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.h plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.h {
--- plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.h 2022-11-27 00:45:52.000000000 +0800 diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.h plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.h
+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.h 2023-07-12 22:20:11.765612637 +0800 --- plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.h 2022-04-15 16:39:24.000000000 +0800
+++ plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.h 2022-08-04 16:27:35.810694440 +0800
@@ -35,6 +35,10 @@ @@ -35,6 +35,10 @@
const void *bytes, const void *bytes,
size_t number_of_bytes); size_t number_of_bytes);
@ -85,41 +86,93 @@ diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.h plymouth-22.02
void ply_buffer_append_from_fd (ply_buffer_t *buffer, void ply_buffer_append_from_fd (ply_buffer_t *buffer,
int fd); int fd);
#define ply_buffer_append(buffer, format, args ...) \ #define ply_buffer_append(buffer, format, args ...) \
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/main.c plymouth-22.02.122+180.b1d5aa9_new/src/main.c diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/main.c plymouth-0.9.5~git20220801.eb1b893_new/src/main.c
--- plymouth-22.02.122+180.b1d5aa9/src/main.c 2023-06-08 10:49:58.000000000 +0800 --- plymouth-0.9.5~git20220801.eb1b893/src/main.c 2022-08-02 21:28:28.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/main.c 2023-07-12 22:38:56.846042006 +0800 +++ plymouth-0.9.5~git20220801.eb1b893_new/src/main.c 2022-08-04 17:37:22.768631505 +0800
@@ -1283,8 +1283,7 @@ @@ -1225,8 +1225,7 @@
} }
/* do not let any tty opened where we could write after deactivate */ /* do not let any tty opened where we could write after deactivate */
- if (ply_kernel_command_line_has_argument ("plymouth.debug")) - if (ply_kernel_command_line_has_argument ("plymouth.debug"))
- ply_logger_close_file (ply_logger_get_error_default ()); - ply_logger_close_file (ply_logger_get_error_default ());
+ ply_logger_close_file (ply_logger_get_error_default ()); + ply_logger_close_file (ply_logger_get_error_default ());
} }
static void static void
@@ -1916,6 +1915,7 @@ @@ -1853,77 +1852,42 @@
state->is_attached = false; state->is_attached = false;
} }
+#if 0 -static void
static void -check_verbosity (state_t *state)
check_verbosity (state_t *state)
{
@@ -1988,6 +1988,45 @@
debug_buffer);
}
}
+#endif
+
+static void initialize_debug (state_t *state) +static void initialize_debug (state_t *state)
+{ {
- char *stream;
-
- ply_trace ("checking if tracing should be enabled");
-
- if (!debug_buffer_path)
- debug_buffer_path = ply_kernel_command_line_get_key_value ("plymouth.debug=file:");
-
- stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:");
- if (stream != NULL || debug_buffer_path != NULL ||
- ply_kernel_command_line_has_argument ("plymouth.debug")) {
- int fd;
-
- ply_trace ("tracing should be enabled!");
- if (!ply_is_tracing ())
- ply_toggle_tracing ();
-
- if (debug_buffer == NULL)
- debug_buffer = ply_buffer_new ();
-
- if (stream != NULL) {
- ply_trace ("streaming debug output to %s instead of screen", stream);
- fd = open (stream, O_RDWR | O_NOCTTY | O_CREAT, 0600);
-
- if (fd < 0)
- ply_trace ("could not stream output to %s: %m", stream);
- else
- ply_logger_set_output_fd (ply_logger_get_error_default (), fd);
- free (stream);
- } else {
- const char *device;
- char *file;
-
- device = state->default_tty;
-
- ply_trace ("redirecting debug output to %s", device);
-
- if (strncmp (device, "/dev/", strlen ("/dev/")) == 0)
- file = strdup (device);
- else
- asprintf (&file, "/dev/%s", device);
+ if (!ply_is_tracing ()) + if (!ply_is_tracing ())
+ ply_toggle_tracing (); + ply_toggle_tracing ();
+
- fd = open (file, O_RDWR | O_APPEND);
+ if (debug_buffer == NULL) + if (debug_buffer == NULL)
+ debug_buffer = ply_buffer_new (); + debug_buffer = ply_buffer_new ();
+
- if (fd < 0)
- ply_trace ("could not redirected debug output to %s: %m", device);
- else
- ply_logger_set_output_fd (ply_logger_get_error_default (), fd);
-
- free (file);
- }
- } else {
- ply_trace ("tracing shouldn't be enabled!");
- }
-
- if (debug_buffer != NULL) {
- if (debug_buffer_path == NULL) {
- if (state->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN ||
- state->mode == PLY_BOOT_SPLASH_MODE_REBOOT)
- debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-shutdown-debug.log");
- else
- debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log");
- }
+ char *stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:"); + char *stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:");
+ if (stream != NULL) + if (stream != NULL)
+ { + {
@ -141,46 +194,45 @@ diff -Nura plymouth-22.02.122+180.b1d5aa9/src/main.c plymouth-22.02.122+180.b1d5
+ else + else
+ debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log"); + debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log");
+ } + }
+
- ply_logger_add_filter (ply_logger_get_error_default (),
- (ply_logger_filter_handler_t)
- on_error_message,
- debug_buffer);
- }
+ if (debug_buffer != NULL) + if (debug_buffer != NULL)
+ { + {
+ ply_logger_add_filter (ply_logger_get_error_default (), + ply_logger_add_filter (ply_logger_get_error_default (),
+ (ply_logger_filter_handler_t) on_error_message, + (ply_logger_filter_handler_t) on_error_message,
+ debug_buffer); + debug_buffer);
+ } + }
+} }
static void static void
check_logging (state_t *state) @@ -2007,7 +1971,7 @@
@@ -2074,8 +2113,10 @@
ply_trace ("going to go with '%s'", state->default_tty);
} }
} }
-
+#if 0 - check_verbosity (state);
check_verbosity (state);
+#endif
+ initialize_debug (state); + initialize_debug (state);
check_logging (state); check_logging (state);
ply_trace ("source built on %s", __DATE__); ply_trace ("source built on %s", __DATE__);
@@ -2101,7 +2142,10 @@ @@ -2033,7 +1997,7 @@
const void *bytes, const void *bytes,
size_t number_of_bytes) size_t number_of_bytes)
{ {
+#if 0 - ply_buffer_append_bytes (debug_buffer, bytes, number_of_bytes);
ply_buffer_append_bytes (debug_buffer, bytes, number_of_bytes);
+#endif
+ ply_buffer_append_log_bytes (debug_buffer, bytes, number_of_bytes); + ply_buffer_append_log_bytes (debug_buffer, bytes, number_of_bytes);
} }
static void static void
@@ -2224,7 +2268,7 @@ @@ -2156,7 +2120,7 @@
bool should_help = false; bool should_help = false;
bool no_boot_log = false; bool no_boot_log = false;
bool no_daemon = false; bool no_daemon = false;
- bool debug = false; - bool debug = false;
+ bool debug = true; + bool debug = true;
bool ignore_serial_consoles = false; bool ignore_serial_consoles = false;
bool graphical_boot = false;
bool attach_to_session; bool attach_to_session;
ply_daemon_handle_t *daemon_handle = NULL;

22
plymouth-manpages.patch Normal file
View File

@ -0,0 +1,22 @@
Index: plymouth-0.9.3+git20180807.7663b0c/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 $<
-man_MANS = \
+man1_MANS = \
plymouth.1 \
- plymouth.8 \
- plymouthd.8 \
plymouth-set-default-theme.1
+man8_MANS = \
+ plymouth.8 \
+ plymouthd.8
+
EXTRA_DIST = \
plymouth.xml \
plymouth1.xml \

50
plymouth-only_use_fb_for_cirrus_bochs.patch Normal file
View File

@ -0,0 +1,50 @@
From: Fabian Vogt <fvogt@suse.com>
Subject: force fb for cirrus and bochs, force drm otherwise
References: bsc#888590, bsc#980750
DRM does not work well with cirrus and bochs (no display) but the framebuffer driver
prevents DRM drivers from loading.
As we need to support cirrus for libvirt and bochs for QEMU, we cannot just remove support for frame-buffer.
diff -Nura plymouth-22.02.122+94.4bd41a3/src/libply-splash-core/ply-device-manager.c plymouth-22.02.122+94.4bd41a3_new/src/libply-splash-core/ply-device-manager.c
--- plymouth-22.02.122+94.4bd41a3/src/libply-splash-core/ply-device-manager.c 2022-10-26 19:09:02.000000000 +0800
+++ plymouth-22.02.122+94.4bd41a3_new/src/libply-splash-core/ply-device-manager.c 2022-10-27 00:07:06.605777003 +0800
@@ -316,6 +316,18 @@
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 (strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
if (!manager->device_timeout_elapsed && !verify_drm_device (device)) {
ply_trace ("ignoring since we only handle SimpleDRM devices after timeout");
@@ -323,10 +335,18 @@
}
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 if (force_fb)
renderer_type = PLY_RENDERER_TYPE_FRAME_BUFFER;
else

63
plymouth.changes
View File

@ -1,66 +1,3 @@
-------------------------------------------------------------------
Fri Nov 15 11:58:59 UTC 2024 - Thomas Zimmermann <tzimmermann@suse.com>
- Remove plymouth-only_use_fb_for_cirrus_bochs.patch: Bochs and cirrus
DRM drivers are fully compatible with plymouth. Remove the workaround
that forces them to use fbdev. Resolves the blank screen after disabling
fbdev interfaces.(bsc#1232727)
-------------------------------------------------------------------
Fri Nov 15 11:28:41 UTC 2024 - Thomas Zimmermann <tzimmermann@suse.com>
- Set BOOT_TTY and SHUTDOWN_TTY to pre-Meson values. With Meson, the
values BOOT_TTY and SHUTDOWN_TTY lose their defaults. As the given
value of tty1 is not a full path name, plymouth fails to find the file
and falls back to serial output. Restoring the _TTY defaults to
/dev/tty1 and /dev/tty7 also restores graphics output. (bsc#1224150)
-------------------------------------------------------------------
Fri Nov 8 13:17:39 UTC 2024 - Cliff Zhao <qzhao@suse.com>
- Update to 22.02.122+94.4bd41a3:
* Port build system to Meson;
* device-manager: Support kernels with CONFIG_VT=n;
* Fix terminal crash;
* terminal: Add API for flushing input buffer;
* device-manager: Only wait for device timeout for framebuffer devices;
* scripts: Update keymap-render script to handle xkb keymaps too;
* drm: Add support for new /dev/input feature;
* frame-buffer: Add support for new /dev/input feature;
* src: Hide console text when splash is requested;
* script: adds a new native GetCapslockState function to lib-plymouth;
- Add plymouth-adapts-xkbommon.patch:
xkbommon in openSUSE install to a specify location, this modify to make
plymouth adapt with it to build.
- Rebase plymouth-crash-avoid-on-keyboard-remove-input-handler.patch:
To fit with the update.
- Rebase plymouth-disable-fedora-logo.patch:
To fit with the update.
- Rebase plymouth-log-on-default.patch:
To fit with the update.
- Update plymouth.spec:
To fit with the update.
Make plymouth use Tumbleweed/Leap's logo instead of upstream's.
- Drop plymouth-manpages.patch:
openSUSE fix the problem in other side, "man 1 plymouth" and
"man 8 plymouth" all works withouth this patch (bsc#871419).
- Drop plymouth-support-multi-monitor-hotplugin.patch:
This patch already included in this update. (bsc#1231214)
-------------------------------------------------------------------
Fri Nov 1 13:17:39 UTC 2024 - Cliff Zhao <qzhao@suse.com>
- Add plymouth-support-multi-monitor-hotplugin.patch:
To support the 2nd monitor hotplugin to the system in random
order. Display the same content is fine.
(bsc#1231214)
-------------------------------------------------------------------
Fri Mar 08 14:01:51 UTC 2024 - Cliff Zhao <qzhao@suse.com>
- Update plymouth.spec: Add service in installation, remove service
in uninstallation based on systemd requirement.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 28 03:33:51 UTC 2023 - Cliff Zhao <qzhao@suse.com> Mon Aug 28 03:33:51 UTC 2023 - Cliff Zhao <qzhao@suse.com>

97
plymouth.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package plymouth # spec file for package plymouth
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2023 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
@ -21,10 +21,9 @@
%bcond_with x11_renderer %bcond_with x11_renderer
%global soversion 5 %global soversion 5
%global plymouth_services plymouth-halt.service plymouth-switch-root-initramfs.service plymouth-start.service plymouth-switch-root.service plymouth-kexec.service plymouth-switch-root-initramfs.service plymouth-quit-wait.service plymouth-quit.service plymouth-halt.service plymouth-kexec.service plymouth-poweroff.service plymouth-quit-wait.service plymouth-quit.service plymouth-read-write.service plymouth-reboot.service plymouth-start.service plymouth-switch-root-initramfs.service plymouth-switch-root.service plymouth-poweroff.service plymouth-switch-root-initramfs.service plymouth-reboot.service plymouth-switch-root-initramfs.service plymouth-read-write.service plymouth-start.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
Name: plymouth Name: plymouth
Version: 22.02.122+180.b1d5aa9 Version: 22.02.122+94.4bd41a3
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
@ -35,24 +34,27 @@ Source0: %{name}-%{version}.tar.xz
Patch0: plymouth-dracut-path.patch 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 Patch1: plymouth-some-greenish-openSUSE-colors.patch
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
Patch2: plymouth-manpages.patch
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@suse.com -- Disable the fedora logo reference which is not in openSUSE. # PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@suse.com -- Disable the fedora logo reference which is not in openSUSE.
Patch2: plymouth-disable-fedora-logo.patch Patch3: plymouth-disable-fedora-logo.patch
# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 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-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none. # PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none.
Patch3: plymouth-keep-KillMode-none.patch Patch5: plymouth-keep-KillMode-none.patch
# PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted. # PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted.
Patch4: plymouth-install-label-library-and-font-file-to-initrd.patch Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch
# PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 qzhao@suse.com -- Hide unuseful output when re-generate initrd. # PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 qzhao@suse.com -- Hide unuseful output when re-generate initrd.
Patch5: plymouth-quiet-dracut-build-info.patch Patch7: plymouth-quiet-dracut-build-info.patch
# PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 qzhao@suse.com -- Add two-step water mark config support. # PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 qzhao@suse.com -- Add two-step water mark config support.
Patch6: plymouth-watermark-config.patch Patch8: plymouth-watermark-config.patch
# PATCH-FIX-OPENSUSE plymouth-log-on-default.patch bsc#1193736 qzhao@suse.com -- Enable plymouth log by default, help to resolve random appear problems. # PATCH-FIX-OPENSUSE plymouth-log-on-default.patch bsc#1193736 qzhao@suse.com -- Enable plymouth log by default, help to resolve random appear problems.
Patch7: plymouth-log-on-default.patch Patch9: plymouth-log-on-default.patch
# PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 qzhao@suse.com -- When DPI > 160, screen will scale output twice. # PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 qzhao@suse.com -- When DPI > 160, screen will scale output twice.
Patch8: plymouth-screen-twice-scale-on-160DPI-higher.patch Patch10: plymouth-screen-twice-scale-on-160DPI-higher.patch
# PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 qzhao@suse.com -- Confirm keyboard handler list not NULL before release memory to avoid crash. # PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 qzhao@suse.com -- Confirm keyboard handler list not NULL before release memory to avoid crash.
Patch9: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch Patch11: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
# PATCH-FIX-OPENSUSE plymouth-adapts-xkbommon.patch qzhao@suse.com -- openSUSE specify xkbommon header files position, plymouth adapt with that to build successfully. BuildRequires: automake
Patch10: plymouth-adapts-xkbommon.patch
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc BuildRequires: gcc
BuildRequires: libtool BuildRequires: libtool
@ -78,11 +80,6 @@ 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
BuildRequires: cmake
BuildRequires: git
BuildRequires: meson
BuildRequires: pkgconfig(libevdev)
BuildRequires: pkgconfig(xkbcommon)
Recommends: %{name}-lang Recommends: %{name}-lang
Requires: %{name}-branding Requires: %{name}-branding
Requires: systemd >= 186 Requires: systemd >= 186
@ -365,45 +362,41 @@ Plymouth.
%prep %prep
%setup -q %setup -q
%autopatch -p1 %autopatch -p1
autoreconf -ivf
%build %build
%meson \ %configure \
-D systemd-integration=true \ --enable-systemd-integration \
-D tracing=true \ --enable-tracing \
-D upstart-monitoring=false \ --disable-silent-rules \
--disable-static \
--disable-upstart-monitoring \
--disable-tests \
%if %{without x11_renderer} %if %{without x11_renderer}
-D gtk=disabled \ --disable-gtk \
%endif %endif
%if 0%{?is_opensuse} --with-release-file=%{_sysconfdir}/os-release \
-D logo=/usr/share/pixmaps/distribution-logos/light-inline.png \ --with-shutdown-tty=/dev/tty7 \
%endif --with-background-start-color-stop=0x1A3D1F \
-D release-file=/etc/os-release \ --with-background-end-color-stop=0x4EA65C \
-D runstatedir=/run \ --with-background-color=0x3391cd \
-D boot-tty=/dev/tty1 \ --runstatedir=/run \
-D shutdown-tty=/dev/tty7 \ --without-rhgb-compat-link \
-D background-start-color-stop=0x1A3D1F \ --without-system-root-install
-D background-end-color-stop=0x4EA65C \
-D background-color=0x3391cd \ make %{?_smp_mflags}
-D debug=true \
-D warning_level=0 \
-D docs=true \
-D drm=true \
-D freetype=enabled \
%{nil}
%meson_build
%install %install
%meson_install %make_install
# *.la are files generated during compilation, useless for final user. # *.la are files generated during compilation, useless for final user.
find %{buildroot} -type f -name "*.la" -delete find %{buildroot} -type f -name "*.la" -delete
# Glow isn't quite ready for primetime # Glow isn't quite ready for primetime
rm -rf %{buildroot}%{_datadir}/%{name}/themes/glow/ rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/
# We will nolonger install /etc/plymouthd.conf. The plymouthd will read /usr/share/plymouth/plymouthd.defaults to get default settings # 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).
# unless user create the config file explicitly(jsc#SLE-11637). rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf
rm -f %{buildroot}%{_sysconfdir}/%{name}/plymouthd.conf
# Move logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d. # Move logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d.
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
@ -414,18 +407,10 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/lo
# Split lang to seperate package. # Split lang to seperate package.
%find_lang %{name} %find_lang %{name}
%pre
%service_add_pre %{plymouth_services}
%post %post
%service_add_post %{plymouth_services}
%{?regenerate_initrd_post} %{?regenerate_initrd_post}
%preun
%service_del_preun %{plymouth_services}
%postun %postun
%service_del_postun %{plymouth_services}
%{?regenerate_initrd_post} %{?regenerate_initrd_post}
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
%service_del_postun_without_restart plymouth-halt.service plymouth-kexec.service plymouth-poweroff.service plymouth-quit-wait.service plymouth-quit.service plymouth-read-write.service plymouth-reboot.service plymouth-start.service %service_del_postun_without_restart plymouth-halt.service plymouth-kexec.service plymouth-poweroff.service plymouth-quit-wait.service plymouth-quit.service plymouth-read-write.service plymouth-reboot.service plymouth-start.service
@ -537,9 +522,6 @@ fi
%else %else
%{_sysconfdir}/logrotate.d/bootlog %{_sysconfdir}/logrotate.d/bootlog
%endif %endif
%if !0%{?is_opensuse}
%{_datadir}/plymouth/bizcom.png
%endif
%{_bindir}/plymouth %{_bindir}/plymouth
%{_sbindir}/plymouthd %{_sbindir}/plymouthd
%{_libdir}/plymouth/details.so %{_libdir}/plymouth/details.so
@ -548,6 +530,7 @@ fi
%{_libdir}/plymouth/renderers/frame-buffer* %{_libdir}/plymouth/renderers/frame-buffer*
%{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/details/details.plymouth
%{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/themes/text/text.plymouth
%{_datadir}/plymouth/bizcom.png
%ghost /run/plymouth %ghost /run/plymouth
%{_localstatedir}/spool/plymouth %{_localstatedir}/spool/plymouth
%{_mandir}/man?/* %{_mandir}/man?/*
@ -555,7 +538,7 @@ fi
%{_unitdir}/* %{_unitdir}/*
%ghost %{_localstatedir}/log/boot.log %ghost %{_localstatedir}/log/boot.log
%{_libexecdir}/plymouth/plymouthd-fd-escrow %{_libexecdir}/plymouth/plymouthd-fd-escrow
%doc AUTHORS README.md ply_header.svg %doc AUTHORS NEWS README.md ply_header.svg
%license COPYING %license COPYING
%files lang -f %{name}.lang %files lang -f %{name}.lang