diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-11 19:15:43 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-15 08:20:06 -0700 |
commit | 66fd2a9e041e0ec94dd46a14e0a479b1ade67886 (patch) | |
tree | e2fc6eb4e05df49db49990c320881a6ddbe56ce8 | |
parent | 547288ad6a7542932ecf73e45503fde8fe745fed (diff) | |
download | meta-openembedded-contrib-66fd2a9e041e0ec94dd46a14e0a479b1ade67886.tar.gz |
udisks: Fix build with glibc 2.28+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch | 77 | ||||
-rw-r--r-- | meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 14 |
2 files changed, 84 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch new file mode 100644 index 0000000000..f140793c5e --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch @@ -0,0 +1,77 @@ +From 64f051963d6cdeebd19f9e7f0a7e584a1f7acc60 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 Aug 2018 19:12:57 -0700 +Subject: [PATCH] include sys/sysmacros.h + +fixes build with glibc 2.28+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/daemon.c | 1 + + src/device.c | 1 + + src/mount-monitor.c | 1 + + tools/udisks.c | 1 + + tools/umount-udisks.c | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/src/daemon.c b/src/daemon.c +index 14e952f..2c61cfb 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -39,6 +39,7 @@ + #include <errno.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <sys/time.h> + #include <sys/resource.h> +diff --git a/src/device.c b/src/device.c +index d73f9d6..5911d78 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -29,6 +29,7 @@ + #include <errno.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/wait.h> + #include <sys/stat.h> + #include <sys/time.h> +diff --git a/src/mount-monitor.c b/src/mount-monitor.c +index 573a69c..ccf3365 100644 +--- a/src/mount-monitor.c ++++ b/src/mount-monitor.c +@@ -28,6 +28,7 @@ + #include <errno.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <mntent.h> + +diff --git a/tools/udisks.c b/tools/udisks.c +index d30159b..f24a30a 100644 +--- a/tools/udisks.c ++++ b/tools/udisks.c +@@ -29,6 +29,7 @@ + #include <errno.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <sys/wait.h> + #include <fcntl.h> +diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c +index 2813fe0..5cf6b4d 100644 +--- a/tools/umount-udisks.c ++++ b/tools/umount-udisks.c +@@ -29,6 +29,7 @@ + #include <errno.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <pwd.h> diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb index e33266001e..7cd9992214 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb @@ -11,13 +11,13 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ dbus-glib-native \ " -SRC_URI = " \ - http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ - file://optional-depends.patch \ - file://0001-fix-build-with-newer-glibc-versions.patch \ - file://udisks-1.0.5-fix-service-file.patch \ - file://0001-Make-udev-rules-directory-configurable.patch \ -" +SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ + file://optional-depends.patch \ + file://0001-fix-build-with-newer-glibc-versions.patch \ + file://udisks-1.0.5-fix-service-file.patch \ + file://0001-Make-udev-rules-directory-configurable.patch \ + file://0001-include-sys-sysmacros.h.patch \ + " SRC_URI[udisks.md5sum] = "70d48dcfe523a74cd7c7fbbc2847fcdd" SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71" |