summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2018-02-01 20:01:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commitf7a97647ffa08c9991a1bc85301c459866311925 (patch)
tree46e582cc4038fcc88a2e8099c2c26afe74c09345 /meta
parent5a23f93c3d2fca2197bd61aff0d1279c5295c80b (diff)
downloadpoky-f7a97647ffa08c9991a1bc85301c459866311925.tar.gz
libnl: 3.2.29 -> 3.4.0
1) Upgrade libnl from 3.2.29 to 3.4.0. 2) Add one patch "0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch", for musl compile. 3) Delete one patch "fix-pktloc_syntax_h-race.patch", since upstream has refactored the makefiles, and the problematic code is now absent. (From OE-Core rev: 7502216082f7cf777173e316dfe67a116a1a2f50) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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/fix-pktloc_syntax_h-race.patch36
-rw-r--r--meta/recipes-support/libnl/libnl_3.4.0.bb (renamed from meta/recipes-support/libnl/libnl_3.2.29.bb)7
3 files changed, 42 insertions, 39 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
new file mode 100644
index 0000000000..b20a299623
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
@@ -0,0 +1,38 @@
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/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
deleted file mode 100644
index 79aa0bdf11..0000000000
--- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3libnl has progressed to 0.3.2 and there does not appear to be any
4"make -j" issues with this build after my limited testing on that
5newer version so we can assume this issue is fixed upstream
6
7Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
8
9Index: libnl-3.2.25/lib/Makefile.am
10===================================================================
11--- libnl-3.2.25.orig/lib/Makefile.am
12+++ libnl-3.2.25/lib/Makefile.am
13@@ -46,9 +46,12 @@ CLEANFILES = \
14
15 # Hack to avoid using ylwrap. It does not function correctly in combination
16 # with --header-file=
17+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
18+route/pktloc_grammar.h: route/pktloc_grammar.c
19 route/pktloc_grammar.c: route/pktloc_grammar.l
20 $(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
21
22+route/pktloc_syntax.h: route/pktloc_syntax.c
23 route/pktloc_syntax.c: route/pktloc_syntax.y
24 $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^
25
26@@ -102,7 +105,9 @@ BUILT_SOURCES = \
27 route/cls/ematch_grammar.c \
28 route/cls/ematch_syntax.c \
29 route/pktloc_grammar.c \
30- route/pktloc_syntax.c
31+ route/pktloc_syntax.c \
32+ route/pktloc_syntax.h \
33+ route/pktloc_grammar.h
34
35 EXTRA_DIST = \
36 route/pktloc_grammar.l \
diff --git a/meta/recipes-support/libnl/libnl_3.2.29.bb b/meta/recipes-support/libnl/libnl_3.4.0.bb
index 7d4839ba50..90dc644be4 100644
--- a/meta/recipes-support/libnl/libnl_3.2.29.bb
+++ b/meta/recipes-support/libnl/libnl_3.4.0.bb
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
10DEPENDS = "flex-native bison-native" 10DEPENDS = "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-pktloc_syntax_h-race.patch \
14 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" 15"
16
16UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" 17UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
17 18
18SRC_URI[md5sum] = "a8ba62a5c4f883f4e493a46d1f3733fe" 19SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311"
19SRC_URI[sha256sum] = "0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922" 20SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf"
20 21
21inherit autotools pkgconfig 22inherit autotools pkgconfig
22 23