summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libnl
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-09-03 12:19:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 08:15:45 +0100
commit3417dcede51569f411c5decb62fa951354bd867a (patch)
tree72bd4c2539ed83d5432f4344dfad262d970265f4 /meta/recipes-support/libnl
parentafc4d8b9d42e95a59b2d7f49409247cd4631b54b (diff)
downloadpoky-3417dcede51569f411c5decb62fa951354bd867a.tar.gz
libnl: upgrade to 3.5.0
Drop the musl workaround, as upstream has solved this correctly now. (From OE-Core rev: 6f777c872064cada250043da60d24295153642b6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libnl')
-rw-r--r--meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch38
-rw-r--r--meta/recipes-support/libnl/libnl_3.5.0.bb (renamed from meta/recipes-support/libnl/libnl_3.4.0.bb)5
2 files changed, 2 insertions, 41 deletions
diff --git a/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch b/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
deleted file mode 100644
index b20a299623..0000000000
--- a/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Subject: [PATCH] fix libnl-3.4.0 musl compile problem
2Avoid in6_addr redefinition
3
4Upstream-Status: Pending
5
6Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
7---
8 include/linux-private/linux/if_bridge.h | 1 -
9 include/linux-private/linux/ipv6.h | 1 -
10 2 files changed, 2 deletions(-)
11
12diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h
13index f24050b..8f7490c 100644
14--- a/include/linux-private/linux/if_bridge.h
15+++ b/include/linux-private/linux/if_bridge.h
16@@ -15,7 +15,6 @@
17
18 #include <linux/types.h>
19 #include <linux/if_ether.h>
20-#include <linux/in6.h>
21
22 #define SYSFS_BRIDGE_ATTR "bridge"
23 #define SYSFS_BRIDGE_FDB "brforward"
24diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h
25index e05e684..f16349d 100644
26--- a/include/linux-private/linux/ipv6.h
27+++ b/include/linux-private/linux/ipv6.h
28@@ -2,7 +2,6 @@
29 #define _IPV6_H
30
31 #include <asm/byteorder.h>
32-#include <linux/in6.h>
33
34 /* The latest drafts declared increase in minimal mtu up to 1280. */
35
36--
372.7.4
38
diff --git a/meta/recipes-support/libnl/libnl_3.4.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb
index 90dc644be4..e6a225af52 100644
--- a/meta/recipes-support/libnl/libnl_3.4.0.bb
+++ b/meta/recipes-support/libnl/libnl_3.5.0.bb
@@ -11,13 +11,12 @@ DEPENDS = "flex-native bison-native"
11 11
12SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ 12SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \
13 file://fix-pc-file.patch \ 13 file://fix-pc-file.patch \
14 file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \
15" 14"
16 15
17UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" 16UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
18 17
19SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311" 18SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4"
20SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" 19SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa"
21 20
22inherit autotools pkgconfig 21inherit autotools pkgconfig
23 22