From 5cea5f2451f57612ec77dedb26e9a5a7a0f0e6d9 Mon Sep 17 00:00:00 2001 From: "Davis, Michael" Date: Mon, 25 Feb 2019 17:28:37 +0000 Subject: plymouth: Update to version 0.9.4 Signed-off-by: Michael Davis Signed-off-by: Khem Raj --- .../files/0002-Fix-build-with-glibc-2.28.patch | 34 ----------- meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 67 ---------------------- meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb | 67 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 101 deletions(-) delete mode 100644 meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch delete mode 100644 meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb create mode 100644 meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb (limited to 'meta-oe/recipes-core') diff --git a/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch b/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch deleted file mode 100644 index 8638f75b36..0000000000 --- a/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0c0345303b7971d6cec478fd8b81d64bc1fbe0f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 21 Aug 2018 23:26:45 +0200 -Subject: [PATCH] Fix build with >= glibc 2.28 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from [1] - -[1] https://bugs.freedesktop.org/show_bug.cgi?id=102191 - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/libply-splash-core/ply-terminal.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c -index a0954f2..f3b32fe 100644 ---- a/src/libply-splash-core/ply-terminal.c -+++ b/src/libply-splash-core/ply-terminal.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.14.4 - diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb deleted file mode 100644 index a5b16c979f..0000000000 --- a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ /dev/null @@ -1,67 +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 = "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 \ - file://0002-Fix-build-with-glibc-2.28.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" diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb new file mode 100644 index 0000000000..305977e5e1 --- /dev/null +++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb @@ -0,0 +1,67 @@ +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.xz \ + file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ + " + +SRC_URI[md5sum] = "4efa5551d230165981b105e7c6a50aa7" +SRC_URI[sha256sum] = "4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6791351" + +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" -- cgit 1.2.3-korg