diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/udisks')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch | 26 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb | 6 |
2 files changed, 3 insertions, 29 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch deleted file mode 100644 index 98e6c75f2..000000000 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch +++ /dev/null @@ -1,26 +0,0 @@ -musl does not define __GNUC_PREREQ therefore check for C library being glibc -if not then define the macro - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: udisks-2.1.7/udisks/udisksclient.c -=================================================================== ---- udisks-2.1.7.orig/udisks/udisksclient.c -+++ udisks-2.1.7/udisks/udisksclient.c -@@ -27,8 +27,15 @@ - #include "udisksobjectinfo.h" - - /* For __GNUC_PREREQ usage below */ --#ifdef __GNUC__ -+#ifdef __GLIBC__ - # include <features.h> -+#else -+#if defined(__GNUC__) -+#define __GNUC_PREREQ(__maj, __min) \ -+ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) -+#else -+#define __GNUC_PREREQ(__maj, __min) 0 -+#endif - #endif - - /** diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb index f0aad9538..ecaf01e71 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb @@ -18,10 +18,9 @@ RDEPENDS_${PN} = "acl" SRC_URI = " \ git://github.com/storaged-project/udisks.git;branch=master \ - file://non-gnu-libc.patch \ " -PV = "2.8.2" -SRCREV = "7a787aa3b340fc7f1ca72d748635d6c5445edc58" +PV = "2.8.4+git${SRCREV}" +SRCREV = "db5f487345da2eaa87976450ea51c2c465d9b82e" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" @@ -50,6 +49,7 @@ FILES_${PN} += " \ PACKAGES =+ "${PN}-libs" FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" +FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" SYSTEMD_SERVICE_${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" |