<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 15 May 2017 at 12:05, Huang Qiyu <span dir="ltr"><<a href="mailto:huangqy.fnst@cn.fujitsu.com" target="_blank">huangqy.fnst@cn.fujitsu.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">1) Upgrade libnl from 3.2.29 to 3.3.0.<br>
2) Delete patch "fix-pktloc_syntax_h-race.<wbr>patch", since it is integrated upstream.<br>
3) Add patch "musl-header-conflict.patch" to fix musl compile error.<br>
<br>
Signed-off-by: Huang Qiyu <<a href="mailto:huangqy.fnst@cn.fujitsu.com">huangqy.fnst@cn.fujitsu.com</a>><br>
---<br>
.../libnl/libnl/fix-pktloc_<wbr>syntax_h-race.patch | 36 -------------<br>
.../libnl/libnl/musl-header-<wbr>conflict.patch | 59 ++++++++++++++++++++++<br>
.../libnl/{<a href="http://libnl_3.2.29.bb" rel="noreferrer" target="_blank">libnl_3.2.29.bb</a> => <a href="http://libnl_3.3.0.bb" rel="noreferrer" target="_blank">libnl_3.3.0.bb</a>} | 7 +--<br>
3 files changed, 63 insertions(+), 39 deletions(-)<br>
delete mode 100644 meta/recipes-support/libnl/<wbr>libnl/fix-pktloc_syntax_h-<wbr>race.patch<br>
create mode 100644 meta/recipes-support/libnl/<wbr>libnl/musl-header-conflict.<wbr>patch<br>
rename meta/recipes-support/libnl/{<a href="http://libnl_3.2.29.bb" rel="noreferrer" target="_blank">li<wbr>bnl_3.2.29.bb</a> => <a href="http://libnl_3.3.0.bb" rel="noreferrer" target="_blank">libnl_3.3.0.bb</a>} (88%)<br>
<br>
diff --git a/meta/recipes-support/libnl/<wbr>libnl/fix-pktloc_syntax_h-<wbr>race.patch b/meta/recipes-support/libnl/<wbr>libnl/fix-pktloc_syntax_h-<wbr>race.patch<br>
deleted file mode 100644<br>
index 79aa0bd..0000000<br>
--- a/meta/recipes-support/libnl/<wbr>libnl/fix-pktloc_syntax_h-<wbr>race.patch<br>
+++ /dev/null<br>
@@ -1,36 +0,0 @@<br>
-Upstream-Status: Inappropriate [configuration]<br>
-<br>
-libnl has progressed to 0.3.2 and there does not appear to be any<br>
-"make -j" issues with this build after my limited testing on that<br>
-newer version so we can assume this issue is fixed upstream<br>
-<br>
-Signed-off-by: Martin Jansa <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>><br>
-<br>
-Index: libnl-3.2.25/lib/Makefile.am<br>
-=============================<wbr>==============================<wbr>========<br>
---- libnl-3.2.25.orig/lib/<wbr>Makefile.am<br>
-+++ libnl-3.2.25/lib/Makefile.am<br>
-@@ -46,9 +46,12 @@ CLEANFILES = \<br>
-<br>
- # Hack to avoid using ylwrap. It does not function correctly in combination<br>
- # with --header-file=<br>
-+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h<br>
-+route/pktloc_grammar.h: route/pktloc_grammar.c<br>
- route/pktloc_grammar.c: route/pktloc_grammar.l<br>
- $(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_<wbr>grammar.h $(LFLAGS) -o $@ $^<br>
-<br>
-+route/pktloc_syntax.h: route/pktloc_syntax.c<br>
- route/pktloc_syntax.c: route/pktloc_syntax.y<br>
- $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^<br>
-<br>
-@@ -102,7 +105,9 @@ BUILT_SOURCES = \<br>
- route/cls/ematch_grammar.c \<br>
- route/cls/ematch_syntax.c \<br>
- route/pktloc_grammar.c \<br>
-- route/pktloc_syntax.c<br>
-+ route/pktloc_syntax.c \<br>
-+ route/pktloc_syntax.h \<br>
-+ route/pktloc_grammar.h<br>
-<br>
- EXTRA_DIST = \<br>
- route/pktloc_grammar.l \<br>
diff --git a/meta/recipes-support/libnl/<wbr>libnl/musl-header-conflict.<wbr>patch b/meta/recipes-support/libnl/<wbr>libnl/musl-header-conflict.<wbr>patch<br>
new file mode 100644<br>
</div></div>index 0000000..5363685<br>
<span class="">--- /dev/null<br>
+++ b/meta/recipes-support/libnl/<wbr>libnl/musl-header-conflict.<wbr>patch<br>
@@ -0,0 +1,59 @@<br>
</span>+From fa1ecb21bd612c0f7c0bd380c15d05<wbr>8227451e4e Mon Sep 17 00:00:00 2001<br>
+From: Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com">zhengrq.fnst@cn.fujitsu.com</a>><br>
+Date: Tue, 16 May 2017 02:30:21 +0900<br>
<div><div class="h5">+Subject: [PATCH] Fix musl compile error like:<br>
+<br>
+In file included from ../libnl-3.3.0/include/linux-<wbr>private/linux/ipv6.h:5:0,<br>
+ from ../libnl-3.3.0/include/<wbr>netlink-private/netlink.h:54,<br>
+ from ../libnl-3.3.0/lib/nl.c:28:<br>
+../libnl-3.3.0/include/linux-<wbr>private/linux/in6.h:32:8: error:<br>
+redefinition of 'struct in6_addr'<br>
+ struct in6_addr {<br>
+ ^~~~~~~~<br>
+<br>
+Signed-off-by: Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com">zhengrq.fnst@cn.fujitsu.com</a>><br>
+---<br>
+ include/linux-private/linux/<wbr>if_bridge.h | 1 -<br>
+ include/linux-private/linux/<wbr>ipv6.h | 1 -<br>
+ include/netlink-private/<wbr>netlink.h | 1 -<br>
+ 3 files changed, 3 deletions(-)<br>
+<br>
+diff --git a/include/linux-private/linux/<wbr>if_bridge.h b/include/linux-private/linux/<wbr>if_bridge.h<br>
+index f24050b..8f7490c 100644<br>
+--- a/include/linux-private/linux/<wbr>if_bridge.h<br>
++++ b/include/linux-private/linux/<wbr>if_bridge.h<br>
+@@ -15,7 +15,6 @@<br>
+<br>
+ #include <linux/types.h><br>
+ #include <linux/if_ether.h><br>
+-#include <linux/in6.h><br>
+<br>
+ #define SYSFS_BRIDGE_ATTR "bridge"<br>
+ #define SYSFS_BRIDGE_FDB "brforward"<br>
+diff --git a/include/linux-private/linux/<wbr>ipv6.h b/include/linux-private/linux/<wbr>ipv6.h<br>
+index e05e684..f16349d 100644<br>
+--- a/include/linux-private/linux/<wbr>ipv6.h<br>
++++ b/include/linux-private/linux/<wbr>ipv6.h<br>
+@@ -2,7 +2,6 @@<br>
+ #define _IPV6_H<br>
+<br>
+ #include <asm/byteorder.h><br>
+-#include <linux/in6.h><br>
+<br>
+ /* The latest drafts declared increase in minimal mtu up to 1280. */<br>
+<br>
+diff --git a/include/netlink-private/<wbr>netlink.h b/include/netlink-private/<wbr>netlink.h<br>
</div></div>+index dd07c10..25ee07f 100644<br>
+--- a/include/netlink-private/<wbr>netlink.h<br>
++++ b/include/netlink-private/<wbr>netlink.h<br>
+@@ -30,7 +30,6 @@<br>
<span class="">+ #include <limits.h><br>
+ #include <search.h><br>
+<br>
+-#include <arpa/inet.h><br>
+ #include <netdb.h><br>
+<br>
+ #include <defs.h><br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-support/libnl/<a href="http://libnl_3.2.29.bb" rel="noreferrer" target="_blank">l<wbr>ibnl_3.2.29.bb</a> b/meta/recipes-support/libnl/<a href="http://libnl_3.3.0.bb" rel="noreferrer" target="_blank">l<wbr>ibnl_3.3.0.bb</a><br>
similarity index 88%<br>
rename from meta/recipes-support/libnl/<a href="http://libnl_3.2.29.bb" rel="noreferrer" target="_blank">lib<wbr>nl_3.2.29.bb</a><br>
rename to meta/recipes-support/libnl/<a href="http://libnl_3.3.0.bb" rel="noreferrer" target="_blank">lib<wbr>nl_3.3.0.bb</a><br>
</span>index 7d4839b..9138aa8 100644<br>
<div class="HOEnZb"><div class="h5">--- a/meta/recipes-support/libnl/<a href="http://libnl_3.2.29.bb" rel="noreferrer" target="_blank">l<wbr>ibnl_3.2.29.bb</a><br>
+++ b/meta/recipes-support/libnl/<a href="http://libnl_3.3.0.bb" rel="noreferrer" target="_blank">l<wbr>ibnl_3.3.0.bb</a><br>
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>4fbd65380cdd255951079008b36451<wbr>6c"<br>
DEPENDS = "flex-native bison-native"<br>
<br>
SRC_URI = "<a href="https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('." rel="noreferrer" target="_blank">https://github.com/thom311/${<wbr>BPN}/releases/download/${BPN}$<wbr>{@d.getVar('PV').replace('.</a>','<wbr>_')}/${BP}.tar.gz \<br>
- file://fix-pktloc_syntax_h-<wbr>race.patch \<br>
file://fix-pc-file.patch \<br>
"<br>
UPSTREAM_CHECK_URI = "<a href="https://github.com/thom311/${BPN}/releases" rel="noreferrer" target="_blank">https://github.com/thom311/${<wbr>BPN}/releases</a>"<br>
<br>
-SRC_URI[md5sum] = "<wbr>a8ba62a5c4f883f4e493a46d1f3733<wbr>fe"<br>
-SRC_URI[sha256sum] = "<wbr>0beb593dc6abfffa18a5c787b27884<wbr>979c1b7e7f1fd468c801e3cc938a68<wbr>5922"<br>
+SRC_URI_append_libc-musl = "file://musl-header-conflict.<wbr>patch"<br></div></div></blockquote><div><br></div><div>Does the patched version not build with glibc or why is this only patched for musl?</div><div><br></div><div>Also patch seems to be missing Upstream-Status.</div><div><br></div><div>Jussi</div><div><br></div></div></div></div>