Skip to contentSkip to conversation

libnl: Pull in version 2.0 from oe-core

PATCH New Franklin S. Cooper Jr 1 participant 1 message Sep 9, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libnl: Pull in version 2.0 from oe-core

* Version 2.0 of libnl is required for software required by wilink 6 and wilink 8.
* Pull in older recipe to re enable wilink support.

---
 .../libnl/libnl-2.0/fix-pc-file.patch              |   17 +++++++++++
 .../libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch |   29 ++++++++++++++++++++
 .../recipes-support/libnl/libnl_2.0.bb             |   29 ++++++++++++++++++++
 3 files changed, 75 insertions(+), 0 deletions(-)
 create mode 100644 meta-arago-extras/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
 create mode 100644 meta-arago-extras/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
 create mode 100644 meta-arago-extras/recipes-support/libnl/libnl_2.0.bb
meta-arago-extras/recipes-support/libnl/libnl-2.0/fix-pc-file.patch new file +17 -0
new file mode 100644
index 0000000..85afe8f
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+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 <[email protected]>
+Index: libnl-2.0/libnl-2.0.pc.in
+===================================================================
+--- libnl-2.0.orig/libnl-2.0.pc.in
++++ libnl-2.0/libnl-2.0.pc.in
+@@ -6,5 +6,5 @@
+ 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}
meta-arago-extras/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch new file +29 -0
new file mode 100644
index 0000000..ea32e82
@@ -0,0 +1,29 @@
+Upstream-Status: Inappropriate [configuration]
+
+libnl has progressed to 0.3.2 and there does not appear to be any
+"make -j" issues with this build after my limited testing on that
+newer version so we can assume this issue is fixed upstream
+
+Signed-off-by: Martin Jansa <[email protected]>
+
+Index: libnl-2.0/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
+ 
++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 $@ $^
+ 
++route/pktloc_syntax.h: route/pktloc_syntax.c
+ route/pktloc_syntax.c: route/pktloc_syntax.y
+ 	$(YACC) -d $(YFLAGS) -o $@ $^
+ 
meta-arago-extras/recipes-support/libnl/libnl_2.0.bb new file +29 -0
new file mode 100644
index 0000000..5882bf5
@@ -0,0 +1,29 @@
+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"
+
+DEFAULT_PREFERENCE = "-1"
+
+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.*"
Signature · 1 line
1.7.0.4