From 7502216082f7cf777173e316dfe67a116a1a2f50 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Thu, 1 Feb 2018 20:01:58 +0200 Subject: 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. Signed-off-by: Huang Qiyu Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...ATCH-fix-libnl-3.4.0-musl-compile-problem.patch | 38 ++++++++++++++++++ .../libnl/libnl/fix-pktloc_syntax_h-race.patch | 36 ----------------- meta/recipes-support/libnl/libnl_3.2.29.bb | 45 --------------------- meta/recipes-support/libnl/libnl_3.4.0.bb | 46 ++++++++++++++++++++++ 4 files changed, 84 insertions(+), 81 deletions(-) create mode 100644 meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch delete mode 100644 meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch delete mode 100644 meta/recipes-support/libnl/libnl_3.2.29.bb create mode 100644 meta/recipes-support/libnl/libnl_3.4.0.bb 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 @@ +Subject: [PATCH] fix libnl-3.4.0 musl compile problem +Avoid in6_addr redefinition + +Upstream-Status: Pending + +Signed-off-by: Huang Qiyu +--- + include/linux-private/linux/if_bridge.h | 1 - + include/linux-private/linux/ipv6.h | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h +index f24050b..8f7490c 100644 +--- a/include/linux-private/linux/if_bridge.h ++++ b/include/linux-private/linux/if_bridge.h +@@ -15,7 +15,6 @@ + + #include + #include +-#include + + #define SYSFS_BRIDGE_ATTR "bridge" + #define SYSFS_BRIDGE_FDB "brforward" +diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h +index e05e684..f16349d 100644 +--- a/include/linux-private/linux/ipv6.h ++++ b/include/linux-private/linux/ipv6.h +@@ -2,7 +2,6 @@ + #define _IPV6_H + + #include +-#include + + /* The latest drafts declared increase in minimal mtu up to 1280. */ + +-- +2.7.4 + 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 @@ -Upstream-Status: Inappropriate [configuration] - -libnl has progressed to 0.3.2 and there does not appear to be any -"make -j" issues with this build after my limited testing on that -newer version so we can assume this issue is fixed upstream - -Signed-off-by: Martin Jansa - -Index: libnl-3.2.25/lib/Makefile.am -=================================================================== ---- libnl-3.2.25.orig/lib/Makefile.am -+++ libnl-3.2.25/lib/Makefile.am -@@ -46,9 +46,12 @@ CLEANFILES = \ - - # Hack to avoid using ylwrap. It does not function correctly in combination - # with --header-file= -+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h -+route/pktloc_grammar.h: route/pktloc_grammar.c - route/pktloc_grammar.c: route/pktloc_grammar.l - $(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ - -+route/pktloc_syntax.h: route/pktloc_syntax.c - route/pktloc_syntax.c: route/pktloc_syntax.y - $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ - -@@ -102,7 +105,9 @@ BUILT_SOURCES = \ - route/cls/ematch_grammar.c \ - route/cls/ematch_syntax.c \ - route/pktloc_grammar.c \ -- route/pktloc_syntax.c -+ route/pktloc_syntax.c \ -+ route/pktloc_syntax.h \ -+ route/pktloc_grammar.h - - EXTRA_DIST = \ - route/pktloc_grammar.l \ diff --git a/meta/recipes-support/libnl/libnl_3.2.29.bb b/meta/recipes-support/libnl/libnl_3.2.29.bb deleted file mode 100644 index 7d4839ba50..0000000000 --- a/meta/recipes-support/libnl/libnl_3.2.29.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "A library for applications dealing with netlink sockets" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" -SECTION = "libs/network" - -PE = "1" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ - file://fix-pktloc_syntax_h-race.patch \ - file://fix-pc-file.patch \ -" -UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" - -SRC_URI[md5sum] = "a8ba62a5c4f883f4e493a46d1f3733fe" -SRC_URI[sha256sum] = "0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922" - -inherit autotools pkgconfig - -FILES_${PN} = "${libdir}/libnl-3.so.* \ - ${libdir}/libnl.so.* \ - ${sysconfdir}" -RREPLACES_${PN} = "libnl2" -RCONFLICTS_${PN} = "libnl2" -FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la" -FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" - -PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route ${PN}-xfrm" -FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ - ${libdir}/libnl/cli/*/*.so \ - ${bindir}/genl-ctrl-list \ - ${bindir}/idiag-socket-details \ - ${bindir}/nf-* \ - ${bindir}/nl-*" -FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ - ${libdir}/libnl-genl.so.*" -FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" -FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" -FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" -FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" -RREPLACES_${PN}-genl = "libnl-genl2" -RCONFLICTS_${PN}-genl = "libnl-genl2" diff --git a/meta/recipes-support/libnl/libnl_3.4.0.bb b/meta/recipes-support/libnl/libnl_3.4.0.bb new file mode 100644 index 0000000000..90dc644be4 --- /dev/null +++ b/meta/recipes-support/libnl/libnl_3.4.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "A library for applications dealing with netlink sockets" +HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" +SECTION = "libs/network" + +PE = "1" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ + file://fix-pc-file.patch \ + file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \ +" + +UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" + +SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311" +SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" + +inherit autotools pkgconfig + +FILES_${PN} = "${libdir}/libnl-3.so.* \ + ${libdir}/libnl.so.* \ + ${sysconfdir}" +RREPLACES_${PN} = "libnl2" +RCONFLICTS_${PN} = "libnl2" +FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la" +FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" + +PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route ${PN}-xfrm" +FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ + ${libdir}/libnl/cli/*/*.so \ + ${bindir}/genl-ctrl-list \ + ${bindir}/idiag-socket-details \ + ${bindir}/nf-* \ + ${bindir}/nl-*" +FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ + ${libdir}/libnl-genl.so.*" +FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" +FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" +FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" +FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" +RREPLACES_${PN}-genl = "libnl-genl2" +RCONFLICTS_${PN}-genl = "libnl-genl2" -- cgit 1.2.3-korg