| Message ID | 20170712161907.13526-1-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | 19e793f65d214294baa9eeaf982f4ced351c7748 |
| Headers | show |
On Wed, Jul 12, 2017 at 1:19 PM, Ross Burton <ross.burton@intel.com> wrote: > It's possible that src/intel/vulkcan can be written into by sed before it has > been created, so add the required mkdir calls. > > Signed-off-by: Ross Burton <ross.burton@intel.com> Has this been send to upstream? Upstream-Status? -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
The second sob is from the patch I sent upstream. The first two lines of the patch header are the OE ones: +++ b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch @@ -0,0 +1,37 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> Ross On 14 July 2017 at 18:19, Otavio Salvador <otavio.salvador@ossystems.com.br> wrote: > On Wed, Jul 12, 2017 at 1:19 PM, Ross Burton <ross.burton@intel.com> > wrote: > > It's possible that src/intel/vulkcan can be written into by sed before > it has > > been created, so add the required mkdir calls. > > > > Signed-off-by: Ross Burton <ross.burton@intel.com> > > Has this been send to upstream? Upstream-Status? > > > -- > Otavio Salvador O.S. Systems > http://www.ossystems.com.br http://code.ossystems.com.br > Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 > -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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 00000000000..15ee5eeb14c --- /dev/null +++ b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch @@ -0,0 +1,37 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From c78979fd95a1c4f732f7e6edf0f32c524e5955b8 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Wed, 12 Jul 2017 17:10:07 +0100 +Subject: [PATCH] src/intel/Makefile.vulkan.am: create target directories when + required + +In out-of-tree builds src/intel/vulkan won't exist, so always create it before +writing into it. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + src/intel/Makefile.vulkan.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am +index 3857a5dc62..26e9cd410c 100644 +--- a/src/intel/Makefile.vulkan.am ++++ b/src/intel/Makefile.vulkan.am +@@ -44,11 +44,13 @@ EXTRA_DIST += \ + vulkan/TODO + + vulkan/dev_icd.json : vulkan/dev_icd.json.in ++ $(MKDIR_GEN) + $(AM_V_GEN) $(SED) \ + -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ + < $(srcdir)/vulkan/dev_icd.json.in > $@ + + vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in ++ $(MKDIR_GEN) + $(AM_V_GEN) $(SED) \ + -e "s#@install_libdir@#${libdir}#" \ + < $(srcdir)/vulkan/intel_icd.json.in > $@ +-- +2.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 2257045c42c..f0b634a045b 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 \ file://0001-Use-wayland-scanner-in-the-path.patch \ file://0002-hardware-gloat.patch \ file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \ + file://vulkan-mkdir.patch \ " SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"
It's possible that src/intel/vulkcan can be written into by sed before it has been created, so add the required mkdir calls. Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../recipes-graphics/mesa/files/vulkan-mkdir.patch | 37 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa_17.1.4.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-graphics/mesa/files/vulkan-mkdir.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core