From patchwork Tue Aug 16 16:58:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11456 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E20CC25B0E for ; Tue, 16 Aug 2022 16:59:09 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.18094.1660669141050154256 for ; Tue, 16 Aug 2022 09:59:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=T0APrCfS; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id m2so9760085pls.4 for ; Tue, 16 Aug 2022 09:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=hBbsZCdXCnaRcvKtdoNonL1JS/BODT23GGm55vqsWZI=; b=T0APrCfSpdrsKVcit7s2ySL0NPpM2zsH6Fxqrwh1bkwyM7/l+GIWPyxyNNZaFmKy1+ 65cg/kDkHnREytc/PiyAS+yfwyEYyxReaEnuVY4MtKNP0w1toHulZNo8IbI8QHWUWF7v DH40ZbsW8cE6QwXtZ9d7issAL+/vFMoPiWakatNJH29WkcVsyTezr5gLlJMtEqUSEvXx vh0yzGWCwGG8iwKPlg7yM1m8ZIShFa9DupAED5s8W1FLZPTb5nA3zZ4Q/okWtLl1VUDY jJHg4jsenMcttdppyDIKP2DRK+Xd2zC7V5m8UckaA4XWFQti4d/YLnIxh7G/XglB3Ipg hptA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=hBbsZCdXCnaRcvKtdoNonL1JS/BODT23GGm55vqsWZI=; b=nz2DrmwtJTaoTt154invAzLMfaH3sOiUFrheY6ku4WemYASvVymZ7KOZCWGYYB3J0f av9OCVt3QPT0Z/9LpR0/2bPSU4cviGumc5CIaycjsATLaSNamQUvlUzfnR6CC/15Ez+B PXWn5kPp8t3whwSh8IEB2hqD3UvkRlOybH+5yoGp3Vux/NF5peV2aUhm+eHfB0/gAOvb GmqQFTGSIqD9KwJUnrFWxIc/64L63rMzGNDK8abUQ/LSQIr4pNHz4LBp0hGONdPSsAfr INw8h8I32lnvH/e+NTNn5wPLDWYvynz5LHe3iJbFa9pUXHxYfehSTCaym3vtROSbyqcK +Pjw== X-Gm-Message-State: ACgBeo2h7Fz5VNvOia8vKym0hdwQrL0V74CB92YA7lGIWbmjPGLhYSUR c9WcepgIMb9dSNMveZfkhoS7Ax3bNQEcYQ== X-Google-Smtp-Source: AA6agR6BVwboYV4do1TP9Bez2zUlMTPtjuNc2ffg8Pw/l8INLj4uOnRtUuUdmaspbNpZYOUt+h1B8Q== X-Received: by 2002:a17:903:2c9:b0:172:57d5:d6f0 with SMTP id s9-20020a17090302c900b0017257d5d6f0mr18999116plk.61.1660669139840; Tue, 16 Aug 2022 09:58:59 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id x21-20020a17090a531500b001f04479017fsm6562577pjh.29.2022.08.16.09.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 09:58:59 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/7] boost: Compile out stdlib unary/binary_functions for c++11 and newer Date: Tue, 16 Aug 2022 09:58:51 -0700 Message-Id: <20220816165857.2342796-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Aug 2022 16:59:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169442 These base classes are deprecated/removed from libcpp15 Signed-off-by: Khem Raj --- ...y-binary_function-base-classes-are-d.patch | 34 +++++++++++++++++++ meta/recipes-support/boost/boost_1.79.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch diff --git a/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch b/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch new file mode 100644 index 00000000000..49603348eee --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch @@ -0,0 +1,34 @@ +From f9b55f5a1fab85bf73c95e6372779d6f50f75e84 Mon Sep 17 00:00:00 2001 +From: jzmaddock +Date: Mon, 11 Jul 2022 18:26:07 +0100 +Subject: [PATCH] The std lib unary/binary_function base classes are + deprecated/removed from libcpp15. Fixes + https://github.com/boostorg/container_hash/issues/24. + +Upstream-Status: Backport [https://github.com/boostorg/config/pull/440/commits/f0af4a9184457939b89110795ae2d293582c5f66] +Signed-off-by: Khem Raj +--- + boost/config/stdlib/libcpp.hpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/boost/config/stdlib/libcpp.hpp b/boost/config/stdlib/libcpp.hpp +index bc8536ead..0e9f2445e 100644 +--- a/boost/config/stdlib/libcpp.hpp ++++ b/boost/config/stdlib/libcpp.hpp +@@ -168,4 +168,13 @@ + # define BOOST_NO_CXX14_HDR_SHARED_MUTEX + #endif + ++#if _LIBCPP_VERSION >= 15000 ++// ++// Unary function is now deprecated in C++11 and later: ++// ++#if __cplusplus >= 201103L ++#define BOOST_NO_CXX98_FUNCTION_BASE ++#endif ++#endif ++ + // --- end --- +-- +2.37.2 + diff --git a/meta/recipes-support/boost/boost_1.79.0.bb b/meta/recipes-support/boost/boost_1.79.0.bb index dd5d6eadd61..09e25567903 100644 --- a/meta/recipes-support/boost/boost_1.79.0.bb +++ b/meta/recipes-support/boost/boost_1.79.0.bb @@ -5,4 +5,5 @@ SRC_URI += "file://boost-CVE-2012-2677.patch \ file://boost-math-disable-pch-for-gcc.patch \ file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ file://0001-dont-setup-compiler-flags-m32-m64.patch \ + file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ " From patchwork Tue Aug 16 16:58:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11458 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0DEEC48BE4 for ; Tue, 16 Aug 2022 16:59:09 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.18096.1660669142447483395 for ; Tue, 16 Aug 2022 09:59:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FYiLmgbd; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d16so9731718pll.11 for ; Tue, 16 Aug 2022 09:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=zV2J1wmdypdKCpDtsdI9Z67FTy+9PhG8U9/GlbPw1ro=; b=FYiLmgbdYNdCHLCMM9MVBkuHNoWOS7WFzMNCtZDzc0quV+od/oWrsdBKZaKBSJ9L3K dsEFWY5ToRgzdhD4yrZNq5+f6P2Ljd9sEFS1Y7B7Jsdo35GqOwkgMQ+Udp22IUXjzDef QasbL6jNu9k2Lwjjr23YsFUyac2xbusiAVklo047C9ucaRshRy1TQYtmVVZtWCI+D1Lq 1jECTJ3r+unZibAggBLm70Jl+A/RSrFnzbBr6M2z5LtVjPfQQDwhMkCWPDFaBrpNklKX 500Ck4iSSGi9GBGezRGAAGUpOs+ljMgqf5yCr+3/MNBsRypNGZfDLt3c9QktCbhR31AM V0Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=zV2J1wmdypdKCpDtsdI9Z67FTy+9PhG8U9/GlbPw1ro=; b=R+Z6jK3PhSex/5GaQ+2dBLciKuyeA5r+f5Ta8kztrU89XkFnthomRNWAmkjooi5MOb dkOx2q0PIBBXAdtekp1TCAFqemprk4wU1JrZGRqu5nCFo1UAGPP4csqFuJHcmtE5wc/9 GroS1K+peFt1lhW1ExunQN4EbOQQvhNdjY43agoO/QfpT/K4op0TFVmwiZFvaXUxaYnk 5AQq1SRQUZnWIX+G8uYOQ2EB7gjwKYXWlihQ4su2Ogit+VzUaiXd0PWEhu38KLZ7U7WJ MDM0ow4W/ne4my3E59hb+S2CtaiasKGcampAw30pTJWPcIahr6labhIMv5ku82bbT0YP 2KsQ== X-Gm-Message-State: ACgBeo0kO3plgSBvyCZkyW1ZdFBJGgg3bDUdhNzAo4HExIEJc/OsqsVo /MMbHv3UzFTCSlaCREhGH2Rt/1FwgggMyg== X-Google-Smtp-Source: AA6agR6loPkpSphZnxCYVfqtntVApUuCit1G4pC5l/kJ61GWEOChqRrh1NEXopOzRK91JgniN7WoeQ== X-Received: by 2002:a17:902:ce90:b0:16e:f7c3:c478 with SMTP id f16-20020a170902ce9000b0016ef7c3c478mr22756851plg.82.1660669141289; Tue, 16 Aug 2022 09:59:01 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id x21-20020a17090a531500b001f04479017fsm6562577pjh.29.2022.08.16.09.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 09:59:00 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 2/7] vulkan-samples: Qualify move as std::move Date: Tue, 16 Aug 2022 09:58:52 -0700 Message-Id: <20220816165857.2342796-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220816165857.2342796-1-raj.khem@gmail.com> References: <20220816165857.2342796-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Aug 2022 16:59:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169443 Fixes build with clang Signed-off-by: Khem Raj --- .../0001-Qualify-move-as-std-move.patch | 405 ++++++++++++++++++ .../vulkan/vulkan-samples_git.bb | 1 + 2 files changed, 406 insertions(+) create mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch new file mode 100644 index 00000000000..80ee521499f --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch @@ -0,0 +1,405 @@ +From 9e061b12b9305eee96a4d3129b646c244cc02347 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Aug 2022 19:16:45 -0700 +Subject: [PATCH] Qualify move as std::move + +Seeing errors like below with clang-15 + +spirv_common.hpp:692:19: error: unqualified call to std::move + +squashed Backport of following upstream commits + +https://github.com/KhronosGroup/SPIRV-Cross/commit/44c3333a1c315ead00c24f7aef5fa8a7ccf49299 +https://github.com/KhronosGroup/SPIRV-Cross/commit/0eda71c40936586ea812d0d20d93c11a3e9af192 + +Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Cross/commit/0eda71c40936586ea812d0d20d93c11a3e9af192] +Signed-off-by: Khem Raj +--- + main.cpp | 38 +++++++++++++++++++------------------- + spirv_common.hpp | 2 +- + spirv_cpp.hpp | 2 +- + spirv_cross.cpp | 18 +++++++++--------- + spirv_glsl.cpp | 2 +- + spirv_glsl.hpp | 2 +- + spirv_hlsl.cpp | 4 ++-- + spirv_hlsl.hpp | 2 +- + spirv_msl.cpp | 2 +- + spirv_parser.cpp | 4 ++-- + spirv_reflect.hpp | 2 +- + 11 files changed, 39 insertions(+), 39 deletions(-) + +diff --git a/main.cpp b/main.cpp +index 78991094..581c5e3b 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -65,7 +65,7 @@ struct CLICallbacks + struct CLIParser + { + CLIParser(CLICallbacks cbs_, int argc_, char *argv_[]) +- : cbs(move(cbs_)) ++ : cbs(std::move(cbs_)) + , argc(argc_) + , argv(argv_) + { +@@ -722,7 +722,7 @@ static int main_inner(int argc, char *argv[]) + auto old_name = parser.next_string(); + auto new_name = parser.next_string(); + auto model = stage_to_execution_model(parser.next_string()); +- args.entry_point_rename.push_back({ old_name, new_name, move(model) }); ++ args.entry_point_rename.push_back({ old_name, new_name, std::move(model) }); + }); + cbs.add("--entry", [&args](CLIParser &parser) { args.entry = parser.next_string(); }); + cbs.add("--stage", [&args](CLIParser &parser) { args.entry_stage = parser.next_string(); }); +@@ -731,20 +731,20 @@ static int main_inner(int argc, char *argv[]) + HLSLVertexAttributeRemap remap; + remap.location = parser.next_uint(); + remap.semantic = parser.next_string(); +- args.hlsl_attr_remap.push_back(move(remap)); ++ args.hlsl_attr_remap.push_back(std::move(remap)); + }); + + cbs.add("--remap", [&args](CLIParser &parser) { + string src = parser.next_string(); + string dst = parser.next_string(); + uint32_t components = parser.next_uint(); +- args.remaps.push_back({ move(src), move(dst), components }); ++ args.remaps.push_back({ std::move(src), std::move(dst), components }); + }); + + cbs.add("--remap-variable-type", [&args](CLIParser &parser) { + string var_name = parser.next_string(); + string new_type = parser.next_string(); +- args.variable_type_remaps.push_back({ move(var_name), move(new_type) }); ++ args.variable_type_remaps.push_back({ std::move(var_name), std::move(new_type) }); + }); + + cbs.add("--rename-interface-variable", [&args](CLIParser &parser) { +@@ -757,18 +757,18 @@ static int main_inner(int argc, char *argv[]) + + uint32_t loc = parser.next_uint(); + string var_name = parser.next_string(); +- args.interface_variable_renames.push_back({ cls, loc, move(var_name) }); ++ args.interface_variable_renames.push_back({ cls, loc, std::move(var_name) }); + }); + + cbs.add("--pls-in", [&args](CLIParser &parser) { + auto fmt = pls_format(parser.next_string()); + auto name = parser.next_string(); +- args.pls_in.push_back({ move(fmt), move(name) }); ++ args.pls_in.push_back({ std::move(fmt), std::move(name) }); + }); + cbs.add("--pls-out", [&args](CLIParser &parser) { + auto fmt = pls_format(parser.next_string()); + auto name = parser.next_string(); +- args.pls_out.push_back({ move(fmt), move(name) }); ++ args.pls_out.push_back({ std::move(fmt), std::move(name) }); + }); + cbs.add("--shader-model", [&args](CLIParser &parser) { + args.shader_model = parser.next_uint(); +@@ -788,7 +788,7 @@ static int main_inner(int argc, char *argv[]) + cbs.default_handler = [&args](const char *value) { args.input = value; }; + cbs.error_handler = [] { print_help(); }; + +- CLIParser parser{ move(cbs), argc - 1, argv + 1 }; ++ CLIParser parser{ std::move(cbs), argc - 1, argv + 1 }; + if (!parser.parse()) + { + return EXIT_FAILURE; +@@ -808,14 +808,14 @@ static int main_inner(int argc, char *argv[]) + auto spirv_file = read_spirv_file(args.input); + if (spirv_file.empty()) + return EXIT_FAILURE; +- Parser spirv_parser(move(spirv_file)); ++ Parser spirv_parser(std::move(spirv_file)); + + spirv_parser.parse(); + + // Special case reflection because it has little to do with the path followed by code-outputting compilers + if (!args.reflect.empty()) + { +- CompilerReflection compiler(move(spirv_parser.get_parsed_ir())); ++ CompilerReflection compiler(std::move(spirv_parser.get_parsed_ir())); + compiler.set_format(args.reflect); + auto json = compiler.compile(); + if (args.output) +@@ -831,13 +831,13 @@ static int main_inner(int argc, char *argv[]) + + if (args.cpp) + { +- compiler.reset(new CompilerCPP(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerCPP(std::move(spirv_parser.get_parsed_ir()))); + if (args.cpp_interface_name) + static_cast(compiler.get())->set_interface_name(args.cpp_interface_name); + } + else if (args.msl) + { +- compiler.reset(new CompilerMSL(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerMSL(std::move(spirv_parser.get_parsed_ir()))); + + auto *msl_comp = static_cast(compiler.get()); + auto msl_opts = msl_comp->get_msl_options(); +@@ -850,13 +850,13 @@ static int main_inner(int argc, char *argv[]) + msl_comp->set_msl_options(msl_opts); + } + else if (args.hlsl) +- compiler.reset(new CompilerHLSL(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerHLSL(std::move(spirv_parser.get_parsed_ir()))); + else + { + combined_image_samplers = !args.vulkan_semantics; + if (!args.vulkan_semantics) + build_dummy_sampler = true; +- compiler.reset(new CompilerGLSL(move(spirv_parser.get_parsed_ir()))); ++ compiler.reset(new CompilerGLSL(std::move(spirv_parser.get_parsed_ir()))); + } + + if (!args.variable_type_remaps.empty()) +@@ -867,7 +867,7 @@ static int main_inner(int argc, char *argv[]) + out = remap.new_variable_type; + }; + +- compiler->set_variable_type_remap_callback(move(remap_cb)); ++ compiler->set_variable_type_remap_callback(std::move(remap_cb)); + } + + for (auto &rename : args.entry_point_rename) +@@ -1019,7 +1019,7 @@ static int main_inner(int argc, char *argv[]) + { + auto active = compiler->get_active_interface_variables(); + res = compiler->get_shader_resources(active); +- compiler->set_enabled_interface_variables(move(active)); ++ compiler->set_enabled_interface_variables(std::move(active)); + } + else + res = compiler->get_shader_resources(); +@@ -1034,7 +1034,7 @@ static int main_inner(int argc, char *argv[]) + + auto pls_inputs = remap_pls(args.pls_in, res.stage_inputs, &res.subpass_inputs); + auto pls_outputs = remap_pls(args.pls_out, res.stage_outputs, nullptr); +- compiler->remap_pixel_local_storage(move(pls_inputs), move(pls_outputs)); ++ compiler->remap_pixel_local_storage(std::move(pls_inputs), std::move(pls_outputs)); + + for (auto &ext : args.extensions) + compiler->require_extension(ext); +@@ -1101,7 +1101,7 @@ static int main_inner(int argc, char *argv[]) + for (uint32_t i = 0; i < args.iterations; i++) + { + if (args.hlsl) +- glsl = static_cast(compiler.get())->compile(move(args.hlsl_attr_remap)); ++ glsl = static_cast(compiler.get())->compile(std::move(args.hlsl_attr_remap)); + else + glsl = compiler->compile(); + } +diff --git a/spirv_common.hpp b/spirv_common.hpp +index aa32142d..0daf5ad5 100644 +--- a/spirv_common.hpp ++++ b/spirv_common.hpp +@@ -536,7 +536,7 @@ struct SPIRExpression : IVariant + + // Only created by the backend target to avoid creating tons of temporaries. + SPIRExpression(std::string expr, uint32_t expression_type_, bool immutable_) +- : expression(move(expr)) ++ : expression(std::move(expr)) + , expression_type(expression_type_) + , immutable(immutable_) + { +diff --git a/spirv_cpp.hpp b/spirv_cpp.hpp +index bcdb669b..b4da84b9 100644 +--- a/spirv_cpp.hpp ++++ b/spirv_cpp.hpp +@@ -27,7 +27,7 @@ class CompilerCPP : public CompilerGLSL + { + public: + explicit CompilerCPP(std::vector spirv_) +- : CompilerGLSL(move(spirv_)) ++ : CompilerGLSL(std::move(spirv_)) + { + } + +diff --git a/spirv_cross.cpp b/spirv_cross.cpp +index 19bac301..d21dbd41 100644 +--- a/spirv_cross.cpp ++++ b/spirv_cross.cpp +@@ -28,16 +28,16 @@ using namespace spirv_cross; + + Compiler::Compiler(vector ir_) + { +- Parser parser(move(ir_)); ++ Parser parser(std::move(ir_)); + parser.parse(); +- set_ir(move(parser.get_parsed_ir())); ++ set_ir(std::move(parser.get_parsed_ir())); + } + + Compiler::Compiler(const uint32_t *ir_, size_t word_count) + { + Parser parser(ir_, word_count); + parser.parse(); +- set_ir(move(parser.get_parsed_ir())); ++ set_ir(std::move(parser.get_parsed_ir())); + } + + Compiler::Compiler(const ParsedIR &ir_) +@@ -47,12 +47,12 @@ Compiler::Compiler(const ParsedIR &ir_) + + Compiler::Compiler(ParsedIR &&ir_) + { +- set_ir(move(ir_)); ++ set_ir(std::move(ir_)); + } + + void Compiler::set_ir(ParsedIR &&ir_) + { +- ir = move(ir_); ++ ir = std::move(ir_); + parse_fixup(); + } + +@@ -716,7 +716,7 @@ unordered_set Compiler::get_active_interface_variables() const + + void Compiler::set_enabled_interface_variables(std::unordered_set active_variables) + { +- active_interface_variables = move(active_variables); ++ active_interface_variables = std::move(active_variables); + check_active_interface_variables = true; + } + +@@ -2163,7 +2163,7 @@ void Compiler::CombinedImageSamplerHandler::push_remap_parameters(const SPIRFunc + unordered_map remapping; + for (uint32_t i = 0; i < length; i++) + remapping[func.arguments[i].id] = remap_parameter(args[i]); +- parameter_remapping.push(move(remapping)); ++ parameter_remapping.push(std::move(remapping)); + } + + void Compiler::CombinedImageSamplerHandler::pop_remap_parameters() +@@ -3611,7 +3611,7 @@ void Compiler::analyze_image_and_sampler_usage() + + CombinedImageSamplerUsageHandler handler(*this, dref_handler.dref_combined_samplers); + traverse_all_reachable_opcodes(get(ir.default_entry_point), handler); +- comparison_ids = move(handler.comparison_ids); ++ comparison_ids = std::move(handler.comparison_ids); + need_subpass_input = handler.need_subpass_input; + + // Forward information from separate images and samplers into combined image samplers. +@@ -3650,7 +3650,7 @@ void Compiler::build_function_control_flow_graphs_and_analyze() + CFGBuilder handler(*this); + handler.function_cfgs[ir.default_entry_point].reset(new CFG(*this, get(ir.default_entry_point))); + traverse_all_reachable_opcodes(get(ir.default_entry_point), handler); +- function_cfgs = move(handler.function_cfgs); ++ function_cfgs = std::move(handler.function_cfgs); + + for (auto &f : function_cfgs) + { +diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp +index a8855987..fabbb105 100644 +--- a/spirv_glsl.cpp ++++ b/spirv_glsl.cpp +@@ -6876,7 +6876,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) + bool ptr_chain = opcode == OpPtrAccessChain; + auto e = access_chain(ops[2], &ops[3], length - 3, get(ops[0]), &meta, ptr_chain); + +- auto &expr = set(ops[1], move(e), ops[0], should_forward(ops[2])); ++ auto &expr = set(ops[1], std::move(e), ops[0], should_forward(ops[2])); + + auto *backing_variable = maybe_get_backing_variable(ops[2]); + expr.loaded_from = backing_variable ? backing_variable->self : ops[2]; +diff --git a/spirv_glsl.hpp b/spirv_glsl.hpp +index caf0ad3b..aac1196e 100644 +--- a/spirv_glsl.hpp ++++ b/spirv_glsl.hpp +@@ -138,7 +138,7 @@ public: + } + + explicit CompilerGLSL(std::vector spirv_) +- : Compiler(move(spirv_)) ++ : Compiler(std::move(spirv_)) + { + init(); + } +diff --git a/spirv_hlsl.cpp b/spirv_hlsl.cpp +index a5b6d2dc..0933017e 100644 +--- a/spirv_hlsl.cpp ++++ b/spirv_hlsl.cpp +@@ -2028,7 +2028,7 @@ void CompilerHLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret + out_argument += " "; + out_argument += "SPIRV_Cross_return_value"; + out_argument += type_to_array_glsl(type); +- arglist.push_back(move(out_argument)); ++ arglist.push_back(std::move(out_argument)); + } + + for (auto &arg : func.arguments) +@@ -4553,7 +4553,7 @@ void CompilerHLSL::require_texture_query_variant(const SPIRType &type) + + string CompilerHLSL::compile(std::vector vertex_attributes) + { +- remap_vertex_attributes = move(vertex_attributes); ++ remap_vertex_attributes = std::move(vertex_attributes); + return compile(); + } + +diff --git a/spirv_hlsl.hpp b/spirv_hlsl.hpp +index b2b60fca..3503c674 100644 +--- a/spirv_hlsl.hpp ++++ b/spirv_hlsl.hpp +@@ -63,7 +63,7 @@ public: + }; + + explicit CompilerHLSL(std::vector spirv_) +- : CompilerGLSL(move(spirv_)) ++ : CompilerGLSL(std::move(spirv_)) + { + } + +diff --git a/spirv_msl.cpp b/spirv_msl.cpp +index 0e1e733d..fbfcdba5 100644 +--- a/spirv_msl.cpp ++++ b/spirv_msl.cpp +@@ -32,7 +32,7 @@ static const uint32_t k_aux_mbr_idx_swizzle_const = 0u; + + CompilerMSL::CompilerMSL(vector spirv_, vector *p_vtx_attrs, + vector *p_res_bindings) +- : CompilerGLSL(move(spirv_)) ++ : CompilerGLSL(std::move(spirv_)) + { + if (p_vtx_attrs) + for (auto &va : *p_vtx_attrs) +diff --git a/spirv_parser.cpp b/spirv_parser.cpp +index 1725b4ca..0fcd7691 100644 +--- a/spirv_parser.cpp ++++ b/spirv_parser.cpp +@@ -24,7 +24,7 @@ namespace spirv_cross + { + Parser::Parser(std::vector spirv) + { +- ir.spirv = move(spirv); ++ ir.spirv = std::move(spirv); + } + + Parser::Parser(const uint32_t *spirv_data, size_t word_count) +@@ -223,7 +223,7 @@ void Parser::parse(const Instruction &instruction) + case OpExtension: + { + auto ext = extract_string(ir.spirv, instruction.offset); +- ir.declared_extensions.push_back(move(ext)); ++ ir.declared_extensions.push_back(std::move(ext)); + break; + } + +diff --git a/spirv_reflect.hpp b/spirv_reflect.hpp +index 13b5b431..f5c6a6ff 100644 +--- a/spirv_reflect.hpp ++++ b/spirv_reflect.hpp +@@ -34,7 +34,7 @@ class CompilerReflection : public CompilerGLSL + + public: + explicit CompilerReflection(std::vector spirv_) +- : Parent(move(spirv_)) ++ : Parent(std::move(spirv_)) + { + options.vulkan_semantics = true; + } +-- +2.37.2 + diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 41cb4a437d3..54994c683d2 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -9,6 +9,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;prot file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ file://debugfix.patch \ file://0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch \ + file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \ " UPSTREAM_CHECK_COMMITS = "1" From patchwork Tue Aug 16 16:58:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11457 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A05D8C3F6B0 for ; Tue, 16 Aug 2022 16:59:09 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.18096.1660669142447483395 for ; Tue, 16 Aug 2022 09:59:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Xr5TgOgw; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d16so9731772pll.11 for ; Tue, 16 Aug 2022 09:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=d+/5vUN8A3bB4KEM9Q6Y4CFKJndGcBtMYH/jWsewlRA=; b=Xr5TgOgwBi5raLM8eLZyAq/zZwO3Ylw/ZEzrbuaEwDfkXYyNik+DQXx5Lt5v2kfeAO bP2V6TqW8gh1EFXgGJs/p9Hlk9Zis4zWDZdp5IpmrxU5uc+nv+emu/8zt925k4k7GQdo dPPwiezT+sAj8dYt3xbpqGInt62IhTqgifSqap1822Fr4OsGSKduRFL0EoT1dbKbsYzH Hxz5Wh9ggR0RJ4SJ7mUHs0nBFw3jMYO8OJLPsobFce7UryfgekFklmCLxEXndb7iuXV0 s0FgMIMrWQCFAgTNEHzkgISDfd7EfRUwmc1dWwDMeZftwl14TWx2/uQEOZmqVAtan7+U fO7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=d+/5vUN8A3bB4KEM9Q6Y4CFKJndGcBtMYH/jWsewlRA=; b=02YXBLnpmp7Ef9AYSCQQ3W5NQZZ3qzSfLj2Cf0hn3NPYodiaopnHEb3/lS7Ww6Bna+ aJc2RhdiE3IfDbzOurDHgYMVi8SUkyKxY3V2TRh6AYtdTKkjh14hRtWkNLozF8uVu9KI zJuHE+4NVh0rFBidtN9DzKf/Oo68jckUrBTet7U3D4QXbwePWOPHqVvt4gY6A0Q7YS/n 15ZXuM4wJ9dPtcaLwbs3RZ4yIboQYFgtSpt0q8ikr1paPHgb9Nju55AD3tDzaWkGchTw ZBoaPetlEQGH8erspHX3OkMgo/UXpx7HRSyee2k4Ke5xvW0JFwrRFkECbqsscJ9o56Ju dGcg== X-Gm-Message-State: ACgBeo0ePqzOjfnbqh9b5+MQ45cFWwMDjVqd04a1MUnET7pv5SamNPNz YHU//XD0ohya1pNPLmT6wqdd62WDMQ/nUg== X-Google-Smtp-Source: AA6agR6DAhv7Ez6u3GF0vY/PRtiFWXsj9MufRxWxdUeFRn3s8ZlTOoeSFR43+Y4uThlP8fF/eYKJ4Q== X-Received: by 2002:a17:903:40c4:b0:16d:d2a9:43ae with SMTP id t4-20020a17090340c400b0016dd2a943aemr22567968pld.57.1660669142735; Tue, 16 Aug 2022 09:59:02 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id x21-20020a17090a531500b001f04479017fsm6562577pjh.29.2022.08.16.09.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 09:59:01 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 3/7] rpm: Remove -Wimplicit-function-declaration warnings Date: Tue, 16 Aug 2022 09:58:53 -0700 Message-Id: <20220816165857.2342796-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220816165857.2342796-1-raj.khem@gmail.com> References: <20220816165857.2342796-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Aug 2022 16:59:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169444 Signed-off-by: Khem Raj --- ...ude-lib-rpmchroot.h-for-rpmChrootOut.patch | 26 +++++++++++++++++++ meta/recipes-devtools/rpm/rpm_4.17.1.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-devtools/rpm/files/0001-rpmscript-Include-lib-rpmchroot.h-for-rpmChrootOut.patch diff --git a/meta/recipes-devtools/rpm/files/0001-rpmscript-Include-lib-rpmchroot.h-for-rpmChrootOut.patch b/meta/recipes-devtools/rpm/files/0001-rpmscript-Include-lib-rpmchroot.h-for-rpmChrootOut.patch new file mode 100644 index 00000000000..2e0665853bf --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-rpmscript-Include-lib-rpmchroot.h-for-rpmChrootOut.patch @@ -0,0 +1,26 @@ +From fee6dd39e7223700cc4f7e073924b18409b645b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 15 Aug 2022 22:45:23 -0700 +Subject: [PATCH] rpmscript: Include lib/rpmchroot.h for rpmChrootOut() + +This fixes implicit function declarations warning + +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2152] +Signed-off-by: Khem Raj +--- + lib/rpmscript.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/rpmscript.c b/lib/rpmscript.c +index 3e3a0027a..6d6d4c507 100644 +--- a/lib/rpmscript.c ++++ b/lib/rpmscript.c +@@ -17,7 +17,7 @@ + #include "rpmio/rpmio_internal.h" + + #include "lib/rpmplugins.h" /* rpm plugins hooks */ +- ++#include "lib/rpmchroot.h" /* rpmChrootOut */ + #include "debug.h" + + struct scriptNextFileFunc_s { diff --git a/meta/recipes-devtools/rpm/rpm_4.17.1.bb b/meta/recipes-devtools/rpm/rpm_4.17.1.bb index 9b6446f265f..66955ad98ca 100644 --- a/meta/recipes-devtools/rpm/rpm_4.17.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.17.1.bb @@ -40,6 +40,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.17.x;protoc file://0001-docs-do-not-build-manpages-requires-pandoc.patch \ file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ + file://0001-rpmscript-Include-lib-rpmchroot.h-for-rpmChrootOut.patch \ " PE = "1" From patchwork Tue Aug 16 16:58:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11459 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FC5BC2BB41 for ; Tue, 16 Aug 2022 16:59:09 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web10.18014.1660669145111054483 for ; Tue, 16 Aug 2022 09:59:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QTE/dfzE; spf=pass (domain: gmail.com, ip: 209.85.216.51, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f51.google.com with SMTP id t2-20020a17090a4e4200b001f21572f3a4so10226668pjl.0 for ; Tue, 16 Aug 2022 09:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Hoa3pBEItjavgdh2dWU9su9dh1AvZn+1L4cDgbD85oM=; b=QTE/dfzE9MK++2tXaRn42c6/OiXjg4D/0B9oKDjkUfU7wAG/aeqpyew0Pmt4vhyas4 kJ7VaEI1nOG/bBP9pA2bP1KpfQOWUeFqGjsDR3u8fdAABgBjOTPxHK+h9HFGEGhZBdFh P/I8vMcLLv5lE/gmBG8Ta5Lsrm+9cXAsWJ86j5lnPzVnroeZGkuhPL9NjiEr6gnqi8wV 9NUNIsZFOK8Qo8HIpoFfN48YXECQQZWHhzJS3O8jTVvQrznTAPV2X0lX4UgRpIV38HR4 dQUerOjwBThslnaJkQmwLLJivR1iZYRwSoQBNVRpIoWy5YpW4Sgwby/HilylDGo+hPxu E4Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Hoa3pBEItjavgdh2dWU9su9dh1AvZn+1L4cDgbD85oM=; b=T6l6I+LYpQAD5K7ppKkwjlbhdhGLyyNk2o6amio+dEYKUYeNUZQpekvVlwQvQbylP2 ZkS0ZTOnS+MN4xHwGopCv4guwvnodpw5F02aVqpnISRhUkidsWvWVn0YD/DBbZWI7iov fb5WypxHs/yWdraSpny57HT1QdzADxercB5hSIRvQ2BZPbVRywjwCCN45P54FbwsgPka SFkeyMt2V7lP1/K5wlpUbOC5SV+OPolg5VUvIeT/LqJcCWq/8tGuhewt6mg7H8KPyRhW 28J7QxY/3tbHb//ggo8A58qMpWMaVTtFeuIHk8fR4aI+xjekDsN8OGJP369p/OCLENxY Tj2Q== X-Gm-Message-State: ACgBeo0ma6cBnNtsaSd4fgQxdou9ucas1KXEE3S/3Shvt6GGhpAkmcd0 rgoQz0ZF3DBewP+vXyfCyYoCoeE3i7Q7Rg== X-Google-Smtp-Source: AA6agR7cF9idthAAWZUE5X/ktFZAtdVd6fItYiYKhyeGZJLG5bd4MH2CpL1/QNXsdrOOulXeDDb/pw== X-Received: by 2002:a17:902:e744:b0:170:d01d:df10 with SMTP id p4-20020a170902e74400b00170d01ddf10mr23150374plf.40.1660669143961; Tue, 16 Aug 2022 09:59:03 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id x21-20020a17090a531500b001f04479017fsm6562577pjh.29.2022.08.16.09.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 09:59:03 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 4/7] nfs-utils: Upgrade to 2.6.2 Date: Tue, 16 Aug 2022 09:58:54 -0700 Message-Id: <20220816165857.2342796-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220816165857.2342796-1-raj.khem@gmail.com> References: <20220816165857.2342796-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Aug 2022 16:59:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169445 Fix build with clang Package new rpcctl utility into a new package Signed-off-by: Khem Raj --- ...td-Check-for-return-of-stat-function.patch | 34 +++++++ .../0006-Fix-function-prototypes.patch | 93 +++++++++++++++++++ ...{nfs-utils_2.6.1.bb => nfs-utils_2.6.2.bb} | 11 ++- 3 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0005-mountd-Check-for-return-of-stat-function.patch create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0006-Fix-function-prototypes.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.1.bb => nfs-utils_2.6.2.bb} (92%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0005-mountd-Check-for-return-of-stat-function.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0005-mountd-Check-for-return-of-stat-function.patch new file mode 100644 index 00000000000..13a21e53070 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0005-mountd-Check-for-return-of-stat-function.patch @@ -0,0 +1,34 @@ +From 887ecc7837962e9be77a4fea7d9122648f73a84a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 15 Aug 2022 14:47:53 -0700 +Subject: [PATCH] mountd: Check for return of stat function + +simplify the check, stat() return 0 on success -1 on failure + +Fixes clang reported errors e.g. + +| v4clients.c:29:6: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses] +| if (!stat("/proc/fs/nfsd/clients", &sb) == 0 || +| ^ ~~ + +Upstream-Status: Submitted [https://patchwork.kernel.org/project/linux-nfs/patch/20220816024403.2694169-1-raj.khem@gmail.com/] +Signed-off-by: Khem Raj +Cc: Konstantin Khorenko +Cc: Steve Dickson +--- + support/export/v4clients.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/support/export/v4clients.c b/support/export/v4clients.c +index 5f15b61..3230251 100644 +--- a/support/export/v4clients.c ++++ b/support/export/v4clients.c +@@ -26,7 +26,7 @@ void v4clients_init(void) + { + struct stat sb; + +- if (!stat("/proc/fs/nfsd/clients", &sb) == 0 || ++ if (stat("/proc/fs/nfsd/clients", &sb) != 0 || + !S_ISDIR(sb.st_mode)) + return; + if (clients_fd >= 0) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0006-Fix-function-prototypes.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0006-Fix-function-prototypes.patch new file mode 100644 index 00000000000..793bc4651cd --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0006-Fix-function-prototypes.patch @@ -0,0 +1,93 @@ +From cf0ffbb5c8fa167376926d12a63613f15aa7602f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 15 Aug 2022 14:50:15 -0700 +Subject: [PATCH] Fix function prototypes + +Clang is now erroring out on functions with out parameter types + +Fixes errors like +error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] + +Upstream-Status: Submitted [https://patchwork.kernel.org/project/linux-nfs/patch/20220816024403.2694169-2-raj.khem@gmail.com/] +Signed-off-by: Khem Raj +--- + support/export/auth.c | 2 +- + support/export/v4root.c | 2 +- + support/export/xtab.c | 2 +- + utils/exportfs/exportfs.c | 4 ++-- + utils/mount/network.c | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/support/export/auth.c b/support/export/auth.c +index 03ce4b8..2d7960f 100644 +--- a/support/export/auth.c ++++ b/support/export/auth.c +@@ -82,7 +82,7 @@ check_useipaddr(void) + } + + unsigned int +-auth_reload() ++auth_reload(void) + { + struct stat stb; + static ino_t last_inode; +diff --git a/support/export/v4root.c b/support/export/v4root.c +index c12a7d8..fbb0ad5 100644 +--- a/support/export/v4root.c ++++ b/support/export/v4root.c +@@ -198,7 +198,7 @@ static int v4root_add_parents(nfs_export *exp) + * looking for components of the v4 mount. + */ + void +-v4root_set() ++v4root_set(void) + { + nfs_export *exp; + int i; +diff --git a/support/export/xtab.c b/support/export/xtab.c +index c888a80..e210ca9 100644 +--- a/support/export/xtab.c ++++ b/support/export/xtab.c +@@ -135,7 +135,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export) + } + + int +-xtab_export_write() ++xtab_export_write(void) + { + return xtab_write(etab.statefn, etab.tmpfn, etab.lockfn, 1); + } +diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c +index 6ba615d..0897b22 100644 +--- a/utils/exportfs/exportfs.c ++++ b/utils/exportfs/exportfs.c +@@ -69,14 +69,14 @@ static int _lockfd = -1; + * need these additional lockfile() routines. + */ + static void +-grab_lockfile() ++grab_lockfile(void) + { + _lockfd = open(lockfile, O_CREAT|O_RDWR, 0666); + if (_lockfd != -1) + lockf(_lockfd, F_LOCK, 0); + } + static void +-release_lockfile() ++release_lockfile(void) + { + if (_lockfd != -1) { + lockf(_lockfd, F_ULOCK, 0); +diff --git a/utils/mount/network.c b/utils/mount/network.c +index ed2f825..01ead49 100644 +--- a/utils/mount/network.c ++++ b/utils/mount/network.c +@@ -179,7 +179,7 @@ static const unsigned long probe_mnt3_only[] = { + + static const unsigned int *nfs_default_proto(void); + #ifdef MOUNT_CONFIG +-static const unsigned int *nfs_default_proto() ++static const unsigned int *nfs_default_proto(void) + { + extern unsigned long config_default_proto; + /* diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.2.bb similarity index 92% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.1.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.2.bb index bbed5aea59b..42311c66c73 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.2.bb @@ -30,8 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://clang-warnings.patch \ + file://0005-mountd-Check-for-return-of-stat-function.patch \ + file://0006-Fix-function-prototypes.patch \ " -SRC_URI[sha256sum] = "60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df" +SRC_URI[sha256sum] = "5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. @@ -70,7 +72,7 @@ PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper,libdevmap # keyutils is available in meta-oe PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils,python3-core" -PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats" +PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats ${PN}-rpcctl" CONFFILES:${PN}-client += "${localstatedir}/lib/nfs/etab \ ${localstatedir}/lib/nfs/rmtab \ @@ -93,9 +95,12 @@ FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*" FILES:${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat ${sbindir}/nfsdclnts" RDEPENDS:${PN}-stats = "python3-core" +FILES:${PN}-rpcctl = "${sbindir}/rpcctl" +RDEPENDS:${PN}-rpcctl = "python3-core" + FILES:${PN}-staticdev += "${libdir}/libnfsidmap/*.a" -FILES:${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/" +FILES:${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/ ${nonarch_base_libdir}/modprobe.d" do_configure:prepend() { sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ From patchwork Tue Aug 16 16:58:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11460 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A0B8C25B0E for ; Tue, 16 Aug 2022 16:59:19 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.18099.1660669146455225699 for ; Tue, 16 Aug 2022 09:59:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=htx0ONkG; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id 20so1148497plo.10 for ; Tue, 16 Aug 2022 09:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=IpwTNl/tzAl5oLknqMbJzURT9GkouYd3IL2SC3uKDcM=; b=htx0ONkG6b4EaYqvGXu5716k6heeA5ElzC/+2XRETSEqGgTYv/FZi/kQvPrFDgkqCN wszrCA7UzzQ8UDg0CuniipxEHmXC7jCileSlE07kL5MmZwoh+ONXB/RJXnk0/DNWuczT x2+esH/7HE+HvsHM7ZTn3YgegLCF4XMIeG+4Fc+SchjgXBsv5rBj1t5xqhf6gBQBS9UI SVXrD2GcifckuOfLMn2u2woV38zI4IgvNkFCDg7zODo/SDGpQskkIZx+bQ62eo1Wh8MP n288ijxEvOI8GGTAANgNtdu9Oq9gmxxwPJp8IPLb+UaoYMbP/+p1x60X8DSYOq6MsZBs Heyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=IpwTNl/tzAl5oLknqMbJzURT9GkouYd3IL2SC3uKDcM=; b=i594mln9SAnwGnaA6oVIJCOnaiIin+7kR4s1G4VUjZ9tIgVbe3PK2mgRZtJnxwRADm +VT6vidL8x6gejo+IrcMtgoXacGaBatl4uHBUSVz3jL5/ZCFiHk1cPHM26vRqxLItCJy IyWSDlAEb/n5Ba71v6ej30hxp0Ohtvxc0Lu9LGvIB3P6Y+edocY+vKeBW9wcvLcTLSRJ XYcj/JQq7Rvbgj7ZCVHGFQwcJ14nFgQkMosnuyHSnLMUMeiWwkSugr5pr0z8fYam7KzB go7SLq+A+aCtAeGqUIJBCWIiarotaGPhKpsqIliso1EM495NoVwRqaGQkvwbR6B7y+2e u1aA== X-Gm-Message-State: ACgBeo3YWoYpYFArI6UTgW1rCPpjTcPxVtKu7iC3pgv5Y+bbK4P19TqE +HYAXsnAvbWyE/niDUlERJXLDdnPL9lSYw== X-Google-Smtp-Source: AA6agR7t3v6DLV8W5VewtTWTpoHy30HL6Zj0HO6Hui6Brcgve9n29ZqpwryCyy+BXGwZPyStfRVXvg== X-Received: by 2002:a17:902:d4d2:b0:16e:fe70:ca7e with SMTP id o18-20020a170902d4d200b0016efe70ca7emr22850600plg.11.1660669145381; Tue, 16 Aug 2022 09:59:05 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id x21-20020a17090a531500b001f04479017fsm6562577pjh.29.2022.08.16.09.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 09:59:04 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 5/7] apt: Do not use std::binary_function Date: Tue, 16 Aug 2022 09:58:55 -0700 Message-Id: <20220816165857.2342796-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220816165857.2342796-1-raj.khem@gmail.com> References: <20220816165857.2342796-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Aug 2022 16:59:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169446 This feature is removed from c++17 Signed-off-by: Khem Raj --- ...-init-tables-from-dpkg-configuration.patch | 4 +- ...001-Remove-using-std-binary_function.patch | 87 +++++++++++++++++++ ...n-dpkg-configure-a-at-the-end-of-our.patch | 4 +- meta/recipes-devtools/apt/apt_2.4.5.bb | 1 + 4 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch diff --git a/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch b/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch index 59b9cd190f5..37a31330102 100644 --- a/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch +++ b/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch @@ -1,4 +1,4 @@ -From 11ba49594ae9d11f0070198c146b5e437fa83022 Mon Sep 17 00:00:00 2001 +From b84280fec4e1d0d33eca78e76556023f8f8fe5b7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 10 May 2019 16:47:38 +0200 Subject: [PATCH] Do not init tables from dpkg configuration @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc -index b9d9b15..1725c59 100644 +index b9d9b15d2..1725c5966 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -281,8 +281,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) diff --git a/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch new file mode 100644 index 00000000000..3065210a04b --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch @@ -0,0 +1,87 @@ +From e91fb0618ce0a5d42f239d0fca602544858f0819 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 16 Aug 2022 08:44:18 -0700 +Subject: [PATCH] Remove using std::binary_function + +std::binary_function and std::unary_function are deprecated since c++11 +and removed in c++17, therefore remove it and use lambda functions to get same +functionality implemented. + +Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/253] +Signed-off-by: Khem Raj +--- + ftparchive/apt-ftparchive.cc | 33 ++++++++++----------------------- + 1 file changed, 10 insertions(+), 23 deletions(-) + +diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc +index 87ce9153c..56fdc2246 100644 +--- a/ftparchive/apt-ftparchive.cc ++++ b/ftparchive/apt-ftparchive.cc +@@ -48,6 +48,11 @@ + using namespace std; + unsigned Quiet = 0; + ++auto ContentsCompare = [](const auto &a, const auto &b) { return a.ContentsMTime < b.ContentsMTime; }; ++auto DBCompare = [](const auto &a, const auto &b) { return a.BinCacheDB < b.BinCacheDB; }; ++auto SrcDBCompare = [](const auto &a, const auto &b) { return a.SrcCacheDB < b.SrcCacheDB; }; ++ ++ + static struct timeval GetTimevalFromSteadyClock() /*{{{*/ + { + auto const Time = std::chrono::steady_clock::now().time_since_epoch(); +@@ -116,24 +121,6 @@ struct PackageMap + bool SrcDone; + time_t ContentsMTime; + +- struct ContentsCompare : public binary_function +- { +- inline bool operator() (const PackageMap &x,const PackageMap &y) +- {return x.ContentsMTime < y.ContentsMTime;}; +- }; +- +- struct DBCompare : public binary_function +- { +- inline bool operator() (const PackageMap &x,const PackageMap &y) +- {return x.BinCacheDB < y.BinCacheDB;}; +- }; +- +- struct SrcDBCompare : public binary_function +- { +- inline bool operator() (const PackageMap &x,const PackageMap &y) +- {return x.SrcCacheDB < y.SrcCacheDB;}; +- }; +- + void GetGeneral(Configuration &Setup,Configuration &Block); + bool GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats); + bool GenSources(Configuration &Setup,struct CacheDB::Stats &Stats); +@@ -869,7 +856,7 @@ static bool DoGenerateContents(Configuration &Setup, + else + I->ContentsMTime = A.st_mtime; + } +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::ContentsCompare()); ++ stable_sort(PkgList.begin(),PkgList.end(),ContentsCompare); + + /* Now for Contents.. The process here is to do a make-like dependency + check. Each contents file is verified to be newer than the package files +@@ -941,8 +928,8 @@ static bool Generate(CommandLine &CmdL) + LoadBinDir(PkgList,Setup); + + // Sort by cache DB to improve IO locality. +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare()); +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare()); ++ stable_sort(PkgList.begin(),PkgList.end(),DBCompare); ++ stable_sort(PkgList.begin(),PkgList.end(),SrcDBCompare); + + // Generate packages + if (_config->FindB("APT::FTPArchive::ContentsOnly", false) == false) +@@ -993,8 +980,8 @@ static bool Clean(CommandLine &CmdL) + LoadBinDir(PkgList,Setup); + + // Sort by cache DB to improve IO locality. +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare()); +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare()); ++ stable_sort(PkgList.begin(),PkgList.end(),DBCompare); ++ stable_sort(PkgList.begin(),PkgList.end(),SrcDBCompare); + + string CacheDir = Setup.FindDir("Dir::CacheDir"); + diff --git a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch index 593ed7d0968..6f4d5b6e729 100644 --- a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +++ b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch @@ -1,4 +1,4 @@ -From 47c2b42af60ceefd8ed52b32a3a365facf0e05b8 Mon Sep 17 00:00:00 2001 +From a2dd661484536492b47d4c88998f2bf516749bc8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 21 May 2020 20:13:25 +0000 Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our @@ -20,7 +20,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc -index 93effa9..4375781 100644 +index 93effa959..4375781d1 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1199,12 +1199,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() diff --git a/meta/recipes-devtools/apt/apt_2.4.5.bb b/meta/recipes-devtools/apt/apt_2.4.5.bb index 53849f80a30..564bdeec410 100644 --- a/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-cmake-Do-not-build-po-files.patch \ file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \ file://0001-aptwebserver.cc-Include-array.patch \ + file://0001-Remove-using-std-binary_function.patch \ " SRC_URI:append:class-native = " \ From patchwork Tue Aug 16 16:58:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 14272 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Khem Raj" Subject: [PATCH 6/7] ltp: Fix sys/mount.h and linux/mount.h conflict Date: Tue, 16 Aug 2022 09:58:56 -0700 Message-Id: <20220816165857.2342796-6-raj.khem@gmail.com> In-Reply-To: <20220816165857.2342796-1-raj.khem@gmail.com> References: <20220816165857.2342796-1-raj.khem@gmail.com> MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org Cc: Khem Raj backport needed patches Signed-off-by: Khem Raj --- ...ove-duplicate-include-of-sys-mount.h.patch | 30 -------- ...olve-conflict-in-different-header-fi.patch | 71 +++++++++++++++++++ ...-lapi-pidfd-adding-pidfd-header-file.patch | 60 ++++++++++++++++ meta/recipes-extended/ltp/ltp_20220527.bb | 3 +- 4 files changed, 133 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch deleted file mode 100644 index fc7fea02f9b..00000000000 --- a/meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 463f3f85e326253feb35015a022ab6d1e03fe1d5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2022 20:50:27 -0700 -Subject: [PATCH] Remove duplicate include of - - is already included by lapi/mount.h. - -This fixes build with glibc 2.36+ - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/953] -Signed-off-by: Khem Raj ---- - testcases/kernel/syscalls/statx/statx09.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/statx/statx09.c b/testcases/kernel/syscalls/statx/statx09.c -index aea329e086..34c5f41f87 100644 ---- a/testcases/kernel/syscalls/statx/statx09.c -+++ b/testcases/kernel/syscalls/statx/statx09.c -@@ -18,7 +18,6 @@ - */ - - #define _GNU_SOURCE --#include - #include - #include "tst_test.h" - #include "lapi/fs.h" --- -2.37.1 - diff --git a/meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch b/meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch new file mode 100644 index 00000000000..cdbcf6b2888 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch @@ -0,0 +1,71 @@ +From b857f8723f30a4b9554bf6b0ff8fa52fd07e8b60 Mon Sep 17 00:00:00 2001 +From: Li Wang +Date: Fri, 5 Aug 2022 14:34:01 +0800 +Subject: [PATCH] lapi/fsmount: resolve conflict in different header files + +The latest glibc added new wrappers (e.g. mount_setattr, fsopen) support +in sys/mount.h, which partly conflicts with linux/mount.h at the same time. + +We need to make adjustments to header files to fix compiling error on +different platforms. + +Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/b857f8723f30a4b9554bf6b0ff8fa52fd07e8b60] +Signed-off-by: Li Wang +Reviewed-by: Petr Vorel +--- + configure.ac | 1 + + include/lapi/fs.h | 6 ++++-- + include/lapi/fsmount.h | 7 +++++-- + 3 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d50ec1ea7..dbd53cab6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -113,6 +113,7 @@ AC_CHECK_FUNCS_ONCE([ \ + mkdirat \ + mknodat \ + modify_ldt \ ++ mount_setattr \ + move_mount \ + name_to_handle_at \ + open_tree \ +diff --git a/include/lapi/fs.h b/include/lapi/fs.h +index 27b3a183c..84a168a67 100644 +--- a/include/lapi/fs.h ++++ b/include/lapi/fs.h +@@ -6,8 +6,10 @@ + * Email: code@zilogic.com + */ + +-#ifdef HAVE_LINUX_FS_H +-# include ++#ifndef HAVE_MOUNT_SETATTR ++# ifdef HAVE_LINUX_FS_H ++# include ++# endif + #endif + + #include +diff --git a/include/lapi/fsmount.h b/include/lapi/fsmount.h +index b11e7a7bd..07eb42ffa 100644 +--- a/include/lapi/fsmount.h ++++ b/include/lapi/fsmount.h +@@ -11,9 +11,12 @@ + #include "config.h" + #include + #include ++#include + +-#ifdef HAVE_LINUX_MOUNT_H +-# include ++#ifndef HAVE_FSOPEN ++# ifdef HAVE_LINUX_MOUNT_H ++# include ++# endif + #endif + + #include "lapi/fcntl.h" +-- +2.37.2 + diff --git a/meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch b/meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch new file mode 100644 index 00000000000..184c42640ae --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch @@ -0,0 +1,60 @@ +From dbc9c14c92a5acf450d07868a735ac8cd6ec5b90 Mon Sep 17 00:00:00 2001 +From: Li Wang +Date: Fri, 5 Aug 2022 14:34:00 +0800 +Subject: [PATCH] lapi/pidfd: adding pidfd header file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The newer Glibc already provided wrapper for the series pidfd syscall, +so let's include the header file conditionally. + + # rpm -q glibc-devel + glibc-devel-2.35.9000-31.fc37.ppc64le + # rpm -ql glibc-devel | grep pidfd + /usr/include/sys/pidfd.h + +To get rid of compiling error from fedora-rawhide: + + tst_safe_macros.c: In function ‘safe_pidfd_open’: + tst_safe_macros.c:135:16: error: implicit declaration of function ‘pidfd_open’ [-Werror=implicit-function-declaration] + 135 | rval = pidfd_open(pid, flags); + | ^~~~~~~~~~ + +Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/dbc9c14c92a5acf450d07868a735ac8cd6ec5b90] +Signed-off-by: Li Wang +Reviewed-by: Petr Vorel +--- + configure.ac | 1 + + include/lapi/pidfd.h | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 69b145b5f..d50ec1ea7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,6 +71,7 @@ AC_CHECK_HEADERS_ONCE([ \ + sys/epoll.h \ + sys/fanotify.h \ + sys/inotify.h \ ++ sys/pidfd.h + sys/prctl.h \ + sys/shm.h \ + sys/timerfd.h \ +diff --git a/include/lapi/pidfd.h b/include/lapi/pidfd.h +index 244d3acaf..9ca8e5aa2 100644 +--- a/include/lapi/pidfd.h ++++ b/include/lapi/pidfd.h +@@ -8,6 +8,9 @@ + #define LAPI_PIDFD_H__ + + #include ++#ifdef HAVE_SYS_PIDFD_H ++# include ++#endif + #include "config.h" + #include "lapi/syscalls.h" + +-- +2.37.2 + diff --git a/meta/recipes-extended/ltp/ltp_20220527.bb b/meta/recipes-extended/ltp/ltp_20220527.bb index 6d812958cdd..a547298828b 100644 --- a/meta/recipes-extended/ltp/ltp_20220527.bb +++ b/meta/recipes-extended/ltp/ltp_20220527.bb @@ -37,7 +37,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht file://0001-netstress-Restore-runtime-to-5m.patch \ file://0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch \ file://0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch \ - file://0001-Remove-duplicate-include-of-sys-mount.h.patch \ + file://0001-lapi-pidfd-adding-pidfd-header-file.patch \ + file://0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch \ " S = "${WORKDIR}/git" From patchwork Tue Aug 16 16:58:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ED5FC32772 for ; Tue, 16 Aug 2022 16:59:09 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.18015.1660669148978940195 for ; Tue, 16 Aug 2022 09:59:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Noivy6/H; spf=pass (domain: gmail.com, ip: 209.85.210.180, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f180.google.com with SMTP id y141so9838874pfb.7 for ; Tue, 16 Aug 2022 09:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Dl/0OWja+KOhyVl1zq0mOMzC7x4h7z2lqRJJSOPiTcg=; b=Noivy6/Hhy4JQuPAd7ReskOLxhyr6ek0kpRM3hkQdpGZfS9d+DrYt+a1WJoClQCUYr QVtemD8goBWeO3fWnNI8zOyt3aepM1FM0P7M/3Y9D2fkUSqt/huh8kRjwUT0yeE4jK/P 2zSA30pTBKE3Ma8Xa0idaYdn40mOgi8+d7XkSrUuoiZ66ZcHgqSN+fJ2PpET2SxQ6e6J vdNGUFfYyU0CUFMPI5bRuHsELb/kpT67lenphgEWNV4Yi7pAMmnkCN7UhSLL8VDmAebb SQxKsP8fNkq2wnkF2q9N2n40KI14z25fjVvGLIvdXp1MwM1bdStINMbn3b0FN5lhSNBn QmvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Dl/0OWja+KOhyVl1zq0mOMzC7x4h7z2lqRJJSOPiTcg=; b=zBC6NwL/4dzoC0VIJTBcX/fVJR1NsP1g1MdBl4DZPsEeB6WQF6SziIzDDbaZu+5zcI Fs/4TV7AGy+qMGUJ/5tPtV+JWZ4Pq4Fjgb9MR7kIsb00gt82idoVWkVnXs4mAFQOENoJ QEDBFX6sOoyTKLehQZtkpaJVBm8vt3NXVhwI/TmVWhbpcryX20ahKBckxuLgeGGY374O HGMiChrZKL3xTvikuPN8Rmx86Oy4V0cOxsfWelJpm7XAVzUiTGu1rwf0KPnViW+AwRZ5 yRIcSZFUcPmduKKHDJ3T2/dKtuTqMeyZ8NuvFgCExtvH0CGgwvlNkMFGIas1sRElraRX v9lQ== X-Gm-Message-State: ACgBeo1QP5YWgfBTR7SxQAGudv66az+l+BMPVzGQjswcVvOSi34/KPLy RvESYwQyTrZIWlEkh70yNYSyIMvaGcpChg== X-Google-Smtp-Source: AA6agR4cCa3ldUG7IlItTQ6Dj+T2yra+w83DveZKWXamukuqXfyEqamMopmJ8QemiWdpsCAggAP+hQ== X-Received: by 2002:a05:6a00:1813:b0:52d:cccf:e443 with SMTP id y19-20020a056a00181300b0052dcccfe443mr21938594pfa.81.1660669147933; Tue, 16 Aug 2022 09:59:07 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::bb7a]) by smtp.gmail.com with ESMTPSA id x21-20020a17090a531500b001f04479017fsm6562577pjh.29.2022.08.16.09.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 09:59:07 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 7/7] spirv-tools: Update to 1.3.224.0 Date: Tue, 16 Aug 2022 09:58:57 -0700 Message-Id: <20220816165857.2342796-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220816165857.2342796-1-raj.khem@gmail.com> References: <20220816165857.2342796-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Aug 2022 16:59:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169448 Fixes build with clang Signed-off-by: Khem Raj --- v2: Drop uprev of vulkan-headers recipe, there was no change .../spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} (96%) diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb similarity index 96% rename from meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb rename to meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb index eb907326c43..cfea28a6efe 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb @@ -7,7 +7,7 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" +SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)"