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-graphics/mx/mx-1.0 | |
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-graphics/mx/mx-1.0')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch | 46 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch | 20 |
2 files changed, 66 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch new file mode 100644 index 000000000..3c8a83202 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch @@ -0,0 +1,46 @@ +Fix build for S != B + +This patch is specific to version 1.4.x +Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 +Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> +-- +Index: git/docs/reference/libmx-gtk/Makefile.am +=================================================================== +--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 ++++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -77,7 +80,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in +Index: git/docs/reference/libmx/Makefile.am +=================================================================== +--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 ++++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -106,7 +109,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch new file mode 100644 index 000000000..82c93dd60 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch @@ -0,0 +1,20 @@ +Fix missing include directory when building tests + +This patch is currently required for all versions of mx +Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 +Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> +-- +Index: git/tests/Makefile.am +=================================================================== +--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 ++++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 +@@ -10,7 +10,8 @@ + + INCLUDES = \ + -I$(top_srcdir) \ +- -I$(top_builddir) ++ -I$(top_builddir)\ ++ -I$(top_builddir)/mx + + noinst_PROGRAMS = \ + test-deform-texture \ |