sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Mihai Prica 2012-12-04 18:50:29 +02:00 committed by Richard Purdie
parent ef05a7fe17
commit f57bb216ed
4 changed files with 66 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch → meta/recipes-support/libnl/libnl/fix-pc-file.patch
View File

@ -4,14 +4,14 @@ Some packages are asking only for libnl-2.0, but expects to get also
libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Index: libnl-2.0/libnl-2.0.pc.in
Index: libnl-3.2.14/libnl-3.0.pc.in
===================================================================
--- libnl-2.0.orig/libnl-2.0.pc.in
+++ libnl-2.0/libnl-2.0.pc.in
@@ -6,5 +6,5 @@
--- libnl-3.2.14.orig/libnl-3.0.pc.in
+++ libnl-3.2.14/libnl-3.0.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: libnl
Description: Convenience library for netlink sockets
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lnl
+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route
Cflags: -I${includedir}
-Libs: -L${libdir} -lnl-@MAJ_VERSION@
+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@
Cflags: -I${includedir}/libnl@MAJ_VERSION@

27
meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch → meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
View File

@ -6,24 +6,31 @@ newer version so we can assume this issue is fixed upstream
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Index: libnl-2.0/lib/Makefile.am
Index: libnl-3.2.14/lib/Makefile.am
===================================================================
--- libnl-2.0.orig/lib/Makefile.am
+++ libnl-2.0/lib/Makefile.am
@@ -27,11 +27,16 @@ CLEANFILES = \
route/pktloc_grammar.c route/pktloc_grammar.h \
route/pktloc_syntax.c route/pktloc_syntax.h
--- libnl-3.2.14.orig/lib/Makefile.am
+++ libnl-3.2.14/lib/Makefile.am
@@ -39,9 +39,12 @@ CLEANFILES = \
+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
+
# Hack to avoid using ylwrap. It does not function correctly in combination
# with --header-file=
+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
+route/pktloc_grammar.h: route/pktloc_grammar.c
route/pktloc_grammar.c: route/pktloc_grammar.l
$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
$(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
+route/pktloc_syntax.h: route/pktloc_syntax.c
route/pktloc_syntax.c: route/pktloc_syntax.y
$(YACC) -d $(YFLAGS) -o $@ $^
$(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
@@ -89,7 +92,9 @@ BUILT_SOURCES = \
route/cls/ematch_grammar.c \
route/cls/ematch_syntax.c \
route/pktloc_grammar.c \
- route/pktloc_syntax.c
+ route/pktloc_syntax.c \
+ route/pktloc_syntax.h \
+ route/pktloc_grammar.h
EXTRA_DIST = \
route/pktloc_grammar.l \

27
meta/recipes-support/libnl/libnl_2.0.bb
View File

@ -1,27 +0,0 @@
DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
SECTION = "libs/network"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
DEPENDS = "flex-native bison-native"
PE = "1"
PR = "r6"
SRC_URI = "\
http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
file://fix-pktloc_syntax_h-race.patch \
file://fix-pc-file.patch \
"
SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
inherit autotools pkgconfig
PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
FILES_${PN}-route = "${libdir}/libnl-route.so.*"
FILES_${PN}-nf = "${libdir}/libnl-nf.so.*"
FILES_${PN}-genl = "${libdir}/libnl-genl.so.*"
FILES_${PN}-cli = "${libdir}/libnl-cli.so.*"

42
meta/recipes-support/libnl/libnl_3.2.14.bb Normal file
View File

@ -0,0 +1,42 @@
DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
SECTION = "libs/network"
PE = "1"
PR = "r0"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "flex-native bison-native"
SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
file://fix-pktloc_syntax_h-race.patch \
file://fix-pc-file.patch "
SRC_URI[md5sum] = "81d44f530aa0af1638a220c413baec05"
SRC_URI[sha256sum] = "6bb043eea08765bada37a053d932f073db9d51e7a8cd419e237c785ba6369e2c"
inherit autotools pkgconfig
FILES_${PN} = "${libdir}/libnl-3.so.* \
${libdir}/libnl.so.* \
${sysconfdir}"
RREPLACES_${PN} = "libnl2"
RCONFLICTS_${PN} = "libnl2"
FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug"
FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \
${libdir}/libnl/cli/*/*.la"
FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl"
FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \
${libdir}/libnl/cli/*/*.so.* \
${sbindir}/nl-*"
FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*"
FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \
${libdir}/libnl-genl.so.* \
${sbindir}/genl-ctrl-list"
RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"