diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-12-31 19:12:02 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-01 22:15:08 -0800 |
commit | ded3a74af9803eec7a3d1be6bcea02549615acf5 (patch) | |
tree | 9d4488a47cccb170c6bb45d59208dd877f71ed35 /meta-oe/recipes-support/udisks | |
parent | ef16acb2bf86b76a7e61a6b1edb3861983c2c7ee (diff) | |
download | meta-openembedded-ded3a74af9803eec7a3d1be6bcea02549615acf5.tar.gz |
udisks2: Updare to latest master beyond 2.8.4
Drop the feature.h patch since its fixed differently upstream [1]
[1] https://github.com/storaged-project/udisks/commit/7c9bb088ed8c7b509e94f68abe6427b45fad092f
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/udisks')
-rw-r--r-- | meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch | 26 | ||||
-rw-r--r-- | meta-oe/recipes-support/udisks/udisks2_git.bb | 5 |
2 files changed, 2 insertions, 29 deletions
diff --git a/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch b/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch deleted file mode 100644 index 98e6c75f2..000000000 --- a/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | musl does not define __GNUC_PREREQ therefore check for C library being glibc | ||
2 | if not then define the macro | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Index: udisks-2.1.7/udisks/udisksclient.c | ||
7 | =================================================================== | ||
8 | --- udisks-2.1.7.orig/udisks/udisksclient.c | ||
9 | +++ udisks-2.1.7/udisks/udisksclient.c | ||
10 | @@ -27,8 +27,15 @@ | ||
11 | #include "udisksobjectinfo.h" | ||
12 | |||
13 | /* For __GNUC_PREREQ usage below */ | ||
14 | -#ifdef __GNUC__ | ||
15 | +#ifdef __GLIBC__ | ||
16 | # include <features.h> | ||
17 | +#else | ||
18 | +#if defined(__GNUC__) | ||
19 | +#define __GNUC_PREREQ(__maj, __min) \ | ||
20 | + (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) | ||
21 | +#else | ||
22 | +#define __GNUC_PREREQ(__maj, __min) 0 | ||
23 | +#endif | ||
24 | #endif | ||
25 | |||
26 | /** | ||
diff --git a/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-oe/recipes-support/udisks/udisks2_git.bb index 21851666e..ecaf01e71 100644 --- a/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-oe/recipes-support/udisks/udisks2_git.bb | |||
@@ -18,10 +18,9 @@ RDEPENDS_${PN} = "acl" | |||
18 | 18 | ||
19 | SRC_URI = " \ | 19 | SRC_URI = " \ |
20 | git://github.com/storaged-project/udisks.git;branch=master \ | 20 | git://github.com/storaged-project/udisks.git;branch=master \ |
21 | file://non-gnu-libc.patch \ | ||
22 | " | 21 | " |
23 | PV = "2.8.4" | 22 | PV = "2.8.4+git${SRCREV}" |
24 | SRCREV = "f333e13de8d32f2b82237ccd180c3458d71e78b8" | 23 | SRCREV = "db5f487345da2eaa87976450ea51c2c465d9b82e" |
25 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
26 | 25 | ||
27 | CVE_PRODUCT = "udisks" | 26 | CVE_PRODUCT = "udisks" |