diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-07-30 10:19:04 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-02 09:26:16 +0100 |
commit | 3c61104c29a1d6ea39d40d1472629fbac50d7108 (patch) | |
tree | 24d0580d13a41d63716b9fae2bd71eeec9ebad5c /meta | |
parent | d468e24ad48e56348b0de45028121ba36c1b3342 (diff) | |
download | poky-3c61104c29a1d6ea39d40d1472629fbac50d7108.tar.gz |
libnl: Upgrade to 3.2.25
Remove one patch and rebase another
(From OE-Core rev: 9f807f9e242d3380012cb55ad89f24bf4f2e8b83)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | From 82fdf49c185fd5f3810781af9ef52aa6a52bf2df Mon Sep 17 00:00:00 2001 | ||
2 | From: "Song.Li" <Song.Li@windriver.com> | ||
3 | Date: Thu, 28 Jun 2012 20:03:17 +0800 | ||
4 | Subject: [PATCH] fix lib/cache_mngr.c two parentheses bugs | ||
5 | |||
6 | there are two parentheses bugs in libnl /lib/cache_mngr.c file. | ||
7 | The parentheses doesn't make any sense, | ||
8 | This will cause the variable err get a bool value, | ||
9 | the correct value of variable err should be the return value | ||
10 | of the function which can be any integer value. | ||
11 | |||
12 | --- | ||
13 | lib/cache_mngr.c | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | Upstream-Status: Pending | ||
17 | |||
18 | diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c | ||
19 | index dae8768..57cc1f9 100644 | ||
20 | --- a/lib/cache_mngr.c | ||
21 | +++ b/lib/cache_mngr.c | ||
22 | @@ -150,10 +150,10 @@ int nl_cache_mngr_alloc(struct nl_sock *sk, int protocol, int flags, | ||
23 | /* Required to receive async event notifications */ | ||
24 | nl_socket_disable_seq_check(mngr->cm_sock); | ||
25 | |||
26 | - if ((err = nl_connect(mngr->cm_sock, protocol) < 0)) | ||
27 | + if ((err = nl_connect(mngr->cm_sock, protocol)) < 0) | ||
28 | goto errout; | ||
29 | |||
30 | - if ((err = nl_socket_set_nonblocking(mngr->cm_sock) < 0)) | ||
31 | + if ((err = nl_socket_set_nonblocking(mngr->cm_sock)) < 0) | ||
32 | goto errout; | ||
33 | |||
34 | NL_DBG(1, "Allocated cache manager %p, protocol %d, %d caches\n", | ||
35 | -- | ||
36 | 1.7.9.5 | ||
37 | |||
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 | |||
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> |
8 | 8 | ||
9 | Index: libnl-3.2.14/lib/Makefile.am | 9 | Index: libnl-3.2.25/lib/Makefile.am |
10 | =================================================================== | 10 | =================================================================== |
11 | --- libnl-3.2.14.orig/lib/Makefile.am | 11 | --- libnl-3.2.25.orig/lib/Makefile.am |
12 | +++ libnl-3.2.14/lib/Makefile.am | 12 | +++ libnl-3.2.25/lib/Makefile.am |
13 | @@ -39,9 +39,12 @@ CLEANFILES = \ | 13 | @@ -46,9 +46,12 @@ CLEANFILES = \ |
14 | 14 | ||
15 | # Hack to avoid using ylwrap. It does not function correctly in combination | 15 | # Hack to avoid using ylwrap. It does not function correctly in combination |
16 | # with --header-file= | 16 | # with --header-file= |
17 | +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h | 17 | +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h |
18 | +route/pktloc_grammar.h: route/pktloc_grammar.c | 18 | +route/pktloc_grammar.h: route/pktloc_grammar.c |
19 | route/pktloc_grammar.c: route/pktloc_grammar.l | 19 | route/pktloc_grammar.c: route/pktloc_grammar.l |
20 | $(AM_V_GEN) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ | 20 | $(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ |
21 | 21 | ||
22 | +route/pktloc_syntax.h: route/pktloc_syntax.c | 22 | +route/pktloc_syntax.h: route/pktloc_syntax.c |
23 | route/pktloc_syntax.c: route/pktloc_syntax.y | 23 | route/pktloc_syntax.c: route/pktloc_syntax.y |
24 | $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^ | 24 | $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ |
25 | 25 | ||
26 | @@ -89,7 +92,9 @@ BUILT_SOURCES = \ | 26 | @@ -102,7 +105,9 @@ BUILT_SOURCES = \ |
27 | route/cls/ematch_grammar.c \ | 27 | route/cls/ematch_grammar.c \ |
28 | route/cls/ematch_syntax.c \ | 28 | route/cls/ematch_syntax.c \ |
29 | route/pktloc_grammar.c \ | 29 | 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" | |||
12 | SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ | 12 | SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ |
13 | file://fix-pktloc_syntax_h-race.patch \ | 13 | file://fix-pktloc_syntax_h-race.patch \ |
14 | file://fix-pc-file.patch \ | 14 | file://fix-pc-file.patch \ |
15 | file://fix-lib-cache_mngr.c-two-parentheses-bugs.patch \ | ||
16 | " | 15 | " |
17 | SRC_URI[md5sum] = "6e0e7bad0674749d930dd9f285343d55" | 16 | |
18 | SRC_URI[sha256sum] = "fb8d6e5dc8af5b85bc6d00a71582a68a01e6a3f7d1664d4a646e289a99dd6816" | 17 | SRC_URI[md5sum] = "03f74d0cd5037cadc8cdfa313bbd195c" |
18 | SRC_URI[sha256sum] = "8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5" | ||
19 | 19 | ||
20 | inherit autotools-brokensep pkgconfig | 20 | inherit autotools-brokensep pkgconfig |
21 | 21 | ||