1) Upgrade libnl from 3.2.29 to 3.4.0. 2) Delete one patch "fix-pktloc_syntax_h-race.patch", for it is inappropriate.
Signed-off-by: Huang Qiyu <[email protected]> --- .../libnl/libnl/fix-pktloc_syntax_h-race.patch | 36 ---------------------- .../libnl/{libnl_3.2.29.bb => libnl_3.4.0.bb} | 5 ++- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch rename meta/recipes-support/libnl/{libnl_3.2.29.bb => libnl_3.4.0.bb} (88%) 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 deleted file mode 100644 index 79aa0bd..0000000 --- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch +++ /dev/null @@ -1,36 +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 <[email protected]> - -Index: libnl-3.2.25/lib/Makefile.am -=================================================================== ---- libnl-3.2.25.orig/lib/Makefile.am -+++ libnl-3.2.25/lib/Makefile.am -@@ -46,9 +46,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) $(MKDIR_P) route; $(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) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ - -@@ -102,7 +105,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_3.2.29.bb b/meta/recipes-support/libnl/libnl_3.4.0.bb similarity index 88% rename from meta/recipes-support/libnl/libnl_3.2.29.bb rename to meta/recipes-support/libnl/libnl_3.4.0.bb index 7d4839b..411ad28 100644 --- a/meta/recipes-support/libnl/libnl_3.2.29.bb +++ b/meta/recipes-support/libnl/libnl_3.4.0.bb @@ -10,13 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "flex-native bison-native" SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ - file://fix-pktloc_syntax_h-race.patch \ file://fix-pc-file.patch \ " UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"; -SRC_URI[md5sum] = "a8ba62a5c4f883f4e493a46d1f3733fe" -SRC_URI[sha256sum] = "0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922" +SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311" +SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" inherit autotools pkgconfig -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
