From patchwork Sun Aug 7 05:52:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11052 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 3FC04C19F2A for ; Sun, 7 Aug 2022 05:53:09 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web09.11187.1659851579344949820 for ; Sat, 06 Aug 2022 22:52:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Jyv3de4M; spf=pass (domain: gmail.com, ip: 209.85.216.52, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f52.google.com with SMTP id pm17so6162311pjb.3 for ; Sat, 06 Aug 2022 22:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=oYqCIqfEYNoPim+YuCSkVUCsqfKK+CZnOz/um736Yds=; b=Jyv3de4MLi713FXGYCmgVPye/xfLferGznkAvSCWsmmhVjcLtZk9fkfu7yUSq8RFqv Aa98GV6o9LOEElHnvzGIl58D93I2vj2StXwOxdneSmLpyU6v8WnxZtAyKnlq+SgTA3qF y3OoVJ5eVq3YEBcSl+/6kt3GcXbnghWaXbR/52zonZxry1k+BLo/7pozWyLrFp/HXqzV Aap31vFYt7u3v3HGGUfYUfOjLJFggrrJxvECojut47XWaHbFqSn4aJvmyR2FJ2xDitKj Qwx6cfFuTtCyAZhsHBlbY+795z5mXZVIsCIEaS+3i2mHz+7CCA/lCg2jy+Uc23bSRv0K CbWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=oYqCIqfEYNoPim+YuCSkVUCsqfKK+CZnOz/um736Yds=; b=XKCuKYfwjX2DtHthVMwiizOBt930Hgv0kBgIu0PFVFf7gyKLBrvLTzRhY+THILem71 RpEDoM/8xcI6LW6fcQaN/yYNSvEpyyDdSx4g/YNbopC6YF4MpYW2gUJLkNJq0DgJP0vI 1gF37XgHw6LC5GJXBXY7NDjfpooV+k/pFMEs57o38XiZ6Jmx/Ih7ZSujXzwsIx0T/jI/ +iDvvjQ9NFn9ILdwv46qwjK3jhGitCgDtI0oK8X2Lub9ULOYwElg3cLJyq6b/z2z6O/h 0cL6lPcql29eBDrsREgtFMF+ui1emwK+F/0hMhSOUxv6yySoKFfArOtI8MaAQKDgNjhM fzhQ== X-Gm-Message-State: ACgBeo0WAC5A1wBeX1nIXlnlm5BtoKZYaiV9JQnwgPJVF9izlSg2srOO reEZ7Wg3aBApJfSX4U6G7y27k9JSvyc= X-Google-Smtp-Source: AA6agR56CXZOmIYtHQ+v0bblyLxVbzsw51bhvuW2qEXr05+Sc1r6F7x+fV6T0yAU/q4RfPMkbKtyIQ== X-Received: by 2002:a17:902:ced2:b0:16e:e19b:c5c9 with SMTP id d18-20020a170902ced200b0016ee19bc5c9mr14252604plg.136.1659851577909; Sat, 06 Aug 2022 22:52:57 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::9f45]) by smtp.gmail.com with ESMTPSA id f20-20020a635554000000b0041a716cec9esm3872380pgm.62.2022.08.06.22.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 22:52:57 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 1/5] kronosnet: Upgrade to 1.24 Date: Sat, 6 Aug 2022 22:52:51 -0700 Message-Id: <20220807055255.2982774-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.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 ; Sun, 07 Aug 2022 05:53:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98142 Remove upstreamed patches Signed-off-by: Khem Raj --- ...ests-Correct-include-path-for-poll.h.patch | 29 ------------------- .../{kronosnet_1.22.bb => kronosnet_1.24.bb} | 3 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch rename meta-networking/recipes-extended/kronosnet/{kronosnet_1.22.bb => kronosnet_1.24.bb} (92%) diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch deleted file mode 100644 index 0d261fd4ef..0000000000 --- a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cae68083fda5d4ca832ff3cc8a533454df2efe23 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Oct 2021 20:35:53 -0700 -Subject: [PATCH] libknet/tests: Correct include path for poll.h - -Fixes -/usr/include/sys/poll.h:1:2: error: redirec -ting incorrect #include to [-Werror,-W#warnings] -| #warning redirecting incorrect #include to - -Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/363] -Signed-off-by: Khem Raj ---- - libknet/tests/test-common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libknet/tests/test-common.c b/libknet/tests/test-common.c -index 86b76b0..8f8b6ca 100644 ---- a/libknet/tests/test-common.c -+++ b/libknet/tests/test-common.c -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - - #include "libknet.h" - #include "test-common.h" diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb similarity index 92% rename from meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb rename to meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb index 0b0bc29452..cbd5e7a0fd 100644 --- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb +++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb @@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa88 SECTION = "libs" DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" -SRCREV = "0123ecebce0ad6aba3cdb320027192e15fd71e23" +SRCREV = "f8f80fd7f9b85f2626d2c6452612962ad8efca9e" SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \ - file://0001-libknet-tests-Correct-include-path-for-poll.h.patch \ file://0001-links.c-Fix-build-with-gcc-12.patch \ " From patchwork Sun Aug 7 05:52:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11053 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 4E3EAC25B0D for ; Sun, 7 Aug 2022 05:53:09 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web12.11224.1659851580458123545 for ; Sat, 06 Aug 2022 22:53:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pBL7mXOl; spf=pass (domain: gmail.com, ip: 209.85.216.49, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f49.google.com with SMTP id gj1so6207339pjb.0 for ; Sat, 06 Aug 2022 22:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=3Iy7Eh9YN7jIHqhgxhg8GSjK2EMO08iQrW5gImbco/U=; b=pBL7mXOldCnHh7Ni0xLQvCSmwDcxTM3XrPXw2f7jQcJ+cY+fsu4cY/vzdSxsBJkvl/ BrYi6OMGZWe2Yk/HC+WG+ApyGAawEiIY10QaFOYWBlKfI6WPZ4mYp43tmF04Vc53khE+ 0EdSIqYddsctVit6Krbb0TJRQAX4x0jjnZ3p4pme78+BXEE6MN8q4cEvCohjj5kssqLd hluV9EKVMiY4tK2ntkp2Pd3PxFp/da+/6SBJ3G+iWg6r+UdK2dUa08IPM8uubhQ+qKnC jBexKsN35QQkyXv1oj/4x3+dDqofvDnCun0wTQb8tLN2apTigsxzhY3AQVNF0nbwUXIV etiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=3Iy7Eh9YN7jIHqhgxhg8GSjK2EMO08iQrW5gImbco/U=; b=Ctc0hJApHZ8SaUE/4N71k049NaaGh2jzCd5ZxXcnQtfgTBPi+LmHkd8Pu1qqPu+R15 f6VJzL9JzkXd19Bz/GqLB3i4omsCUdJ9//3Umm91/DYCIZVnn/ljG14Sb4TH+enSHNP4 teWimAXEgeopGXyMimXIHoW6U8/tiOkJv2bHM8riLjBTGcy3sUez0M6YxkJeD7u81AVG 76YzMbCG63ik+SgqqZ/nVSGnlzv5ezvBSgP2HUKx5BtF5WLdoQCCH7KxEX0K02kvuuqp 7alpDwXXbMjFXDXgqYOPmgipjb2Qlous0hSQ6/TXEYYFEFg5T3tN3OrORtxkWDNJ4q5g S2Vg== X-Gm-Message-State: ACgBeo2Utmx/Fp1V9Xyrky5LJElcpLGzm8Kyh7v/BEo4K9Z8/YhckNvY i46O3TxtlFkX8vpEKOipXTAhvqY3df0= X-Google-Smtp-Source: AA6agR4tcvxS6u+txVigh38gEyqTdSxKGDaYS3VDhXYKRXsF3BlALMlXfQVAlk4v8wudom43padEuQ== X-Received: by 2002:a17:90a:f418:b0:1f3:223d:4349 with SMTP id ch24-20020a17090af41800b001f3223d4349mr24131111pjb.2.1659851579379; Sat, 06 Aug 2022 22:52:59 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::9f45]) by smtp.gmail.com with ESMTPSA id f20-20020a635554000000b0041a716cec9esm3872380pgm.62.2022.08.06.22.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 22:52:58 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/5] ostree: Upgrade to 2022.5 release Date: Sat, 6 Aug 2022 22:52:52 -0700 Message-Id: <20220807055255.2982774-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807055255.2982774-1-raj.khem@gmail.com> References: <20220807055255.2982774-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 ; Sun, 07 Aug 2022 05:53:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98143 Backport a fix for building with glibc 2.36+ while here Signed-off-by: Khem Raj --- ...01-Remove-unused-linux-fs.h-includes.patch | 42 +++++++++++++++++++ ...bostree-Remove-including-sys-mount.h.patch | 29 +++++++++++++ ...-se-luks-gencpio-There-is-no-bashism.patch | 25 +++++++++++ .../{ostree_2022.2.bb => ostree_2022.5.bb} | 5 ++- 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch rename meta-oe/recipes-extended/ostree/{ostree_2022.2.bb => ostree_2022.5.bb} (96%) diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch b/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch new file mode 100644 index 0000000000..2659e4696d --- /dev/null +++ b/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch @@ -0,0 +1,42 @@ +From 7d32c352f628747cfadabf9fe7fcc13608e5dfe6 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Wed, 3 Aug 2022 10:37:40 -0400 +Subject: [PATCH] Remove unused `linux/fs.h` includes + +Prep for fixing conflicts introduced by newer glibc. +cc https://github.com/ostreedev/ostree/issues/2685 + +Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76] +Signed-off-by: Khem Raj +--- + src/libostree/ostree-repo-commit.c | 1 - + src/ostree/ot-main.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c +index afab3fdf..35b16c71 100644 +--- a/src/libostree/ostree-repo-commit.c ++++ b/src/libostree/ostree-repo-commit.c +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + #include + + #include "otutil.h" +diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c +index b7b50d67..7a4405a5 100644 +--- a/src/ostree/ot-main.c ++++ b/src/ostree/ot-main.c +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + + #include "ot-main.h" + #include "ostree.h" +-- +2.37.1 + diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch b/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch new file mode 100644 index 0000000000..5c2792cf89 --- /dev/null +++ b/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch @@ -0,0 +1,29 @@ +From 7ff956e4088e0bdc6bfd429f99124a8a9256c181 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Aug 2022 21:44:11 -0700 +Subject: [PATCH] libostree: Remove including sys/mount.h + +This conflicts with linux/mount.h which is included by linux/fs.h +with glibc 2.36+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/libostree/ostree-sysroot-deploy.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c +index 2dc9f58b..61b19e42 100644 +--- a/src/libostree/ostree-sysroot-deploy.c ++++ b/src/libostree/ostree-sysroot-deploy.c +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.37.1 + diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch new file mode 100644 index 0000000000..5cf5784f14 --- /dev/null +++ b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch @@ -0,0 +1,25 @@ +From dd55633e49aa43dede3c8e1770ae8761487f050e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Aug 2022 21:52:31 -0700 +Subject: [PATCH] s390x-se-luks-gencpio: There is no bashism + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/libostree/s390x-se-luks-gencpio | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio +index e821e2fe..96c1d123 100755 +--- a/src/libostree/s390x-se-luks-gencpio ++++ b/src/libostree/s390x-se-luks-gencpio +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # This script creates new initramdisk with LUKS config within + set -euo pipefail + +-- +2.37.1 + diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.2.bb b/meta-oe/recipes-extended/ostree/ostree_2022.5.bb similarity index 96% rename from meta-oe/recipes-extended/ostree/ostree_2022.2.bb rename to meta-oe/recipes-extended/ostree/ostree_2022.5.bb index 50d0548cc7..b3d9ec56b7 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.2.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2022.5.bb @@ -19,9 +19,12 @@ DEPENDS = " \ SRC_URI = " \ gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ + file://0001-Remove-unused-linux-fs.h-includes.patch \ + file://0001-libostree-Remove-including-sys-mount.h.patch \ + file://0001-s390x-se-luks-gencpio-There-is-no-bashism.patch \ file://run-ptest \ " -SRCREV = "fbc6d21c2f71099fbab44cbdd74222b91f61c667" +SRCREV = "15740d042c9c5258a1c082b5e228cf6f115edbb0" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" From patchwork Sun Aug 7 05:52:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11054 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 4E394C25B0C for ; Sun, 7 Aug 2022 05:53:09 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.11154.1659851581786355238 for ; Sat, 06 Aug 2022 22:53:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bQq4tg9T; spf=pass (domain: gmail.com, ip: 209.85.214.181, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id w10so6025949plq.0 for ; Sat, 06 Aug 2022 22:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=cxOYPYYdmUedkOkBYgRUD4LW1aCCwxaNc3oFH15RPSY=; b=bQq4tg9TmOnURL1qjZBbhsRNBhNW+UU0JVDbrZZldJFydef9gXmaB4cSZ7vuTsaJ0L CJ4ZXL4ZfB1GYB5T5jM/Ja0CsXnCyCc7SBCZFQNJ/tNzPBp0mPQ5eZfF1WhPpaQNJnT2 ctuKYwwFfu8u88B4FU90DXrw5E7M8WGcb3HhyeRFp61PWLcNpQFFpM/KRkU1+1dggsGD Fxd1wgkJiH9Jw2Xz0IxE8RNud+h8IQVihBQqbBJKibauUNOziQ9oH7nlDNxwQIne+IRF s9ieX6dZiMnEtkkamwbuAO1xLSuArf25zcLaooNEVySJq1M7JtwGHKul6DiLB8slUJKt d0CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=cxOYPYYdmUedkOkBYgRUD4LW1aCCwxaNc3oFH15RPSY=; b=KUd9SYfxGDZwrMqpO7IL5Brwt8g7yR+e92wf6n62zJfm8LMNeKTjBMQdkecpysz8aU /I2LbUjIzNSXw9VnlCU69tdBWCSZ7/KOFDpwjgBoh5TbLm3CRdpRuPwaRt8UAdlc6WiR XkuWvGhTqqUgDUuKY2Wotjaq9npghYSB18lhRrWNjnVR+xFArG142kwYOOrdC93U6ga2 aXitlPnaJn9AF7mTwtvUyHMaVEty17q85z7UgSMoAIZugKjY4psnlijL0rJZ6OqExPwB gw4nfCny7F4xKo98Ggrloz2qiggxS+mKGn2bDhJc4q+QCBmiG2m/RY8banXHU4JdRyYu wP2w== X-Gm-Message-State: ACgBeo3YISJloZHhKN/SimWmXpwRkSnwX2rSjL7UaREJniDKwAKftu0o mfzOV7Cc/6PLkVxoAi05sYyXdE8UMmw= X-Google-Smtp-Source: AA6agR7RZQUvO0waufbuiZnRWMJU4ye3XV2zX+/JLmz3E3IGi2IIZMz0uT1Bdsg1IUWxVW+t2IO83g== X-Received: by 2002:a17:90a:df14:b0:1f3:3a50:9dc1 with SMTP id gp20-20020a17090adf1400b001f33a509dc1mr14923404pjb.139.1659851580754; Sat, 06 Aug 2022 22:53:00 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::9f45]) by smtp.gmail.com with ESMTPSA id f20-20020a635554000000b0041a716cec9esm3872380pgm.62.2022.08.06.22.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 22:52:59 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH V2 3/5] sdbus-c++-libsystemd: Fix build with glibc 2.36 Date: Sat, 6 Aug 2022 22:52:53 -0700 Message-Id: <20220807055255.2982774-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807055255.2982774-1-raj.khem@gmail.com> References: <20220807055255.2982774-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 ; Sun, 07 Aug 2022 05:53:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98144 Signed-off-by: Khem Raj --- ...lude-linux-fs.h-to-resolve-fsconfig_.patch | 74 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_250.3.bb | 1 + 2 files changed, 75 insertions(+) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch new file mode 100644 index 0000000000..01afd37a37 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch @@ -0,0 +1,74 @@ +From b0933e76c6f0594c10cf8a9a70b34e15b68066d1 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sat, 23 Jul 2022 10:38:49 +0000 +Subject: [PATCH] glibc: Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 + +Upstream-Status: Backport [https://github.com/systemd/systemd/pull/23992/commits/21c03ad5e9d8d0350e30dae92a5e15da318a1539] +Signed-off-by: Khem Raj +--- + meson.build | 13 ++++++++++++- + src/basic/fd-util.c | 2 ++ + src/core/namespace.c | 2 ++ + src/shared/mount-util.c | 2 ++ + 4 files changed, 18 insertions(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -474,7 +474,6 @@ decl_headers = ''' + #include + #include + #include +-#include + ''' + + foreach decl : ['char16_t', +@@ -486,6 +485,17 @@ foreach decl : ['char16_t', + # We get -1 if the size cannot be determined + have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0 + ++ if decl == 'struct mount_attr' ++ if have ++ want_linux_fs_h = false ++ else ++ have = cc.sizeof(decl, ++ prefix : decl_headers + '#include ', ++ args : '-D_GNU_SOURCE') > 0 ++ want_linux_fs_h = have ++ endif ++ endif ++ + if decl == 'struct statx' + if have + want_linux_stat_h = false +@@ -501,6 +511,7 @@ foreach decl : ['char16_t', + endforeach + + conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h) ++conf.set10('WANT_LINUX_FS_H', want_linux_fs_h) + + foreach ident : ['secure_getenv', '__secure_getenv'] + conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident)) +--- a/src/core/namespace.c ++++ b/src/core/namespace.c +@@ -6,7 +6,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #include "alloc-util.h" + #include "base-filesystem.h" +--- a/src/shared/mount-util.c ++++ b/src/shared/mount-util.c +@@ -7,7 +7,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #include "alloc-util.h" + #include "chase-symlinks.h" diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb index d5c799aac3..853cc20b67 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb @@ -14,6 +14,7 @@ SRCREV = "73be9643910c3f7f3ff84765d63060846c110016" SRCBRANCH = "v250-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://static-libsystemd-pkgconfig.patch \ + file://0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch \ " # patches needed by musl From patchwork Sun Aug 7 05:52:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11050 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 41CB6C48BEA for ; Sun, 7 Aug 2022 05:53:09 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web08.11099.1659851583048069451 for ; Sat, 06 Aug 2022 22:53:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ABhybwiU; spf=pass (domain: gmail.com, ip: 209.85.215.179, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f179.google.com with SMTP id q16so5992892pgq.6 for ; Sat, 06 Aug 2022 22:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=SgwG+CC25YOjubbyjIhLAJ3npBgZXPb5CtIfZs5jGok=; b=ABhybwiUFR5eE3rYQghYKHLyF6eLIRIEfF9jauLJrqfSyU2KTURb8sIOnrSZHePZa0 EYpHEuIxAvQoSbsIakbXYctuGnr1BINA04GVeLDNkPCAH0NwGvOEsdnYU91x1Z9y1Nm/ j87NCW1wMAvqrpPhap3qU3EfGNEtTc40WkDEpx+VrEDpNGzd4X/dAb0v3+Sr/vByGp3w T4D6NOnWOYNRhxJy8TeonePCvs3YdyIsltupkswFS69olxAFsA9CneByH25oeiDnTO6i /CncoBLiW5fsbYqiwOdIp6L77gsdzg0veRN/O+M8niJxfHw6tOSzbdDPQtTQ0YQOgYj6 QN2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=SgwG+CC25YOjubbyjIhLAJ3npBgZXPb5CtIfZs5jGok=; b=4STI6naAT8j7etU9sptG1KkXTpwdiS7UKP+nVLCGxQ5a9IQ2LED4+BpXPt7OjRP9BB Jln1A7RveU7dPwlEetgI9Xm8kOxUb6KBVc1GiRWwh0Evu7gYszTENuVqIVvi4t1X4nL6 jVSLbQu97oen6GV84hwJX0t/zEy0ZiikXbhCUGFFg7ESNVEnQ9Aq9aY1ogZo1sozuosr 6OLmSKC5rxKIfIIKpHitbAPIBiP7WuW3E0s5QHkjOXLMKXMAr0G28po/u1wYW/SBC+za JY6MmmNm3hgzqP4b4mQO8v9pOWU1QFoyUQonbxNUlf2VaJUXqXvTxooTNwB7firYxRbK x/vQ== X-Gm-Message-State: ACgBeo2hSm+/Qnyn7w8hLN88E3s+uGIKg7VUP6Z9J2cG+QyM4kYe061A OFYVrwgmv4IC5pYRhmXVekpnFZdjRys= X-Google-Smtp-Source: AA6agR4ohR1/VHoVfuQn8QlWvyv3V4Ibz+K/euwnRcJIRNFPkws8yEP0FtS3lRtH7SY6P71RwZ7EsQ== X-Received: by 2002:a63:d315:0:b0:41a:d15a:b1b7 with SMTP id b21-20020a63d315000000b0041ad15ab1b7mr11662702pgg.275.1659851582052; Sat, 06 Aug 2022 22:53:02 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::9f45]) by smtp.gmail.com with ESMTPSA id f20-20020a635554000000b0041a716cec9esm3872380pgm.62.2022.08.06.22.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 22:53:01 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-filesystems][PATCH 4/5] xfstests: Upgrade to v2022.07.10 Date: Sat, 6 Aug 2022 22:52:54 -0700 Message-Id: <20220807055255.2982774-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807055255.2982774-1-raj.khem@gmail.com> References: <20220807055255.2982774-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 ; Sun, 07 Aug 2022 05:53:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98145 Signed-off-by: Khem Raj --- meta-filesystems/recipes-utils/xfstests/xfstests_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb index 868fa0330f..a6fc89d606 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb @@ -9,8 +9,8 @@ SRC_URI = "\ git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ " -SRCREV_xfstests = "37881397f1aa62df3c63468049c80b301b0e89eb" -SRCREV_unionmount = "cec4c51a3bf8ba80bb99fc74b302749d4e3d2f1d" +SRCREV_xfstests = "47ed066309716c73a97fff9b7f557f72d90bffb4" +SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" S = "${WORKDIR}/git" From patchwork Sun Aug 7 05:52:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11051 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 408F1C3F6B0 for ; Sun, 7 Aug 2022 05:53:09 +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.web08.11100.1659851584251986862 for ; Sat, 06 Aug 2022 22:53:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G1akpdRG; 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 e8-20020a17090a280800b001f2fef7886eso6410456pjd.3 for ; Sat, 06 Aug 2022 22:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=jz8jH1l6MtdXaR3QaDfxHzjM1JjrLnPRUW92Wl8cLos=; b=G1akpdRGXcC6cpo92+0zLTdNXKJ0H7xRNMFSsCdpEHnlLGNngQkSrrXw0IRdcGa9Wn QLpTjhxNGzFdpGcEEbO7OvATpKPgwfsxFHAbpWat0DSIUOLWx8kr1qcSD2DXwGLhxSbI O11MLjW7rMxukJwQ5t6l97i+4EAcWH6GkheazdLHl309EKeH5TndFvYsASyZc+9Bqvra vE0ypV/qlNzT6vTzR+ZVzYR/9QHRQCsXLG0IuR+X7o/5YIcRjiMSon5uUD/VYbraiDMh Oatf0cd2S4DBx+a9AmkAmgG3/eWtSHbbaDLkEWkFjSERHcyvQ+lu8RSb0kxlS8E0Fb5k aHBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=jz8jH1l6MtdXaR3QaDfxHzjM1JjrLnPRUW92Wl8cLos=; b=tk77MWV8OT1JMIquLhRw6oVcWvyg/BfvwjR5pogwX5dmKwFNHeRpt0UbScwyp630vV Ff2LlbGzGbb35z0K8leUamqDexFbHtTRvpTC5jIyRjGr+v11gEioibgCV6K/Ic/CL+vM 1a0wqjdiWTkM/X493Nk3cW9wILRzkiYVoIJTLA/a7qCrIG2UWEefkFsgYqwPhm5NpfKb wY0wS3IBYaXFt2xLQ0j4msgkD96ckp6b3m3F932eLxcWcGm/WvONgShs1E1rP/TtE/7t 9OmQTniT1pJRjViFhIbA8vYKvG5Ak2kJlEc8P8B2Ge77BS9UNQ3FkA0x+PPfkgP6cEk9 vdaA== X-Gm-Message-State: ACgBeo3e1aDaSUb6sZirtreWZxP1Oat3vTm+MpuVNZCsSqJDezCykHf5 9tz1jOZWz+BNyQ8ZnGS4lEytlGIQbS4= X-Google-Smtp-Source: AA6agR79LvJuwKy6ZL2TJLwx7I8VQkH4/jttX3C1PiclY4s0vqvNhMDVY3XHe8lkSlx5CUVJmOau0g== X-Received: by 2002:a17:90b:1e4a:b0:1f7:3769:ac18 with SMTP id pi10-20020a17090b1e4a00b001f73769ac18mr3597742pjb.228.1659851583317; Sat, 06 Aug 2022 22:53:03 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::9f45]) by smtp.gmail.com with ESMTPSA id f20-20020a635554000000b0041a716cec9esm3872380pgm.62.2022.08.06.22.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 22:53:02 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 5/5] autofs: Fix build with glibc 2.36 Date: Sat, 6 Aug 2022 22:52:55 -0700 Message-Id: <20220807055255.2982774-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807055255.2982774-1-raj.khem@gmail.com> References: <20220807055255.2982774-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 ; Sun, 07 Aug 2022 05:53:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98146 Signed-off-by: Khem Raj --- .../autofs/autofs/mount_conflict.patch | 30 +++++++++++++++++++ .../recipes-daemons/autofs/autofs_5.1.8.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch diff --git a/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch b/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch new file mode 100644 index 0000000000..e2a94bf825 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch @@ -0,0 +1,30 @@ +Avoid conflicts between sys/mount.h and linux/mount.h + +linux/fs.h includes linux/mount.h and this include file is unused so +do not include it and avoid conflict too with glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + + #define MODULE_PARSE + #include "automount.h" +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + + #define MODULE_PARSE + #include "automount.h" diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb index 1f87bddbee..cb80844586 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb @@ -26,6 +26,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ file://0001-Define-__SWORD_TYPE-if-undefined.patch \ + file://mount_conflict.patch \ " SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c"