From 066f509f15d7a06deab200663b54b3bd19839ed9 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 15 Feb 2024 09:39:12 +0100 Subject: plymouth: uprev to 24.004.60 The changes include: - Change to use meson buildsystem. - Fix build issues in OE. - Move patches from files to plymouth subdirectory. - Make themes build/installation optional, since a user might not want all themes to be installed to rootfs, now he can set PLYMOUTH_THEMES to chose the themes. Signed-off-by: Ming Liu Signed-off-by: Khem Raj --- ...n-install-ignoring-configured-runstatedir.patch | 30 ------ ...ath-to-systemd-tty-ask-password-agent-con.patch | 34 ------ ...1-Use-standard-runstatedir-vs-custom-flag.patch | 50 --------- ...001-plymouth-Add-the-retain-splash-option.patch | 35 ------ ...art-service-in-add-related-kernel-paramet.patch | 31 ------ .../0001-Avoid-linking-to-plymouth_logo_file.patch | 28 +++++ .../plymouth/0001-Drop-libdl-references.patch | 70 ++++++++++++ ...ath-to-systemd-tty-ask-password-agent-con.patch | 63 +++++++++++ .../plymouth/0001-Make-themes-build-optional.patch | 120 +++++++++++++++++++++ ...001-plymouth-Add-the-retain-splash-option.patch | 35 ++++++ ...art-service-in-add-related-kernel-paramet.patch | 31 ++++++ .../recipes-core/plymouth/plymouth_22.02.122.bb | 73 ------------- .../recipes-core/plymouth/plymouth_24.004.60.bb | 102 ++++++++++++++++++ 13 files changed, 449 insertions(+), 253 deletions(-) delete mode 100644 meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch delete mode 100644 meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch delete mode 100644 meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch delete mode 100644 meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch delete mode 100644 meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch create mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch create mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch create mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch create mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch create mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch create mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch delete mode 100644 meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb create mode 100644 meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb (limited to 'meta-oe/recipes-core') diff --git a/meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch b/meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch deleted file mode 100644 index e04917e305..0000000000 --- a/meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4c90a66fb7fd9dbb861c5a888fc828f3795fe540 Mon Sep 17 00:00:00 2001 -From: Ben Brown -Date: Tue, 19 Jul 2022 16:12:12 +0100 -Subject: [PATCH] Fix daemon install ignoring configured runstatedir - -Upstream-Status: Backport - -Signed-off-by: Ben Brown -Signed-off-by: Ming Liu - ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index ad3655d..abd7a4c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -37,7 +37,7 @@ escrow_PROGRAMS = plymouthd-fd-escrow - - plymouthd_fd_escrow_SOURCES = plymouthd-fd-escrow.c - --plymouthdrundir = $(localstatedir)/run/plymouth -+plymouthdrundir = $(plymouthruntimedir) - plymouthdspooldir = $(localstatedir)/spool/plymouth - plymouthdtimedir = $(localstatedir)/lib/plymouth - --- -2.25.1 - diff --git a/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch b/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch deleted file mode 100644 index 6a86c76d13..0000000000 --- a/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 746c690f57b52e6fe21cc2a11b5bb71d25af3128 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 13 Dec 2017 16:15:57 +0100 -Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index aad673e..6b37179 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,7 +48,10 @@ PLYMOUTH_LIBS="-lm -lrt -ldl" - AC_SUBST(PLYMOUTH_CFLAGS) - AC_SUBST(PLYMOUTH_LIBS) - --AC_PATH_PROG([SYSTEMD_ASK_PASSWORD_AGENT], [systemd-tty-ask-password-agent]) -+AC_ARG_WITH(systemd-tty-ask-password-agent, AS_HELP_STRING([--with-systemd-tty-ask-password-agent],[path of systemd-tty-ask-password-agent]),SYSTEMD_ASK_PASSWORD_AGENT=${withval},SYSTEMD_ASK_PASSWORD_AGENT=/bin/systemd-tty-ask-password-agent) -+AC_SUBST(SYSTEMD_ASK_PASSWORD_AGENT) -+ -+# checked: UDEVADM is not used - AC_PATH_PROG([UDEVADM], [udevadm]) - - AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],[enable building with pango, disabled there is no encryption prompts]),enable_pango=$enableval,enable_pango=yes) --- -2.9.5 - diff --git a/meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch b/meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch deleted file mode 100644 index e351098f35..0000000000 --- a/meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 97012d2c38b84fffb32867fb5eeac64a93455626 Mon Sep 17 00:00:00 2001 -From: Ben Brown -Date: Tue, 19 Jul 2022 16:10:24 +0100 -Subject: [PATCH] Use standard runstatedir vs custom flag - -Upstream-Status: Backport - ---- - configure.ac | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -Signed-off-by: Ben Brown -Signed-off-by: Ming Liu - -diff --git a/configure.ac b/configure.ac -index 608ad02..34a2f2c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -140,9 +140,7 @@ if test x$enable_systemd_integration = xyes; then - AC_SUBST(SYSTEMD_UNIT_DIR) - fi - --AC_ARG_WITH([runtimedir], -- AC_HELP_STRING([--with-runtimedir=DIR], [runtime data dir [LOCALSTATEDIR/run]]), -- [plymouthruntimedir=${withval}/plymouth], [plymouthruntimedir=""]) -+AC_ARG_WITH([runtimedir], [], [AC_MSG_ERROR([--with-runtimedir is obsolete, use --runstatedir instead])], []) - - AC_ARG_WITH(system-root-install, AS_HELP_STRING([--with-system-root-install],[Install client in /bin and daemon in /sbin]),with_system_root_install=${withval},with_system_root_install=no) - AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = yes]) -@@ -150,16 +148,11 @@ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = ye - if test x$with_system_root_install = xyes; then - plymouthclientdir=/bin - plymouthdaemondir=/sbin -- if (test -z "${plymouthruntimedir}"); then -- plymouthruntimedir=/run/plymouth -- fi - else - plymouthclientdir=$bindir - plymouthdaemondir=$sbindir -- if (test -z "${plymouthruntimedir}"); then -- plymouthruntimedir=$localstatedir/run/plymouth -- fi - fi -+plymouthruntimedir=$runstatedir/plymouth - AC_SUBST(plymouthclientdir) - AC_SUBST(plymouthdaemondir) - AC_SUBST(plymouthruntimedir) --- -2.25.1 - diff --git a/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch b/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch deleted file mode 100644 index 58838500bf..0000000000 --- a/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f270f80d4c36a22a0f7b8de8fb6b1abef6f7b183 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Tue, 15 Feb 2022 16:23:10 +0800 -Subject: [PATCH] plymouth : Add the retain-splash option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Adding the "retain-splash” option to tell plymouth to keep the boot -splash’s contents on screen even after plymouth exits to make the -splash screen show more friendly on the system which boots so fast. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Mingli Yu ---- - systemd-units/plymouth-quit.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd-units/plymouth-quit.service.in b/systemd-units/plymouth-quit.service.in -index ed9f9b9..147e9ee 100644 ---- a/systemd-units/plymouth-quit.service.in -+++ b/systemd-units/plymouth-quit.service.in -@@ -3,7 +3,7 @@ Description=Terminate Plymouth Boot Screen - After=rc-local.service plymouth-start.service systemd-user-sessions.service - - [Service] --ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit -+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash - Type=oneshot - RemainAfterExit=yes - TimeoutSec=20 --- -2.17.1 - diff --git a/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch b/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch deleted file mode 100644 index 7ba1034e93..0000000000 --- a/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 658eac007d14d836cb002a5675487bac63d50324 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 7 Feb 2022 03:22:12 +0000 -Subject: [PATCH] plymouth-start.service.in: add related kernel parameter - -Add extra kernel parameter to make the plymouth splash screen -display during boot. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/156] - -Signed-off-by: Mingli Yu ---- - systemd-units/plymouth-start.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in -index 830a62d..c20aabe 100644 ---- a/systemd-units/plymouth-start.service.in -+++ b/systemd-units/plymouth-start.service.in -@@ -9,7 +9,7 @@ ConditionVirtualization=!container - IgnoreOnIsolate=true - - [Service] --ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session -+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --kernel-command-line="splash plymouth.ignore-serial-consoles" --pid-file=@plymouthruntimedir@/pid --attach-to-session - ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash - Type=forking - RemainAfterExit=yes --- -2.31.1 - diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch new file mode 100644 index 0000000000..77c9fbd964 --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch @@ -0,0 +1,28 @@ +From 210090a8bddc4d4fae6089449306276a58db7409 Mon Sep 17 00:00:00 2001 +From: Ming Liu +Date: Wed, 14 Feb 2024 14:45:29 +0100 +Subject: [PATCH] Avoid linking to plymouth_logo_file + +Otherwise it would lead to install errors during cross-compilation. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Ming Liu +--- + themes/spinfinity/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/themes/spinfinity/meson.build b/themes/spinfinity/meson.build +index f48e8e55..da9ea705 100644 +--- a/themes/spinfinity/meson.build ++++ b/themes/spinfinity/meson.build +@@ -56,5 +56,5 @@ install_data( + + install_symlink('header-image.png', + install_dir: plymouth_theme_path / 'spinfinity', +- pointing_to: plymouth_logo_file, ++ pointing_to: '..' / '..'/ 'bizcom.png', + ) +-- +2.34.1 + diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch new file mode 100644 index 0000000000..e922f5ce95 --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch @@ -0,0 +1,70 @@ +From c1d5f8265a1974908ae8dd32714d305035939cc7 Mon Sep 17 00:00:00 2001 +From: Ming Liu +Date: Wed, 14 Feb 2024 12:24:44 +0100 +Subject: [PATCH] Drop libdl references + +dl has been integrated into libc since glibc 2.34, dont need to link to +it any more. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Ming Liu +--- + meson.build | 2 -- + src/client/meson.build | 1 - + src/libply-splash-core/meson.build | 1 - + src/libply/meson.build | 1 - + 4 files changed, 5 deletions(-) + +diff --git a/meson.build b/meson.build +index c6996aed..91688f73 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,8 +24,6 @@ cc = meson.get_compiler('c') + lm_dep = cc.find_library('m') + lrt_dep = cc.find_library('rt') + +-ldl_dep = dependency('dl') +- + libpng_dep = dependency('libpng', version: '>= 1.2.16') + + libudev_dep = dependency('libudev', required: get_option('udev')) +diff --git a/src/client/meson.build b/src/client/meson.build +index 0506c8b4..272a811c 100644 +--- a/src/client/meson.build ++++ b/src/client/meson.build +@@ -52,7 +52,6 @@ pkgconfig.generate(libply_boot_client, + description: 'Client Library for Boot Splash', + libraries: [ + libply, +- ldl_dep, + ], + subdirs: [ + 'plymouth-1/ply', +diff --git a/src/libply-splash-core/meson.build b/src/libply-splash-core/meson.build +index cd22345c..c0f62b4b 100644 +--- a/src/libply-splash-core/meson.build ++++ b/src/libply-splash-core/meson.build +@@ -81,7 +81,6 @@ pkgconfig.generate(libply_splash_core, + description: 'Utility Library for Boot Splash Plugins', + libraries: [ + libply, +- ldl_dep, + ], + subdirs: [ + 'plymouth-1/ply', +diff --git a/src/libply/meson.build b/src/libply/meson.build +index 70f72488..77dced75 100644 +--- a/src/libply/meson.build ++++ b/src/libply/meson.build +@@ -17,7 +17,6 @@ libply_sources = files( + ) + + libply_deps = [ +- ldl_dep, + lm_dep, + ] + +-- +2.34.1 + diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch new file mode 100644 index 0000000000..a25aa3b16c --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch @@ -0,0 +1,63 @@ +From beb9b218f94872e70d02578d4ff016e08abc4717 Mon Sep 17 00:00:00 2001 +From: Ming Liu +Date: Wed, 14 Feb 2024 12:03:26 +0100 +Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +Signed-off-by: Ming Liu +--- + meson.build | 2 +- + meson_options.txt | 5 +++++ + systemd-units/meson.build | 2 +- + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 26789060..c6996aed 100644 +--- a/meson.build ++++ b/meson.build +@@ -44,7 +44,7 @@ if get_option('systemd-integration') + systemd_unit_dir = systemd_dep.get_variable('systemdsystemunitdir', + pkgconfig_define: [ 'rootprefix', get_option('prefix') ], + ) +- systemd_ask_password_agent = find_program('systemd-tty-ask-password-agent') ++ systemd_ask_password_agent = get_option('systemd-tty-ask-password-agent') + endif + + if get_option('upstart-monitoring') +diff --git a/meson_options.txt b/meson_options.txt +index 4f601bb0..aac661fc 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -53,6 +53,11 @@ option('systemd-integration', + value: true, + description: 'Coordinate boot up with systemd', + ) ++option('systemd-tty-ask-password-agent', ++ type: 'string', ++ value: '/bin/systemd-tty-ask-password-agent', ++ description: 'Path of systemd-tty-ask-password-agent', ++) + option('udev', + type: 'feature', + value: 'auto', +diff --git a/systemd-units/meson.build b/systemd-units/meson.build +index 06379312..7adc86ae 100644 +--- a/systemd-units/meson.build ++++ b/systemd-units/meson.build +@@ -21,7 +21,7 @@ foreach unit_templ : systemd_unit_templates + 'PLYMOUTH_CLIENT_DIR': get_option('prefix') / get_option('bindir'), + 'PLYMOUTH_DAEMON_DIR': get_option('prefix') / get_option('sbindir'), + 'plymouthruntimedir': plymouth_runtime_dir, +- 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent.full_path(), ++ 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent, + }, + install: true, + install_dir: systemd_unit_dir, +-- +2.34.1 + diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch new file mode 100644 index 0000000000..ab9aa7c39e --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch @@ -0,0 +1,120 @@ +From 2caf68370791c7aa48f94628c7f7a012753388c5 Mon Sep 17 00:00:00 2001 +From: Ming Liu +Date: Wed, 14 Feb 2024 15:07:00 +0100 +Subject: [PATCH] Make themes build optional + +The users can choose which themes should be built. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Ming Liu +--- + meson_options.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++ + themes/meson.build | 38 ++++++++++++++++++++++++++--------- + 2 files changed, 79 insertions(+), 9 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index 4f601bb0..1cbf6d2b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -83,3 +83,53 @@ option('docs', + value: true, + description: 'Build documentation', + ) ++option('spinfinity-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with spinfinity theme', ++) ++option('fade-in-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with fade-in theme', ++) ++option('text-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with text theme', ++) ++option('details-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with details theme', ++) ++option('solar-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with solar theme', ++) ++option('glow-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with glow theme', ++) ++option('script-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with script theme', ++) ++option('spinner-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with spinner theme', ++) ++option('tribar-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with tribar theme', ++) ++option('bgrt-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with bgrt theme', ++) +diff --git a/themes/meson.build b/themes/meson.build +index dc2ca6e2..15918472 100644 +--- a/themes/meson.build ++++ b/themes/meson.build +@@ -1,10 +1,30 @@ +-subdir('spinfinity') +-subdir('fade-in') ++if get_option('spinfinity-theme') ++ subdir('spinfinity') ++endif ++if get_option('fade-in-theme') ++ subdir('fade-in') ++endif ++if get_option('text-theme') + subdir('text') +-subdir('details') +-subdir('solar') +-subdir('glow') +-subdir('script') +-subdir('spinner') +-subdir('tribar') +-subdir('bgrt') ++endif ++if get_option('details-theme') ++ subdir('details') ++endif ++if get_option('solar-theme') ++ subdir('solar') ++endif ++if get_option('glow-theme') ++ subdir('glow') ++endif ++if get_option('script-theme') ++ subdir('script') ++endif ++if get_option('spinner-theme') ++ subdir('spinner') ++endif ++if get_option('tribar-theme') ++ subdir('tribar') ++endif ++if get_option('bgrt-theme') ++ subdir('bgrt') ++endif +-- +2.34.1 + diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch new file mode 100644 index 0000000000..58838500bf --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch @@ -0,0 +1,35 @@ +From f270f80d4c36a22a0f7b8de8fb6b1abef6f7b183 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 15 Feb 2022 16:23:10 +0800 +Subject: [PATCH] plymouth : Add the retain-splash option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Adding the "retain-splash” option to tell plymouth to keep the boot +splash’s contents on screen even after plymouth exits to make the +splash screen show more friendly on the system which boots so fast. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu +--- + systemd-units/plymouth-quit.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd-units/plymouth-quit.service.in b/systemd-units/plymouth-quit.service.in +index ed9f9b9..147e9ee 100644 +--- a/systemd-units/plymouth-quit.service.in ++++ b/systemd-units/plymouth-quit.service.in +@@ -3,7 +3,7 @@ Description=Terminate Plymouth Boot Screen + After=rc-local.service plymouth-start.service systemd-user-sessions.service + + [Service] +-ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit ++ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash + Type=oneshot + RemainAfterExit=yes + TimeoutSec=20 +-- +2.17.1 + diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch new file mode 100644 index 0000000000..7ba1034e93 --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch @@ -0,0 +1,31 @@ +From 658eac007d14d836cb002a5675487bac63d50324 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 7 Feb 2022 03:22:12 +0000 +Subject: [PATCH] plymouth-start.service.in: add related kernel parameter + +Add extra kernel parameter to make the plymouth splash screen +display during boot. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/156] + +Signed-off-by: Mingli Yu +--- + systemd-units/plymouth-start.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in +index 830a62d..c20aabe 100644 +--- a/systemd-units/plymouth-start.service.in ++++ b/systemd-units/plymouth-start.service.in +@@ -9,7 +9,7 @@ ConditionVirtualization=!container + IgnoreOnIsolate=true + + [Service] +-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --kernel-command-line="splash plymouth.ignore-serial-consoles" --pid-file=@plymouthruntimedir@/pid --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash + Type=forking + RemainAfterExit=yes +-- +2.31.1 + diff --git a/meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb b/meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb deleted file mode 100644 index 469914cd47..0000000000 --- a/meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process." -DESCRIPTION = "Plymouth is an application that runs very early in the boot process \ -(even before the root filesystem is mounted!) that provides a \ -graphical boot animation while the boot process happens in the background." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" -SECTION = "base" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = " \ - http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ - file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ - file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ - file://0001-plymouth-Add-the-retain-splash-option.patch \ - file://0001-Use-standard-runstatedir-vs-custom-flag.patch \ - file://0001-Fix-daemon-install-ignoring-configured-runstatedir.patch \ -" - -SRC_URI[sha256sum] = "100551442221033ce868c447ad6c74d831d209c18ae232b98ae0207e34eadaeb" - -LOGO ??= "${datadir}/plymouth/bizcom.png" -RUNSTATEDIR ??= "${localstatedir}/run" - -EXTRA_OECONF = "--runstatedir=${RUNSTATEDIR}" - -PACKAGECONFIG ??= "initrd logo pango udev ${@bb.utils.filter('DISTRO_FEATURES', 'systemd usrmerge', d)}" -PACKAGECONFIG:append:x86 = " drm" -PACKAGECONFIG:append:x86-64 = " drm" - -PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" -PACKAGECONFIG[documentation] = "--enable-documentation,--disable-documentation" -PACKAGECONFIG[initrd] = ",," -PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" -PACKAGECONFIG[logo] = "--with-logo=${LOGO},--without-logo" -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[systemd] = "--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent,--disable-systemd-integration,systemd" -PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev" -PACKAGECONFIG[upstart-monitoring] = "--enable-upstart-monitoring,--disable-upstart-monitoring,ncurses dbus" -PACKAGECONFIG[usrmerge] = "--without-system-root-install,--with-system-root-install" - -inherit autotools pkgconfig systemd gettext - -do_install:append() { - # Remove /var/run from package as plymouth will populate it on startup - rm -fr ${D}${RUNSTATEDIR} - - if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then - rm -rf "${D}${libexecdir}" - fi -} - -PROVIDES = "virtual/psplash" -RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support" - -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" -PACKAGES =+ "${PN}-set-default-theme" - -FILES:${PN}-initrd = "${libexecdir}/plymouth/*" -FILES:${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" - -FILES:${PN} += "${systemd_unitdir}/system/*" -FILES:${PN}-dbg += "${libdir}/plymouth/renderers/.debug" - -DEPENDS = "libcap libpng" -DEPENDS:append:libc-musl = " musl-rpmatch" - -LDFLAGS:append:libc-musl = " -lrpmatch" - -RDEPENDS:${PN}-initrd = "bash dracut" -RDEPENDS:${PN}-set-default-theme = "bash" - -SYSTEMD_SERVICE:${PN} = "plymouth-start.service" diff --git a/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb b/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb new file mode 100644 index 0000000000..cdf24477a7 --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb @@ -0,0 +1,102 @@ +SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process." +DESCRIPTION = "Plymouth is an application that runs very early in the boot process \ +(even before the root filesystem is mounted!) that provides a \ +graphical boot animation while the boot process happens in the background." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" +SECTION = "base" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = " \ + http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ + file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ + file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ + file://0001-plymouth-Add-the-retain-splash-option.patch \ + file://0001-Drop-libdl-references.patch \ + file://0001-Avoid-linking-to-plymouth_logo_file.patch \ + file://0001-Make-themes-build-optional.patch \ +" + +SRC_URI[sha256sum] = "f3f7841358c98f5e7b06a9eedbdd5e6882fd9f38bbd14a767fb083e3b55b1c34" + +PLYMOUTH_RUNSTATEDIR ??= "${base_prefix}/run" +PLYMOUTH_RELEASE_FILE ??= "${sysconfdir}/system-release" + +PLYMOUTH_BACKGROUND_COLOR ??= "0x5d5950" +PLYMOUTH_BACKGROUND_START_COLOR_STOP ??= "0x807c71" +PLYMOUTH_BACKGROUND_END_COLOR_STOP ??= "0x3a362f" + +PLYMOUTH_BOOT_TTY ??= "/dev/tty1" +PLYMOUTH_SHUTDOWN_TTY ??= "/dev/tty63" + +PLYMOUTH_THEMES ??= "spinfinity fade-in text details solar glow script spinner tribar bgrt" + +EXTRA_OEMESON += " \ + -Drunstatedir=${PLYMOUTH_RUNSTATEDIR} \ + -Drelease-file=${PLYMOUTH_RELEASE_FILE} \ + -Dbackground-color=${PLYMOUTH_BACKGROUND_COLOR} \ + -Dbackground-start-color-stop=${PLYMOUTH_BACKGROUND_START_COLOR_STOP} \ + -Dbackground-end-color-stop=${PLYMOUTH_BACKGROUND_END_COLOR_STOP} \ + -Dboot-tty=${PLYMOUTH_BOOT_TTY} \ + -Dshutdown-tty=${PLYMOUTH_SHUTDOWN_TTY} \ +" + +PACKAGECONFIG ??= "initrd freetype pango udev ${PLYMOUTH_THEMES} ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG:append:x86 = " drm" +PACKAGECONFIG:append:x86-64 = " drm" + +PACKAGECONFIG[drm] = "-Ddrm=true,-Ddrm=false,libdrm" +PACKAGECONFIG[docs] = "-Ddocs=true,-Ddocs=false" +PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype" +PACKAGECONFIG[initrd] = ",," +PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" +PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango cairo" +PACKAGECONFIG[systemd] = "-Dsystemd-integration=true ,-Dsystemd-integration=false,systemd" +PACKAGECONFIG[tracing] = "-Dtracing=true,-Dtracing=false" +PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" +PACKAGECONFIG[upstart-monitoring] = "-Dupstart-monitoring=true,-Dupstart-monitoring=false,ncurses dbus" + +# theme configs +PACKAGECONFIG[spinfinity] = "-Dspinfinity-theme=true,-Dspinfinity-theme=false" +PACKAGECONFIG[fade-in] = "-Dfade-in-theme=true,-Dfade-in-theme=false" +PACKAGECONFIG[text] = "-Dtext-theme=true,-Dtext-theme=false" +PACKAGECONFIG[details] = "-Ddetails-theme=true,-Ddetails-theme=false" +PACKAGECONFIG[solar] = "-Dsolar-theme=true,-Dsolar-theme=false" +PACKAGECONFIG[glow] = "-Dglow-theme=true,-Dglow-theme=false" +PACKAGECONFIG[script] = "-Dscript-theme=true,-Dscript-theme=false" +PACKAGECONFIG[spinner] = "-Dspinner-theme=true,-Dspinner-theme=false" +PACKAGECONFIG[tribar] = "-Dtribar-theme=true,-Dtribar-theme=false" +PACKAGECONFIG[bgrt] = "-Dbgrt-theme=true,-Dbgrt-theme=false" + +inherit meson pkgconfig systemd gettext + +do_install:append() { + # Remove ${PLYMOUTH_RUNSTATEDIR} from package as plymouth will populate it on startup + rm -fr ${D}${PLYMOUTH_RUNSTATEDIR} + + if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then + rm -rf "${D}${libexecdir}" + fi +} + +PROVIDES = "virtual/psplash" +RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support" + +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" +PACKAGES =+ "${PN}-set-default-theme" + +FILES:${PN}-initrd = "${libexecdir}/plymouth/*" +FILES:${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" + +FILES:${PN} += "${systemd_unitdir}/system/*" + +DEPENDS = "libcap libpng libxkbcommon xkeyboard-config libevdev" +DEPENDS:append:libc-musl = " musl-rpmatch" + +LDFLAGS:append:libc-musl = " -lrpmatch" + +RDEPENDS:${PN}-initrd = "bash dracut" +RDEPENDS:${PN}-set-default-theme = "bash" + +SYSTEMD_SERVICE:${PN} = "plymouth-start.service" -- cgit 1.2.3-korg