diff options
| author | Julien Stephan <jstephan@baylibre.com> | 2023-08-24 09:34:58 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-29 09:41:07 +0100 |
| commit | 038d646d7e3d54d8775f97611515fdcf1db2af6c (patch) | |
| tree | 310dc1719efaa9c2b20d9433d579ebfd961bd4b7 /meta/recipes-graphics/vulkan | |
| parent | 060f285e58509fd1f38bc4eca990d4643e648c1a (diff) | |
| download | poky-038d646d7e3d54d8775f97611515fdcf1db2af6c.tar.gz | |
vulkan-samples: convert debugfix.patch to git format patch
devtool modify on vulkan-samples fails to apply the debugfix.patch
because it is not in one of git's known formats.
Here is the error:
ERROR: Applying patch 'debugfix.patch' on target directory '<..>/build/tmp/work/core2-64-poky-linux/vulkan-samples/git/devtooltmp-38uz7jyq/workdir/git'
CmdError("sh -c 'git add -f -A .'", 0, 'stdout:
stderr: fatal: not a git repository (or any of the parent directories):
.git
')
Also, rename debugfix.patch to something more meaningfull
(From OE-Core rev: c05c508cf3141a6923d87e1d04f7387ce3c91a9d)
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan')
| -rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch (renamed from meta/recipes-graphics/vulkan/vulkan-samples/debugfix.patch) | 22 | ||||
| -rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 |
2 files changed, 18 insertions, 6 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/debugfix.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch index d723fcc19a..7609011421 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples/debugfix.patch +++ b/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | From d998c753254649c7cf7c64e3fed78e41c11ad7ed Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 3 | Date: Wed, 23 Aug 2023 09:38:37 +0200 | ||
| 4 | Subject: [PATCH] vulkan-samples: Fix reproducibility issue | ||
| 5 | |||
| 1 | There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths | 6 | There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths |
| 2 | used for logging with LOGE() in the code. We need to make this match the value we use | 7 | used for logging with LOGE() in the code. We need to make this match the value we use |
| 3 | in the debug source remapping from CFLAGS | 8 | in the debug source remapping from CFLAGS |
| @@ -16,11 +21,16 @@ will currently change the output! | |||
| 16 | Upstream-Status: Pending [needs to be discussed upstream] | 21 | Upstream-Status: Pending [needs to be discussed upstream] |
| 17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 22 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 18 | 23 | ||
| 19 | Index: git/bldsys/cmake/global_options.cmake | 24 | Signed-off-by: Julien Stephan <jstephan@baylibre.com> |
| 20 | =================================================================== | 25 | --- |
| 21 | --- git.orig/bldsys/cmake/global_options.cmake | 26 | bldsys/cmake/global_options.cmake | 2 +- |
| 22 | +++ git/bldsys/cmake/global_options.cmake | 27 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 23 | @@ -47,7 +47,7 @@ set(CMAKE_CXX_STANDARD 14) | 28 | |
| 29 | diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake | ||
| 30 | index b15c2da..d8952e5 100644 | ||
| 31 | --- a/bldsys/cmake/global_options.cmake | ||
| 32 | +++ b/bldsys/cmake/global_options.cmake | ||
| 33 | @@ -62,7 +62,7 @@ set(CMAKE_CXX_STANDARD 14) | ||
| 24 | set(CMAKE_DISABLE_SOURCE_CHANGES ON) | 34 | set(CMAKE_DISABLE_SOURCE_CHANGES ON) |
| 25 | set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) | 35 | set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) |
| 26 | 36 | ||
| @@ -29,3 +39,5 @@ Index: git/bldsys/cmake/global_options.cmake | |||
| 29 | add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE}) | 39 | add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE}) |
| 30 | 40 | ||
| 31 | set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}") | 41 | set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}") |
| 42 | -- | ||
| 43 | 2.41.0 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 458d1405ae..66f1ef5e9d 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb | |||
| @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" | |||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" |
| 7 | 7 | ||
| 8 | SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ | 8 | SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ |
| 9 | file://debugfix.patch \ | 9 | file://0001-vulkan-samples-Fix-reproducibility-issue.patch \ |
| 10 | file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch;patchdir=third_party/spdlog \ | 10 | file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch;patchdir=third_party/spdlog \ |
| 11 | file://0001-Deprecate-u8string_view.patch;patchdir=third_party/spdlog \ | 11 | file://0001-Deprecate-u8string_view.patch;patchdir=third_party/spdlog \ |
| 12 | file://32bit.patch \ | 12 | file://32bit.patch \ |