diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-support/libnl/libnl | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/libnl/libnl')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch | 17 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch | 36 |
2 files changed, 53 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch new file mode 100644 index 000000000..fe8b833a1 --- /dev/null +++ b/import-layers/yocto-poky/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 <martin.jansa@gmail.com> +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/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch new file mode 100644 index 000000000..79aa0bdf1 --- /dev/null +++ b/import-layers/yocto-poky/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 <martin.jansa@gmail.com> + +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 \ |
