From 9f807f9e242d3380012cb55ad89f24bf4f2e8b83 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 30 Jul 2014 10:19:04 -0700 Subject: libnl: Upgrade to 3.2.25 Remove one patch and rebase another Signed-off-by: Saul Wold --- ...fix-lib-cache_mngr.c-two-parentheses-bugs.patch | 37 ------------------- .../libnl/libnl/fix-pktloc_syntax_h-race.patch | 14 +++---- meta/recipes-support/libnl/libnl_3.2.24.bb | 43 ---------------------- meta/recipes-support/libnl/libnl_3.2.25.bb | 43 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 87 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch delete mode 100644 meta/recipes-support/libnl/libnl_3.2.24.bb create mode 100644 meta/recipes-support/libnl/libnl_3.2.25.bb diff --git a/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch b/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch deleted file mode 100644 index 22b0d88428..0000000000 --- a/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 82fdf49c185fd5f3810781af9ef52aa6a52bf2df Mon Sep 17 00:00:00 2001 -From: "Song.Li" -Date: Thu, 28 Jun 2012 20:03:17 +0800 -Subject: [PATCH] fix lib/cache_mngr.c two parentheses bugs - -there are two parentheses bugs in libnl /lib/cache_mngr.c file. -The parentheses doesn't make any sense, -This will cause the variable err get a bool value, -the correct value of variable err should be the return value -of the function which can be any integer value. - ---- - lib/cache_mngr.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Upstream-Status: Pending - -diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c -index dae8768..57cc1f9 100644 ---- a/lib/cache_mngr.c -+++ b/lib/cache_mngr.c -@@ -150,10 +150,10 @@ int nl_cache_mngr_alloc(struct nl_sock *sk, int protocol, int flags, - /* Required to receive async event notifications */ - nl_socket_disable_seq_check(mngr->cm_sock); - -- if ((err = nl_connect(mngr->cm_sock, protocol) < 0)) -+ if ((err = nl_connect(mngr->cm_sock, protocol)) < 0) - goto errout; - -- if ((err = nl_socket_set_nonblocking(mngr->cm_sock) < 0)) -+ if ((err = nl_socket_set_nonblocking(mngr->cm_sock)) < 0) - goto errout; - - NL_DBG(1, "Allocated cache manager %p, protocol %d, %d caches\n", --- -1.7.9.5 - 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 index b93d97b1b7..79aa0bdf11 100644 --- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch +++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch @@ -6,24 +6,24 @@ newer version so we can assume this issue is fixed upstream Signed-off-by: Martin Jansa -Index: libnl-3.2.14/lib/Makefile.am +Index: libnl-3.2.25/lib/Makefile.am =================================================================== ---- libnl-3.2.14.orig/lib/Makefile.am -+++ libnl-3.2.14/lib/Makefile.am -@@ -39,9 +39,12 @@ CLEANFILES = \ +--- 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) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ + $(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) $(YACC) -d $(YFLAGS) -o $@ $^ + $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ -@@ -89,7 +92,9 @@ BUILT_SOURCES = \ +@@ -102,7 +105,9 @@ BUILT_SOURCES = \ route/cls/ematch_grammar.c \ route/cls/ematch_syntax.c \ route/pktloc_grammar.c \ diff --git a/meta/recipes-support/libnl/libnl_3.2.24.bb b/meta/recipes-support/libnl/libnl_3.2.24.bb deleted file mode 100644 index d34ab74eac..0000000000 --- a/meta/recipes-support/libnl/libnl_3.2.24.bb +++ /dev/null @@ -1,43 +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 = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ - file://fix-pktloc_syntax_h-race.patch \ - file://fix-pc-file.patch \ - file://fix-lib-cache_mngr.c-two-parentheses-bugs.patch \ - " -SRC_URI[md5sum] = "6e0e7bad0674749d930dd9f285343d55" -SRC_URI[sha256sum] = "fb8d6e5dc8af5b85bc6d00a71582a68a01e6a3f7d1664d4a646e289a99dd6816" - -inherit autotools-brokensep pkgconfig - -FILES_${PN} = "${libdir}/libnl-3.so.* \ - ${libdir}/libnl.so.* \ - ${sysconfdir}" -RREPLACES_${PN} = "libnl2" -RCONFLICTS_${PN} = "libnl2" -FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" -FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ - ${libdir}/libnl/cli/*/*.la" -FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" - -PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag" -FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ - ${libdir}/libnl/cli/*/*.so.* \ - ${sbindir}/nl-*" -FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" -FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" -FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" -FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ - ${libdir}/libnl-genl.so.* \ - ${sbindir}/genl-ctrl-list" -RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" -RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" diff --git a/meta/recipes-support/libnl/libnl_3.2.25.bb b/meta/recipes-support/libnl/libnl_3.2.25.bb new file mode 100644 index 0000000000..dcaa85d3af --- /dev/null +++ b/meta/recipes-support/libnl/libnl_3.2.25.bb @@ -0,0 +1,43 @@ +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 = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ + file://fix-pktloc_syntax_h-race.patch \ + file://fix-pc-file.patch \ + " + +SRC_URI[md5sum] = "03f74d0cd5037cadc8cdfa313bbd195c" +SRC_URI[sha256sum] = "8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5" + +inherit autotools-brokensep pkgconfig + +FILES_${PN} = "${libdir}/libnl-3.so.* \ + ${libdir}/libnl.so.* \ + ${sysconfdir}" +RREPLACES_${PN} = "libnl2" +RCONFLICTS_${PN} = "libnl2" +FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" +FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ + ${libdir}/libnl/cli/*/*.la" +FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" + +PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag" +FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ + ${libdir}/libnl/cli/*/*.so.* \ + ${sbindir}/nl-*" +FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" +FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" +FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" +FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ + ${libdir}/libnl-genl.so.* \ + ${sbindir}/genl-ctrl-list" +RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" +RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" -- cgit 1.2.3-korg