diff options
author | Mihai Prica <mihai.prica@intel.com> | 2012-12-04 18:50:29 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:13 +0000 |
commit | f57bb216eddff047f4fd13af127b26802168e150 (patch) | |
tree | d1053ce139907d43d52f8c9f09c275a2757a048e /meta/recipes-support/libnl/libnl | |
parent | ef05a7fe17690e0f1557071f230593a66148d7dd (diff) | |
download | poky-f57bb216eddff047f4fd13af127b26802168e150.tar.gz |
libnl: upgrade to 3.2.14
* Based on the 3.2.9 recipe from meta-oe
* Modified the patches to work with the new name of the library file (libnl-3.so)
(From OE-Core rev: a343ced372ba659b3388a09ce615ee9a9127d921)
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libnl/libnl')
-rw-r--r-- | meta/recipes-support/libnl/libnl/fix-pc-file.patch | 17 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch | 36 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch new file mode 100644 index 0000000000..fe8b833a1c --- /dev/null +++ b/meta/recipes-support/libnl/libnl/fix-pc-file.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Some packages are asking only for libnl-2.0, but expects to get also | ||
4 | libnl-genl, libnl-nf libnl-route, easiest way to fix them is here. | ||
5 | |||
6 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
7 | Index: libnl-3.2.14/libnl-3.0.pc.in | ||
8 | =================================================================== | ||
9 | --- libnl-3.2.14.orig/libnl-3.0.pc.in | ||
10 | +++ libnl-3.2.14/libnl-3.0.pc.in | ||
11 | @@ -6,5 +6,5 @@ includedir=@includedir@ | ||
12 | Name: libnl | ||
13 | Description: Convenience library for netlink sockets | ||
14 | Version: @PACKAGE_VERSION@ | ||
15 | -Libs: -L${libdir} -lnl-@MAJ_VERSION@ | ||
16 | +Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@ | ||
17 | Cflags: -I${includedir}/libnl@MAJ_VERSION@ | ||
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 new file mode 100644 index 0000000000..332ec0101d --- /dev/null +++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | libnl has progressed to 0.3.2 and there does not appear to be any | ||
4 | "make -j" issues with this build after my limited testing on that | ||
5 | newer version so we can assume this issue is fixed upstream | ||
6 | |||
7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
8 | |||
9 | Index: libnl-3.2.14/lib/Makefile.am | ||
10 | =================================================================== | ||
11 | --- libnl-3.2.14.orig/lib/Makefile.am | ||
12 | +++ libnl-3.2.14/lib/Makefile.am | ||
13 | @@ -39,9 +39,12 @@ CLEANFILES = \ | ||
14 | |||
15 | # Hack to avoid using ylwrap. It does not function correctly in combination | ||
16 | # with --header-file= | ||
17 | +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h | ||
18 | +route/pktloc_grammar.h: route/pktloc_grammar.c | ||
19 | route/pktloc_grammar.c: route/pktloc_grammar.l | ||
20 | $(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ | ||
21 | |||
22 | +route/pktloc_syntax.h: route/pktloc_syntax.c | ||
23 | route/pktloc_syntax.c: route/pktloc_syntax.y | ||
24 | $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^ | ||
25 | |||
26 | @@ -89,7 +92,9 @@ BUILT_SOURCES = \ | ||
27 | route/cls/ematch_grammar.c \ | ||
28 | route/cls/ematch_syntax.c \ | ||
29 | route/pktloc_grammar.c \ | ||
30 | - route/pktloc_syntax.c | ||
31 | + route/pktloc_syntax.c \ | ||
32 | + route/pktloc_syntax.h \ | ||
33 | + route/pktloc_grammar.h | ||
34 | |||
35 | EXTRA_DIST = \ | ||
36 | route/pktloc_grammar.l \ | ||