summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2016-02-26 06:25:50 +0100
committerGerrit Code Review <gerrit@172.30.200.200>2016-03-14 13:32:23 +0000
commitb3a5a720f96df72810b01d2c1d599015924811e0 (patch)
tree6d1343b2c7e0da70819efc79608b8703ab7f1e9b
parentd33e1cc64a0b204bbacca793569b581024133061 (diff)
Temporary build fix for the wandboard
This temporary fix conditional to the wandboard is used to overcome a build breakage in the examples of wayland-ivi-extension. Change-Id: If5eccbce94e8aeb73cf303c72284510f966714f3 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch13
-rw-r--r--meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb2
2 files changed, 15 insertions, 0 deletions
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch
new file mode 100644
index 000000000..86b448be1
--- /dev/null
+++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3610fa9..8b4614d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ add_subdirectory(ivi-layermanagement-api/ilmCommon)
+ add_subdirectory(ivi-layermanagement-api/ilmClient)
+ add_subdirectory(ivi-layermanagement-api/ilmControl)
+ add_subdirectory(ivi-layermanagement-api/test)
+-add_subdirectory(ivi-layermanagement-examples)
++#add_subdirectory(ivi-layermanagement-examples)
+
+ if(WITH_ILM_INPUT)
+ add_subdirectory(ivi-input-api/ilmInput)
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
index 56bb560ad..7bc619072 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
+++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
@@ -10,6 +10,8 @@ DEPENDS = "weston"
SRC_URI = "git://git.projects.genivi.org/${PN}.git \
file://apply_weston-1.5.x.patch \
"
+SRC_URI_append_wandboard = "file://wandboard_fix_build.patch"
+
SRCREV = "8f0874b606b8e2a9385af947728905735bad3939"
S = "${WORKDIR}/git"