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-2.0 | |
| 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-2.0')
| -rw-r--r-- | meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch | 29 |
2 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch deleted file mode 100644 index 85afe8f751..0000000000 --- a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 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-2.0/libnl-2.0.pc.in | ||
| 8 | =================================================================== | ||
| 9 | --- libnl-2.0.orig/libnl-2.0.pc.in | ||
| 10 | +++ libnl-2.0/libnl-2.0.pc.in | ||
| 11 | @@ -6,5 +6,5 @@ | ||
| 12 | Name: libnl | ||
| 13 | Description: Convenience library for netlink sockets | ||
| 14 | Version: @PACKAGE_VERSION@ | ||
| 15 | -Libs: -L${libdir} -lnl | ||
| 16 | +Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route | ||
| 17 | Cflags: -I${includedir} | ||
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch deleted file mode 100644 index ea32e82b66..0000000000 --- a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 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-2.0/lib/Makefile.am | ||
| 10 | =================================================================== | ||
| 11 | --- libnl-2.0.orig/lib/Makefile.am | ||
| 12 | +++ libnl-2.0/lib/Makefile.am | ||
| 13 | @@ -27,11 +27,16 @@ CLEANFILES = \ | ||
| 14 | route/pktloc_grammar.c route/pktloc_grammar.h \ | ||
| 15 | route/pktloc_syntax.c route/pktloc_syntax.h | ||
| 16 | |||
| 17 | +BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h | ||
| 18 | + | ||
| 19 | # Hack to avoid using ylwrap. It does not function correctly in combination | ||
| 20 | # with --header-file= | ||
| 21 | +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h | ||
| 22 | +route/pktloc_grammar.h: route/pktloc_grammar.c | ||
| 23 | route/pktloc_grammar.c: route/pktloc_grammar.l | ||
| 24 | $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ | ||
| 25 | |||
| 26 | +route/pktloc_syntax.h: route/pktloc_syntax.c | ||
| 27 | route/pktloc_syntax.c: route/pktloc_syntax.y | ||
| 28 | $(YACC) -d $(YFLAGS) -o $@ $^ | ||
| 29 | |||
