mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

plymouth: uprev to 22.02.122

Browse Source 
Also introduce more PACKAGECONFIGs to make build more predicable.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ming Liu
2022-10-02 16:51:57 +02:00
committed by Khem Raj
parent ff7666cae8
commit 479b1455e3
3 changed files with 108 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch
+30
View File
@@ -0,0 +1,30 @@
From 4c90a66fb7fd9dbb861c5a888fc828f3795fe540 Mon Sep 17 00:00:00 2001
From: Ben Brown <ben@demerara.io>
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 <ben@demerara.io>
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
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
meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch
+50
View File
@@ -0,0 +1,50 @@
From 97012d2c38b84fffb32867fb5eeac64a93455626 Mon Sep 17 00:00:00 2001
From: Ben Brown <ben@demerara.io>
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 <ben@demerara.io>
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
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
meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb → meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb
+28 -28
View File
@@ -1,62 +1,58 @@
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. \
"
(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"
DEPENDS = "libcap libpng cairo dbus udev"
DEPENDS:append:libc-musl = " musl-rpmatch"
PROVIDES = "virtual/psplash"
RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support"
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-systemd-switch-to-KillMode-mixed.patch \
file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \
file://0001-plymouth-Add-the-retain-splash-option.patch \
"
SRC_URI[md5sum] = "8a25d23f3ae732af300a56fa33cacff2"
EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \
--with-logo=${LOGO} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '--disable-systemd-integration', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge','--without-system-root-install','--with-system-root-install',d)} \
file://0001-Use-standard-runstatedir-vs-custom-flag.patch \
file://0001-Fix-daemon-install-ignoring-configured-runstatedir.patch \
"
PACKAGECONFIG ??= "pango initrd"
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[pango] = "--enable-pango,--disable-pango,pango"
PACKAGECONFIG[documentation] = "--enable-documentation,--disable-documentation"
PACKAGECONFIG[initrd] = ",,"
PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
PACKAGECONFIG[initrd] = ",,,"
LOGO ??= "${datadir}/plymouth/bizcom.png"
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
LDFLAGS:append:libc-musl = " -lrpmatch"
do_install:append() {
# Remove /var/run from package as plymouth will populate it on startup
rm -fr "${D}${localstatedir}/run"
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"
@@ -66,6 +62,10 @@ 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"