summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-05-09 20:44:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:56:49 +0100
commit9ddb1093708dee853384a1cc28cadddcc293016b (patch)
treec5d579e3ed2ba080a5faadb6ad0655442b250a14 /meta
parentc53c3181df418a9980f46c3d738a9975b7afb5cf (diff)
downloadpoky-9ddb1093708dee853384a1cc28cadddcc293016b.tar.gz
mesa: fix a build race in src/intel/vulkan
(From OE-Core rev: 5681ba2e403afb6cea03662a2aca6b1834567ddc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/files/vulkan-mkdir.patch41
-rw-r--r--meta/recipes-graphics/mesa/mesa_18.0.2.bb1
2 files changed, 42 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..9922a55b40
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
@@ -0,0 +1,41 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 4854c72bc21486f81712c8693588f7af6c64cf93 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 9 May 2018 20:41:36 +0100
7Subject: [PATCH] src/intel/Makefile.vulkan.am: add missing MKDIR_GEN
8
9Out of tree builds can try to write into a directory that doesn't exist yet:
10
11| Traceback (most recent call last):
12| File "../../../mesa-18.0.2/src/intel/vulkan/anv_icd.py", line 46, in <module>
13| with open(args.out, 'w') as f:
14| IOError: [Errno 2] No such file or directory: 'vulkan/intel_icd.x86_64.json'
15| Makefile:4882: recipe for target 'vulkan/intel_icd.x86_64.json' failed
16
17Add missing MKDIR_GEN calls to solve this.
18---
19 src/intel/Makefile.vulkan.am | 2 ++
20 1 file changed, 2 insertions(+)
21
22diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
23index 0bcbf0419c..4125cb205a 100644
24--- a/src/intel/Makefile.vulkan.am
25+++ b/src/intel/Makefile.vulkan.am
26@@ -64,10 +64,12 @@ EXTRA_DIST += \
27 vulkan/TODO
28
29 vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
30+ $(MKDIR_GEN)
31 $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
32 --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
33
34 vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py
35+ $(MKDIR_GEN)
36 $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
37 --lib-path="${libdir}" --out $@
38
39--
402.11.0
41
diff --git a/meta/recipes-graphics/mesa/mesa_18.0.2.bb b/meta/recipes-graphics/mesa/mesa_18.0.2.bb
index aaac1e58e1..f2ac38e919 100644
--- a/meta/recipes-graphics/mesa/mesa_18.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.0.2.bb
@@ -8,6 +8,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
8 file://llvm-config-version.patch \ 8 file://llvm-config-version.patch \
9 file://0001-winsys-svga-drm-Include-sys-types.h.patch \ 9 file://0001-winsys-svga-drm-Include-sys-types.h.patch \
10 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ 10 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
11 file://vulkan-mkdir.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "3c303da98ec2ce37c795baeba5aee31e" 14SRC_URI[md5sum] = "3c303da98ec2ce37c795baeba5aee31e"