summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libnl/libnl/fix-pc-file.patch (renamed from meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch)14
-rw-r--r--meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch (renamed from meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch)27
-rw-r--r--meta/recipes-support/libnl/libnl_2.0.bb27
-rw-r--r--meta/recipes-support/libnl/libnl_3.2.14.bb42
4 files changed, 66 insertions, 44 deletions
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
index 85afe8f751..fe8b833a1c 100644
--- a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
+++ b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
@@ -4,14 +4,14 @@ Some packages are asking only for libnl-2.0, but expects to get also
4libnl-genl, libnl-nf libnl-route, easiest way to fix them is here. 4libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
5 5
6Signed-off-by: Martin Jansa <martin.jansa@gmail.com> 6Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
7Index: libnl-2.0/libnl-2.0.pc.in 7Index: libnl-3.2.14/libnl-3.0.pc.in
8=================================================================== 8===================================================================
9--- libnl-2.0.orig/libnl-2.0.pc.in 9--- libnl-3.2.14.orig/libnl-3.0.pc.in
10+++ libnl-2.0/libnl-2.0.pc.in 10+++ libnl-3.2.14/libnl-3.0.pc.in
11@@ -6,5 +6,5 @@ 11@@ -6,5 +6,5 @@ includedir=@includedir@
12 Name: libnl 12 Name: libnl
13 Description: Convenience library for netlink sockets 13 Description: Convenience library for netlink sockets
14 Version: @PACKAGE_VERSION@ 14 Version: @PACKAGE_VERSION@
15-Libs: -L${libdir} -lnl 15-Libs: -L${libdir} -lnl-@MAJ_VERSION@
16+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route 16+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@
17 Cflags: -I${includedir} 17 Cflags: -I${includedir}/libnl@MAJ_VERSION@
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
index ea32e82b66..332ec0101d 100644
--- a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
+++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
@@ -6,24 +6,31 @@ newer version so we can assume this issue is fixed upstream
6 6
7Signed-off-by: Martin Jansa <martin.jansa@gmail.com> 7Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
8 8
9Index: libnl-2.0/lib/Makefile.am 9Index: libnl-3.2.14/lib/Makefile.am
10=================================================================== 10===================================================================
11--- libnl-2.0.orig/lib/Makefile.am 11--- libnl-3.2.14.orig/lib/Makefile.am
12+++ libnl-2.0/lib/Makefile.am 12+++ libnl-3.2.14/lib/Makefile.am
13@@ -27,11 +27,16 @@ CLEANFILES = \ 13@@ -39,9 +39,12 @@ CLEANFILES = \
14 route/pktloc_grammar.c route/pktloc_grammar.h \
15 route/pktloc_syntax.c route/pktloc_syntax.h
16 14
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 15 # Hack to avoid using ylwrap. It does not function correctly in combination
20 # with --header-file= 16 # with --header-file=
21+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h 17+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
22+route/pktloc_grammar.h: route/pktloc_grammar.c 18+route/pktloc_grammar.h: route/pktloc_grammar.c
23 route/pktloc_grammar.c: route/pktloc_grammar.l 19 route/pktloc_grammar.c: route/pktloc_grammar.l
24 $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ 20 $(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
25 21
26+route/pktloc_syntax.h: route/pktloc_syntax.c 22+route/pktloc_syntax.h: route/pktloc_syntax.c
27 route/pktloc_syntax.c: route/pktloc_syntax.y 23 route/pktloc_syntax.c: route/pktloc_syntax.y
28 $(YACC) -d $(YFLAGS) -o $@ $^ 24 $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
29 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 \
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
deleted file mode 100644
index c96e7db2e9..0000000000
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
2HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
3SECTION = "libs/network"
4
5LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
7
8DEPENDS = "flex-native bison-native"
9PE = "1"
10PR = "r6"
11
12SRC_URI = "\
13 http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
14 file://fix-pktloc_syntax_h-race.patch \
15 file://fix-pc-file.patch \
16"
17
18SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
19SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
20
21inherit autotools pkgconfig
22
23PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
24FILES_${PN}-route = "${libdir}/libnl-route.so.*"
25FILES_${PN}-nf = "${libdir}/libnl-nf.so.*"
26FILES_${PN}-genl = "${libdir}/libnl-genl.so.*"
27FILES_${PN}-cli = "${libdir}/libnl-cli.so.*"
diff --git a/meta/recipes-support/libnl/libnl_3.2.14.bb b/meta/recipes-support/libnl/libnl_3.2.14.bb
new file mode 100644
index 0000000000..4206b1bd79
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl_3.2.14.bb
@@ -0,0 +1,42 @@
1DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
2HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
3SECTION = "libs/network"
4
5PE = "1"
6PR = "r0"
7
8LICENSE = "LGPLv2.1"
9LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
10
11DEPENDS = "flex-native bison-native"
12
13SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
14 file://fix-pktloc_syntax_h-race.patch \
15 file://fix-pc-file.patch "
16
17SRC_URI[md5sum] = "81d44f530aa0af1638a220c413baec05"
18SRC_URI[sha256sum] = "6bb043eea08765bada37a053d932f073db9d51e7a8cd419e237c785ba6369e2c"
19
20inherit autotools pkgconfig
21
22FILES_${PN} = "${libdir}/libnl-3.so.* \
23 ${libdir}/libnl.so.* \
24 ${sysconfdir}"
25RREPLACES_${PN} = "libnl2"
26RCONFLICTS_${PN} = "libnl2"
27FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug"
28FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \
29 ${libdir}/libnl/cli/*/*.la"
30FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
31
32PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl"
33FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \
34 ${libdir}/libnl/cli/*/*.so.* \
35 ${sbindir}/nl-*"
36FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
37FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*"
38FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \
39 ${libdir}/libnl-genl.so.* \
40 ${sbindir}/genl-ctrl-list"
41RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
42RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"