diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-core/plymouth')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch | 34 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb (renamed from external/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb) | 13 |
2 files changed, 7 insertions, 40 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch b/external/meta-openembedded/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch deleted file mode 100644 index 8638f75b..00000000 --- a/external/meta-openembedded/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?= <schnitzeltony@gmail.com> -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 <schnitzeltony@gmail.com> ---- - 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 <sys/socket.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <termios.h> - #include <unistd.h> - #include <wchar.h> --- -2.14.4 - diff --git a/external/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/external/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb index a5b16c97..78c1cb44 100644 --- a/external/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ b/external/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb @@ -17,16 +17,17 @@ PROVIDES = "virtual/psplash" RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = " \ - http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2 \ + 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://0002-Fix-build-with-glibc-2.28.patch \ -" -SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" -SRC_URI[sha256sum] = "2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f" + " + +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)} \ + ${@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)} \ " PACKAGECONFIG ??= "pango initrd" |