diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-07-30 10:19:04 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-02 09:25:33 +0100 |
| commit | 9f807f9e242d3380012cb55ad89f24bf4f2e8b83 (patch) | |
| tree | 0a509e4d831d79efce813c92e5d3c8a64daa8ea2 /meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch | |
| parent | ea5446311c2c20774077d64e959029b73dd5aca8 (diff) | |
| download | openembedded-core-contrib-9f807f9e242d3380012cb55ad89f24bf4f2e8b83.tar.gz | |
libnl: Upgrade to 3.2.25
Remove one patch and rebase another
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch')
| -rw-r--r-- | meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch | 14 |
1 files changed, 7 insertions, 7 deletions
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 b93d97b1b7..79aa0bdf11 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 @@ -6,24 +6,24 @@ newer version so we can assume this issue is fixed upstream Signed-off-by: Martin Jansa <martin.jansa@gmail.com> -Index: libnl-3.2.14/lib/Makefile.am +Index: libnl-3.2.25/lib/Makefile.am =================================================================== ---- libnl-3.2.14.orig/lib/Makefile.am -+++ libnl-3.2.14/lib/Makefile.am -@@ -39,9 +39,12 @@ CLEANFILES = \ +--- 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) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ + $(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) $(YACC) -d $(YFLAGS) -o $@ $^ + $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ -@@ -89,7 +92,9 @@ BUILT_SOURCES = \ +@@ -102,7 +105,9 @@ BUILT_SOURCES = \ route/cls/ematch_grammar.c \ route/cls/ematch_syntax.c \ route/pktloc_grammar.c \ |