summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-07-12 17:18:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:38 +0100
commitf22dfe95cc935d8fb2c302de8b85dcd7d7c8cf95 (patch)
treec6dbc02ff7f9a5ba1a7382d2e875bc9502970a8f
parenta46a9dd6bd2be114de465aea6184a7914ff176ec (diff)
downloadpoky-f22dfe95cc935d8fb2c302de8b85dcd7d7c8cf95.tar.gz
mesa: fix build race on src/intel/vulkan
It's possible that src/intel/vulkcan can be written into by sed before it has been created, so add the required mkdir calls. (From OE-Core rev: 19e793f65d214294baa9eeaf982f4ced351c7748) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/vulkan-mkdir.patch37
-rw-r--r--meta/recipes-graphics/mesa/mesa_17.1.4.bb1
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
new file mode 100644
index 0000000000..15ee5eeb14
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
@@ -0,0 +1,37 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From c78979fd95a1c4f732f7e6edf0f32c524e5955b8 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 12 Jul 2017 17:10:07 +0100
7Subject: [PATCH] src/intel/Makefile.vulkan.am: create target directories when
8 required
9
10In out-of-tree builds src/intel/vulkan won't exist, so always create it before
11writing into it.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14---
15 src/intel/Makefile.vulkan.am | 2 ++
16 1 file changed, 2 insertions(+)
17
18diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
19index 3857a5dc62..26e9cd410c 100644
20--- a/src/intel/Makefile.vulkan.am
21+++ b/src/intel/Makefile.vulkan.am
22@@ -44,11 +44,13 @@ EXTRA_DIST += \
23 vulkan/TODO
24
25 vulkan/dev_icd.json : vulkan/dev_icd.json.in
26+ $(MKDIR_GEN)
27 $(AM_V_GEN) $(SED) \
28 -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
29 < $(srcdir)/vulkan/dev_icd.json.in > $@
30
31 vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in
32+ $(MKDIR_GEN)
33 $(AM_V_GEN) $(SED) \
34 -e "s#@install_libdir@#${libdir}#" \
35 < $(srcdir)/vulkan/intel_icd.json.in > $@
36--
372.11.0
diff --git a/meta/recipes-graphics/mesa/mesa_17.1.4.bb b/meta/recipes-graphics/mesa/mesa_17.1.4.bb
index 2257045c42..f0b634a045 100644
--- a/meta/recipes-graphics/mesa/mesa_17.1.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.1.4.bb
@@ -7,6 +7,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
7 file://0001-Use-wayland-scanner-in-the-path.patch \ 7 file://0001-Use-wayland-scanner-in-the-path.patch \
8 file://0002-hardware-gloat.patch \ 8 file://0002-hardware-gloat.patch \
9 file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \ 9 file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \
10 file://vulkan-mkdir.patch \
10" 11"
11 12
12SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5" 13SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"