diff options
author | Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2017-02-24 14:40:42 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-28 12:34:15 +0100 |
commit | 45e1eeb4ba3f75b90de6a44d362ad1fd4a5b5877 (patch) | |
tree | 4933c2069cb6901690e897e87ed25853d424e5a6 /meta-oe/recipes-extended/collectd | |
parent | 545b16a983d11fa264a86b5d8e5a8a1251bdee56 (diff) | |
download | meta-openembedded-45e1eeb4ba3f75b90de6a44d362ad1fd4a5b5877.tar.gz |
collect: fix to build with glibc 2.25
Fix to build with glibc 2.25 and remove from blacklist.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/collectd')
-rw-r--r-- | meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-extended/collectd/collectd_5.5.0.bb | 3 |
2 files changed, 25 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch new file mode 100644 index 000000000..be942e5ef --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Subject: fix to build with glibc 2.25 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
6 | --- | ||
7 | src/md.c | 1 + | ||
8 | 1 file changed, 1 insertion(+) | ||
9 | |||
10 | diff --git a/src/md.c b/src/md.c | ||
11 | index 3725f9a..202225b 100644 | ||
12 | --- a/src/md.c | ||
13 | +++ b/src/md.c | ||
14 | @@ -25,6 +25,7 @@ | ||
15 | #include "utils_ignorelist.h" | ||
16 | |||
17 | #include <sys/ioctl.h> | ||
18 | +#include <sys/sysmacros.h> | ||
19 | |||
20 | #include <linux/major.h> | ||
21 | #include <linux/raid/md_u.h> | ||
22 | -- | ||
23 | 2.8.3 | ||
24 | |||
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb index b544b92c5..59732db81 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ | |||
14 | file://0001-conditionally-check-libvirt.patch \ | 14 | file://0001-conditionally-check-libvirt.patch \ |
15 | file://0001-collectd-replace-deprecated-readdir_r-with-readdir.patch \ | 15 | file://0001-collectd-replace-deprecated-readdir_r-with-readdir.patch \ |
16 | file://CVE-2016-6254.patch \ | 16 | file://CVE-2016-6254.patch \ |
17 | file://0001-fix-to-build-with-glibc-2.25.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI[md5sum] = "c39305ef5514b44238b0d31f77e29e6a" | 19 | SRC_URI[md5sum] = "c39305ef5514b44238b0d31f77e29e6a" |
19 | SRC_URI[sha256sum] = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88" | 20 | SRC_URI[sha256sum] = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88" |
@@ -86,5 +87,3 @@ INITSCRIPT_PARAMS = "defaults" | |||
86 | # threshold.so load.so are also provided by gegl | 87 | # threshold.so load.so are also provided by gegl |
87 | # disk.so is also provided by libgphoto2-camlibs | 88 | # disk.so is also provided by libgphoto2-camlibs |
88 | PRIVATE_LIBS = "threshold.so load.so disk.so" | 89 | PRIVATE_LIBS = "threshold.so load.so disk.so" |
89 | |||
90 | PNBLACKLIST[collectd] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130654/" | ||