Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sumo migration: vulkan: fix patch file to remove bad $-escape 

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2018-12-17 14:30:12 +01:00
parent 5eb88b8c5d
commit 2b6db8f0b9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-digi-dey/recipes-graphics/vulkan/vulkan/0001-CMakeLists.txt-Modify-the-library-path-to-point-to-u.patch → meta-digi-dey/recipes-graphics/vulkan/vulkan/0001-CMakeLists.txt-Modify-the-library-path-to-point-to.patch
View File

@ -1,6 +1,6 @@
From 5d967d036c49a4d609dec979c21fc34159788008 Mon Sep 17 00:00:00 2001
From abb274c45150373c91bf74d4511b86e039f08306 Mon Sep 17 00:00:00 2001
From: Neena Busireddy <neenareddy.busireddy@nxp.com>
Date: Mon, 30 Apr 2018 13:52:36 -0500
Date: Tue, 31 Jul 2018 18:22:49 -0500
Subject: [PATCH] CMakeLists.txt: Modify the library path to point to
/usr/lib/libVK<validation layer>.so in json files
@ -10,7 +10,7 @@ Signed-off-by: Neena Busireddy <neenareddy.busireddy@nxp.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 35a1b41..3af3975 100644
index 35a1b41..9e761a5 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -92,7 +92,7 @@ if(UNIX)
@ -18,7 +18,7 @@ index 35a1b41..3af3975 100644
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/staging-json
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json ${CMAKE_CURRENT_BINARY_DIR}/staging-json
- COMMAND sed -i -e "/\"library_path\":/s$./libVkLayer$libVkLayer$" ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json
+ COMMAND sed -i -e "/\"library_path\":/s$./libVkLayer$$(libdir)/libVkLayer$" ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json
+ COMMAND sed -i -e "/\"library_path\":/s$./libVkLayer$/usr/lib/libVkLayer$" ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json
VERBATIM
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json
)

2
meta-digi-dey/recipes-graphics/vulkan/vulkan_%.bbappend
View File

@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += " \
file://icd_VSI.json \
file://0001-CMakeLists.txt-Modify-the-library-path-to-point-to-u.patch \
file://0001-CMakeLists.txt-Modify-the-library-path-to-point-to.patch \
"
# choose wayland
PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '' ,d)}"