Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *vulkan-samples* to *3d48fe1691fd105e3c38cdea4cb8d58d85eb0fdc* has Failed(do_compile).
Detailed error information:
do_compile failed
Next steps:
- apply the patch: git am
0001-vulkan-samples-upgrade-to-latest-revision.patch
- check the changes to upstream patches and summarize them in the commit
message,
- compile an image that contains the package
- perform some basic sanity tests
- amend the patch and sign it off: git commit -s --reset-author --amend
- send it to the appropriate mailing list
Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.
Please review the attached files for further information and build/update
failures.
Any problem please file a bug at
https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
Regards,
The Upgrade Helper
-- >8 --
>From 73bb2c2ac1fe54a179a8d331b9a1ad2f278bb577 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <[email protected]>
Date: Wed, 15 Nov 2023 12:06:54 +0000
Subject: [PATCH] vulkan-samples: upgrade to latest revision
---
.../0001-Deprecate-u8string_view.patch | 59 ----------
...ot-use-LFS64-functions-on-linux-musl.patch | 37 -------
...002-Committing-changes-from-do_patch.patch | 16 +++
.../vulkan/vulkan-samples/32bit.patch | 101 ------------------
.../vulkan/vulkan-samples_git.bb | 6 +-
5 files changed, 18 insertions(+), 201 deletions(-)
delete mode 100644
meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch
delete mode 100644
meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
create mode 100644
meta/recipes-graphics/vulkan/vulkan-samples/0002-Committing-changes-from-do_patch.patch
delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch
diff --git
a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch
b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch
deleted file mode 100644
index c2304bdd48..0000000000
---
a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 93987b1ce7d6f91387202495aac61026070597df Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 15 Jan 2023 21:37:52 -0800
-Subject: [PATCH] Deprecate u8string_view
-
-Use basic_string_view instead
-
-Upstream-Status: Backport
[https://github.com/fmtlib/fmt/commit/dea7fde8b7d649923dd41b0766bdf076033c62a2]
-Signed-off-by: Khem Raj <[email protected]>
----
- include/spdlog/fmt/bundled/core.h | 3 ++-
- include/spdlog/fmt/bundled/format.h | 15 ++-------------
- 2 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/include/spdlog/fmt/bundled/core.h
b/include/spdlog/fmt/bundled/core.h
-index 50b79351..e8b029ef 100644
---- a/include/spdlog/fmt/bundled/core.h
-+++ b/include/spdlog/fmt/bundled/core.h
-@@ -1484,7 +1484,8 @@ FMT_API void vprint(wstring_view format_str,
wformat_args args);
-
- /**
- \rst
-- Prints formatted data to ``stdout``.
-+ Formats ``args`` according to specifications in ``format_str`` and writes
the
-+ output to ``stdout``.
-
- **Example**::
-
-diff --git a/include/spdlog/fmt/bundled/format.h
b/include/spdlog/fmt/bundled/format.h
-index 1bb24a52..39426361 100644
---- a/include/spdlog/fmt/bundled/format.h
-+++ b/include/spdlog/fmt/bundled/format.h
-@@ -407,21 +407,10 @@ void basic_buffer<T>::append(const U *begin, const U
*end) {
- enum char8_t: unsigned char {};
- #endif
-
--// A UTF-8 string view.
--class u8string_view : public basic_string_view<char8_t> {
-- public:
-- typedef char8_t char_type;
--
-- u8string_view(const char *s):
-- basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s)) {}
-- u8string_view(const char *s, size_t count) FMT_NOEXCEPT:
-- basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s), count) {}
--};
--
- #if FMT_USE_USER_DEFINED_LITERALS
- inline namespace literals {
--inline u8string_view operator"" _u(const char *s, std::size_t n) {
-- return {s, n};
-+inline basic_string_view<char8_t> operator"" _u(const char* s, std::size_t n)
{
-+ return {reinterpret_cast<const char8_t*>(s), n};
- }
- }
- #endif
---
-2.39.0
-
diff --git
a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
deleted file mode 100644
index f2bd7e510b..0000000000
---
a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ce7a593e74c8e0c2ece15c73e7614d4f13a19a53 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 30 Dec 2022 13:04:08 -0800
-Subject: [PATCH] Do not use LFS64 functions on linux/musl
-
-On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using
-LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped
-providing aliases for these functions [1] which means it wont compile on
-newer musl systems. Therefore only use it on 32bit glibc/linux platforms
-and exclude musl like cygwin or OSX
-
-[1]
https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4
-
-Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589]
-Signed-off-by: Khem Raj <[email protected]>
----
- include/spdlog/details/os.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
-index 8e8476f0..be0a67b8 100644
---- a/include/spdlog/details/os.h
-+++ b/include/spdlog/details/os.h
-@@ -227,7 +227,9 @@ inline size_t filesize(FILE *f)
- #else // unix
- int fd = fileno(f);
- // 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
--#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) ||
defined(__ppc64__)) && !defined(__CYGWIN__)
-+#if !defined(__FreeBSD__) && !defined(__APPLE__) && \
-+ (defined(__linux__) && defined(__GLIBC__)) && \
-+ (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
- struct stat64 st;
- if (::fstat64(fd, &st) == 0)
- {
---
-2.39.0
-
diff --git
a/meta/recipes-graphics/vulkan/vulkan-samples/0002-Committing-changes-from-do_patch.patch
b/meta/recipes-graphics/vulkan/vulkan-samples/0002-Committing-changes-from-do_patch.patch
new file mode 100644
index 0000000000..4136202025
--- /dev/null
+++
b/meta/recipes-graphics/vulkan/vulkan-samples/0002-Committing-changes-from-do_patch.patch
@@ -0,0 +1,16 @@
+From 1dc1efd68884f232ac77ca5020e57914e4e9bb3b Mon Sep 17 00:00:00 2001
+From: OpenEmbedded <oe.patch@oe>
+Date: Wed, 15 Nov 2023 12:05:43 +0000
+Subject: [PATCH] Committing changes from do_patch
+
+---
+ third_party/spdlog | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/spdlog b/third_party/spdlog
+index 7bf8f14..8539c01 160000
+--- a/third_party/spdlog
++++ b/third_party/spdlog
+@@ -1 +1 @@
+-Subproject commit 7bf8f148795d2571b4ae4aa9c6d2a8111fbb7077
++Subproject commit 8539c013cca512fa13135944e4c5a756ddbf1183
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch
b/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch
deleted file mode 100644
index 644c3b6167..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 49761ca63797014223d8e3ff6fb2c0235803c19c Mon Sep 17 00:00:00 2001
-From: asuessenbach <[email protected]>
-Date: Wed, 3 May 2023 09:50:08 +0200
-Subject: [PATCH] Resolve some Vulkan-Hpp-related issues on Win32.
-
-This patch fixes vulkan-samples compilation on 32-bit hosts.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
----
- framework/common/hpp_vk_common.h | 4 ++--
- framework/core/hpp_buffer.cpp | 4 ++--
- framework/core/hpp_buffer.h | 2 +-
- framework/core/hpp_image.cpp | 2 +-
- samples/api/hpp_texture_loading/hpp_texture_loading.cpp | 2 +-
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/framework/common/hpp_vk_common.h
b/framework/common/hpp_vk_common.h
-index 39ed3dcde..0cbbe479e 100644
---- a/framework/common/hpp_vk_common.h
-+++ b/framework/common/hpp_vk_common.h
-@@ -92,7 +92,7 @@ inline bool
is_dynamic_buffer_descriptor_type(vk::DescriptorType descriptor_type
-
- inline vk::ShaderModule load_shader(const std::string &filename, vk::Device
device, vk::ShaderStageFlagBits stage)
- {
-- return vkb::load_shader(filename, device,
static_cast<VkShaderStageFlagBits>(stage));
-+ return static_cast<vk::ShaderModule>(vkb::load_shader(filename, device,
static_cast<VkShaderStageFlagBits>(stage)));
- }
-
- inline void set_image_layout(vk::CommandBuffer command_buffer,
-@@ -104,7 +104,7 @@ inline void set_image_layout(vk::CommandBuffer
command_buffer,
- vk::PipelineStageFlags dst_mask =
vk::PipelineStageFlagBits::eAllCommands)
- {
- vkb::set_image_layout(command_buffer,
-- image,
-+ static_cast<VkImage>(image),
- static_cast<VkImageLayout>(old_layout),
- static_cast<VkImageLayout>(new_layout),
-
static_cast<VkImageSubresourceRange>(subresource_range),
-diff --git a/framework/core/hpp_buffer.cpp b/framework/core/hpp_buffer.cpp
-index 8da265acb..e6509b9f4 100644
---- a/framework/core/hpp_buffer.cpp
-+++ b/framework/core/hpp_buffer.cpp
-@@ -84,7 +84,7 @@ HPPBuffer::~HPPBuffer()
- if (get_handle() && (allocation != VK_NULL_HANDLE))
- {
- unmap();
-- vmaDestroyBuffer(get_device().get_memory_allocator(),
get_handle(), allocation);
-+ vmaDestroyBuffer(get_device().get_memory_allocator(),
static_cast<VkBuffer>(get_handle()), allocation);
- }
- }
-
-@@ -93,7 +93,7 @@ VmaAllocation HPPBuffer::get_allocation() const
- return allocation;
- }
-
--VkDeviceMemory HPPBuffer::get_memory() const
-+vk::DeviceMemory HPPBuffer::get_memory() const
- {
- return memory;
- }
-diff --git a/framework/core/hpp_buffer.h b/framework/core/hpp_buffer.h
-index 7a243c265..bad47406d 100644
---- a/framework/core/hpp_buffer.h
-+++ b/framework/core/hpp_buffer.h
-@@ -55,7 +55,7 @@ class HPPBuffer : public
vkb::core::HPPVulkanResource<vk::Buffer>
-
- VmaAllocation get_allocation() const;
- const uint8_t *get_data() const;
-- VkDeviceMemory get_memory() const;
-+ vk::DeviceMemory get_memory() const;
-
- /**
- * @return Return the buffer's device address (note: requires that the
buffer has been created with the VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT
usage fla)
-diff --git a/framework/core/hpp_image.cpp b/framework/core/hpp_image.cpp
-index 00fa89ba7..5e6f27363 100644
---- a/framework/core/hpp_image.cpp
-+++ b/framework/core/hpp_image.cpp
-@@ -138,7 +138,7 @@ HPPImage::~HPPImage()
- if (get_handle() && memory)
- {
- unmap();
-- vmaDestroyImage(get_device().get_memory_allocator(),
get_handle(), memory);
-+ vmaDestroyImage(get_device().get_memory_allocator(),
static_cast<VkImage>(get_handle()), memory);
- }
- }
-
-diff --git a/samples/api/hpp_texture_loading/hpp_texture_loading.cpp
b/samples/api/hpp_texture_loading/hpp_texture_loading.cpp
-index 11a1f24c1..cbdd22773 100644
---- a/samples/api/hpp_texture_loading/hpp_texture_loading.cpp
-+++ b/samples/api/hpp_texture_loading/hpp_texture_loading.cpp
-@@ -170,7 +170,7 @@ void HPPTextureLoading::load_texture()
- memory_allocate_info = {memory_requirements.size,
-
get_device()->get_gpu().get_memory_type(memory_requirements.memoryTypeBits,
vk::MemoryPropertyFlagBits::eDeviceLocal)};
- texture.device_memory =
get_device()->get_handle().allocateMemory(memory_allocate_info);
-- VK_CHECK(vkBindImageMemory(get_device()->get_handle(),
texture.image, texture.device_memory, 0));
-+ get_device()->get_handle().bindImageMemory(texture.image,
texture.device_memory, 0);
-
- vk::CommandBuffer copy_command =
get_device()->create_command_buffer(vk::CommandBufferLevel::ePrimary, true);
-
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 66f1ef5e9d..afb106c27d 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -7,13 +7,11 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
SRC_URI =
"gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0
\
file://0001-vulkan-samples-Fix-reproducibility-issue.patch \
-
file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch;patchdir=third_party/spdlog
\
-
file://0001-Deprecate-u8string_view.patch;patchdir=third_party/spdlog \
- file://32bit.patch \
+ file://0002-Committing-changes-from-do_patch.patch \
"
UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "2307c3eb5608cb1205fa3514b3a31dbfb857d00c"
+SRCREV = "3d48fe1691fd105e3c38cdea4cb8d58d85eb0fdc"
UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
S = "${WORKDIR}/git"
--
2.39.2
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1843 entries from dependency cache.
Parsing recipes...done.
Parsing of 911 .bb files complete (910 cached, 1 parsed). 1843 targets, 38
skipped, 0 masked, 0 errors.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "2.6.0"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "universal"
TARGET_SYS = "x86_64-poky-linux"
MACHINE = "qemux86-64"
DISTRO = "poky"
DISTRO_VERSION = "4.3+snapshot-196d5205eeb639ffdbda868a2709f16e96c5d967"
TUNE_FEATURES = "m64 core2"
TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp
workspace =
"tmp-auh-upgrades:196d5205eeb639ffdbda868a2709f16e96c5d967"
Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing
build without monitoring pressure
done.
Sstate summary: Wanted 73 Local 61 Mirrors 0 Missed 12 Current 226 (83% match,
95% complete)
Removing 9 stale sstate objects for arch core2-64...done.
Removing 1 stale sstate objects for arch qemux86_64...done.
NOTE: Executing Tasks
NOTE: Running setscene task 234 of 299
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb:do_create_spdx_setscene)
NOTE: Running task 618 of 897
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_recipe_qa)
NOTE: recipe vulkan-samples-git-r0: task do_recipe_qa: Started
NOTE: recipe gcc-runtime-13.2.0-r0: task do_create_spdx_setscene: Started
NOTE: recipe gcc-runtime-13.2.0-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running setscene task 277 of 299
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/glibc/glibc_2.38.bb:do_create_spdx_setscene)
NOTE: recipe vulkan-samples-git-r0: task do_recipe_qa: Succeeded
NOTE: Task
/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_recipe_qa
unihash changed to
28f33ec608cdd6b893fa93e53e72bc742b0e5428120fd2cd1293c3c084780e52
NOTE: recipe glibc-2.38+git-r0: task do_create_spdx_setscene: Started
NOTE: Running task 706 of 897
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_fetch)
NOTE: recipe glibc-2.38+git-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running setscene task 284 of 299
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_create_spdx_setscene)
NOTE: Running setscene task 286 of 299
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_populate_sysroot_setscene)
NOTE: recipe vulkan-samples-git-r0: task do_fetch: Started
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_create_spdx_setscene: Started
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_populate_sysroot_setscene:
Started
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_create_spdx_setscene: Succeeded
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_populate_sysroot_setscene:
Succeeded
NOTE: Running setscene task 298 of 299
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_recipe_qa_setscene)
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_recipe_qa_setscene: Started
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_recipe_qa_setscene: Succeeded
NOTE: Setscene tasks completed
NOTE: recipe vulkan-samples-git-r0: task do_fetch: Succeeded
NOTE: Running task 878 of 897
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_unpack)
NOTE: Running task 879 of 897
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_prepare_recipe_sysroot)
NOTE: recipe vulkan-samples-git-r0: task do_unpack: Started
NOTE: recipe vulkan-samples-git-r0: task do_prepare_recipe_sysroot: Started
NOTE: recipe vulkan-samples-git-r0: task do_prepare_recipe_sysroot: Succeeded
NOTE: recipe vulkan-samples-git-r0: task do_unpack: Succeeded
NOTE: Running task 880 of 897
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_patch)
NOTE: Running task 881 of 897
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_collect_spdx_deps)
NOTE: recipe vulkan-samples-git-r0: task do_patch: Started
NOTE: recipe vulkan-samples-git-r0: task do_collect_spdx_deps: Started
NOTE: recipe vulkan-samples-git-r0: task do_collect_spdx_deps: Succeeded
NOTE: recipe vulkan-samples-git-r0: task do_patch: Failed
NOTE: Tasks Summary: Attempted 881 tasks of which 875 didn't need to be rerun
and 1 failed.
NOTE: Writing buildhistory
NOTE: Writing buildhistory took: 3 seconds
NOTE: The errors for this build are stored in
/home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20231115120605.txt
You can send the errors to a reports server by running:
send-error-report
/home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20231115120605.txt
[-s server]
NOTE: The contents of these logs will be posted in public if you use the above
command with the default server. Please ensure you remove any identifying or
proprietary information when prompted before sending.
Summary: 1 task failed:
/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_patch
Summary: There was 1 ERROR message, returning a non-zero exit code.
ERROR: vulkan-samples-git-r0 do_patch: Applying patch
'0002-Committing-changes-from-do_patch.patch' on target directory
'/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/vulkan-samples/git/git'
CmdError('quilt --quiltrc
/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/vulkan-samples/git/recipe-sysroot-native/etc/quiltrc
push', 0, 'stdout: Applying patch 0002-Committing-changes-from-do_patch.patch
File third_party/spdlog is not a regular file -- refusing to patch
1 out of 1 hunk ignored -- rejects in file
Patch 0002-Committing-changes-from-do_patch.patch does not apply (enforce with
-f)
stderr: ')
ERROR: Logfile of failure stored in:
/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/vulkan-samples/git/temp/log.do_patch.394161
ERROR: Task
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-graphics/vulkan/vulkan-samples_git.bb:do_patch)
failed with exit code '1'
0001-vulkan-samples-upgrade-to-latest-revision.patch
Description: Binary data
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#190695): https://lists.openembedded.org/g/openembedded-core/message/190695 Mute This Topic: https://lists.openembedded.org/mt/102605831/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
