From patchwork Tue Apr 12 22:03:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 6622 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 1E695C46467 for ; Tue, 12 Apr 2022 23:50:14 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.2475.1649800999339431980 for ; Tue, 12 Apr 2022 15:03:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CTsUvSmO; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id j17so241471pfi.9 for ; Tue, 12 Apr 2022 15:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CR9qAfuwL0AEXWkCp7hu+ongZkjK7cUDBn0Y739m8SQ=; b=CTsUvSmO66BGf7klKqKBe565A2DUR/opVuE/i6zgYb9LjH9GI08vsqLDbZa+WYIHn0 Iv/WhXWLE/zV7+WCis0GEr2iXIzKf7iPlk7E8Mu4Z2rz61RGgo/i//BQVXvp8CZMkZ3x z+T2aZNU3AoRdbRzIkElElKkqCL96FDWZyLpECUb2oe6C2H3vbUeQs79G+9HT2fwZyfr Nbv1tU312+YbERrbE3wughd8KT+QjlGGBpOlyJUY4dDuMfRTjMYjaEHQs0eBhjjghWOv 5znK1/l0ewCyMQ9txe2bg3WjolOByRu9Wpkez28hWjv4IgZst+Rartz9tcK/Ao/Ft3gB V/tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CR9qAfuwL0AEXWkCp7hu+ongZkjK7cUDBn0Y739m8SQ=; b=vniIaUW0ZZ13kjU3hvGxYDy4lYIUkxhBosjCV/Ec7aNn7jxWCvOUaPXhEn0m8ucTP5 DW7GELt17v4JGhKp6xjEhohAH7vTJUErFX6t1WRT2Fu92kG+VLXS5hHwG9YaoBgrIwH3 xzvr8SWq+L96K2vL6uPNw1COmkSk4PJK5yIHl7VhpC9jmcHXV+W9Bt+7xDocJOgj+jLN /cX6dCyx/d1S6kKnHtjJMr7HbSbMdlYp5WTxUeUXkwN7NefDrCBlKsBjBssGOmp8Z8IH MOZgFjKwTdgCpsUbmBzdQWrBnv/cGYvBXvQv3YEnDHpS6v5E5gm+uJdTMdCyMh3iOuuc 2Cyg== X-Gm-Message-State: AOAM532nxzGTts4ri2BQgbc4HfBEZIzbMLgD8FLoAgmCPvKgynxVui2y T5V7idc4q4TbVoK6/ISqwR/3DdLiXHSaZg== X-Google-Smtp-Source: ABdhPJwqNf2aW8BGBJXdDhW3xbgDwjY+2jjEWVMijWZgghAxFICC5ioefclUZsigcQYz1PRJE4AViw== X-Received: by 2002:a63:6809:0:b0:37c:68d3:1224 with SMTP id d9-20020a636809000000b0037c68d31224mr31725010pgc.287.1649800998597; Tue, 12 Apr 2022 15:03:18 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::94ca]) by smtp.gmail.com with ESMTPSA id v8-20020a17090a7c0800b001cb63a477eesm502881pjf.12.2022.04.12.15.03.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:03:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/7] libkcapi: Upgrade to 1.4.0 Date: Tue, 12 Apr 2022 15:03:10 -0700 Message-Id: <20220412220316.3876985-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.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 ; Tue, 12 Apr 2022 23:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96594 Drop upstreamed patch Disable new warnings seen with gcc 12 Signed-off-by: Khem Raj --- ...Adjust-for-musl-msghdr-struct-compat.patch | 81 ------------------- .../{libkcapi_1.3.1.bb => libkcapi_1.4.0.bb} | 7 +- 2 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch rename meta-oe/recipes-crypto/libkcapi/{libkcapi_1.3.1.bb => libkcapi_1.4.0.bb} (80%) diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch b/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch deleted file mode 100644 index 687eb359cf..0000000000 --- a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d54e532821d40f8094a49742831d32ec7e76caed Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 16 Dec 2021 15:18:21 -0800 -Subject: [PATCH] kcapi-kernel-if: Adjust for musl msghdr struct compatibility - -musl sticks to POSIX and defines msg_iovlen and msg_controllen as int -and socklen_t types respectively whereas glibc and kernel mark them as -size_t which is them assumed as such in the code here as well, Make the -needed conversions to get it going on musl/linux also see [1] for more -info - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=7168790763cdeb794df52be6e3b39fbb021c5a64 - -Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/131] -Signed-off-by: Khem Raj ---- - lib/kcapi-kernel-if.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - -diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c -index 739841e..e5d15d4 100644 ---- a/lib/kcapi-kernel-if.c -+++ b/lib/kcapi-kernel-if.c -@@ -168,10 +168,14 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, - } - - msg.msg_control = buffer_p; -- msg.msg_controllen = bufferlen; - msg.msg_iov = iov; -+#ifdef __GLIBC__ - msg.msg_iovlen = iovlen; -- -+ msg.msg_controllen = bufferlen; -+#else -+ msg.msg_iovlen = (int)iovlen; -+ msg.msg_controllen = (socklen_t)bufferlen; -+#endif - /* encrypt/decrypt operation */ - header = CMSG_FIRSTHDR(&msg); - if (!header) { -@@ -193,7 +197,11 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, - } - header->cmsg_level = SOL_ALG; - header->cmsg_type = ALG_SET_IV; -+#ifdef __GLIBC__ - header->cmsg_len = iv_msg_size; -+#else -+ header->cmsg_len = (socklen_t)iv_msg_size; -+#endif - alg_iv = (void*)CMSG_DATA(header); - alg_iv->ivlen = tfm->info.ivsize; - memcpy(alg_iv->iv, handle->cipher.iv, tfm->info.ivsize); -@@ -244,8 +252,11 @@ ssize_t _kcapi_common_send_data(struct kcapi_handle *handle, - msg.msg_controllen = 0; - msg.msg_flags = 0; - msg.msg_iov = iov; -+#ifdef __GLIBC__ - msg.msg_iovlen = iovlen; -- -+#else -+ msg.msg_iovlen = (int)iovlen; -+#endif - ret = sendmsg(*_kcapi_get_opfd(handle), &msg, (int)flags); - if (ret < 0) - ret = -errno; -@@ -542,8 +553,11 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, - msg.msg_controllen = 0; - msg.msg_flags = 0; - msg.msg_iov = iov; -+#ifdef __GLIBC__ - msg.msg_iovlen = iovlen; -- -+#else -+ msg.msg_iovlen = (int)iovlen; -+#endif - ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); - if (ret < 0) - ret = -errno; --- -2.34.1 - diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.4.0.bb similarity index 80% rename from meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb rename to meta-oe/recipes-crypto/libkcapi/libkcapi_1.4.0.bb index 8ff5ddd175..3be8c76b54 100644 --- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb +++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.4.0.bb @@ -1,12 +1,11 @@ SUMMARY = "Linux Kernel Crypto API User Space Interface Library" HOMEPAGE = "http://www.chronox.de/libkcapi.html" LICENSE = "BSD-3-Clause | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23" +LIC_FILES_CHKSUM = "file://COPYING;md5=a2562899bc38f1735868f0bf0c1dd1a5" S = "${WORKDIR}/git" -SRCREV = "2936ecd060c299157ac880650ba2c9fd94d27bb1" +SRCREV = "1429ab42d48123cc8f73b96c69a87fb9c6d8a7c9" SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \ - file://0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch \ " inherit autotools @@ -27,5 +26,7 @@ do_install:append() { } CPPFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" +CPPFLAGS:remove:libc-musl:toolchain-clang = "-Wno-error=sign-conversion" +CPPFLAGS:append:libc-musl = " -Wno-error=sign-conversion" BBCLASSEXTEND = "native" From patchwork Tue Apr 12 22:03:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 6619 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 1D8FBC3525B for ; Tue, 12 Apr 2022 23:50:14 +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.web11.2476.1649801000448394960 for ; Tue, 12 Apr 2022 15:03:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iR2q10WU; 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 d15so225618pll.10 for ; Tue, 12 Apr 2022 15:03:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NW/2CIBreGlzvdGWyXz9X6F5DfpJ2N+wigkjA9T4Sqw=; b=iR2q10WUqz+4gAkzFG91I87KRd0SVmDDR1dbvfggm7ndp+4ZEnkBJbhcR2YVkdQL9m i+635rlJ6FxFnCrtt0RvZPSsGefPtUA6OfNnkqnnnh/y0hLMTAf/GPFN3mcBhHeKEqcM eaSTcphFGCcAfwJAPQJI0rOC0+O0bTxNQNatoWr/vWXvmB1qosAkCxjndEApNcLfBz1W Vygt497j1JJThBMconesP3fA4zV8cdGQV053QDlbQQY5+kug2He8EDLAs5TKAJuo8Wmx /yQYJEtAA62JpTyy6ld4k5dGwcSxho1LfuJTJZTpC31TudHGVafX4tGXpVeI1tuXNLI9 ZpHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NW/2CIBreGlzvdGWyXz9X6F5DfpJ2N+wigkjA9T4Sqw=; b=Q5enA+Ugo11tQV4eemH7Sdeh4GoQ/jDOWBbJjtB2z/Vwo0VuqSkfUqXWHw+hleb7C9 6VoB4E67fNrKlbaOmqVIGsQyT6gS5ch9BYkRp6uSoGhYgKhuS7TK3lce3xHViA6sWJnr EeGhmVdJfIe/0S4+wH/2u7G/GkJFBw2WY+z2hu+L+fUX/YkHdrc59OrMQOvcbjyXCYrW +MNqKjQHo5COV9icdgy5vYQo6uXG7FcmadU9zix3qMDJ3OOoP54QrCxLmpuhBHa5uJpd lJcUobxKd5drJwrZopmV5eZGBtt7UCEBBi/1pWKEEVuknQtWqwXa2yVu707dBJXzSswH AaBg== X-Gm-Message-State: AOAM533UiOfshTlzBfozFU9ftN7EgaFS/3ERhB8W/3UybhzDewuMLwyE pdilIPTarIqVSxdJ3wt6LIC1jqw7sfj/vQ== X-Google-Smtp-Source: ABdhPJy6NF7AXGTK4pK5ec1sa0yjOWWKzoKZskcfCnYAOnlZ8kGlD/hBEwuwFCPtDD7UFl+DP9nr1A== X-Received: by 2002:a17:902:cccf:b0:156:31a:736e with SMTP id z15-20020a170902cccf00b00156031a736emr39369530ple.76.1649800999734; Tue, 12 Apr 2022 15:03:19 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::94ca]) by smtp.gmail.com with ESMTPSA id v8-20020a17090a7c0800b001cb63a477eesm502881pjf.12.2022.04.12.15.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:03:19 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/7] libpfm4: Remove -Werror from compiler flags Date: Tue, 12 Apr 2022 15:03:11 -0700 Message-Id: <20220412220316.3876985-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412220316.3876985-1-raj.khem@gmail.com> References: <20220412220316.3876985-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, 12 Apr 2022 23:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96595 Newer versions of compilers get stricter and add new diagnostics which cause build failures that upstream should address not distros Fixes | In function 'perf_table_alloc_umask', | inlined from 'gen_tracepoint_table' at pfmlib_perf_event_pmu.c:434:10: | pfmlib_perf_event_pmu.c:304:47: error: pointer may be used after 'realloc' [-Werror=use-after-free] Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb b/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb index e476370e05..d2d2512b2c 100644 --- a/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb +++ b/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedba UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" -EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\"" +EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\" DBG='-g -Wall -Wextra -Wno-unused-parameter'" EXTRA_OEMAKE:append:powerpc = " ARCH=\"powerpc\"" EXTRA_OEMAKE:append:powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" EXTRA_OEMAKE:append:powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" From patchwork Tue Apr 12 22:03:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 6620 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 1E444C3527C for ; Tue, 12 Apr 2022 23:50:14 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web08.2458.1649801001467218026 for ; Tue, 12 Apr 2022 15:03:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pY4nKMc8; spf=pass (domain: gmail.com, ip: 209.85.215.173, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f173.google.com with SMTP id k29so1901130pgm.12 for ; Tue, 12 Apr 2022 15:03:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n1Yx+XE68+dtn7lgu28eolxplNWlTobNXa9nJUW29TM=; b=pY4nKMc8MfuAY2c+Uzt0qAS3FFo/fApvG1eUFliLi9VTWl4/P3wHALpSvu3ujyy3ZI ZPGFeF0s43Y2fF5Qm/IvSXECKMh8OHAUSk61zZtu5qJb+qxghAy3ZbuoLx/iT+EwO7Dh ec0AcxwHxxTlS5laubunLpeZ5dxdkPE390aQb/iegU76H03xA6HVTFz7dWOAi9pSHYvW 7Sko3QTb/XHg0LZ21u6rhHzVpE4/9zE3iyE8jcTl7Cd2KSkJOJJFQwQ7xFItq9QZVPhN uozKCJNpuKArXfgnKvMvbGmKfIZxM5c/hhnlcgg4w+zrg6dsV3RlHUc72yyWkIhMKFst q8Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n1Yx+XE68+dtn7lgu28eolxplNWlTobNXa9nJUW29TM=; b=c+m+E0Q5L/Be098B4B/PqJnc2Nru8zOz9K9KhlV/gn+sLbTEptA21Y3c/rbkgfd03/ z5TZSSDw5E3YgXtIWymm0dW/QBdZzW/lVYq2ROn2ik4H3Q8EcNqspcWBXd05ZYg0jUEQ hwbEYwYc3aOQU/6kwx/PXnzTBfKP3MtwzPakUhWPk4mkZY+y4LD/6Jp+Zv9UX29RYG8b hBVosMb588DDhYouKBG8VuBZ2R1VsNqjITF6IJzA0Q25D2vLQ3iTnAd4FrZUsuAkzgy1 9DKv7877JYO0u+VfHhbOomXFrChNiBDpoj+GTip30qA2zffR5uhtZT7sKR6WrdAtDY2Y w2jw== X-Gm-Message-State: AOAM531xOYT5Qh1t3Wgdesvd0cFYKZ/0oIaZcsh5pdWNhMaKMIDKQpCG 49lSCK60FC60wEN34A1c9oN1YIcDetg5wg== X-Google-Smtp-Source: ABdhPJy1cW9MNs7RYE6s1b4RMRsKBj+8I1zw0XMT4yd3goBNiBDB0AL7ecj1nzqicvuQSzhaqmYFIg== X-Received: by 2002:a63:5c0b:0:b0:382:76f4:c768 with SMTP id q11-20020a635c0b000000b0038276f4c768mr31749118pgb.93.1649801000755; Tue, 12 Apr 2022 15:03:20 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::94ca]) by smtp.gmail.com with ESMTPSA id v8-20020a17090a7c0800b001cb63a477eesm502881pjf.12.2022.04.12.15.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:03:20 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/7] parallel-deqp-runner: Fix build with gcc 12 Date: Tue, 12 Apr 2022 15:03:12 -0700 Message-Id: <20220412220316.3876985-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412220316.3876985-1-raj.khem@gmail.com> References: <20220412220316.3876985-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, 12 Apr 2022 23:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96596 Signed-off-by: Khem Raj --- ...emchr-are-C-APIs-not-C-std-namespace.patch | 45 +++++++++++++++++++ .../parallel-deqp-runner_git.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch new file mode 100644 index 0000000000..2316c1ffdf --- /dev/null +++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch @@ -0,0 +1,45 @@ +From 98bef35c010a9c7891634fe9bcc4b560abbcb4e9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Apr 2022 11:29:50 -0700 +Subject: [PATCH] memmove and memchr are C APIs not C++ std namespace + +Fixes build error +../git/src/deqp-runner.cc: In member function 'Line_reader::read_status Line_reader::read(char**, double)': +../git/src/deqp-runner.cc:249:10: error: 'memmove' is not a member of 'std'; did you mean 'wmemmove'? + 249 | std::memmove(buf_.data(), buf_.data() + skip_sz_, valid_sz_); + | ^~~~~~~ + | wmemmove +../git/src/deqp-runner.cc:255:35: error: 'memchr' is not a member of 'std'; did you mean 'wmemchr'? + 255 | while (!(newline = (char *)std::memchr(buf_.data(), '\n', valid_sz_)) && + | ^~~~~~ + | wmemchr + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/parallel-deqp-runner/-/merge_requests/17] +Signed-off-by: Khem Raj +--- + src/deqp-runner.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/deqp-runner.cc b/src/deqp-runner.cc +index 1cc8a55..55a15f9 100644 +--- a/src/deqp-runner.cc ++++ b/src/deqp-runner.cc +@@ -246,13 +246,13 @@ Line_reader::read_status Line_reader::read(char **text, double timeout) { + + if (skip_sz_) { + valid_sz_ -= skip_sz_; +- std::memmove(buf_.data(), buf_.data() + skip_sz_, valid_sz_); ++ memmove(buf_.data(), buf_.data() + skip_sz_, valid_sz_); + skip_sz_ = 0; + } + + char *newline; + bool end = false; +- while (!(newline = (char *)std::memchr(buf_.data(), '\n', valid_sz_)) && ++ while (!(newline = (char *)memchr(buf_.data(), '\n', valid_sz_)) && + !end && valid_sz_ + 1 < (int)buf_.size()) { + for (;;) { + struct pollfd p = {}; +-- +2.35.1 + diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb index 52723d7af1..eff6ad8f83 100644 --- a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb +++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -3,6 +3,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa" SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https;branch=master \ file://0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch \ + file://0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch \ " # Modify these as desired From patchwork Tue Apr 12 22:03:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 6624 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 28A69C3527E for ; Tue, 12 Apr 2022 23:50:14 +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.web12.2457.1649801002972195304 for ; Tue, 12 Apr 2022 15:03:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YDUsdbZv; 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 bg24so51723pjb.1 for ; Tue, 12 Apr 2022 15:03:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9WsPQeju77JF3z/HyXljylfrbLIBS95pmdcfMlVnAqw=; b=YDUsdbZvJsjj5y8WaTmqJ+vttEJ9dgr029GdN+5ttNe1UGMR8qs0ERxIgt3TZUE/Gg 7Yeenktwt4s7xyzz+wb2gV/nyhj8KBQvzcz+p+QJN3jfCZE+Gy6K2ijTSXbHy3h7E0tR 7bRBPKiuriLgOAQonQSYOyLKSXOUB5iRqsoBqxZlNp4jmVHPw//bl24IPN3ap3V6/I9u oocAoBdyq2fPFrUtxzh0tu5liYU7dKtmBOl0Be9GFANFaohpdHR4jeQNTRy0a0FnLKE3 y6DSXKWYRurr2FZm+4pFPByq52mP2z3GHWfXkAY8FTmV7FkZZjfHMtEjTtQlejY5tdOa ksFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9WsPQeju77JF3z/HyXljylfrbLIBS95pmdcfMlVnAqw=; b=YclZ+NvwBqmueyLm9Z3RUvTWYel316MAfgshmOrW9jTqGtGP3q5/oZUMK6jCSNXg39 PFB0lschVqvDWubhWQ/v80pxyFwN5rJC5FTIWP8Jq/gWvVKL0xyCuuBcHSnxpm5eiV66 /L90mlPyz8qhm5gGTORni890aFF+ZJPoCt5OK6s2lGfEZonjtoQIMgc/x2uGUFST7kDq tHgt7Ohr5nGHdDnXV8HFj5G+qAnTieKflvNg7xvAFX+koHz71bWnW4DBV0aYu73Cu/2v X/bk88lnDGCjWiFSWtarQsc/EAylFW3glcKlueRoL4H52aP2uTkFKpenO1hDLi7Io5EP A1dw== X-Gm-Message-State: AOAM530vCDDoCPejNU4OIa/38SDa8V3FsrEo3x3XcP7Fe3nE49LpK8/g 3AZtddvLvXq1dwsaZbltYEWSTvycHBmoiQ== X-Google-Smtp-Source: ABdhPJw5h9GqhDC8tJHBfgW4Havf773n1hXJEDWyB13UpCywcq7oO7q8aOzQD7afnjM6nV5gxw8org== X-Received: by 2002:a17:902:da90:b0:154:4737:a3f with SMTP id j16-20020a170902da9000b0015447370a3fmr39505304plx.73.1649801002110; Tue, 12 Apr 2022 15:03:22 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::94ca]) by smtp.gmail.com with ESMTPSA id v8-20020a17090a7c0800b001cb63a477eesm502881pjf.12.2022.04.12.15.03.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:03:21 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/7] glmark2: Fix build with gcc12 Date: Tue, 12 Apr 2022 15:03:13 -0700 Message-Id: <20220412220316.3876985-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412220316.3876985-1-raj.khem@gmail.com> References: <20220412220316.3876985-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, 12 Apr 2022 23:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96597 Signed-off-by: Khem Raj --- ...atrix-Include-missing-utility-header.patch | 24 +++++++++++++++++++ .../recipes-benchmark/glmark2/glmark2_git.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch new file mode 100644 index 0000000000..959a18e5eb --- /dev/null +++ b/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch @@ -0,0 +1,24 @@ +From 45cb02332b38b2059e7e44369c3d8684492a7def Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Apr 2022 11:41:41 -0700 +Subject: [PATCH] libmatrix: Include missing header + +Fixes build with gcc12 +| ../git/src/libmatrix/program.h:43:21: error: 'exchange' is not a member of 'std' | 43 | ready_(std::exchange(shader.ready_, false)), | | ^~~~~~~~ + +Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/174] +Signed-off-by: Khem Raj +--- + src/libmatrix/program.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/libmatrix/program.h ++++ b/src/libmatrix/program.h +@@ -13,6 +13,7 @@ + #define PROGRAM_H_ + + #include ++#include + #include + #include + #include "mat.h" diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 47d927397c..1406f68b05 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -17,6 +17,7 @@ SRC_URI = " \ git://github.com/glmark2/glmark2.git;protocol=https;branch=master \ file://0001-fix-dispmanx-build.patch \ file://0002-run-dispmanx-fullscreen.patch \ + file://0001-libmatrix-Include-missing-utility-header.patch \ " SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70" From patchwork Tue Apr 12 22:03:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 6623 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 28B02C4707A for ; Tue, 12 Apr 2022 23:50:14 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web12.2459.1649801003816575758 for ; Tue, 12 Apr 2022 15:03:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=M4W36NqC; spf=pass (domain: gmail.com, ip: 209.85.215.177, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f177.google.com with SMTP id s137so15746148pgs.5 for ; Tue, 12 Apr 2022 15:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JcJHhXPuJWsGq2LPlmmKRfNFTz2mwWeQM9M927ptGl4=; b=M4W36NqC4SHnE7Aj+2MdMjvlYQk6pqMHFo7UbpITt1hG+5c+VwvvDWdX4YHDge0DOM yprchGK5Her6YkgdR5JH+jzeWx0MewCmlTnYnEvCVyiF8c1E0MvmVibd9JqPRz9UKRfb mdZw/FnuMOwftLi9/UIcI0V2jnlex/v1IiHTfh2i8K01g0tcAhuHv0q9WGxn2bWnErn+ kChnsuuyk1rOGYYvE66hYhRg1vaKMXTo5DZAy7S3tLciGSdoHg6XdoBU0OV+F5+bl3Em 2VMGGk26Prn85kFGLEfupMZFnBHIh6LM++8o5LGIPCXr2HRaRqD0Bree81LA+JXFTRy1 tQzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JcJHhXPuJWsGq2LPlmmKRfNFTz2mwWeQM9M927ptGl4=; b=NouC/zrdyva6jeP7kebCAfDH5hckUtdw2YsjRrlgBgE/5DZUvlAs4PBSkJ90NC20SB v4y7QQCyH3edi4upqoueSvUgAzrlculNxLmPW49AKCDdosrRBDrI6m7F1kuExY/R2J9F t3ADVok0rZEUu4ngINPT2Jlj3lw3Y2qU8ZRBd3mOU9GOBhbEwnuEINh041lBCh1+g0um 6sf5F28Zk7orEoH+jbXynLsJoKsHF1cRA3VlpGdoCUJ6t0NBYvV0qb/L7LzNzVHo8iMj Oq6V8ooaQa1jc8QFl50WBF3OvwmvjCwefHBRHyOs7HsT0B1X0aOH14s8woKN31YpP4T7 0Cng== X-Gm-Message-State: AOAM533fV3ECWxzdj+TUzyFyX6gPcePicQ8E7y0KQE9OmHuGHaxqA4Mh 1TavAJP8jzup8cE9px1Fu3neXyrN6/SQew== X-Google-Smtp-Source: ABdhPJyAW1vwSkfsvHcV84k3c7c9QuqB7VDZKh9t+jKgTvd81Cbbyc4uIy5eVn9lljbCJHVguX/53w== X-Received: by 2002:a63:18f:0:b0:37c:4671:a2ce with SMTP id 137-20020a63018f000000b0037c4671a2cemr33107802pgb.429.1649801003061; Tue, 12 Apr 2022 15:03:23 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::94ca]) by smtp.gmail.com with ESMTPSA id v8-20020a17090a7c0800b001cb63a477eesm502881pjf.12.2022.04.12.15.03.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:03:22 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 5/7] memcached: Upgrade to 1.6.15 Date: Tue, 12 Apr 2022 15:03:14 -0700 Message-Id: <20220412220316.3876985-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412220316.3876985-1-raj.khem@gmail.com> References: <20220412220316.3876985-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, 12 Apr 2022 23:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96598 Drop upstreamed patch Signed-off-by: Khem Raj --- ...heck-for-NDEBUG-before-using-total_w.patch | 48 ------------------- ...memcached_1.6.9.bb => memcached_1.6.15.bb} | 3 +- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch rename meta-networking/recipes-support/memcached/{memcached_1.6.9.bb => memcached_1.6.15.bb} (91%) diff --git a/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch b/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch deleted file mode 100644 index 2979552a34..0000000000 --- a/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d6294e9166e4875a0572349aabcc5e51acbd2e3c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 4 Jun 2021 11:33:12 -0700 -Subject: [PATCH] stats_prefix.c: Check for NDEBUG before using total_written - variable - -When using NDEBUG assert macro is ineffective which is caught by latest -clang and reports that total_written is set but unused. Therefore check -for NDEBUG to make sure assert is used only when its effective - -Fixes -error: variable 'total_written' set but not used [-Werror,-Wunused-but-set-variable] - size_t size = 0, written = 0, total_written = 0; - ^ -Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/792] -Signed-off-by: Khem Raj ---- - stats_prefix.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/stats_prefix.c b/stats_prefix.c -index 62f0d04..d72e514 100644 ---- a/stats_prefix.c -+++ b/stats_prefix.c -@@ -127,8 +127,10 @@ char *stats_prefix_dump(int *length) { - PREFIX_STATS *pfs; - char *buf; - int i, pos; -- size_t size = 0, written = 0, total_written = 0; -- -+ size_t size = 0, written = 0; -+#ifndef NDEBUG -+ size_t total_written = 0; -+#endif - /* - * Figure out how big the buffer needs to be. This is the sum of the - * lengths of the prefixes themselves, plus the size of one copy of -@@ -154,8 +156,10 @@ char *stats_prefix_dump(int *length) { - pfs->prefix, pfs->num_gets, pfs->num_hits, - pfs->num_sets, pfs->num_deletes); - pos += written; -+#ifndef NDEBUG - total_written += written; - assert(total_written < size); -+#endif - } - } - diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.9.bb b/meta-networking/recipes-support/memcached/memcached_1.6.15.bb similarity index 91% rename from meta-networking/recipes-support/memcached/memcached_1.6.9.bb rename to meta-networking/recipes-support/memcached/memcached_1.6.15.bb index adf3c34e11..b28bfe72b7 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.6.9.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.15.bb @@ -21,9 +21,8 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ - file://0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch \ " -SRC_URI[sha256sum] = "d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1" +SRC_URI[sha256sum] = "8d7abe3d649378edbba16f42ef1d66ca3f2ac075f2eb97145ce164388e6ed515" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" From patchwork Tue Apr 12 22:03:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 6621 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 27EB4C3527D for ; Tue, 12 Apr 2022 23:50:14 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web09.2383.1649801004731684274 for ; Tue, 12 Apr 2022 15:03:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IIXBfQWV; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id bg24so51785pjb.1 for ; Tue, 12 Apr 2022 15:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cOPo+ROBoqWsyySGavO3Z/N5qqtfqTgyC4Bi1By+Gl4=; b=IIXBfQWVlSvi3G2g9t44P33cF5vtZuKtKy9Z8FH41zI6fAz1NKpaBHTa7XgIFznD5Y ihMOiMUz2Xbv2U9GkBFznRJY3Dho1Z4ozQ4dRvIbtPNctun8zvjJc6hv3AK/9gaMhB3K PFm7oYQhNMVP7Rsyo4exQdyCd295z6YeEw+a3vTMKA1gBz4Cu7fPdSds2R8McZoaM9lc lBauSs4oGo03Fs5Gnbhw7+H/1sWfyf3lmiVEQilnIrdkgSxu/UbqHdbRp1ZAEKHmhgSp mGTfKPJaQwH/mJDaNbNBnxIZj4TUBk7kz4eqQ99yL11UrjTvOTD8bU/2ChS83r3NmKCD MfnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cOPo+ROBoqWsyySGavO3Z/N5qqtfqTgyC4Bi1By+Gl4=; b=TJz1iD0WrLV5Zb+9Hq9ZxsainiAUJ50jFLCWHrqMfRGDr/ecpTIVozhdH3IDxf9m2J 8aNcy2FTp16qT0bPvEK6iz7WQ1xoi/O2YcQHIEMfJ7PG3C66UdxrTNaBOfcdKPNJdOxR 33fFOVjnKn2W/RAQGqbKqitcIZbQw/mNJ70EALuEP58W8fFHI0RrVyjBpp/ZmlPpFzDv K94M5xF+QWZYLi2X1GkeZigpZcuO3yEpaJmJAWbtG5nILhjt2raayEUouF/HiV1ttvP4 G6kOcPE1IYIsNdDgIq2qjTz3/+WEz503sJlcKBB9kbcujvJ7dAecnjDGtnydtp3MU1JZ DnQg== X-Gm-Message-State: AOAM533SeuwnaV7iI0ix1Kjj5cFAXFvhRzbAKBfR/464fYgB3tGG6YMF RUCNedrikgHiTTBxGVtaVT1tbVYYRytIZQ== X-Google-Smtp-Source: ABdhPJyRAhbDiIYwrMoPtKXWtd3sBGM/zzXRiU3xBDZrHwd+u53URy82dNGMka1umpkFWmfuR8/C5w== X-Received: by 2002:a17:903:185:b0:158:7255:4bf1 with SMTP id z5-20020a170903018500b0015872554bf1mr9741806plg.102.1649801004003; Tue, 12 Apr 2022 15:03:24 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::94ca]) by smtp.gmail.com with ESMTPSA id v8-20020a17090a7c0800b001cb63a477eesm502881pjf.12.2022.04.12.15.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:03:23 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 6/7] tvheadend: Update to latest trunk Date: Tue, 12 Apr 2022 15:03:15 -0700 Message-Id: <20220412220316.3876985-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412220316.3876985-1-raj.khem@gmail.com> References: <20220412220316.3876985-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, 12 Apr 2022 23:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96599 Forward port 64bit time_t patch Disable warnings as errors Signed-off-by: Khem Raj --- .../tvheadend/0001-adjust-for-64bit-time_t.patch | 8 ++++---- meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch index 59bd4ef08f..ff2e789e32 100644 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch @@ -146,12 +146,12 @@ Signed-off-by: Khem Raj /* Failed */ --- a/src/epggrab/module/opentv.c +++ b/src/epggrab/module/opentv.c -@@ -486,7 +486,7 @@ opentv_parse_event_section_one +@@ -497,7 +497,7 @@ opentv_parse_event_section_one 1, &save, &changes); tvhdebug(LS_OPENTV, "find by time start %"PRItime_t " stop " - "%"PRItime_t " eid %d = %p", -- ev.start, ev.stop, ev.eid, ebc); -+ (intmax_t)ev.start, (intmax_t)ev.stop, ev.eid, ebc); + "%"PRItime_t " ch %"PRId64" eid %d = %p", +- ev.start, ev.stop, ch->ch_number, ev.eid, ebc); ++ (intmax_t)ev.start, (intmax_t)ev.stop, ch->ch_number, ev.eid, ebc); save |= epg_broadcast_set_dvb_eid(ebc, ev.eid, &changes); } else { ebc = epg_broadcast_find_by_eid(ch, ev.eid); diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index c278cf5994..b3d9d6bf7d 100644 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/tvheadend/tvheadend.git;branch=master;protocol=https file://0001-adjust-for-64bit-time_t.patch \ " -SRCREV = "ce09077056f9c6558c188d135cec3be85cc9c200" +SRCREV = "9a51cea492e4a5579ca3ddf9233fecfa419de078" PV = "4.3+git${SRCPV}" PKGV = "4.3+git${GITPKGV}" @@ -26,5 +26,8 @@ EXTRA_OECONF += "--arch=${TARGET_ARCH} \ --disable-dvbscan \ " +EXTRA_OECONF:append:libc-musl = " --disable-execinfo" + +EXTRA_OEMAKE = "CFLAGS_NO_WERROR=yes" CLEANBROKEN = "1" From patchwork Tue Apr 12 22:03:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 6625 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 32F33C35280 for ; Tue, 12 Apr 2022 23:50:14 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web08.2459.1649801006278276290 for ; Tue, 12 Apr 2022 15:03:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZzKAMZjX; spf=pass (domain: gmail.com, ip: 209.85.216.42, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f42.google.com with SMTP id a16-20020a17090a6d9000b001c7d6c1bb13so43654pjk.4 for ; Tue, 12 Apr 2022 15:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zR8KeN7EPPh0pfVF9C6AhTOh/JSB2yyUHWU24YhzvnQ=; b=ZzKAMZjXgbnIBw94BzvpknXaOhfB8PXzULtOeXm8F+GwWqRFKqHzbt7OkCRg6Vyiig Wq8lv1vns/+mUFbiEGus5Yo8XfzdcI1tRN6KwzGcEBZCMmaje5puDsJMpxueCpE5eq3j 97VJFnnORMnMpZI+FNrciEV/3tZQyhHYO9GZcJEmwQlfP7TEBXXtZVFKkYf603cr1N7W 6tZYVVmmRNJmx199+RCCMdZZGLLTnCI4mek9r2WGPImAVgKBdxpk7JcWTJWOfwcuM3XQ zEXNJWIMdaCRAKNQoy6uaBG70O5nKHlNKALhTsdr3TvkD9bfszEsGe+ILFAczGyMh+GD Nidg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zR8KeN7EPPh0pfVF9C6AhTOh/JSB2yyUHWU24YhzvnQ=; b=e/7jgdgFcsiBX0Ezy8OcHPDxmaaN2CWCPeVCTynEs6SkGlMXa2WdFIiSjOkWSXwesN Hb1Qygphn1F22KdSFNaVTyZYIZ6zNPP6K2tO2uVInEuG0Y7a4mM+YkdE+3F5I2fk8XIH UueBeujxLI+/Otcn34beE8j4wi4Zj+BtjUms5LptYpMxCRgZZFFNJJJ37agPJuqGfJo2 XERYrRF0Rdjyd/5y0WwAJrTmNrzuEeKGLy6ugFVbX5ox/ioAg4yiYMUxNsVz+CDS3S6I Cev4Bs/TasNU/uxSZSC+ntTOCo5lhvHZV+ySXfVGuxAwl4S0VRicLYU4tMgTHxYIsZ28 haYA== X-Gm-Message-State: AOAM532yjhD+UxsNpF9s9BwwK99gbWkXDtYpWqpp1Bx4+yKHLWh7q1Ew Qc7Tz3FvtfNgCUCbRUrYSKLuIs5RE1GYXw== X-Google-Smtp-Source: ABdhPJxHGXrudWAjdwx4ewm4urSvqrjqiC5TjJ5v3JoMlbj7W2foPas7r3IDUgLF2ASmJvux5S9bWg== X-Received: by 2002:a17:90b:4b11:b0:1cb:2a65:f275 with SMTP id lx17-20020a17090b4b1100b001cb2a65f275mr7329277pjb.33.1649801005439; Tue, 12 Apr 2022 15:03:25 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::94ca]) by smtp.gmail.com with ESMTPSA id v8-20020a17090a7c0800b001cb63a477eesm502881pjf.12.2022.04.12.15.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:03:24 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 7/7] ot-br-posix: Disable Wsign-compare for clang Date: Tue, 12 Apr 2022 15:03:16 -0700 Message-Id: <20220412220316.3876985-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412220316.3876985-1-raj.khem@gmail.com> References: <20220412220316.3876985-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, 12 Apr 2022 23:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96600 Specify is via CXXFLAGS instead of pragma dance. Signed-off-by: Khem Raj --- .../Turn-off-sign-compare-for-musl-libc.patch | 131 ------------------ .../openthread/ot-br-posix_git.bb | 3 +- 2 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch deleted file mode 100644 index df84550be0..0000000000 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Stefan Schmidt -Subject: Turn off sign compare for musl libc - -When building with musl and clang the usage of CMSG_NXTHDR results in -sign-compare error. Disable the check only in this specific part of the -code with a #pragma. - -| /home/stefan/huawei/yocto-upstream/yoe/workspace/sources/ot-br-posix/third_party/openthread/repo/src/posix/platform/udp.cpp:147:28: fatal error: comparison of integers of different signs: 'unsigned long' and 'long' [-Wsign-compare] -| cmsg = CMSG_NXTHDR(&msg, cmsg); -| ^~~~~~~~~~~~~~~~~~~~~~~ -| /home/stefan/huawei/yocto-upstream/yoe/build/tmp/work/cortexa57-yoe-linux-musl/ot-br-posix/0.3.0+git999-r0/recipe-sysroot/usr/include/sys/socket.h:358:44: note: expanded from macro 'CMSG_NXTHDR' -| __CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \ -| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - -Idea and fix taken from -recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch -by Khem Raj. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Stefan Schmidt - -diff --git a/src/backbone_router/nd_proxy.cpp b/src/backbone_router/nd_proxy.cpp -index 7136878c3d..8a223c95c7 100644 ---- a/src/backbone_router/nd_proxy.cpp -+++ b/src/backbone_router/nd_proxy.cpp -@@ -185,9 +185,18 @@ void NdProxyManager::ProcessMulticastNeighborSolicition() - VerifyOrExit(icmp6header->icmp6_type == ND_NEIGHBOR_SOLICIT, error = OTBR_ERROR_PARSE); - - otbrLogDebug("NdProxyManager: Received ND-NS from %s", src.ToString().c_str()); -- -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - for (cmsghdr = CMSG_FIRSTHDR(&msghdr); cmsghdr; cmsghdr = CMSG_NXTHDR(&msghdr, cmsghdr)) -- { -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif -+ { - if (cmsghdr->cmsg_level != IPPROTO_IPV6) - { - continue; -Submodule third_party/openthread/repo contains modified content -diff --git a/third_party/openthread/repo/src/posix/platform/infra_if.cpp b/third_party/openthread/repo/src/posix/platform/infra_if.cpp -index 9f93d2b1c..1ed40fe50 100644 ---- a/third_party/openthread/repo/src/posix/platform/infra_if.cpp -+++ b/third_party/openthread/repo/src/posix/platform/infra_if.cpp -@@ -228,7 +228,17 @@ otError InfraNetif::SendIcmp6Nd(uint32_t aInfraIfIndex, - packetInfo->ipi6_ifindex = mInfraIfIndex; - - // Per section 6.1.2 of RFC 4861, we need to send the ICMPv6 message with IP Hop Limit 255. -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - cmsgPointer = CMSG_NXTHDR(&msgHeader, cmsgPointer); -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif - cmsgPointer->cmsg_level = IPPROTO_IPV6; - cmsgPointer->cmsg_type = IPV6_HOPLIMIT; - cmsgPointer->cmsg_len = CMSG_LEN(sizeof(hopLimit)); -@@ -481,7 +491,17 @@ void InfraNetif::ReceiveIcmp6Message(void) - - bufferLength = static_cast(rval); - -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - for (cmh = CMSG_FIRSTHDR(&msg); cmh; cmh = CMSG_NXTHDR(&msg, cmh)) -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif - { - if (cmh->cmsg_level == IPPROTO_IPV6 && cmh->cmsg_type == IPV6_PKTINFO && - cmh->cmsg_len == CMSG_LEN(sizeof(struct in6_pktinfo))) -diff --git a/third_party/openthread/repo/src/posix/platform/udp.cpp b/third_party/openthread/repo/src/posix/platform/udp.cpp -index b7aacc5fa..a814fea70 100644 ---- a/third_party/openthread/repo/src/posix/platform/udp.cpp -+++ b/third_party/openthread/repo/src/posix/platform/udp.cpp -@@ -144,8 +144,18 @@ otError transmitPacket(int aFd, uint8_t *aPayload, uint16_t aLength, const otMes - { - struct in6_pktinfo pktinfo; - -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - cmsg = CMSG_NXTHDR(&msg, cmsg); -- cmsg->cmsg_level = IPPROTO_IPV6; -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif -+ cmsg->cmsg_level = IPPROTO_IPV6; - cmsg->cmsg_type = IPV6_PKTINFO; - cmsg->cmsg_len = CMSG_LEN(sizeof(pktinfo)); - -@@ -200,7 +210,17 @@ otError receivePacket(int aFd, uint8_t *aPayload, uint16_t &aLength, otMessageIn - VerifyOrExit(rval > 0, perror("recvmsg")); - aLength = static_cast(rval); - -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - for (struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg); cmsg != nullptr; cmsg = CMSG_NXTHDR(&msg, cmsg)) -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif - { - if (cmsg->cmsg_level == IPPROTO_IPV6) - { diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index d9f558d792..c1af388627 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -16,7 +16,6 @@ PV = "0.3.0+git${SRCPV}" SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ - file://Turn-off-sign-compare-for-musl-libc.patch \ " S = "${WORKDIR}/git" @@ -24,6 +23,8 @@ SYSTEMD_SERVICE:${PN} = "otbr-agent.service" inherit pkgconfig cmake systemd +CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" + EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ -DOTBR_DBUS=ON \ -DOTBR_REST=ON \