summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2024-02-15 09:39:12 +0100
committerKhem Raj <raj.khem@gmail.com>2024-02-15 08:50:05 -0800
commit066f509f15d7a06deab200663b54b3bd19839ed9 (patch)
treeab210fb439c6185f9217ac7d04e8bc63f25165cf
parentbf011a9f5e89186b338b6a335d10ef84929be0ce (diff)
downloadmeta-openembedded-066f509f15d7a06deab200663b54b3bd19839ed9.tar.gz
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 <liu.ming50@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch30
-rw-r--r--meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch34
-rw-r--r--meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch50
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch28
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch70
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch63
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch120
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch (renamed from meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch)0
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch (renamed from meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch)0
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb73
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb102
11 files changed, 383 insertions, 187 deletions
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 @@
1From 4c90a66fb7fd9dbb861c5a888fc828f3795fe540 Mon Sep 17 00:00:00 2001
2From: Ben Brown <ben@demerara.io>
3Date: Tue, 19 Jul 2022 16:12:12 +0100
4Subject: [PATCH] Fix daemon install ignoring configured runstatedir
5
6Upstream-Status: Backport
7
8Signed-off-by: Ben Brown <ben@demerara.io>
9Signed-off-by: Ming Liu <liu.ming50@gmail.com>
10
11---
12 src/Makefile.am | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/Makefile.am b/src/Makefile.am
16index ad3655d..abd7a4c 100644
17--- a/src/Makefile.am
18+++ b/src/Makefile.am
19@@ -37,7 +37,7 @@ escrow_PROGRAMS = plymouthd-fd-escrow
20
21 plymouthd_fd_escrow_SOURCES = plymouthd-fd-escrow.c
22
23-plymouthdrundir = $(localstatedir)/run/plymouth
24+plymouthdrundir = $(plymouthruntimedir)
25 plymouthdspooldir = $(localstatedir)/spool/plymouth
26 plymouthdtimedir = $(localstatedir)/lib/plymouth
27
28--
292.25.1
30
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 @@
1From 746c690f57b52e6fe21cc2a11b5bb71d25af3128 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Wed, 13 Dec 2017 16:15:57 +0100
4Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
12---
13 configure.ac | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index aad673e..6b37179 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -48,7 +48,10 @@ PLYMOUTH_LIBS="-lm -lrt -ldl"
21 AC_SUBST(PLYMOUTH_CFLAGS)
22 AC_SUBST(PLYMOUTH_LIBS)
23
24-AC_PATH_PROG([SYSTEMD_ASK_PASSWORD_AGENT], [systemd-tty-ask-password-agent])
25+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)
26+AC_SUBST(SYSTEMD_ASK_PASSWORD_AGENT)
27+
28+# checked: UDEVADM is not used
29 AC_PATH_PROG([UDEVADM], [udevadm])
30
31 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)
32--
332.9.5
34
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 @@
1From 97012d2c38b84fffb32867fb5eeac64a93455626 Mon Sep 17 00:00:00 2001
2From: Ben Brown <ben@demerara.io>
3Date: Tue, 19 Jul 2022 16:10:24 +0100
4Subject: [PATCH] Use standard runstatedir vs custom flag
5
6Upstream-Status: Backport
7
8---
9 configure.ac | 11 ++---------
10 1 file changed, 2 insertions(+), 9 deletions(-)
11
12Signed-off-by: Ben Brown <ben@demerara.io>
13Signed-off-by: Ming Liu <liu.ming50@gmail.com>
14
15diff --git a/configure.ac b/configure.ac
16index 608ad02..34a2f2c 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -140,9 +140,7 @@ if test x$enable_systemd_integration = xyes; then
20 AC_SUBST(SYSTEMD_UNIT_DIR)
21 fi
22
23-AC_ARG_WITH([runtimedir],
24- AC_HELP_STRING([--with-runtimedir=DIR], [runtime data dir [LOCALSTATEDIR/run]]),
25- [plymouthruntimedir=${withval}/plymouth], [plymouthruntimedir=""])
26+AC_ARG_WITH([runtimedir], [], [AC_MSG_ERROR([--with-runtimedir is obsolete, use --runstatedir instead])], [])
27
28 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)
29 AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = yes])
30@@ -150,16 +148,11 @@ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = ye
31 if test x$with_system_root_install = xyes; then
32 plymouthclientdir=/bin
33 plymouthdaemondir=/sbin
34- if (test -z "${plymouthruntimedir}"); then
35- plymouthruntimedir=/run/plymouth
36- fi
37 else
38 plymouthclientdir=$bindir
39 plymouthdaemondir=$sbindir
40- if (test -z "${plymouthruntimedir}"); then
41- plymouthruntimedir=$localstatedir/run/plymouth
42- fi
43 fi
44+plymouthruntimedir=$runstatedir/plymouth
45 AC_SUBST(plymouthclientdir)
46 AC_SUBST(plymouthdaemondir)
47 AC_SUBST(plymouthruntimedir)
48--
492.25.1
50
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 @@
1From 210090a8bddc4d4fae6089449306276a58db7409 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Wed, 14 Feb 2024 14:45:29 +0100
4Subject: [PATCH] Avoid linking to plymouth_logo_file
5
6Otherwise it would lead to install errors during cross-compilation.
7
8Upstream-Status: Inappropriate [embedded specific]
9
10Signed-off-by: Ming Liu <liu.ming50@gmail.com>
11---
12 themes/spinfinity/meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/themes/spinfinity/meson.build b/themes/spinfinity/meson.build
16index f48e8e55..da9ea705 100644
17--- a/themes/spinfinity/meson.build
18+++ b/themes/spinfinity/meson.build
19@@ -56,5 +56,5 @@ install_data(
20
21 install_symlink('header-image.png',
22 install_dir: plymouth_theme_path / 'spinfinity',
23- pointing_to: plymouth_logo_file,
24+ pointing_to: '..' / '..'/ 'bizcom.png',
25 )
26--
272.34.1
28
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 @@
1From c1d5f8265a1974908ae8dd32714d305035939cc7 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Wed, 14 Feb 2024 12:24:44 +0100
4Subject: [PATCH] Drop libdl references
5
6dl has been integrated into libc since glibc 2.34, dont need to link to
7it any more.
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Ming Liu <liu.ming50@gmail.com>
12---
13 meson.build | 2 --
14 src/client/meson.build | 1 -
15 src/libply-splash-core/meson.build | 1 -
16 src/libply/meson.build | 1 -
17 4 files changed, 5 deletions(-)
18
19diff --git a/meson.build b/meson.build
20index c6996aed..91688f73 100644
21--- a/meson.build
22+++ b/meson.build
23@@ -24,8 +24,6 @@ cc = meson.get_compiler('c')
24 lm_dep = cc.find_library('m')
25 lrt_dep = cc.find_library('rt')
26
27-ldl_dep = dependency('dl')
28-
29 libpng_dep = dependency('libpng', version: '>= 1.2.16')
30
31 libudev_dep = dependency('libudev', required: get_option('udev'))
32diff --git a/src/client/meson.build b/src/client/meson.build
33index 0506c8b4..272a811c 100644
34--- a/src/client/meson.build
35+++ b/src/client/meson.build
36@@ -52,7 +52,6 @@ pkgconfig.generate(libply_boot_client,
37 description: 'Client Library for Boot Splash',
38 libraries: [
39 libply,
40- ldl_dep,
41 ],
42 subdirs: [
43 'plymouth-1/ply',
44diff --git a/src/libply-splash-core/meson.build b/src/libply-splash-core/meson.build
45index cd22345c..c0f62b4b 100644
46--- a/src/libply-splash-core/meson.build
47+++ b/src/libply-splash-core/meson.build
48@@ -81,7 +81,6 @@ pkgconfig.generate(libply_splash_core,
49 description: 'Utility Library for Boot Splash Plugins',
50 libraries: [
51 libply,
52- ldl_dep,
53 ],
54 subdirs: [
55 'plymouth-1/ply',
56diff --git a/src/libply/meson.build b/src/libply/meson.build
57index 70f72488..77dced75 100644
58--- a/src/libply/meson.build
59+++ b/src/libply/meson.build
60@@ -17,7 +17,6 @@ libply_sources = files(
61 )
62
63 libply_deps = [
64- ldl_dep,
65 lm_dep,
66 ]
67
68--
692.34.1
70
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 @@
1From beb9b218f94872e70d02578d4ff016e08abc4717 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Wed, 14 Feb 2024 12:03:26 +0100
4Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
12Signed-off-by: Ming Liu <liu.ming50@gmail.com>
13---
14 meson.build | 2 +-
15 meson_options.txt | 5 +++++
16 systemd-units/meson.build | 2 +-
17 3 files changed, 7 insertions(+), 2 deletions(-)
18
19diff --git a/meson.build b/meson.build
20index 26789060..c6996aed 100644
21--- a/meson.build
22+++ b/meson.build
23@@ -44,7 +44,7 @@ if get_option('systemd-integration')
24 systemd_unit_dir = systemd_dep.get_variable('systemdsystemunitdir',
25 pkgconfig_define: [ 'rootprefix', get_option('prefix') ],
26 )
27- systemd_ask_password_agent = find_program('systemd-tty-ask-password-agent')
28+ systemd_ask_password_agent = get_option('systemd-tty-ask-password-agent')
29 endif
30
31 if get_option('upstart-monitoring')
32diff --git a/meson_options.txt b/meson_options.txt
33index 4f601bb0..aac661fc 100644
34--- a/meson_options.txt
35+++ b/meson_options.txt
36@@ -53,6 +53,11 @@ option('systemd-integration',
37 value: true,
38 description: 'Coordinate boot up with systemd',
39 )
40+option('systemd-tty-ask-password-agent',
41+ type: 'string',
42+ value: '/bin/systemd-tty-ask-password-agent',
43+ description: 'Path of systemd-tty-ask-password-agent',
44+)
45 option('udev',
46 type: 'feature',
47 value: 'auto',
48diff --git a/systemd-units/meson.build b/systemd-units/meson.build
49index 06379312..7adc86ae 100644
50--- a/systemd-units/meson.build
51+++ b/systemd-units/meson.build
52@@ -21,7 +21,7 @@ foreach unit_templ : systemd_unit_templates
53 'PLYMOUTH_CLIENT_DIR': get_option('prefix') / get_option('bindir'),
54 'PLYMOUTH_DAEMON_DIR': get_option('prefix') / get_option('sbindir'),
55 'plymouthruntimedir': plymouth_runtime_dir,
56- 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent.full_path(),
57+ 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent,
58 },
59 install: true,
60 install_dir: systemd_unit_dir,
61--
622.34.1
63
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 @@
1From 2caf68370791c7aa48f94628c7f7a012753388c5 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Wed, 14 Feb 2024 15:07:00 +0100
4Subject: [PATCH] Make themes build optional
5
6The users can choose which themes should be built.
7
8Upstream-Status: Inappropriate [embedded specific]
9
10Signed-off-by: Ming Liu <liu.ming50@gmail.com>
11---
12 meson_options.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++
13 themes/meson.build | 38 ++++++++++++++++++++++++++---------
14 2 files changed, 79 insertions(+), 9 deletions(-)
15
16diff --git a/meson_options.txt b/meson_options.txt
17index 4f601bb0..1cbf6d2b 100644
18--- a/meson_options.txt
19+++ b/meson_options.txt
20@@ -83,3 +83,53 @@ option('docs',
21 value: true,
22 description: 'Build documentation',
23 )
24+option('spinfinity-theme',
25+ type: 'boolean',
26+ value: true,
27+ description: 'Build with spinfinity theme',
28+)
29+option('fade-in-theme',
30+ type: 'boolean',
31+ value: true,
32+ description: 'Build with fade-in theme',
33+)
34+option('text-theme',
35+ type: 'boolean',
36+ value: true,
37+ description: 'Build with text theme',
38+)
39+option('details-theme',
40+ type: 'boolean',
41+ value: true,
42+ description: 'Build with details theme',
43+)
44+option('solar-theme',
45+ type: 'boolean',
46+ value: true,
47+ description: 'Build with solar theme',
48+)
49+option('glow-theme',
50+ type: 'boolean',
51+ value: true,
52+ description: 'Build with glow theme',
53+)
54+option('script-theme',
55+ type: 'boolean',
56+ value: true,
57+ description: 'Build with script theme',
58+)
59+option('spinner-theme',
60+ type: 'boolean',
61+ value: true,
62+ description: 'Build with spinner theme',
63+)
64+option('tribar-theme',
65+ type: 'boolean',
66+ value: true,
67+ description: 'Build with tribar theme',
68+)
69+option('bgrt-theme',
70+ type: 'boolean',
71+ value: true,
72+ description: 'Build with bgrt theme',
73+)
74diff --git a/themes/meson.build b/themes/meson.build
75index dc2ca6e2..15918472 100644
76--- a/themes/meson.build
77+++ b/themes/meson.build
78@@ -1,10 +1,30 @@
79-subdir('spinfinity')
80-subdir('fade-in')
81+if get_option('spinfinity-theme')
82+ subdir('spinfinity')
83+endif
84+if get_option('fade-in-theme')
85+ subdir('fade-in')
86+endif
87+if get_option('text-theme')
88 subdir('text')
89-subdir('details')
90-subdir('solar')
91-subdir('glow')
92-subdir('script')
93-subdir('spinner')
94-subdir('tribar')
95-subdir('bgrt')
96+endif
97+if get_option('details-theme')
98+ subdir('details')
99+endif
100+if get_option('solar-theme')
101+ subdir('solar')
102+endif
103+if get_option('glow-theme')
104+ subdir('glow')
105+endif
106+if get_option('script-theme')
107+ subdir('script')
108+endif
109+if get_option('spinner-theme')
110+ subdir('spinner')
111+endif
112+if get_option('tribar-theme')
113+ subdir('tribar')
114+endif
115+if get_option('bgrt-theme')
116+ subdir('bgrt')
117+endif
118--
1192.34.1
120
diff --git a/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch
index 58838500bf..58838500bf 100644
--- a/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch
+++ b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch
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/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch
index 7ba1034e93..7ba1034e93 100644
--- a/meta-oe/recipes-core/plymouth/files/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
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 @@
1SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process."
2DESCRIPTION = "Plymouth is an application that runs very early in the boot process \
3(even before the root filesystem is mounted!) that provides a \
4graphical boot animation while the boot process happens in the background."
5HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth"
6SECTION = "base"
7
8LICENSE = "GPL-2.0-or-later"
9LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
10
11SRC_URI = " \
12 http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \
13 file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \
14 file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \
15 file://0001-plymouth-Add-the-retain-splash-option.patch \
16 file://0001-Use-standard-runstatedir-vs-custom-flag.patch \
17 file://0001-Fix-daemon-install-ignoring-configured-runstatedir.patch \
18"
19
20SRC_URI[sha256sum] = "100551442221033ce868c447ad6c74d831d209c18ae232b98ae0207e34eadaeb"
21
22LOGO ??= "${datadir}/plymouth/bizcom.png"
23RUNSTATEDIR ??= "${localstatedir}/run"
24
25EXTRA_OECONF = "--runstatedir=${RUNSTATEDIR}"
26
27PACKAGECONFIG ??= "initrd logo pango udev ${@bb.utils.filter('DISTRO_FEATURES', 'systemd usrmerge', d)}"
28PACKAGECONFIG:append:x86 = " drm"
29PACKAGECONFIG:append:x86-64 = " drm"
30
31PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
32PACKAGECONFIG[documentation] = "--enable-documentation,--disable-documentation"
33PACKAGECONFIG[initrd] = ",,"
34PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
35PACKAGECONFIG[logo] = "--with-logo=${LOGO},--without-logo"
36PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
37PACKAGECONFIG[systemd] = "--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent,--disable-systemd-integration,systemd"
38PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev"
39PACKAGECONFIG[upstart-monitoring] = "--enable-upstart-monitoring,--disable-upstart-monitoring,ncurses dbus"
40PACKAGECONFIG[usrmerge] = "--without-system-root-install,--with-system-root-install"
41
42inherit autotools pkgconfig systemd gettext
43
44do_install:append() {
45 # Remove /var/run from package as plymouth will populate it on startup
46 rm -fr ${D}${RUNSTATEDIR}
47
48 if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then
49 rm -rf "${D}${libexecdir}"
50 fi
51}
52
53PROVIDES = "virtual/psplash"
54RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support"
55
56PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}"
57PACKAGES =+ "${PN}-set-default-theme"
58
59FILES:${PN}-initrd = "${libexecdir}/plymouth/*"
60FILES:${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme"
61
62FILES:${PN} += "${systemd_unitdir}/system/*"
63FILES:${PN}-dbg += "${libdir}/plymouth/renderers/.debug"
64
65DEPENDS = "libcap libpng"
66DEPENDS:append:libc-musl = " musl-rpmatch"
67
68LDFLAGS:append:libc-musl = " -lrpmatch"
69
70RDEPENDS:${PN}-initrd = "bash dracut"
71RDEPENDS:${PN}-set-default-theme = "bash"
72
73SYSTEMD_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 @@
1SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process."
2DESCRIPTION = "Plymouth is an application that runs very early in the boot process \
3(even before the root filesystem is mounted!) that provides a \
4graphical boot animation while the boot process happens in the background."
5HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth"
6SECTION = "base"
7
8LICENSE = "GPL-2.0-or-later"
9LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
10
11SRC_URI = " \
12 http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \
13 file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \
14 file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \
15 file://0001-plymouth-Add-the-retain-splash-option.patch \
16 file://0001-Drop-libdl-references.patch \
17 file://0001-Avoid-linking-to-plymouth_logo_file.patch \
18 file://0001-Make-themes-build-optional.patch \
19"
20
21SRC_URI[sha256sum] = "f3f7841358c98f5e7b06a9eedbdd5e6882fd9f38bbd14a767fb083e3b55b1c34"
22
23PLYMOUTH_RUNSTATEDIR ??= "${base_prefix}/run"
24PLYMOUTH_RELEASE_FILE ??= "${sysconfdir}/system-release"
25
26PLYMOUTH_BACKGROUND_COLOR ??= "0x5d5950"
27PLYMOUTH_BACKGROUND_START_COLOR_STOP ??= "0x807c71"
28PLYMOUTH_BACKGROUND_END_COLOR_STOP ??= "0x3a362f"
29
30PLYMOUTH_BOOT_TTY ??= "/dev/tty1"
31PLYMOUTH_SHUTDOWN_TTY ??= "/dev/tty63"
32
33PLYMOUTH_THEMES ??= "spinfinity fade-in text details solar glow script spinner tribar bgrt"
34
35EXTRA_OEMESON += " \
36 -Drunstatedir=${PLYMOUTH_RUNSTATEDIR} \
37 -Drelease-file=${PLYMOUTH_RELEASE_FILE} \
38 -Dbackground-color=${PLYMOUTH_BACKGROUND_COLOR} \
39 -Dbackground-start-color-stop=${PLYMOUTH_BACKGROUND_START_COLOR_STOP} \
40 -Dbackground-end-color-stop=${PLYMOUTH_BACKGROUND_END_COLOR_STOP} \
41 -Dboot-tty=${PLYMOUTH_BOOT_TTY} \
42 -Dshutdown-tty=${PLYMOUTH_SHUTDOWN_TTY} \
43"
44
45PACKAGECONFIG ??= "initrd freetype pango udev ${PLYMOUTH_THEMES} ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
46PACKAGECONFIG:append:x86 = " drm"
47PACKAGECONFIG:append:x86-64 = " drm"
48
49PACKAGECONFIG[drm] = "-Ddrm=true,-Ddrm=false,libdrm"
50PACKAGECONFIG[docs] = "-Ddocs=true,-Ddocs=false"
51PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype"
52PACKAGECONFIG[initrd] = ",,"
53PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3"
54PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango cairo"
55PACKAGECONFIG[systemd] = "-Dsystemd-integration=true ,-Dsystemd-integration=false,systemd"
56PACKAGECONFIG[tracing] = "-Dtracing=true,-Dtracing=false"
57PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev"
58PACKAGECONFIG[upstart-monitoring] = "-Dupstart-monitoring=true,-Dupstart-monitoring=false,ncurses dbus"
59
60# theme configs
61PACKAGECONFIG[spinfinity] = "-Dspinfinity-theme=true,-Dspinfinity-theme=false"
62PACKAGECONFIG[fade-in] = "-Dfade-in-theme=true,-Dfade-in-theme=false"
63PACKAGECONFIG[text] = "-Dtext-theme=true,-Dtext-theme=false"
64PACKAGECONFIG[details] = "-Ddetails-theme=true,-Ddetails-theme=false"
65PACKAGECONFIG[solar] = "-Dsolar-theme=true,-Dsolar-theme=false"
66PACKAGECONFIG[glow] = "-Dglow-theme=true,-Dglow-theme=false"
67PACKAGECONFIG[script] = "-Dscript-theme=true,-Dscript-theme=false"
68PACKAGECONFIG[spinner] = "-Dspinner-theme=true,-Dspinner-theme=false"
69PACKAGECONFIG[tribar] = "-Dtribar-theme=true,-Dtribar-theme=false"
70PACKAGECONFIG[bgrt] = "-Dbgrt-theme=true,-Dbgrt-theme=false"
71
72inherit meson pkgconfig systemd gettext
73
74do_install:append() {
75 # Remove ${PLYMOUTH_RUNSTATEDIR} from package as plymouth will populate it on startup
76 rm -fr ${D}${PLYMOUTH_RUNSTATEDIR}
77
78 if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then
79 rm -rf "${D}${libexecdir}"
80 fi
81}
82
83PROVIDES = "virtual/psplash"
84RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support"
85
86PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}"
87PACKAGES =+ "${PN}-set-default-theme"
88
89FILES:${PN}-initrd = "${libexecdir}/plymouth/*"
90FILES:${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme"
91
92FILES:${PN} += "${systemd_unitdir}/system/*"
93
94DEPENDS = "libcap libpng libxkbcommon xkeyboard-config libevdev"
95DEPENDS:append:libc-musl = " musl-rpmatch"
96
97LDFLAGS:append:libc-musl = " -lrpmatch"
98
99RDEPENDS:${PN}-initrd = "bash dracut"
100RDEPENDS:${PN}-set-default-theme = "bash"
101
102SYSTEMD_SERVICE:${PN} = "plymouth-start.service"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-04 09:42:11 +0000