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

Accepting request 1172828 from home:qzhao:branches:Base:System

Browse Source 
update plymouth to support meson build.

OBS-URL: https://build.opensuse.org/request/show/1172828
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=377
This commit is contained in:
Cliff Zhao 2024-05-09 02:49:43 +00:00 committed by Git OBS Bridge
parent e237109738
commit c493ead1ca
9 changed files with 338 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plymouth-22.02.122+180.b1d5aa9.tar.xz Normal file
View File

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

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

Binary file not shown.

181
plymouth-adapts-xkbommon.patch Normal file
View File

@ -0,0 +1,181 @@
diff -Nura plymouth-22.02.122+180.b1d5aa9/meson.build plymouth-22.02.122+180.b1d5aa9_new/meson.build
--- plymouth-22.02.122+180.b1d5aa9/meson.build 2023-01-17 12:10:48.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/meson.build 2023-07-12 12:44:44.005586635 +0800
@@ -88,6 +88,9 @@
)
config_h_inc = include_directories('.')
+# xkbcommmon header files install position changed in openSUSE
+xkbcommon_h_inc = xkbcommon_dep.get_pkgconfig_variable('includedir')
+
# Subdirectories
subdir('images')
subdir('po')
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply-splash-core/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-core/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/libply-splash-core/meson.build 2022-11-28 18:33:06.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-core/meson.build 2023-07-12 13:47:24.191559213 +0800
@@ -38,7 +38,7 @@
libply_splash_core_sources,
dependencies: libply_splash_core_public_deps + libply_splash_core_private_deps,
c_args: libply_splash_core_cflags,
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
version: plymouth_soversion,
install: true,
)
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply-splash-graphics/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-graphics/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/libply-splash-graphics/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-graphics/meson.build 2023-07-12 12:47:06.293507068 +0800
@@ -27,7 +27,7 @@
libply_splash_graphics_sources,
dependencies: libply_splash_graphics_deps,
c_args: libply_splash_graphics_cflags,
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
version: plymouth_soversion,
install: true,
)
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/meson.build 2023-01-17 12:10:48.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/meson.build 2023-07-12 12:46:14.453171724 +0800
@@ -33,7 +33,7 @@
dependencies: plymouthd_deps,
c_args: plymouthd_cflags,
export_dynamic: true,
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
install: true,
install_dir: get_option('sbindir'),
)
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/controls/label-freetype/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/controls/label-freetype/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/controls/label-freetype/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/controls/label-freetype/meson.build 2023-07-12 12:50:00.551634310 +0800
@@ -6,7 +6,7 @@
libply_splash_core_dep,
libply_splash_graphics_dep,
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/controls/label-pango/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/controls/label-pango/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/controls/label-pango/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/controls/label-pango/meson.build 2023-07-12 12:48:43.638136777 +0800
@@ -8,7 +8,7 @@
libply_splash_core_dep,
libply_splash_graphics_dep,
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/renderers/drm/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/renderers/drm/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/renderers/drm/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/renderers/drm/meson.build 2023-07-12 13:54:44.834359051 +0800
@@ -5,7 +5,7 @@
libply_splash_core_dep,
libdrm_dep,
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path / 'renderers',
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/renderers/frame-buffer/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/renderers/frame-buffer/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/renderers/frame-buffer/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/renderers/frame-buffer/meson.build 2023-07-12 13:53:58.530064834 +0800
@@ -4,7 +4,7 @@
libply_dep,
libply_splash_core_dep,
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path / 'renderers',
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/details/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/details/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/details/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/details/meson.build 2023-07-12 13:49:53.648508853 +0800
@@ -4,7 +4,7 @@
libply_splash_core_dep,
libply_splash_graphics_dep,
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/fade-throbber/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/fade-throbber/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/fade-throbber/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/fade-throbber/meson.build 2023-07-12 12:50:48.887945382 +0800
@@ -10,7 +10,7 @@
'-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')),
'-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')),
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/script/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/script/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/script/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/script/meson.build 2023-07-12 13:52:52.754646902 +0800
@@ -49,7 +49,7 @@
c_args: [
'-DPLYMOUTH_LOGO_FILE="@0@"'.format(plymouth_logo_file),
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/space-flares/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/space-flares/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/space-flares/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/space-flares/meson.build 2023-07-12 13:51:24.641087030 +0800
@@ -7,7 +7,7 @@
c_args: [
'-DPLYMOUTH_LOGO_FILE="@0@"'.format(plymouth_logo_file),
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/text/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/text/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/text/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/text/meson.build 2023-07-12 13:49:05.472202743 +0800
@@ -4,7 +4,7 @@
libply_splash_core_dep,
libply_splash_graphics_dep,
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/tribar/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/tribar/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/tribar/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/tribar/meson.build 2023-07-12 13:52:09.810374034 +0800
@@ -3,7 +3,7 @@
dependencies: [
libply_splash_core_dep,
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,
diff -Nura plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/two-step/meson.build plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/two-step/meson.build
--- plymouth-22.02.122+180.b1d5aa9/src/plugins/splash/two-step/meson.build 2022-11-27 00:45:52.000000000 +0800
+++ plymouth-22.02.122+180.b1d5aa9_new/src/plugins/splash/two-step/meson.build 2023-07-12 13:50:43.232823908 +0800
@@ -8,7 +8,7 @@
'-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')),
'-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')),
],
- include_directories: config_h_inc,
+ include_directories: [config_h_inc, xkbcommon_h_inc],
name_prefix: '',
install: true,
install_dir: plymouth_plugin_path,

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

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

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

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

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

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

22
plymouth-manpages.patch
View File

@ -1,22 +0,0 @@
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 \

30
plymouth.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Fri Mar 08 17:21:11 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 (bnc#871419).
-------------------------------------------------------------------
Fri Mar 08 14:01:51 UTC 2024 - Cliff Zhao <qzhao@suse.com>

100
plymouth.spec
View File

@ -21,10 +21,10 @@
%bcond_with x11_renderer
%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
%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
Version: 22.02.122+94.4bd41a3
Version: 22.02.122+180.b1d5aa9
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
@ -35,27 +35,26 @@ Source0: %{name}-%{version}.tar.xz
Patch0: plymouth-dracut-path.patch
# PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
Patch1: plymouth-some-greenish-openSUSE-colors.patch
# PATCH-FIX-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.
Patch3: plymouth-disable-fedora-logo.patch
Patch2: 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
Patch3: 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.
Patch5: plymouth-keep-KillMode-none.patch
Patch4: 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.
Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch
Patch5: 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.
Patch7: plymouth-quiet-dracut-build-info.patch
Patch6: 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.
Patch8: plymouth-watermark-config.patch
Patch7: 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.
Patch9: plymouth-log-on-default.patch
Patch8: 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.
Patch10: plymouth-screen-twice-scale-on-160DPI-higher.patch
Patch9: 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.
Patch11: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
BuildRequires: automake
Patch10: 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.
Patch11: plymouth-adapts-xkbommon.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc
BuildRequires: libtool
@ -81,6 +80,11 @@ BuildRequires: pkgconfig(systemd) >= 186
%if %{with x11_renderer}
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
%endif
BuildRequires: cmake
BuildRequires: git
BuildRequires: meson
BuildRequires: pkgconfig(libevdev)
BuildRequires: pkgconfig(xkbcommon)
Recommends: %{name}-lang
Requires: %{name}-branding
Requires: systemd >= 186
@ -363,63 +367,67 @@ Plymouth.
%prep
%setup -q
%autopatch -p1
autoreconf -ivf
%build
%configure \
--enable-systemd-integration \
--enable-tracing \
--disable-silent-rules \
--disable-static \
--disable-upstart-monitoring \
--disable-tests \
%meson \
-D systemd-integration=true \
-D tracing=true \
-D upstart-monitoring=false \
%if %{without x11_renderer}
--disable-gtk \
-D gtk=disabled \
%endif
--with-release-file=%{_sysconfdir}/os-release \
--with-shutdown-tty=/dev/tty7 \
--with-background-start-color-stop=0x1A3D1F \
--with-background-end-color-stop=0x4EA65C \
--with-background-color=0x3391cd \
--runstatedir=/run \
--without-rhgb-compat-link \
--without-system-root-install
make %{?_smp_mflags}
%if 0%{?is_opensuse}
-D logo=/usr/share/pixmaps/distribution-logos/light-inline.png \
%endif
-D release-file=/etc/os-release \
-D runstatedir=/run \
-D boot-tty=tty1 \
-D shutdown-tty=tty1 \
-D background-start-color-stop=0x1A3D1F \
-D background-end-color-stop=0x4EA65C \
-D background-color=0x3391cd \
-D debug=true \
-D warning_level=0 \
-D docs=true \
-D drm=true \
-D freetype=enabled \
%{nil}
%meson_build
%install
%make_install
%meson_install
# *.la are files generated during compilation, useless for final user.
find %{buildroot} -type f -name "*.la" -delete
# Glow isn't quite ready for primetime
rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/
%{__rm} -rf %{buildroot}%{_datadir}/%{name}/themes/glow/
# We will nolonger ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-11637).
rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf
# We will nolonger install /etc/plymouthd.conf. The plymouthd will read /usr/share/plymouth/plymouthd.defaults to get default settings
# unless user create the config file explicitly(jsc#SLE-11637).
%{__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.
%if 0%{?suse_version} > 1500
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
mv %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/logrotate.d/bootlog
%{__mkdir} -p %{buildroot}%{_distconfdir}/logrotate.d
%{__mv} %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/logrotate.d/bootlog
%endif
# Split lang to seperate package.
%find_lang %{name}
%pre
%service_add_pre %{plymouth-services}
%service_add_pre %{plymouth_services}
%post
%service_add_post %{plymouth-services}
%service_add_post %{plymouth_services}
%{?regenerate_initrd_post}
%preun
%service_del_preun %{plymouth-services}
%service_del_preun %{plymouth_services}
%postun
%service_del_postun %{plymouth-services}
%service_del_postun %{plymouth_services}
%{?regenerate_initrd_post}
%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
@ -531,6 +539,9 @@ fi
%else
%{_sysconfdir}/logrotate.d/bootlog
%endif
%if !0%{?is_opensuse}
%{_datadir}/plymouth/bizcom.png
%endif
%{_bindir}/plymouth
%{_sbindir}/plymouthd
%{_libdir}/plymouth/details.so
@ -539,7 +550,6 @@ fi
%{_libdir}/plymouth/renderers/frame-buffer*
%{_datadir}/plymouth/themes/details/details.plymouth
%{_datadir}/plymouth/themes/text/text.plymouth
%{_datadir}/plymouth/bizcom.png
%ghost /run/plymouth
%{_localstatedir}/spool/plymouth
%{_mandir}/man?/*
@ -547,7 +557,7 @@ fi
%{_unitdir}/*
%ghost %{_localstatedir}/log/boot.log
%{_libexecdir}/plymouth/plymouthd-fd-escrow
%doc AUTHORS NEWS README.md ply_header.svg
%doc AUTHORS README.md ply_header.svg
%license COPYING
%files lang -f %{name}.lang