diff options
Diffstat (limited to 'meta/recipes-support/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 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_3.2.25.bb | 43 |
3 files changed, 96 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..79aa0bdf11 --- /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.25/lib/Makefile.am | ||
10 | =================================================================== | ||
11 | --- libnl-3.2.25.orig/lib/Makefile.am | ||
12 | +++ libnl-3.2.25/lib/Makefile.am | ||
13 | @@ -46,9 +46,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) $(MKDIR_P) route; $(FLEX) --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) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ | ||
25 | |||
26 | @@ -102,7 +105,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 \ | ||
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 @@ | |||
1 | SUMMARY = "A library for applications dealing with netlink sockets" | ||
2 | HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" | ||
3 | SECTION = "libs/network" | ||
4 | |||
5 | PE = "1" | ||
6 | |||
7 | LICENSE = "LGPLv2.1" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
9 | |||
10 | DEPENDS = "flex-native bison-native" | ||
11 | |||
12 | SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ | ||
13 | file://fix-pktloc_syntax_h-race.patch \ | ||
14 | file://fix-pc-file.patch \ | ||
15 | " | ||
16 | |||
17 | SRC_URI[md5sum] = "03f74d0cd5037cadc8cdfa313bbd195c" | ||
18 | SRC_URI[sha256sum] = "8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5" | ||
19 | |||
20 | inherit autotools-brokensep pkgconfig | ||
21 | |||
22 | FILES_${PN} = "${libdir}/libnl-3.so.* \ | ||
23 | ${libdir}/libnl.so.* \ | ||
24 | ${sysconfdir}" | ||
25 | RREPLACES_${PN} = "libnl2" | ||
26 | RCONFLICTS_${PN} = "libnl2" | ||
27 | FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" | ||
28 | FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ | ||
29 | ${libdir}/libnl/cli/*/*.la" | ||
30 | FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" | ||
31 | |||
32 | PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag" | ||
33 | FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ | ||
34 | ${libdir}/libnl/cli/*/*.so.* \ | ||
35 | ${sbindir}/nl-*" | ||
36 | FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" | ||
37 | FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" | ||
38 | FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" | ||
39 | FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ | ||
40 | ${libdir}/libnl-genl.so.* \ | ||
41 | ${sbindir}/genl-ctrl-list" | ||
42 | RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" | ||
43 | RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" | ||