diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-core/plymouth | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/plymouth')
2 files changed, 100 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch new file mode 100644 index 000000000..6a86c76d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch @@ -0,0 +1,34 @@ +From 746c690f57b52e6fe21cc2a11b5bb71d25af3128 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +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 <schnitzeltony@gmail.com> +--- + 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-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb new file mode 100644 index 000000000..7e8d6e32a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb @@ -0,0 +1,66 @@ +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 = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "libcap libpng cairo dbus udev" +PROVIDES = "virtual/psplash" +RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" + +SRC_URI = " \ + http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2 \ + file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ +" +SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" +SRC_URI[sha256sum] = "2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f" + +EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ + --with-logo=${LOGO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-system-root-install --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '', d)} \ +" + +PACKAGECONFIG ??= "pango initrd" +PACKAGECONFIG_append_x86 = " drm" +PACKAGECONFIG_append_x86-64 = " drm" + +PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" +PACKAGECONFIG[initrd] = ",,," + +LOGO ??= "${datadir}/plymouth/bizcom.png" + +inherit autotools pkgconfig systemd + +do_install_append() { + # Remove /var/run from package as plymouth will populate it on startup + rm -fr "${D}${localstatedir}/run" + + if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then + rm -rf "${D}${libexecdir}" + fi +} + +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" + + +RDEPENDS_${PN}-initrd = "bash dracut" +RDEPENDS_${PN}-set-default-theme = "bash" + +SYSTEMD_SERVICE_${PN} = "plymouth-start.service" |