From patchwork Thu Jan 26 07:17:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18668 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 E048EC54EED for ; Thu, 26 Jan 2023 07:17:41 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.68536.1674717459424444693 for ; Wed, 25 Jan 2023 23:17:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eBItYea5; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id k10-20020a17090a590a00b0022ba875a1a4so4470099pji.3 for ; Wed, 25 Jan 2023 23:17:39 -0800 (PST) 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:subject:date:message-id:reply-to; bh=EoGgCnJ3Rnrynaho5+Z4dpmdFC5Y2mM2vzqGkaENpj4=; b=eBItYea52U6+kfBDeMJGZfO/CsDfrIWdBxWXZhaN65y0/X7QB02ke07scOOG76nttl y52iZyoeiySLGZoFP1xnnwLCAVov3xcQxQSPrtmW1TJ/GnKDdt6QZP6N5twWwaBEnQ4o aZv0HoMxXikj/+f1DxMV1ccyLdVjLI4qn5bBsgIxvEF8pfdOlbSpiqOORqcZnJAdHd4R ITsMx2yWbqq+eX8xexcezXQsZSJGRQ0sJWw1gZtbfGaXCmgOk6iTesJNbcM6CseEs6nx 3IN71qkgLgZ7EIW8SywZRfv+o9qQ52Lac38j0wv47Dc1qU1G0/vAf4v04HfldWogyIyA 39Wg== 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:subject:date:message-id :reply-to; bh=EoGgCnJ3Rnrynaho5+Z4dpmdFC5Y2mM2vzqGkaENpj4=; b=OZ97kXRoZbgzxeiFO9zUrwpVmxD0sVUMFKo2PtpYyr0w/KaA8pEF308puYAT7Jj6Po x+aSu9i6oT4YCx4q/d0jeCn+8q61po4cUsqwz7BPSDNgq4nar5SyvQL+2co5c0+xsZHw 7NvS7QMvYXc/5J0xC8GwsPJ0SKj2PHVUl12ukSL5eZmnKrRdQjuMRGmMis9HMKNUGW7J Ls77kJmakPrkeqVapCmFt+Cd+BSneATaT3CggmFHyMX8S29feTFmi92HDCvo3ClRobSk QHir9ckR4jxwYaR8yig61vUoweQCBuWqJk51FbQXH4p/rRUq6KTXUPgsSyRz1rHS6YCv LEHQ== X-Gm-Message-State: AFqh2kqzwQMqFX3qg/wTaXalJ3ynRODAQVeC0O4bChuy8na96PJYXy0/ TeUZPWcE5dYV+LXX4I1DIRsBpiNY3vn3Kg== X-Google-Smtp-Source: AMrXdXvZ4glYQnlVtFHpBwpEuEMf7CdIykhPdGvB3IoUCga+H9Wr1KjLRQqhxBB6c442fJrUKxZVVQ== X-Received: by 2002:a17:902:cec3:b0:194:d9b5:3bf0 with SMTP id d3-20020a170902cec300b00194d9b53bf0mr31297076plg.18.1674717458493; Wed, 25 Jan 2023 23:17:38 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:38 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 01/13] vulkan-cts,opengl-es-cts: Fix build with gcc-13 Date: Wed, 25 Jan 2023 23:17:23 -0800 Message-Id: <20230126071735.2444745-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 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 ; Thu, 26 Jan 2023 07:17:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100783 Signed-off-by: Khem Raj --- .../files/0001-Include-missing-cstdint.patch | 34 +++++++++++ .../files/0001-include-missing-cstdint.patch | 61 +++++++++++++++++++ ...01-vulkancts-Include-missing-cstdint.patch | 32 ++++++++++ .../vk-gl-cts/files/0001-vulkancts.patch | 40 ------------ .../vk-gl-cts/khronos-cts.inc | 2 +- .../vk-gl-cts/opengl-es-cts_3.2.8.0.bb | 3 +- .../vk-gl-cts/vulkan-cts_1.3.3.1.bb | 5 +- 7 files changed, 134 insertions(+), 43 deletions(-) create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch new file mode 100644 index 0000000000..0dd59713a1 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch @@ -0,0 +1,34 @@ +From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 19:19:34 -0800 +Subject: [PATCH] Include missing + +This error is seen with gcc-13 where include headers are not implicitly +included [1] + +Fixes errors e.g. +error: 'uint32_t' does not name a type + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj +--- + framework/common/tcuDefs.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp +index ad3d0736d..6dfac10fb 100644 +--- a/framework/common/tcuDefs.hpp ++++ b/framework/common/tcuDefs.hpp +@@ -26,6 +26,7 @@ + #include "deDefs.hpp" + #include "qpTestLog.h" + ++#include + #include + #include + +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..47d9fc748a --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch @@ -0,0 +1,61 @@ +From 74cf53d89529902ecdef5b230421bc4d30fd089b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 15:36:14 -0800 +Subject: [PATCH] include missing + +gcc-13 exposed errors like below due to it removing indirect includes of +these headers in libstdc++ [1] + +../git/external/amber/src/include/amber/shader_info.h:60:15: error: 'uint32_t' was not declared in this scope + 60 | std::vector shader_data; + | ^~~~~~~~ + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://github.com/google/amber/pull/1016] +Signed-off-by: Khem Raj +--- + include/amber/recipe.h | 1 + + include/amber/shader_info.h | 1 + + src/descriptor_set_and_binding_parser.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/include/amber/recipe.h b/include/amber/recipe.h +index 310a86a..1b83213 100644 +--- a/include/amber/recipe.h ++++ b/include/amber/recipe.h +@@ -15,6 +15,7 @@ + #ifndef AMBER_RECIPE_H_ + #define AMBER_RECIPE_H_ + ++#include + #include + #include + #include +diff --git a/include/amber/shader_info.h b/include/amber/shader_info.h +index 6c9126a..b5ce751 100644 +--- a/include/amber/shader_info.h ++++ b/include/amber/shader_info.h +@@ -15,6 +15,7 @@ + #ifndef AMBER_SHADER_INFO_H_ + #define AMBER_SHADER_INFO_H_ + ++#include + #include + #include + +diff --git a/src/descriptor_set_and_binding_parser.h b/src/descriptor_set_and_binding_parser.h +index 145aa42..4b0d774 100644 +--- a/src/descriptor_set_and_binding_parser.h ++++ b/src/descriptor_set_and_binding_parser.h +@@ -15,6 +15,7 @@ + #ifndef SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ + #define SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ + ++#include + #include + + #include "amber/result.h" +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch new file mode 100644 index 0000000000..40aea8f203 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch @@ -0,0 +1,32 @@ +From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 31 May 2021 17:31:33 -0700 +Subject: [PATCH] vulkancts: Include missing + +Fixes build with gcc-13 + +../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type + 2798 | BufferDataType type = static_cast(reinterpret_cast(expectedOutputs[resultIndex].getUserData())); + | ^~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj +--- + .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +index ab02be1dc..3d3ee4829 100644 +--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp ++++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +@@ -33,6 +33,7 @@ + #include "deFloat16.h" + #include "vkQueryUtil.hpp" + #include "vkRefUtil.hpp" ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch deleted file mode 100644 index 2fd1d7123a..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 31 May 2021 17:31:33 -0700 -Subject: [PATCH] vulkancts: - -O_TRUNC value in OperationId enum collides with the macro O_TRUNC -defined in the POSIX header fnctl.h. To avoid the collision undefine -O_TRUNC in this particular sourcefile before its is used in enums -down below. - -This is fixed upstream differently -https://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b - -But until we get this module uprev'ed to that, lets use a simpler -workaround - -Upstream-Status: Inappropriate [Fixed Differently] -Signed-off-by: Khem Raj ---- - .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -index 22e6c75fa..db7f4b54a 100644 ---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -@@ -38,6 +38,10 @@ - #include - #include - -+#ifdef O_TRUNC -+#undef O_TRUNC -+#endif -+ - namespace vkt - { - namespace SpirVAssembly --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index c7535405b0..01f4a572f8 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -26,7 +26,7 @@ ANY_OF_DISTRO_FEATURES += "opengl wayland" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" SRC_URI += " \ - file://0001-vulkancts.patch \ + file://0001-vulkancts-Include-missing-cstdint.patch \ file://0001-use-library-sonames-for-linking.patch \ " diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb index 024a1719d0..edfeda2bef 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb @@ -12,7 +12,8 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "d70e01c0be7b8a7d20b186b30b29a75b18bba75d" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src" +SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb index c996eb1f76..862963dd0d 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb @@ -11,7 +11,10 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch" +SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ + file://0001-Include-missing-cstdint.patch \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src \ +" S = "${WORKDIR}/git" From patchwork Thu Jan 26 07:17:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18669 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 DB9C2C54E94 for ; Thu, 26 Jan 2023 07:17:41 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.68626.1674717460429623922 for ; Wed, 25 Jan 2023 23:17:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bRrt8KqS; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id jm10so1099363plb.13 for ; Wed, 25 Jan 2023 23:17:40 -0800 (PST) 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:subject:date :message-id:reply-to; bh=ohbovFq9xONaoElHpPzldE51K4zTCOcFaBziQG5yJ9k=; b=bRrt8KqSI34wv5Jiu8/KyvVKCwJ+ASsZt28gWTG9WPo1cuve7cpPKvKpmmqaXtAbUj fcjPHcmKpUWMt5NDJ0gowFpkBdUB2EsJ5OLF1lFZhf4VcfCu/WKQ4sOulWfd/sGhvSKA 6fPJ0V5ppaMvDC8x8TIpVaJJp90fAT1692Od5IVQBz07UcSjKZPuXI5iTHrjxPA5/jjf HhvwQq5MNJmNbnk00m/5zQIFPXuaVYlD+1/pfIZxv3mxK8gM8KaAFKJbRUVU2VQx18AM Fs5OT5lNqOveKG7fl6lidc1PQW2FikCyCbpBlx2k4jjEnFnRm7uYUiRZJ2lmc2dWJxfg eEwA== 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 :subject:date:message-id:reply-to; bh=ohbovFq9xONaoElHpPzldE51K4zTCOcFaBziQG5yJ9k=; b=sLQFIAWBa3+jeIp0EmCPbyI4m1RNniLbAHo4NLCXRKviWvPUxh9POdIiVC2FPR7TAp BDofUr3LiHwJXQgHFDqhjcrgrKJ4BHpLV23WBwwnMoUmiISW7js9tp1ez/idFACSRXWb V3dHbOVVrtqGA4rDIhsvliXEwRCQvmQDzgBWqb628hEZQ4sKhyDE9HZ8u55LoWJQgmtt EOFz6UET7chBmGv6pxa2nndqE72MCsy8JTIlpKf2oLJbjHFJMFr6QKVgLmYi8j7hYkSv AXRYlGyFCqBjgEnlGtz5Qkpj2nlrxgIjlPJPK8xrGX8CzysJ29bqDoOQW1Uch2cxi67W 4tVw== X-Gm-Message-State: AO0yUKVQ4AcyatV+a8Er5VKNy4/P+Nb0vrJaYtAAk61e1ywb9TGN9XxS j4lRU5aYUSdEaadZgU00SQSlo4kgms7+pw== X-Google-Smtp-Source: AK7set+4j+V+OORec2Tjew8Z3H8DPYw7ZW3pFFJ+Kp7gEHgnzzB8JIecUm7P5tQRUhfPp67e8bwrjQ== X-Received: by 2002:a17:902:d044:b0:195:ed79:4846 with SMTP id l4-20020a170902d04400b00195ed794846mr853906pll.22.1674717459519; Wed, 25 Jan 2023 23:17:39 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:38 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 02/13] rocksdb: Fix build with gcc13 Date: Wed, 25 Jan 2023 23:17:24 -0800 Message-Id: <20230126071735.2444745-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100784 Signed-off-by: Khem Raj --- ...-missing-includes-cstdint-and-cstdio.patch | 70 +++++++++++++++++++ meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb | 1 + 2 files changed, 71 insertions(+) create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch new file mode 100644 index 0000000000..1c505f7e18 --- /dev/null +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -0,0 +1,70 @@ +From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 24 Jan 2023 21:40:43 -0800 +Subject: [PATCH] Add missing includes and + +This is needed with GCC 13 and newer [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1] +Signed-off-by: Khem Raj +--- + .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 1 + + storage/rocksdb/rocksdb/util/string_util.h | 1 + + tpool/aio_linux.cc | 1 + + 6 files changed, 6 insertions(+) + +--- a/db/compaction/compaction_iteration_stats.h ++++ b/db/compaction/compaction_iteration_stats.h +@@ -7,6 +7,7 @@ + + #include + ++#include + #include "rocksdb/rocksdb_namespace.h" + + namespace ROCKSDB_NAMESPACE { +--- a/include/rocksdb/utilities/checkpoint.h ++++ b/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include + #include + #include + #include "rocksdb/status.h" +--- a/table/block_based/data_block_hash_index.h ++++ b/table/block_based/data_block_hash_index.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + #include + #include + +--- a/util/slice.cc ++++ b/util/slice.cc +@@ -12,6 +12,7 @@ + #include + + #include ++#include + + #include "rocksdb/convenience.h" + #include "rocksdb/slice_transform.h" +--- a/util/string_util.h ++++ b/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb index d4f0346ee1..b9416988cf 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb @@ -12,6 +12,7 @@ SRCBRANCH = "7.5.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ + file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://ppc64.patch \ file://mips.patch \ file://arm.patch \ From patchwork Thu Jan 26 07:17:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18667 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 E1099C05027 for ; Thu, 26 Jan 2023 07:17:41 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.68627.1674717461230170261 for ; Wed, 25 Jan 2023 23:17:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=T8n0XZuc; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id t12-20020a17090aae0c00b00229f4cff534so5321609pjq.1 for ; Wed, 25 Jan 2023 23:17:41 -0800 (PST) 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:subject:date :message-id:reply-to; bh=yvY4DzKNYDLrQMgzpO/Xjz92a2Km9X0lChs8g7ng3jE=; b=T8n0XZuc7MXSj4yp0C5C10Wy1aTaxLaaeBlZG3C2/wBOGUGfueqGanN9oKonCwgnJJ 06dyv1xu9f0hPUgQ9MVm5r32nTL+YeY9/gJTbxYZv73prCBpsBy0ovhOH97AVOVW+TGo WtmcurF9Hj1q/91p3PCJ71mhDFzqadCDvcP8hdZsuBMJA1JHOfWNJxfPG7uBp0W3AaL2 lSZ3EQmvPCAuAH2xUV18M4dRWABLl7nUXQ4GzDwOHkkZvyN14iwme0OdOsHrWCB4rEnV SydAYKvcfySrWxN/Jf9NuwgWEwMnmqCVqrutboTQphpu04qssqyKaD92gDmB6zwyIQ+8 puzg== 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 :subject:date:message-id:reply-to; bh=yvY4DzKNYDLrQMgzpO/Xjz92a2Km9X0lChs8g7ng3jE=; b=NZ5DcT2+S67V1KLaXB0BWEf2OCjGYQCXBIiaaazdN1dtW6mRo1EVPkUWbpf0FbM9nJ PdfaIkBdHmh6r3hTGc1nWR1sdfVcdEi1/sHTUySI/kzfPlYYedjDtrb++Y7WAJoMZ2XY Gu1HzcLNkPaEK21i1bFmNXX3j3xXLQezNnyxt8/poXZ6GvkggTmY9VJHRiTBBKBQV39t IKeGuUegnCCkdU8BpOFAZMcVp/dHkAceDh12QA+PO9VnwceiaESZxeQ+M1QqOmBiUpvd RIM4eNxVOFfqPgxZ4xVFr5d1CEyLFT0fQWjSdMODVv4Tyl7qkPe2C+PwB72A2ylKrNzD FnaQ== X-Gm-Message-State: AO0yUKWQlqLXF7A3Z2txJcqhJ1gDn50eJNccltL64SecJMVkUfwgLicD SSWtvnBvgoH+l75IC24HJnvmLv7+ce4R3g== X-Google-Smtp-Source: AK7set8VtUKEcgL6ADsckifX2OcMouX6huAAwft4mqlgnYqAK/HbYv2Ta6WDD9mbmLpP93FLi5uuVw== X-Received: by 2002:a17:902:d492:b0:196:3feb:1f1e with SMTP id c18-20020a170902d49200b001963feb1f1emr1013712plg.47.1674717460355; Wed, 25 Jan 2023 23:17:40 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:39 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 03/13] rocksdb: Upgrade to 7.9.2 Date: Wed, 25 Jan 2023 23:17:25 -0800 Message-Id: <20230126071735.2444745-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100785 Refresh patches Signed-off-by: Khem Raj --- .../files/0001-Add-missing-includes-cstdint-and-cstdio.patch | 2 +- .../files/0001-cmake-Add-check-for-atomic-support.patch | 2 +- .../files/0001-cmake-Use-exported-target-for-bz2.patch | 2 +- meta-oe/recipes-dbs/rocksdb/files/ppc64.patch | 2 +- .../rocksdb/{rocksdb_7.5.3.bb => rocksdb_7.9.2.bb} | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename meta-oe/recipes-dbs/rocksdb/{rocksdb_7.5.3.bb => rocksdb_7.9.2.bb} (96%) diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch index 1c505f7e18..a177ce28b9 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -37,7 +37,7 @@ Signed-off-by: Khem Raj +#include #include #include - #include "rocksdb/status.h" + --- a/table/block_based/data_block_hash_index.h +++ b/table/block_based/data_block_hash_index.h @@ -5,6 +5,7 @@ diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch index 2906100dee..0fe9c12766 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch @@ -27,7 +27,7 @@ Signed-off-by: Khem Raj --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1000,7 +1000,12 @@ option(ROCKSDB_BUILD_SHARED "Build share +@@ -1057,7 +1057,12 @@ set(ROCKSDB_SHARED_LIB rocksdb-shared${A if(WIN32) set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) else() diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch index 139312a298..706e0868e5 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch @@ -13,7 +13,7 @@ Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -153,12 +153,7 @@ else() +@@ -154,12 +154,7 @@ else() if(WITH_BZ2) find_package(BZip2 REQUIRED) add_definitions(-DBZIP2) diff --git a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch index 45deef338c..211c1c720b 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj @@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v uint64_t result; - __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); + __asm __volatile__("mrs %[rt], cntvct_el0" : [rt] "=r"(result)); return result; -#elif defined(__powerpc__) +#elif defined(__powerpc__) && defined(__GLIBC__) diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb similarity index 96% rename from meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb rename to meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb index b9416988cf..29f234d6ec 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "540d5aae516265170564ec27b3e67a54a11b7045" -SRCBRANCH = "7.5.fb" +SRCREV = "444b3f4845dd01b0d127c4b420fdd3b50ad56682" +SRCBRANCH = "7.9.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ file://0001-cmake-Add-check-for-atomic-support.patch \ From patchwork Thu Jan 26 07:17:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18671 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 BE7EDC54E94 for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.68628.1674717462111039724 for ; Wed, 25 Jan 2023 23:17:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IT1qpEWy; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id z9-20020a17090a468900b00226b6e7aeeaso977847pjf.1 for ; Wed, 25 Jan 2023 23:17:42 -0800 (PST) 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:subject:date :message-id:reply-to; bh=lyRhOwNWOxCkPTQxuw+t5II8UA62rV+r7SDsiHChBKg=; b=IT1qpEWyaEnrkaKiyGwa8BkoaaJ6+HbHevH2tbdGUZIaXtSqBsfxIhYczC3RGv39tA JFeAFVy0kImS9nGOq++KB9IgHJ7rLjqjZNt748yr3W5U3DnIVXx18k65xUxy3bKG/pk+ dR1DlGG2R65o34n3nxRj+EMlJxaVwMaaker6TrL3hekdcf5mfxlHgNAhM6Rp0dk+yncp wctPEL7U4TL7qfMCeaafHcCzb6QWSHUJ85fTyZjsRKGLU6Xpa3nbNy2H91ihxTd1Y2Rr wyV8vdYt66tkNU4pgl1YM9XMnUaKh56X6eLOHoMhya31XhN/H/qI1mTw6oAuxp5cfB1F f2EA== 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 :subject:date:message-id:reply-to; bh=lyRhOwNWOxCkPTQxuw+t5II8UA62rV+r7SDsiHChBKg=; b=NVqUGAgKVdiAT3vHxU/wAK2syh1ri+LzsQeCmiLxvvWMGUdHMeHFpJNWd2LXgtG1aL 5k621FGFMGb8M/my3sSadqZUrVjx7IDBK45lerii8L1EBpMIBUCueeJgAy7MyZUYfMps VI7M9bOPozi1DL+HERKHVXMtrzvn+K/LiVGMT7XBVtwuQXcKElwFLlbU8RUXkF6MELz9 BmLkFOS8XHF2ipwr4Z+CwhZdIN2xS1Cf3IukKbLnnB1sPJ5YEA1xSNT/Rhy75wKhRNEF sRY572Puy+Pd5OFlKpFdhAwFMmipsEq9PHiXUl1ZlJyBWBPAzblgMLBu7gxRXZSTB5kb oWzQ== X-Gm-Message-State: AFqh2kqh6uVfTzq/DIXWbf/C+aMDctRb+XLQtwOgfWsVACGq1jbQkM2W Ro9k70wkfAfqnhh3ubUMEDljoxr9d7CdMw== X-Google-Smtp-Source: AMrXdXvyysNIYVLsFfcHpuZ1dyfedvdS+0NtmtejqNtq5EhLQcNViN/01YeH91prveUcYa3ZCuV0/A== X-Received: by 2002:a17:902:b213:b0:194:5c63:3638 with SMTP id t19-20020a170902b21300b001945c633638mr32793959plr.61.1674717461208; Wed, 25 Jan 2023 23:17:41 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:40 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 04/13] redis-plus-plus: Upgrade to 1.3.7 Date: Wed, 25 Jan 2023 23:17:26 -0800 Message-Id: <20230126071735.2444745-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100786 Signed-off-by: Khem Raj --- .../{redis-plus-plus_1.3.5.bb => redis-plus-plus_1.3.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-extended/redis-plus-plus/{redis-plus-plus_1.3.5.bb => redis-plus-plus_1.3.7.bb} (90%) diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb similarity index 90% rename from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb rename to meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb index de19dca387..21783b30d5 100644 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" -SRCREV = "58084931ed1a056d91fe96da7b9ea81fa023560a" +SRCREV = "f3b19a8a1f609d1a1b79002802e5cf8c336dc262" S = "${WORKDIR}/git" From patchwork Thu Jan 26 07:17:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18677 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 E7D11C61DA7 for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.68630.1674717463105713540 for ; Wed, 25 Jan 2023 23:17:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QE1KY2Ft; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id x2-20020a17090a46c200b002295ca9855aso4481886pjg.2 for ; Wed, 25 Jan 2023 23:17:43 -0800 (PST) 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:subject:date :message-id:reply-to; bh=6eeO9HtDvVno8sKuV5clc4ppEkH0V8MoVG+Gg/rCVek=; b=QE1KY2FtXALxXINRzlGTX61/qLRGl6VZZ+tVZa6BKsXAaLCu33QOZuupsjOjYaDA69 ZlBqgwywL5dto6S9I9QjfvrgJwiEibp9qgDhzpdK3BnkGe2uUI2SS15dz2yFHRfHOQfq uU07uEmH992SUEbHffCGUQE2SUuF9TxtRXiIpZlDGMIK726iFmIwlZCdwIYNVd9VROJk vQMccsa3O6C1TDchK7Ysd6XaB4joUh8n6NNFM7UWo3mQOMAaPej57I5ZyQB89V79RK21 D1vNcydpXDZngelj41lICBaSU6P56vV6ImOt14OWKSEcYagSGiLkj7w8MAD7BGqEEQS+ 8YhQ== 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 :subject:date:message-id:reply-to; bh=6eeO9HtDvVno8sKuV5clc4ppEkH0V8MoVG+Gg/rCVek=; b=Smjw1uvCnKURPeZyyfKVilLWZzvN2Oizu1qjL9s6H0QFse1KaSwV2NjkIIy3cPJB5q Mop8wpByQfqlspuHQefJyGmCa1baNKRHkE30ERgf3OrPYlJF+mUqGzLj2qhNl+7iGyA1 mJl4XOgBzQs2BN9Gbjvfkgbhsj0/wldCyGzCKLWVYn0KIdUzG4rt9V4SRKlkod3LPQDw kxAdf9aCt3ph6GTaER3nK49gLCRotvGSQiDjwjuwmtVS2uPkFggJFlWgMZ0fiL8Xw5Yl cG7Iz72pPmyrkmm6mvly809DMNGkxJZ11LOIS59VDec25ypro+cxNYJ1sVx7kBCPp8jE 0Z7A== X-Gm-Message-State: AO0yUKWMuQdi/u5uHBWzuaFH5hRDVglFO1ddmzT3Fjm/zFKrVbbc5H06 reIOplXe7JhrCWKvjtI8yUrOPoDffGKr8Q== X-Google-Smtp-Source: AK7set8Cgguqoqwwhu81bmpt+TpL2eF8V0dMoBqDNX2KRkO9LhZT7V8dt4yvCdH2IbjzrGh8+j0HWg== X-Received: by 2002:a17:902:d2cc:b0:196:3347:78db with SMTP id n12-20020a170902d2cc00b00196334778dbmr4204822plc.61.1674717462108; Wed, 25 Jan 2023 23:17:42 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:41 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 05/13] redis-plus-plus: Fix build with gcc13 Date: Wed, 25 Jan 2023 23:17:27 -0800 Message-Id: <20230126071735.2444745-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100787 Signed-off-by: Khem Raj --- .../files/0001-include-cstdint.patch | 37 +++++++++++++++++++ .../redis-plus-plus/redis-plus-plus_1.3.7.bb | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch diff --git a/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch b/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch new file mode 100644 index 0000000000..bfe2412b5d --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch @@ -0,0 +1,37 @@ +From e74bb5a7ef87e697571181280e6108b89104c02d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 20:40:56 -0800 +Subject: [PATCH] include + +gcc 13 libstdc++ moved some includes around and as a result +is no longer transitively included [1]. Explicitly include it for uintXX_t. + +Fixes + +../git/src/sw/redis++/utils.h:187:1: error: 'uint16_t' does not name a type + 187 | uint16_t crc16(const char *buf, int len); + | ^~~~~~~~ + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/449] +Signed-off-by: Khem Raj +--- + src/sw/redis++/utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sw/redis++/utils.h b/src/sw/redis++/utils.h +index f77f796..ff38f2d 100644 +--- a/src/sw/redis++/utils.h ++++ b/src/sw/redis++/utils.h +@@ -17,6 +17,7 @@ + #ifndef SEWENEW_REDISPLUSPLUS_UTILS_H + #define SEWENEW_REDISPLUSPLUS_UTILS_H + ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb index 21783b30d5..b127025a73 100644 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb @@ -4,7 +4,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ + file://0001-include-cstdint.patch" SRCREV = "f3b19a8a1f609d1a1b79002802e5cf8c336dc262" S = "${WORKDIR}/git" From patchwork Thu Jan 26 07:17:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18676 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 CBAFDC61DA2 for ; Thu, 26 Jan 2023 07:17:51 +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.web10.68538.1674717464016100701 for ; Wed, 25 Jan 2023 23:17:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YUR/UHB5; 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 p24so1108379plw.11 for ; Wed, 25 Jan 2023 23:17:43 -0800 (PST) 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:subject:date :message-id:reply-to; bh=9NrJf9hyRvvhJQNtx13SUFUr28UreczdA2/PYgZx3r8=; b=YUR/UHB5rYO0cv1/DSOdBuzmSR7CswxWpXX2HZuLyeff4usnYBtFp5favPvACwmum/ Ta2tjWUNC406qoDff+mDD4qihFBbdbRwA1arjbGWsadjt98U1n3pjzlFVOfnCCyj1SQ4 DDk6wfth7OybKmWhPJ659wZFLrGsrWdWNjXUih2BRWM2XLKhKVxLM0l5FU1RxDdLWnfE L833ss0rfcXppMZVfWf1nvm/mJ0GnZrDKly0WKIDgndWCOXGXFnuv6JpCFLh6+a7ePIL wS9N69Ibsg/hkQtFV1lN3zJKrtxcI9F8puPXcOc951YjjcfY1QdU2vjZZ6kaeQ37Vye0 eEdw== 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 :subject:date:message-id:reply-to; bh=9NrJf9hyRvvhJQNtx13SUFUr28UreczdA2/PYgZx3r8=; b=BVyU3OFFnIwmD1Za7fC2fqf4RYd7CXMuYQs2l04ySQfX0rBfpP82vsphpZXGmDUEnp pRs9iVmQrhl5+pZWpr5juXu884T4UWWp4ujkk9RNJPmc6mxq+aYK7CEVljOEfQe/8YBf /FzIF3FN4Vh3nQlmclcckjv0nanAx1zw5wgrlDMN/lt7AFvt0yKIdfcBu1z7JtiHiSoj BoXieXxMn1xaWpTQWJ4mJKlXUca4YSD67KIe8rheGBfpe3pM7u1NjT6ntBOnsTekslnk cB8LaOIkthpnAR25vu+z1TV21FeM/jvRc0c9sZ6vZEUXRGDeedfKc1y2YyRjMwy7E7LN Nc/g== X-Gm-Message-State: AFqh2kqNykJauckfDirV6ISwdL43PbOyyL5XPihuiZV+AmubRmH4feKU P4lHrACe4GS+jvGK0yOXnqim5jVU46P+Sw== X-Google-Smtp-Source: AMrXdXsWzfAA0F4oQEwNqYHu8hWxEnkYYGfdAeLfjAdWOEy0hdmFNwUxrPvb4oiuqI430jGIfOX+lQ== X-Received: by 2002:a17:903:32c8:b0:194:de51:9af with SMTP id i8-20020a17090332c800b00194de5109afmr28315900plr.22.1674717463137; Wed, 25 Jan 2023 23:17:43 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:42 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 06/13] rdfind: Upgrade to 1.5.0 release Date: Wed, 25 Jan 2023 23:17:28 -0800 Message-Id: <20230126071735.2444745-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100788 Signed-off-by: Khem Raj --- .../rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch | 2 +- .../rdfind/{rdfind_1.4.1.bb => rdfind_1.5.0.bb} | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/rdfind/{rdfind_1.4.1.bb => rdfind_1.5.0.bb} (74%) diff --git a/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch b/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch index af69c02173..a65d8cb77b 100644 --- a/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch +++ b/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ER - On Debian-ish systems, use \"apt-get install nettle-dev\" to get a system + On Debian-ish systems, use "apt-get install nettle-dev" to get a system wide nettle install. ])]) -AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([ diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb b/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb similarity index 74% rename from meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb rename to meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb index f8eb5d38d4..0d776b4e97 100644 --- a/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb +++ b/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb @@ -9,8 +9,7 @@ SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ file://0001-configure-Fix-check-for-AC_CHECK_LIB.patch \ " -SRC_URI[md5sum] = "180418c863b861d1df221bc486a07ce7" -SRC_URI[sha256sum] = "30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c" +SRC_URI[sha256sum] = "4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080" inherit autotools From patchwork Thu Jan 26 07:17:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18679 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 D98FCC61DA4 for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.68631.1674717465071111068 for ; Wed, 25 Jan 2023 23:17:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lCPpe34M; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id jl3so1123204plb.8 for ; Wed, 25 Jan 2023 23:17:45 -0800 (PST) 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:subject:date :message-id:reply-to; bh=bFKL8myfzWiZtTxmk1gBBeX/2I4YjViX2dbv7+YBpDk=; b=lCPpe34MLiRcFceZ3xBesm+wRFcEykSQRydwUf/gLOjqz8J2O7Z+nyuYXY6G3lo+bu bBbLR6ZJTwQ1J4iisQk3fQgvMRzCjqQMDmgZUo8OnKPpsUNQ+42HeKAb92F7sINavIBq YNd9VvlEtYOf7Vtb0Uk45udS2Drde9p5QC39SvFu2wZXgeNyCd1jS3lJtz8YISs5nVbx lkSYhbj0zFvWxKDWtu2PyCa0gor6Gd0pZ+dpUq3JZRUdmByE0yk5NqjWZTF9x/XHI5Zo QlbdmOWqua04up7x3kfNUyRSMxEuNBinbl9GbEvXEwU909ndl+W6dRfL09LNzXVp+UN9 IfdQ== 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 :subject:date:message-id:reply-to; bh=bFKL8myfzWiZtTxmk1gBBeX/2I4YjViX2dbv7+YBpDk=; b=McjYgW/60utN13Vdu2esXh70IEYzna64dOXtZsa+/uAW/W16qLRMygGjifJxb63gRO tElaBMS9Gi3v+atxf38Bser7SGo/Pj20ZRNfTpfknr+yy1131cruONQ3ycbQ682MT6Y0 /asZA42Vm/CcjlkWyjUz1gAP91cxGF+A9+WtUJnhF9eq5RuzPQXTzFmQkYHn9Xyyub45 wV8FtxsZEAi7t+blBEJyXz8xS+QiI+OGs7s2Gv8pGeOxZUVY8iLy3PVH7JyHYV2c9m13 oZxBCLO3JP6JzMO4bTQ7fOadM0CP+iS7AKx2R/Ltz5U7W/09vBV9Wx+8PuOdOGcCOM02 9NUA== X-Gm-Message-State: AO0yUKXNW1atMyLNhK26WsMcLUfV/kFH0Pc6amX4D3PupRIuxnqFrXRi MPh/S51UVGv5kxgx3SbJnnxGN6mm8mzkAg== X-Google-Smtp-Source: AK7set/UbF4Nn7sVzS/Pj8fWZuqyECrxX4i0BtL8sEV1RqAXi98xqp4xX6KMvBAf06bK01ePF5/urg== X-Received: by 2002:a17:902:e383:b0:191:7d3:7fdd with SMTP id g3-20020a170902e38300b0019107d37fddmr673222ple.60.1674717464177; Wed, 25 Jan 2023 23:17:44 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:43 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 07/13] rdfind: Fix build with gcc13 Date: Wed, 25 Jan 2023 23:17:29 -0800 Message-Id: <20230126071735.2444745-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100789 Signed-off-by: Khem Raj --- ...-standard-headers-limits-and-cstdint.patch | 54 +++++++++++++++++++ .../recipes-support/rdfind/rdfind_1.5.0.bb | 1 + 2 files changed, 55 insertions(+) create mode 100644 meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch diff --git a/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch b/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch new file mode 100644 index 0000000000..bd59b74412 --- /dev/null +++ b/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch @@ -0,0 +1,54 @@ +From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 21:12:47 -0800 +Subject: [PATCH] include standard headers and + +gcc 13 moved some includes around and as a result is no longer +transitively included [1]. Explicitly include it for uint64_t. + +Fixes errors like below + +../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std' + 225 | o.maximumfilesize = std::numeric_limits::max(); + | ^~~~~~~~~~~~~~ + +... + +| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/129] +Signed-off-by: Khem Raj +--- + Fileinfo.hh | 1 + + rdfind.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Fileinfo.hh b/Fileinfo.hh +index 3ffb837..23ed54e 100644 +--- a/Fileinfo.hh ++++ b/Fileinfo.hh +@@ -8,6 +8,7 @@ + #define Fileinfo_hh + + #include ++#include + #include + + // os specific headers +diff --git a/rdfind.cc b/rdfind.cc +index fbd6cb8..64dd8f6 100644 +--- a/rdfind.cc ++++ b/rdfind.cc +@@ -9,6 +9,7 @@ + // std + #include + #include ++#include + #include + #include + +-- +2.39.1 + diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb index 0d776b4e97..8f2c5e8852 100644 --- a/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb +++ b/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb @@ -7,6 +7,7 @@ DEPENDS = "nettle autoconf-archive" SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ file://0001-configure-Fix-check-for-AC_CHECK_LIB.patch \ + file://0001-include-standard-headers-limits-and-cstdint.patch \ " SRC_URI[sha256sum] = "4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080" From patchwork Thu Jan 26 07:17:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18673 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 D8E98C61DA3 for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.68539.1674717465897209435 for ; Wed, 25 Jan 2023 23:17:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NMamLuiB; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id c6so1141850pls.4 for ; Wed, 25 Jan 2023 23:17:45 -0800 (PST) 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:subject:date :message-id:reply-to; bh=b7iFho5JxUDCxrY9ZxQXdleOM2dqazYI2YUkJmOYwek=; b=NMamLuiByLXteYxYpEGfy+S41H0GAWVNVSQAqrA8u3cpBJxaMfeMZsEqPvfcNdy//u r708HVlZg1iaGADK3dNylEE6lFDHOw7tj/D/9qCj6tKCSlXDrOymjmYU5/C/6p8pYDlV j2+OSn6e4nDl5dEziLSG70z3ioKgppkuXEhVqolY2mN1Rl7CPjttZRlUQVQV3xV9tImw ENRmMvXvvr/jTbgp/b/R2wEAjvgMKrXiW/44wgkBUEx6z8MS2/MqLLDL74bsfSptSXgt rG8v4dmTpQUkMoxl97iwVXqHnsAYv6UiwR0R7AvU/ZhjuQBYNFJd4UnqGjQT/RNvunP4 NRAw== 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 :subject:date:message-id:reply-to; bh=b7iFho5JxUDCxrY9ZxQXdleOM2dqazYI2YUkJmOYwek=; b=ZfWzXkEV2+tU53PgduZBS3YMmLYbNipyQqKdilUC2/X31X/bI9s+X6zVc9gEVKqgH1 wBmJiDuMhEdkHCWptnqe2ZcKVL2TFvt92kFj4SGdg2DnEds66kd1HxuZO+1wtfIbtJs7 KYDI5Wk5gwPHiTTkWuRkluGnJeaPfj5G4MzEHtGA8b5UQaUPZeOaFdAspg0mHq2TGAOM qS7jEV4H6fweSsTACyhHnEz8a1MYHJnEPMl/tPUEn/q0wkpBcFvwzwHWsQm/sogSOKmh 4+bK6SWgByQs/j9jaBJ8gK7/FS2GBmUgglP41GUF9uh+hz3iZMhnJX1uzR/ERs01Zxih 6oJQ== X-Gm-Message-State: AO0yUKVLDfQvFcCo2q6PyWZ05f+0f1IR6CQJYVw3Ur9/KW6e1I1C5cpv FC9dXjIbCNIUBlvTXygv6u7bkkKckjQSVw== X-Google-Smtp-Source: AK7set8JJUmjEYbKuLpPLrZ3dMHck1KcliRKl2wL9pwj/Qs6YS8iXxWUrypR6xkgt0eyPE9hZVi+RA== X-Received: by 2002:a17:902:ce92:b0:194:84ef:5f9c with SMTP id f18-20020a170902ce9200b0019484ef5f9cmr1059982plg.29.1674717465025; Wed, 25 Jan 2023 23:17:45 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:44 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 08/13] libiodbc: Fix SRC_URI to not use gitlab archives Date: Wed, 25 Jan 2023 23:17:30 -0800 Message-Id: <20230126071735.2444745-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100790 Fixes ERROR: libiodbc: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol [src-uri-bad] Signed-off-by: Khem Raj --- meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb index 57227375ec..797a9e806a 100644 --- a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb +++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb @@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ " -SRC_URI = "https://github.com/openlink/iODBC/archive/refs/tags/v3.52.15.tar.gz \ - " +SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" S = "${WORKDIR}/iODBC-${PV}" SRC_URI[sha256sum] = "f6b376b6dffb4807343d6d612ed527089f99869ed91bab0bbbb47fdea5ed6ace" From patchwork Thu Jan 26 07:17:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18675 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 D0D9AC61DA0 for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web10.68540.1674717466733444619 for ; Wed, 25 Jan 2023 23:17:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UzZCrFBL; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id b24-20020a17090a551800b0022beefa7a23so4456190pji.5 for ; Wed, 25 Jan 2023 23:17:46 -0800 (PST) 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:subject:date :message-id:reply-to; bh=VKLQgCf8oXFXwJXuko35PzRcB8IQCpcRQaPpz0jBmYU=; b=UzZCrFBLXUc9p9lL5N9PJj4MZNd2J2qfefRiJEyjIF422jbH4WVyd63dq9Dso2is8V 1s1uS2nBWNxq3wsnQYhOKET2lYrdg2HSI7IhIeDLN+QA5G0+nGigdvZaYSJV1pnzO2RE B2Hl1bHv7o3ZY/kPkmZmJFb/ppef5vjwQwbhu/N0QD/h3Bi2JojVmY7EGKG1HhIysUsF G4rZw446yRI3kWoZPbhH+9CZ2j84+JDIqDouvD7E272UHHE/KGSlpTIOwrfictJK7frQ CehET8akCjQwFhSydIkPITxVGtT7OXBzAqdebJdEIcuuytnKfmqKq2BynOHvfyERy3SR oHzA== 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 :subject:date:message-id:reply-to; bh=VKLQgCf8oXFXwJXuko35PzRcB8IQCpcRQaPpz0jBmYU=; b=jC+oq0xP002S7YHtwlHCQQ8XGiHIxGS49OxI1HTgJxfKO3p7z6TgvdTtLmHYbkyQ23 oPNV7rJjZuTdTZO5averHWygTUbY6VtAd0H/3gghj4atn93DTUkT9LLY3zTkFK6n4V2X gQ3ZJEh2uppZ4SvoMwSvffo0XaU40Bj67SkphrXcsQtFkZt1ARtbvYNkixefrC1yHuNa 47HVI05pTfvrSmwO5VFVQKjMLL65rPOv7x4CQNtWyP7MoxNSCQGnGZVQMvQyt9wtmryq gHjo1zFYnlD2kV7OHeMarPlR6AugmRiUYryO8Xm/gKNMPJT2gjcJFV2J3eXuF1A4pxOA HW3w== X-Gm-Message-State: AFqh2koiFo1i4iDKx/+qJa07wG1M2cl8sopt3EqIcH9+uvqaRbbR/PxU RbbqiJiG4jPJAWCp7B/OC25rmeLeSBoLAw== X-Google-Smtp-Source: AMrXdXs7Loy2lgY21rdwl+XSmyvBbwebExd3GlGGa+mw6Zuxdmk0vL36gDBNLZHPAY8qrhdFdFif3g== X-Received: by 2002:a17:902:e84b:b0:194:ddc2:60e8 with SMTP id t11-20020a170902e84b00b00194ddc260e8mr29572157plg.48.1674717465903; Wed, 25 Jan 2023 23:17:45 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:45 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 09/13] opensaf: Fix build with gcc13 Date: Wed, 25 Jan 2023 23:17:31 -0800 Message-Id: <20230126071735.2444745-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100791 Signed-off-by: Khem Raj --- ...1-include-cstdint-for-uintXX_t-types.patch | 43 ++++++++++++++ ...-Werror-enum-int-mismatch-with-gcc13.patch | 59 +++++++++++++++++++ .../opensaf/opensaf_5.22.01.bb | 2 + 3 files changed, 104 insertions(+) create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch new file mode 100644 index 0000000000..e36d4e0cdc --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch @@ -0,0 +1,43 @@ +From 225891675b80beaa9d74ce56809e52c4451df72c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 21:46:22 -0800 +Subject: [PATCH 1/2] include cstdint for uintXX_t types + +GCC-13 needs it [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/imm/immnd/ImmModel.h | 1 + + src/osaf/consensus/consensus_env.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/imm/immnd/ImmModel.h b/src/imm/immnd/ImmModel.h +index 44da470..0660431 100644 +--- a/src/imm/immnd/ImmModel.h ++++ b/src/imm/immnd/ImmModel.h +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/osaf/consensus/consensus_env.h b/src/osaf/consensus/consensus_env.h +index df4f93a..89ccf46 100644 +--- a/src/osaf/consensus/consensus_env.h ++++ b/src/osaf/consensus/consensus_env.h +@@ -15,6 +15,7 @@ + #ifndef OSAF_CONSENSUS_CONSENSUS_ENV_H_ + #define OSAF_CONSENSUS_CONSENSUS_ENV_H_ + ++#include + #include + #include "base/mutex.h" + +-- +2.39.1 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch new file mode 100644 index 0000000000..e3288431eb --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch @@ -0,0 +1,59 @@ +From 5e5686de677c884d5d785254412ced3c9d2d1b08 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 21:47:45 -0800 +Subject: [PATCH 2/2] Fix -Werror=enum-int-mismatch with gcc13 + +Signed-off-by: Khem Raj +--- + src/evt/agent/eda_hdl.h | 5 +++-- + src/evt/evtd/eds_mds.h | 3 +-- + src/smf/smfnd/smfnd.h | 8 ++++---- + 3 files changed, 8 insertions(+), 8 deletions(-) + +--- a/src/evt/agent/eda_hdl.h ++++ b/src/evt/agent/eda_hdl.h +@@ -31,6 +31,7 @@ + #define EVT_AGENT_EDA_HDL_H_ + + #include "evt/agent/eda.h" ++#include "ais/include/saAis.h" + + uint32_t eda_hdl_cbk_dispatch(EDA_CB *, EDA_CLIENT_HDL_REC *, SaDispatchFlagsT); + +@@ -68,11 +69,11 @@ EDA_CHANNEL_HDL_REC *eda_find_chan_hdl_r + + void eda_msg_destroy(EDSV_MSG *msg); + +-uint32_t eda_extract_pattern_from_event( ++SaAisErrorT eda_extract_pattern_from_event( + SaEvtEventPatternArrayT *from_pattern_array, + SaEvtEventPatternArrayT **to_pattern_array); + +-uint32_t eda_allocate_and_extract_pattern_from_event( ++SaAisErrorT eda_allocate_and_extract_pattern_from_event( + SaEvtEventPatternArrayT *from_pattern_array, + SaEvtEventPatternArrayT **to_pattern_array); + +--- a/src/evt/evtd/eds_mds.h ++++ b/src/evt/evtd/eds_mds.h +@@ -49,8 +49,7 @@ uint32_t eds_mds_msg_send(EDS_CB *cb, ED + MDS_SEND_PRIORITY_TYPE prio); + + uint32_t eds_mds_ack_send(EDS_CB *cb, EDSV_MSG *msg, MDS_DEST dest, +- SaTimeT timeout, MDS_SEND_PRIORITY_TYPE prio); +- ++ SaTimeT timeout, uint32_t prio); + uint32_t eds_dec_subscribe_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); + + uint32_t eds_dec_publish_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); +--- a/src/smf/smfnd/smfnd.h ++++ b/src/smf/smfnd/smfnd.h +@@ -76,7 +76,7 @@ extern "C" { + #endif + + /* smfnd_amf.c */ +-extern uint32_t smfnd_amf_init(smfnd_cb_t *cb); ++extern SaAisErrorT smfnd_amf_init(smfnd_cb_t *cb); + + /* smfnd_mds.c */ + extern uint32_t smfnd_mds_init(smfnd_cb_t *cb); diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb index 930755d624..3dd950c720 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb @@ -30,6 +30,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ file://0001-include-missing-array-header.patch \ file://0002-configure-Disable-selected-warnings.patch \ + file://0001-include-cstdint-for-uintXX_t-types.patch \ + file://0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch \ " SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e" From patchwork Thu Jan 26 07:17:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18678 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 E7D8CC636BD for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.68626.1674717460429623922 for ; Wed, 25 Jan 2023 23:17:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bcV8QEfg; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id jm10so1099534plb.13 for ; Wed, 25 Jan 2023 23:17:47 -0800 (PST) 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:subject:date :message-id:reply-to; bh=X41mspqlHm/qJmoQ4MEaKS4VXiC0uK/wOsBA8BA2ABY=; b=bcV8QEfgrNb7ASnNejNmoD9IKStkTLiDtOpFzoqRM9cfCEbPlmRaiN4sV3WSjgyzJO u/onksYJCzEofZLdm64N2DJ4JAiqYo4By6y4xcS8HgK1RiDXqiyTcdMc+xsIR+Gygm5n F8CnF1pZDSc/0BffjIt8/J9iB5tqClvU/yZy+5Rm9gFyV5ygiga5SztLjtw01w+RZPab xrih3rI6IOcmM6vSVbdUTkr7+W98WYEdignsK1W8gho0mr49pYuPFf++M3KTwJPCZ7ef ySTjDcb3Rgk6QjZbQ+MfKATht9LYnQdlPsmd1HzPEgMnKt7mcGex7WGCDufhiuuRB8ID BoMA== 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 :subject:date:message-id:reply-to; bh=X41mspqlHm/qJmoQ4MEaKS4VXiC0uK/wOsBA8BA2ABY=; b=n3Br0ZdfViKLjWRl0+MiU40rjq5plszKxlvoou2nbKwTfKcsc5oVr6sk9bXr+EJhEb seYS4AsX7iyxMHPwuheYctgfxn/V1qfhxj2zTq+ZzWCJYlZDRC91ag/19VFSMHdNso2Y /3/6eMkY28+Cmk9XEtuxNiEoTX0Pfd9alEzpEP5gHjFUs5xNOYaXPg7uRqMSNgCHMzbT OdIDcK8KqTVf7UP6QIYM5Pq/ZN4fHkAGouXnWpvmVBpIjENkKCmxSfhW4v8WcgOhXA96 PuocRoMFdPA6qAUac/MEuew0OmKXMoTbT1Uj/KIyd5QglGe7BlJfhr247iimzZdaokBQ jbiA== X-Gm-Message-State: AFqh2kphzC8R0yE4QEHAesO2T5QVQerqN4LOG2T5aweaOqFh6vB0NQQR RhMUyZYjdKqrkk0DCbzg3W75i2AUnN5mcA== X-Google-Smtp-Source: AMrXdXvF01ACGRf8BNXjlfo7OILONPMeVBjCLpNe5JZk0AgCEmmhmudBOGJUeZirQcLHSthM0n2mXA== X-Received: by 2002:a17:902:7608:b0:194:66db:778d with SMTP id k8-20020a170902760800b0019466db778dmr34321861pll.32.1674717466760; Wed, 25 Jan 2023 23:17:46 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:46 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 10/13] crossguid: Fix build with gcc13 Date: Wed, 25 Jan 2023 23:17:32 -0800 Message-Id: <20230126071735.2444745-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100792 Signed-off-by: Khem Raj --- .../0001-include-missing-cstdint.patch | 31 +++++++++++++++++++ .../crossguid/crossguid_0.2.2.bb | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch diff --git a/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch b/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..a12eba8ebf --- /dev/null +++ b/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch @@ -0,0 +1,31 @@ +From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 22:09:26 -0800 +Subject: [PATCH] include missing + +gcc 13 moved some includes around and as a result is no longer transitively +included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/graeme-hill/crossguid/pull/67] +Signed-off-by: Khem Raj +--- + include/crossguid/guid.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include + #endif + ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb b/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb index b496531ab1..58b049bb4f 100644 --- a/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb +++ b/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" DEPENDS += "util-linux" SRCREV = "ca1bf4b810e2d188d04cb6286f957008ee1b7681" -SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master" +SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master \ + file://0001-include-missing-cstdint.patch" S = "${WORKDIR}/git" From patchwork Thu Jan 26 07:17:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18672 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 CBA54C61D9D for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.68634.1674717468558050405 for ; Wed, 25 Jan 2023 23:17:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=S8i5wf6G; spf=pass (domain: gmail.com, ip: 209.85.216.45, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f45.google.com with SMTP id e10-20020a17090a630a00b0022bedd66e6dso4485619pjj.1 for ; Wed, 25 Jan 2023 23:17:48 -0800 (PST) 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:subject:date :message-id:reply-to; bh=OJbe9ByXpKbuM8y8ExD6XOr5W5ilxZthCVj3em2n+X0=; b=S8i5wf6GkdkQ23r9qwaOWnIohvrFM2/2HSEQRiqQP6a+3O2hvzx5bRQoATRRzWUBst I2jLncGPn7kf9CSV9vEE4ZkV6CzMwvgTjfae7HQO00czhUTEvb0nY4tY4z60GfFybbBd aHoiueX7tFfds6tNA07vo3fi/9+rsokzBIqubn1lO4RVURfdicQLcnImACJeC+52GjlR iTTtPbXnpaC9m6SvxZDa2xhX1zXo79saWH6DCZw41V2tWqwDMSe/ceWk5gYHOGfJrmA6 xKvgh8UDa/JgF2gXt6au7BkfcJNDyVEIK5l3xTSuU7P1Eq8NO0mX7xrNhmeULbU+FyZ3 IZ4w== 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 :subject:date:message-id:reply-to; bh=OJbe9ByXpKbuM8y8ExD6XOr5W5ilxZthCVj3em2n+X0=; b=txRSLpur22Iaa9GayEhVgLMG8H/FZZzJ5nYm6eVRePRDu00usgxt/X0sQ/RGEVYuOH AMh9cC5wVfug2ox8LISncBuSWmmk7Ja3fHZ59WoxxC7zlcXwo3dAY025icj8sZcea6jQ meLwvwOeEkwrLirswYdX/3/dkmmmLs9M4edboCaXMtogLjfTb0DralqgW7ia8thZuqF/ aIDc+WHi+QcqfGuO2eERvHWv5EgtgsxUw4iLYvfdCVDQruUJyTzxEMHX+QzvV1iOGy0O 9svQK6RURBdLKdeqJyALzbhMRM5ismTpK3dhT6D18U+dFhIjFQUOZvttXUAkuvYkQxmw Z6yQ== X-Gm-Message-State: AO0yUKVLplcKd+QTG/1ks/LpolsqdPF8JWuMBGhO9pTGSqu/xPUOryFr T9+1h7wRBjsHruZ2JOggyK4gDfNX8TnRvw== X-Google-Smtp-Source: AK7set+HeexmAxfCtNDxe6rBjHoUyQelp5diiT38WYGNCtq5TnSk1khCx2X7Ah7ToNuyaDnvq9RBUA== X-Received: by 2002:a17:902:dccc:b0:192:8cd1:5e79 with SMTP id t12-20020a170902dccc00b001928cd15e79mr638055pll.41.1674717467788; Wed, 25 Jan 2023 23:17:47 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:47 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 11/13] dbus-cxx: Fix build with gcc13 Date: Wed, 25 Jan 2023 23:17:33 -0800 Message-Id: <20230126071735.2444745-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100793 Signed-off-by: Khem Raj --- .../recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb | 1 + .../files/0001-Include-missing-cstdint.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb index 44804545de..bf1220788e 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ file://0001-Include-typeinfo-for-typeid.patch \ file://0001-include-utility-header.patch \ + file://0001-Include-missing-cstdint.patch \ " SRC_URI:append:libc-musl = " file://fix_build_musl.patch" SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" diff --git a/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch b/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch new file mode 100644 index 0000000000..4ad69eab42 --- /dev/null +++ b/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch @@ -0,0 +1,30 @@ +From 56e2cce87445d514c9992ecc19d03bb2115c82d6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 22:17:31 -0800 +Subject: [PATCH] Include missing + +gcc 13 moved some includes around and as a result is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/111] +Signed-off-by: Khem Raj +--- + dbus-cxx/enums.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbus-cxx/enums.h b/dbus-cxx/enums.h +index 8253a4b..c793fad 100644 +--- a/dbus-cxx/enums.h ++++ b/dbus-cxx/enums.h +@@ -5,6 +5,7 @@ + * * + * This file is part of the dbus-cxx library. * + ***************************************************************************/ ++#include + #include + + #ifndef DBUSCXX_ENUMS_H +-- +2.39.1 + From patchwork Thu Jan 26 07:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18670 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 BE7BDC05027 for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.68628.1674717462111039724 for ; Wed, 25 Jan 2023 23:17:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=n6Ol9h6d; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id z9-20020a17090a468900b00226b6e7aeeaso978019pjf.1 for ; Wed, 25 Jan 2023 23:17:49 -0800 (PST) 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:subject:date :message-id:reply-to; bh=dYLi6wHySElPQmaAY4tpSi3n0NlPDmZGWMJAOUvnr/U=; b=n6Ol9h6dR3vny7eLQ+yecvyqY8Ft//PKR4n8hdxTAYoV3QSJS1U103tVa8ESqyd0MY x+o/msnsJQSvpeAeLiyMcalqooHa7ikz6ib72Ko1HlxaFcO1XnCDCNSyvdi7VBbglCGI 9pl1QRvuRLQCs4bZFM9QemkkK6WEIKMSYwLbKljY1tqJy8HJWjhf+Lm7NiilKYeck+TD eVDkzGNKxPr62dhsT7aq/pdpen101yC7oyTzU5m/tG+LuvTrHDJyG71/ZssDIFHLJqTI Le6CSvZDVRk4OBaF89gnq3tBLM07G1AdDlBW2l4/ifP4WM9MaPLL6uwLk9J5eMI37iHO KTYw== 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 :subject:date:message-id:reply-to; bh=dYLi6wHySElPQmaAY4tpSi3n0NlPDmZGWMJAOUvnr/U=; b=LU/+Fs1qztyVPQE/inzmyEbjLUjoQN4dy+MzHj2cpOm95stcPmxvMEk+tKHWsp1BJr hfp7s5ZTUyVzKxJCkx69AmuCD8Z5G5+qn/VO/zA9GxwNV4SltYpvN6vSpABjuXpK8DXK pd7MNX/E0Dq7lFemeiO7m/xdvpd4/x7ysxhW4ZRyydgHEZcwZevSm6Rg4iZeAaYbgP7f TTRL4DA6fMBnwymLEWpGZU9EssLWaQFtSrZ+WfpaysqVAyysa6fqzGRP2CTyAO2TF6Ks yoPDzDgCuvmemE8oJYf7CPytU4qhYSUe9Y/tsFHLYzQONpD7YUaxAsGjTq9aKO1sG4Rp lvMw== X-Gm-Message-State: AFqh2kotrStwNXTFr53l2qBpG1C88UVZmW5DeKdHfHeBPq8s640nwrbD FLPkqkQj0ArDRHL68trUdX815kz/+TqBZg== X-Google-Smtp-Source: AMrXdXtgSxv4DdJmScU/rmKsRL1U3cqnLagfR6iTJtTLLVtIhvm9W3slr/YjlZBYmqfYR3PrRJaX2w== X-Received: by 2002:a17:902:bb87:b0:194:7532:fb31 with SMTP id m7-20020a170902bb8700b001947532fb31mr33958999pls.62.1674717468568; Wed, 25 Jan 2023 23:17:48 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:48 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 12/13] dbus-cxx: Upgrade to 2.3.1 Date: Wed, 25 Jan 2023 23:17:34 -0800 Message-Id: <20230126071735.2444745-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100794 License-Update: Swith to new license [1] Drop upstreamed patches [1] https://github.com/dbus-cxx/dbus-cxx/commit/efe8d3587104bcd748d990da8b86de9e3ef9a0ed Signed-off-by: Khem Raj --- .../{dbus-cxx_2.1.0.bb => dbus-cxx_2.3.1.bb} | 12 +++---- .../0001-Include-typeinfo-for-typeid.patch | 29 ----------------- .../files/0001-include-utility-header.patch | 32 ------------------- .../dbus-cxx/files/fix_build_musl.patch | 12 ------- 4 files changed, 4 insertions(+), 81 deletions(-) rename meta-oe/recipes-core/dbus-cxx/{dbus-cxx_2.1.0.bb => dbus-cxx_2.3.1.bb} (53%) delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb similarity index 53% rename from meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb rename to meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb index bf1220788e..7af62b7418 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb @@ -2,16 +2,12 @@ SUMMARY = "D-Bus wrapper in C++ for dbus" HOMEPAGE = "https://dbus-cxx.github.io/" BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" SECTION = "base" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" +LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ - file://0001-Include-typeinfo-for-typeid.patch \ - file://0001-include-utility-header.patch \ - file://0001-Include-missing-cstdint.patch \ -" -SRC_URI:append:libc-musl = " file://fix_build_musl.patch" -SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" + file://0001-Include-missing-cstdint.patch" +SRCREV = "898f6ea8f7ffe454e81a9337002df555728d4199" DEPENDS = "\ dbus \ diff --git a/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch b/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch deleted file mode 100644 index 9117877403..0000000000 --- a/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e262b6e7cc6271d71405f10c4817b9b3b2b95f05 Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk -Date: Mon, 13 Dec 2021 02:00:48 +0100 -Subject: [PATCH] Include typeinfo for typeid() - -Otherwise fails with: - error: must '#include ' before using 'typeid' - -Upstream-Status: Submitted -[https://github.com/dbus-cxx/dbus-cxx/pull/83] ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include -+#include - #include - - #if DBUS_CXX_HAS_CXXABI_H --- -2.25.1 - diff --git a/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch b/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch deleted file mode 100644 index 0c8262af75..0000000000 --- a/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 63170cfcfbf483716ce2599e165db80713fc2706 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Apr 2022 06:47:19 -0700 -Subject: [PATCH] include utility header - -Needed for exchange from std namespace - -Fixes -dbus-cxx/variant.cpp:135:25: error: 'exchange' is not a member of 'std' - -Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/98] - -Signed-off-by: Khem Raj ---- - dbus-cxx/variant.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/variant.cpp b/dbus-cxx/variant.cpp -index bcf2684..97b622c 100644 ---- a/dbus-cxx/variant.cpp -+++ b/dbus-cxx/variant.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include "enums.h" - #include "path.h" - #include "signature.h" --- -2.35.1 - diff --git a/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch deleted file mode 100644 index e55d987e43..0000000000 --- a/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; From patchwork Thu Jan 26 07:17:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18674 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 C409CC54EED for ; Thu, 26 Jan 2023 07:17:51 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.68542.1674717470144099021 for ; Wed, 25 Jan 2023 23:17:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bs8186ln; spf=pass (domain: gmail.com, ip: 209.85.216.46, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f46.google.com with SMTP id z1-20020a17090a66c100b00226f05b9595so1006825pjl.0 for ; Wed, 25 Jan 2023 23:17:50 -0800 (PST) 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:subject:date :message-id:reply-to; bh=0NLdeqwGPUgTzQTGEWKQ526JB0d8IQ5UOOcmHgnEip0=; b=bs8186lnX0Fw/KCixwmB7SoIZH+ZU6/8/XHyKRneisRqkv3yEKRoMEgKYjLn5njUzC CS7n6GgzQG1/9+rM7Vs3UHFDpPTT+kENjnGvo7q+7ntE19SVkRbe4Z5XEBlwiV9jngd6 MXwBqMFA+QKYTq4aYPoufyfmyZyxXIbagTJKkDhRGZVb+ePCeaFwAZeofGFY6xGyOIWd KsqQinfg/WWJOsZSatXWa9+OJMAbIY65Qkh4yMiA8iXuV7ae9xQoOxExWICIEelmeHBK iFPP39XOv/32rBxuEGZR8ZeyW2Wl4zBwZ2MpZ+YtmtP3JLu6E/3Qh0Y4kiRQe2LkYqcF MKvQ== 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 :subject:date:message-id:reply-to; bh=0NLdeqwGPUgTzQTGEWKQ526JB0d8IQ5UOOcmHgnEip0=; b=impqcuU0VsBLxHorOP2c5UCqCP8NTQKMAqQcNVRDGaBa+c4eGdIBXYrZQdYUfS4m3Q yOWYoWCHXnW0GMFBVUQgdEPUfBw9PboaS1xZ5WffSWI+Iytws84VcDL2sbD/vrL3vulx ZZ0RhIbtXtpv4fcXfuQLjeTCWw4tW2RQeSUU9iDo1mfwBhqgTploMey63WTJR5Seynld yGFMC4IRpeww4E0z2/rTKR6MWHQ6wLWKVJvteNQvh9E4CEen49cTwVXigQc57kFJaSef 9x7HNict6wXLqVeZeRhKJwjpAIbh4b3GhDaXHCifuBHe67t7zNWr5rKg2PVA/Tayi7XZ nsEA== X-Gm-Message-State: AO0yUKWqOBVHKBznAY3FDMzNs9q6wh9/JMJMFbR1BencigsTNbiSHf6i caASqNU3VPyTBitwRblrIu/kaOiSji23ng== X-Google-Smtp-Source: AK7set+USZGRAyjdpis7fi6WVLr9+r9KOVk9xnZFyVRnRWqc1o+d2MJ4UYOfrovxVGgm+UwfBtcbEA== X-Received: by 2002:a17:902:e293:b0:196:39b2:4ada with SMTP id o19-20020a170902e29300b0019639b24adamr2026119plc.35.1674717469325; Wed, 25 Jan 2023 23:17:49 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id c17-20020a170902b69100b00196025a34b9sm458815pls.159.2023.01.25.23.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 23:17:49 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 13/13] msktutil: Upgrade to 1.2.1 Date: Wed, 25 Jan 2023 23:17:35 -0800 Message-Id: <20230126071735.2444745-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com> References: <20230126071735.2444745-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 ; Thu, 26 Jan 2023 07:17:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100795 Signed-off-by: Khem Raj --- .../{msktutil_1.2.bb => msktutil_1.2.1.bb} | 5 +-- ...figure.ac-Remove-native-include-path.patch | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/msktutil/{msktutil_1.2.bb => msktutil_1.2.1.bb} (75%) create mode 100644 meta-oe/recipes-support/msktutil/mskutil/0001-configure.ac-Remove-native-include-path.patch diff --git a/meta-oe/recipes-support/msktutil/msktutil_1.2.bb b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb similarity index 75% rename from meta-oe/recipes-support/msktutil/msktutil_1.2.bb rename to meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb index 1b9a04ef29..b4f4651e37 100644 --- a/meta-oe/recipes-support/msktutil/msktutil_1.2.bb +++ b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb @@ -7,8 +7,9 @@ DESCRIPTION = "Msktutil creates user or computer accounts in Active Directory, \ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -SRC_URI = "https://github.com/msktutil/msktutil/releases/download/v${PV}/msktutil-${PV}.tar.bz2" -SRC_URI[sha256sum] = "27dc078cbac3186540d8ea845fc0ced6b1d9f844e586ccd9eaa2d9f4650c2ce6" +SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-configure.ac-Remove-native-include-path.patch" +SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" DEPENDS += "krb5 cyrus-sasl openldap" diff --git a/meta-oe/recipes-support/msktutil/mskutil/0001-configure.ac-Remove-native-include-path.patch b/meta-oe/recipes-support/msktutil/mskutil/0001-configure.ac-Remove-native-include-path.patch new file mode 100644 index 0000000000..1643c08566 --- /dev/null +++ b/meta-oe/recipes-support/msktutil/mskutil/0001-configure.ac-Remove-native-include-path.patch @@ -0,0 +1,31 @@ +From bf9795ffbda7bb241b708ff261976016efb943b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 23:12:19 -0800 +Subject: [PATCH] configure.ac: Remove native include path + +On OE com_err.h is found in /usr/include too, therefore adding new path +to include search path is not needed. Moreover it fixed QA checks where +it warns about using build system paths. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index eaac16f..d23d0b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,6 @@ fi + # Fedora, RHEL, Centos has com_err.h in /usr/include/et + AC_CHECK_HEADERS([et/com_err.h]) + if test "$ac_cv_header_et_com_err_h" = "yes"; then +- CPPFLAGS="-I/usr/include/et $CPPFLAGS" + AC_DEFINE(HAVE_COM_ERR_H, 1) + fi + +-- +2.39.1 +