diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-support/libnl/libnl_3.2.25.bb (renamed from meta/recipes-support/libnl/libnl_3.2.24.bb) | 6 |
3 files changed, 10 insertions, 47 deletions
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" <Song.Li@windriver.com> -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 <martin.jansa@gmail.com> -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.25.bb index d34ab74eac..dcaa85d3af 100644 --- a/meta/recipes-support/libnl/libnl_3.2.24.bb +++ b/meta/recipes-support/libnl/libnl_3.2.25.bb @@ -12,10 +12,10 @@ 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" + +SRC_URI[md5sum] = "03f74d0cd5037cadc8cdfa313bbd195c" +SRC_URI[sha256sum] = "8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5" inherit autotools-brokensep pkgconfig |