From b5fbf48b62e48c849cc09d952d2cdbd066089aaf Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 8 Jan 2013 12:19:39 -0200 Subject: libnl: Update to 3.2.18 This release fixes the build failures found when building against old Linux kernel headers and also includes the fix for to use 'flex' instead of 'lex'. (From OE-Core rev: 5de138939c42b0a6d80732130b2617fd60a7d545) Signed-off-by: Otavio Salvador Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../libnl/libnl/fix-build-using-flex.patch | 55 ---------------------- .../libnl/libnl/fix-pktloc_syntax_h-race.patch | 2 +- meta/recipes-support/libnl/libnl_3.2.16.bb | 43 ----------------- meta/recipes-support/libnl/libnl_3.2.18.bb | 42 +++++++++++++++++ 4 files changed, 43 insertions(+), 99 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl/fix-build-using-flex.patch delete mode 100644 meta/recipes-support/libnl/libnl_3.2.16.bb create mode 100644 meta/recipes-support/libnl/libnl_3.2.18.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch b/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch deleted file mode 100644 index 89a36bafbd..0000000000 --- a/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 89ab8d4f1229a1d2605193686cc00e6b2c9786ff Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Mon, 7 Jan 2013 15:44:38 -0200 -Subject: [PATCH] Fix build using flex - -Upstream-Status: Backport [3.2.17] ---- - lib/Makefile.am | 4 ++-- - src/lib/Makefile.am | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 98c7b90..89cc5d2 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -43,14 +43,14 @@ CLEANFILES = \ - 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 $@ $^ -+ $(AM_V_GEN) $(FLEX) --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 $@ $^ - - route/cls/ematch_grammar.c: route/cls/ematch_grammar.l -- $(AM_V_GEN) $(LEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^ -+ $(AM_V_GEN) $(FLEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^ - - route/cls/ematch_syntax.c: route/cls/ematch_syntax.y - $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^ -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 6688e7c..507635d 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -11,13 +11,13 @@ AM_LDFLAGS = \ - #cls_ematch_cmp_la_LDFLAGS = -module -version-info 2:0:0 - - #cls/ematch_grammar.c: cls/ematch_grammar.l --# $(LEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^ -+# $(FLEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^ - - #cls/ematch_syntax.c: cls/ematch_syntax.y - # $(YACC) -d $(YFLAGS) -o $@ $^ - - #cls/pktloc_grammar.c: cls/pktloc_grammar.l --# $(LEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^ -+# $(FLEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^ - - #cls/pktloc_syntax.c: cls/pktloc_syntax.y - # $(YACC) -d $(YFLAGS) -o $@ $^ --- -1.7.10.4 - 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 index 332ec0101d..b93d97b1b7 100644 --- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch +++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch @@ -17,7 +17,7 @@ Index: libnl-3.2.14/lib/Makefile.am +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 $@ $^ + $(AM_V_GEN) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ +route/pktloc_syntax.h: route/pktloc_syntax.c route/pktloc_syntax.c: route/pktloc_syntax.y diff --git a/meta/recipes-support/libnl/libnl_3.2.16.bb b/meta/recipes-support/libnl/libnl_3.2.16.bb deleted file mode 100644 index db9ae9d576..0000000000 --- a/meta/recipes-support/libnl/libnl_3.2.16.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets." -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" -SECTION = "libs/network" - -PE = "1" -PR = "r1" - -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-build-using-flex.patch \ - file://fix-pc-file.patch " - -SRC_URI[md5sum] = "f06e6de102abb2cef71ed671957ee099" -SRC_URI[sha256sum] = "c43a42336c6a3cf559f390e202f8f029d165bd767da7cf7a32a815c570b31826" - -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" diff --git a/meta/recipes-support/libnl/libnl_3.2.18.bb b/meta/recipes-support/libnl/libnl_3.2.18.bb new file mode 100644 index 0000000000..0da7f20f43 --- /dev/null +++ b/meta/recipes-support/libnl/libnl_3.2.18.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] = "378eafcca1f51d1c7498d78946cd891a" +SRC_URI[sha256sum] = "6563e4e72a35f9f96380086f6bd17307552977af98e98bd3dd0fdde8013d53a9" + +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 v1.2.3-54-g00ecf