From a343ced372ba659b3388a09ce615ee9a9127d921 Mon Sep 17 00:00:00 2001 From: Mihai Prica Date: Tue, 4 Dec 2012 18:50:29 +0200 Subject: 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) Signed-off-by: Mihai Prica Signed-off-by: Saul Wold --- .../libnl/libnl-2.0/fix-pc-file.patch | 17 --------- .../libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch | 29 --------------- meta/recipes-support/libnl/libnl/fix-pc-file.patch | 17 +++++++++ .../libnl/libnl/fix-pktloc_syntax_h-race.patch | 36 +++++++++++++++++++ meta/recipes-support/libnl/libnl_2.0.bb | 27 -------------- meta/recipes-support/libnl/libnl_3.2.14.bb | 42 ++++++++++++++++++++++ 6 files changed, 95 insertions(+), 73 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch delete mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch create mode 100644 meta/recipes-support/libnl/libnl/fix-pc-file.patch create mode 100644 meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch delete mode 100644 meta/recipes-support/libnl/libnl_2.0.bb create mode 100644 meta/recipes-support/libnl/libnl_3.2.14.bb diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch deleted file mode 100644 index 85afe8f751..0000000000 --- a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 -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-2.0/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch deleted file mode 100644 index ea32e82b66..0000000000 --- a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - -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 $@ $^ - 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 @@ +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 +Index: libnl-3.2.14/libnl-3.0.pc.in +=================================================================== +--- 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-@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@ 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..332ec0101d --- /dev/null +++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch @@ -0,0 +1,36 @@ +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 + +Index: libnl-3.2.14/lib/Makefile.am +=================================================================== +--- libnl-3.2.14.orig/lib/Makefile.am ++++ libnl-3.2.14/lib/Makefile.am +@@ -39,9 +39,12 @@ CLEANFILES = \ + + # 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 + $(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 + $(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 \ 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 @@ -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.*" 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 @@ +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" -- cgit 1.2.3-korg