Patchwork [6/6] Bring libnl up to date with meta-openebedded

login
register
mail settings
Submitter Matthew McClintock
Date Oct. 4, 2011, 10:03 p.m.
Message ID <1317765787-19127-6-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/12749/
State New, archived
Headers show

Comments

Matthew McClintock - Oct. 4, 2011, 10:03 p.m.
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
This is a blind copy of libnl-2.0 from meta-openembedded

Not sure how to completly verify this is working, feel free
to squash the previous patch with this one

 .../libnl/libnl-2.0/fix-makefile.patch             |   32 --------------------
 meta/recipes-support/libnl/libnl.inc               |    9 +++++
 .../recipes-support/libnl/libnl/fix-makefile.patch |   32 ++++++++++++++++++++
 meta/recipes-support/libnl/libnl/fix-pc-file.patch |   11 +++++++
 .../libnl/libnl/fix-pktloc-dep-race.patch          |   20 ++++++++++++
 meta/recipes-support/libnl/libnl_2.0.bb            |   24 ++++++++------
 6 files changed, 86 insertions(+), 42 deletions(-)
 delete mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
 create mode 100644 meta/recipes-support/libnl/libnl.inc
 create mode 100644 meta/recipes-support/libnl/libnl/fix-makefile.patch
 create mode 100644 meta/recipes-support/libnl/libnl/fix-pc-file.patch
 create mode 100644 meta/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch

Patch

diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
deleted file mode 100644
index 3e88fbd..0000000
--- a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-Upstream-Status: Pending
-
-12/03/2010
-
-add explicit rules for header files generated by lex and yacc,
-otherwise the build of lib/route/pktloc.c may fail in a parallel
-environment.
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-12/06/2010
-
-the dependency rule should really read pktloc.lo instead of
-pktloc.$(OBJEXT), since it's in a libtool setup.
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 92a916e..e8b8ef3 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l
- route/pktloc_syntax.c: route/pktloc_syntax.y
- 	$(YACC) -d $(YFLAGS) -o $@ $^
- 
-+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
-+route/pktloc_syntax.h: route/pktloc_syntax.c
-+route/pktloc_grammar.h: route/pktloc_grammar.c
-+
- libnl_route_la_LDFLAGS = -version-info 2:0:0
- libnl_route_la_LIBADD  = libnl.la
- libnl_route_la_SOURCES = \
diff --git a/meta/recipes-support/libnl/libnl.inc b/meta/recipes-support/libnl/libnl.inc
new file mode 100644
index 0000000..6f502b1
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl.inc
@@ -0,0 +1,9 @@ 
+DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
+
+INC_PR = "r5"
+
+inherit autotools pkgconfig
+
diff --git a/meta/recipes-support/libnl/libnl/fix-makefile.patch b/meta/recipes-support/libnl/libnl/fix-makefile.patch
new file mode 100644
index 0000000..3e88fbd
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl/fix-makefile.patch
@@ -0,0 +1,32 @@ 
+Upstream-Status: Pending
+
+12/03/2010
+
+add explicit rules for header files generated by lex and yacc,
+otherwise the build of lib/route/pktloc.c may fail in a parallel
+environment.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+
+12/06/2010
+
+the dependency rule should really read pktloc.lo instead of
+pktloc.$(OBJEXT), since it's in a libtool setup.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 92a916e..e8b8ef3 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l
+ route/pktloc_syntax.c: route/pktloc_syntax.y
+ 	$(YACC) -d $(YFLAGS) -o $@ $^
+ 
++route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
++route/pktloc_syntax.h: route/pktloc_syntax.c
++route/pktloc_grammar.h: route/pktloc_grammar.c
++
+ libnl_route_la_LDFLAGS = -version-info 2:0:0
+ libnl_route_la_LIBADD  = libnl.la
+ libnl_route_la_SOURCES = \
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 0000000..17666fb
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
@@ -0,0 +1,11 @@ 
+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}
diff --git a/meta/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch b/meta/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch
new file mode 100644
index 0000000..ee21744
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch
@@ -0,0 +1,20 @@ 
+Index: libnl-2.0/lib/Makefile.am
+===================================================================
+--- libnl-2.0.orig/lib/Makefile.am
++++ libnl-2.0/lib/Makefile.am
+@@ -27,11 +27,15 @@ 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_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 $@ $^
+ 
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index 0dfcaf6..f2c88aa 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -1,20 +1,24 @@ 
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-SECTION = "libs/network"
+require libnl.inc
+PE = "1"
+PR = "${INC_PR}.0"
 
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
 
 DEPENDS = "flex-native bison-native"
-PR = "r2"
 
-SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
-          file://fix-makefile.patch \
-         "
+SRC_URI = "\
+  http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
+  file://fix-pc-file.patch \
+  file://fix-pktloc-dep-race.patch \
+  file://fix-makefile.patch \
+"
 
 SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
 SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
 
-inherit autotools pkgconfig
-
-LEAD_SONAME = "libnl.so"
+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.*"