From patchwork Fri Jun 6 14:28:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64451 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 10DF3C5AD49 for ; Fri, 6 Jun 2025 14:28:31 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.34904.1749220106779968770 for ; Fri, 06 Jun 2025 07:28:27 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5D57C152B for ; Fri, 6 Jun 2025 07:28:08 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C17073F673 for ; Fri, 6 Jun 2025 07:28:25 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 01/16] libmodulemd: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:06 +0100 Message-ID: <20250606142822.3387675-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 06 Jun 2025 14:28:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218142 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename, and drop the explicit PV. Signed-off-by: Ross Burton --- .../libmodulemd/{libmodulemd_git.bb => libmodulemd_2.15.1.bb} | 1 - 1 file changed, 1 deletion(-) rename meta/recipes-devtools/libmodulemd/{libmodulemd_git.bb => libmodulemd_2.15.1.bb} (98%) diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb similarity index 98% rename from meta/recipes-devtools/libmodulemd/libmodulemd_git.bb rename to meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb index 0c730329230..4bdc587f4f9 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main" -PV = "2.15.1" SRCREV = "e7f179eeeb6eee1403f090fc43a3c80bb08b5bfd" S = "${WORKDIR}/git" From patchwork Fri Jun 6 14:28:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64450 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 13ED5C61CE7 for ; Fri, 6 Jun 2025 14:28:31 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.34905.1749220107261883025 for ; Fri, 06 Jun 2025 07:28:27 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0C85C1595 for ; Fri, 6 Jun 2025 07:28:09 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 71E983F673 for ; Fri, 6 Jun 2025 07:28:26 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 02/16] libmodulemd: remove libmagic option Date: Fri, 6 Jun 2025 15:28:07 +0100 Message-ID: <20250606142822.3387675-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218143 Meson shows this warning in do_configure: WARNING: libmagic option is obsolete. libmodulemd can detect compression formats without a magic library now. Please stop using this option. It will be removed in the future and will cause a meson failure. Remove the option as it's now redundant. Signed-off-by: Ross Burton --- meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb index 4bdc587f4f9..79fabfc8683 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" inherit meson gobject-introspection pkgconfig -EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" +EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" DEPENDS += "glib-2.0 libyaml glib-2.0-native" From patchwork Fri Jun 6 14:28:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64452 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 31797C61DB8 for ; Fri, 6 Jun 2025 14:28:31 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34864.1749220107978373381 for ; Fri, 06 Jun 2025 07:28:28 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AE715152B for ; Fri, 6 Jun 2025 07:28:09 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 22C033F673 for ; Fri, 6 Jun 2025 07:28:27 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 03/16] libmodulemd: add manpages Date: Fri, 6 Jun 2025 15:28:08 +0100 Message-ID: <20250606142822.3387675-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218144 Inherit manpages and optionally enable the manpages. They're in the repository so don't need more tools to build. Signed-off-by: Ross Burton --- meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb index 79fabfc8683..c31fc44ce4f 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb @@ -10,9 +10,9 @@ SRCREV = "e7f179eeeb6eee1403f090fc43a3c80bb08b5bfd" S = "${WORKDIR}/git" -inherit meson gobject-introspection pkgconfig +inherit meson gobject-introspection pkgconfig manpages -EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" +EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" DEPENDS += "glib-2.0 libyaml glib-2.0-native" @@ -21,3 +21,6 @@ BBCLASSEXTEND = "native nativesdk" GIR_MESON_OPTION = 'skip_introspection' GIR_MESON_ENABLE_FLAG = 'false' GIR_MESON_DISABLE_FLAG = 'true' + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "-Dwith_manpages=enabled,-Dwith_manpages=disabled" From patchwork Fri Jun 6 14:28:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64454 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 4CBB0C677C4 for ; Fri, 6 Jun 2025 14:28:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.34907.1749220108741842037 for ; Fri, 06 Jun 2025 07:28:28 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 58A5F152B for ; Fri, 6 Jun 2025 07:28:10 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BE9A33F673 for ; Fri, 6 Jun 2025 07:28:27 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 04/16] libsass: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:09 +0100 Message-ID: <20250606142822.3387675-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218145 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename and drop the explicit PV. Signed-off-by: Ross Burton --- meta/recipes-support/sass/{libsass_git.bb => libsass_3.6.6.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-support/sass/{libsass_git.bb => libsass_3.6.6.bb} (80%) diff --git a/meta/recipes-support/sass/libsass_git.bb b/meta/recipes-support/sass/libsass_3.6.6.bb similarity index 80% rename from meta/recipes-support/sass/libsass_git.bb rename to meta/recipes-support/sass/libsass_3.6.6.bb index 890cbf8e631..3878072cf19 100644 --- a/meta/recipes-support/sass/libsass_git.bb +++ b/meta/recipes-support/sass/libsass_3.6.6.bb @@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools -SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/sass/libsass.git;protocol=https;branch=master \ file://0001-Remove-version.h-from-source-directory.patch" SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460" -PV = "3.6.6" S = "${WORKDIR}/git" From patchwork Fri Jun 6 14:28:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64456 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 558F7C67861 for ; Fri, 6 Jun 2025 14:28:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34865.1749220109212483743 for ; Fri, 06 Jun 2025 07:28:29 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 097C11595 for ; Fri, 6 Jun 2025 07:28:11 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6EE463F673 for ; Fri, 6 Jun 2025 07:28:28 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 05/16] sassc: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:10 +0100 Message-ID: <20250606142822.3387675-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218146 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename and drop the explicit PV. Signed-off-by: Ross Burton --- meta/recipes-support/sass/{sassc_git.bb => sassc_3.6.2.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-support/sass/{sassc_git.bb => sassc_3.6.2.bb} (84%) diff --git a/meta/recipes-support/sass/sassc_git.bb b/meta/recipes-support/sass/sassc_3.6.2.bb similarity index 84% rename from meta/recipes-support/sass/sassc_git.bb rename to meta/recipes-support/sass/sassc_3.6.2.bb index 64e92f48cfd..4d4dbc03fe2 100644 --- a/meta/recipes-support/sass/sassc_git.bb +++ b/meta/recipes-support/sass/sassc_3.6.2.bb @@ -7,12 +7,11 @@ DEPENDS = "libsass" inherit autotools pkgconfig -SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/sass/sassc.git;protocol=https;branch=master \ file://0001-Remove-sassc_version.h-from-source-directory.patch" SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" S = "${WORKDIR}/git" -PV = "3.6.2" CVE_STATUS[CVE-2022-43357] = "cpe-incorrect: this is CVE for libsass, not sassc wrapper" From patchwork Fri Jun 6 14:28:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64453 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 22FAEC5B555 for ; Fri, 6 Jun 2025 14:28:31 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34867.1749220109863989517 for ; Fri, 06 Jun 2025 07:28:29 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A6FB4152B for ; Fri, 6 Jun 2025 07:28:11 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1FC593F673 for ; Fri, 6 Jun 2025 07:28:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 06/16] blktrace: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:11 +0100 Message-ID: <20250606142822.3387675-6-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218147 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename and drop the explicit PV. Signed-off-by: Ross Burton --- .../blktrace/{blktrace_git.bb => blktrace_1.3.0.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename meta/recipes-kernel/blktrace/{blktrace_git.bb => blktrace_1.3.0.bb} (94%) diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb similarity index 94% rename from meta/recipes-kernel/blktrace/blktrace_git.bb rename to meta/recipes-kernel/blktrace/blktrace_1.3.0.bb index 8fc30d74fd6..061a7b97846 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb @@ -10,14 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "libaio" -SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb" -PV = "1.3.0+git" - -SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master;protocol=https \ +SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=https;branch=master \ file://0001-bno_plot.py-btt_plot.py-Ask-for-python3-specifically.patch \ " +SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb" + S = "${WORKDIR}/git" EXTRA_OEMAKE = "\ From patchwork Fri Jun 6 14:28:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64455 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 5A8A5C678DF for ; Fri, 6 Jun 2025 14:28:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34868.1749220110469713183 for ; Fri, 06 Jun 2025 07:28:30 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4CAAB152B for ; Fri, 6 Jun 2025 07:28:12 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BB5113F673 for ; Fri, 6 Jun 2025 07:28:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 07/16] mobile-broadband-provider-info: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:12 +0100 Message-ID: <20250606142822.3387675-7-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218148 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename and drop the explicit PV. Signed-off-by: Ross Burton --- ...info_git.bb => mobile-broadband-provider-info_20240407.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/mobile-broadband-provider-info/{mobile-broadband-provider-info_git.bb => mobile-broadband-provider-info_20240407.bb} (97%) diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb similarity index 97% rename from meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb rename to meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb index 06ded459344..e07b93d6955 100644 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb @@ -5,11 +5,11 @@ SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" -SRCREV = "55ba955d53305df96123534488fd160ea882b4dd" -PV = "20240407" PE = "1" SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" +SRCREV = "55ba955d53305df96123534488fd160ea882b4dd" + S = "${WORKDIR}/git" inherit meson From patchwork Fri Jun 6 14:28:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64457 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 63F06C678DA for ; Fri, 6 Jun 2025 14:28:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34869.1749220111083936869 for ; Fri, 06 Jun 2025 07:28:31 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E8585152B for ; Fri, 6 Jun 2025 07:28:12 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 630493F673 for ; Fri, 6 Jun 2025 07:28:30 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 08/16] squashfs-tools: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:13 +0100 Message-ID: <20250606142822.3387675-8-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218149 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename, drop the explicit PV, and set the tag name in the SRC_URI to verify the SHA. Signed-off-by: Ross Burton --- .../{squashfs-tools_git.bb => squashfs-tools_4.6.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/squashfs-tools/{squashfs-tools_git.bb => squashfs-tools_4.6.1.bb} (99%) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb similarity index 99% rename from meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb rename to meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb index 982a43f8899..51a2fbdb934 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb @@ -7,9 +7,9 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PV = "4.6.1" -SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184" SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1" +SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184" + UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" S = "${WORKDIR}/git" From patchwork Fri Jun 6 14:28:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64458 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 717C4C71131 for ; Fri, 6 Jun 2025 14:28:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34870.1749220111836564727 for ; Fri, 06 Jun 2025 07:28:31 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 91CD0152B for ; Fri, 6 Jun 2025 07:28:13 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0AD9A3F673 for ; Fri, 6 Jun 2025 07:28:30 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 09/16] squashfs-tools: update to 4.7 Date: Fri, 6 Jun 2025 15:28:14 +0100 Message-ID: <20250606142822.3387675-9-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218150 The REPRODUCIBLE_DEFAULT option was removed in 4.7[1]. Backport a patch to fix missing pthread typedefs, and a patch to fix missing pid_t typedefs. Also clean up the tasks to be neater and more concise. [1] squash-tools ae9914d15293af7c596148aedd997b3058e35d9e Signed-off-by: Ross Burton --- .../squashfs-tools/squashfs-tools/pid.patch | 40 +++++++++++++++++++ .../squashfs-tools/thread.patch | 33 +++++++++++++++ ...s-tools_4.6.1.bb => squashfs-tools_4.7.bb} | 15 ++++--- 3 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch rename meta/recipes-devtools/squashfs-tools/{squashfs-tools_4.6.1.bb => squashfs-tools_4.7.bb} (77%) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch new file mode 100644 index 00000000000..a15b6211248 --- /dev/null +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch @@ -0,0 +1,40 @@ +From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 6 Jun 2025 15:23:07 +0100 +Subject: [PATCH] print_pager: add missing includes + +When building with musl: + + print_pager.h:33:25: error: unknown type name 'pid_t' + 33 | extern void wait_to_die(pid_t process); + | ^~~~~ + print_pager.h:34:25: error: unknown type name 'pid_t' + 34 | extern FILE *exec_pager(pid_t *process); + | ^~~~~ + +print_pager.h uses pid_t and FILE, so add the required #includes to +ensure that these are defined. + +Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/314] +Signed-off-by: Ross Burton +--- + squashfs-tools/print_pager.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/squashfs-tools/print_pager.h b/squashfs-tools/print_pager.h +index c33d4d2e..f3e0da6c 100644 +--- a/squashfs-tools/print_pager.h ++++ b/squashfs-tools/print_pager.h +@@ -30,6 +30,9 @@ + #define MORE_PAGER 2 + #define UNKNOWN_PAGER 3 + ++#include ++#include ++ + extern void wait_to_die(pid_t process); + extern FILE *exec_pager(pid_t *process); + extern int get_column_width(); +-- +2.43.0 + diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch new file mode 100644 index 00000000000..01741639c03 --- /dev/null +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch @@ -0,0 +1,33 @@ +From b6e9f4b62cc3e762ceeddc0fc099f7d65f7b7361 Mon Sep 17 00:00:00 2001 +From: Shiji Yang +Date: Wed, 4 Jun 2025 19:53:39 +0800 +Subject: [PATCH] thread: add the missing pthread.h header + +Fix build error on macos: + +In file included from mksquashfs_help.c:35: +./thread.h:46:39: error: unknown type name 'pthread_mutex_t'; did you mean 'pthread_attr_t'? + 46 | extern void wait_thread_idle(int tid, pthread_mutex_t *mutex); + | ^~~~~~~~~~~~~~~ + | pthread_attr_t + +Signed-off-by: Shiji Yang + +Upstream-Status: Backport [b6e9f4b62cc3e762ceeddc0fc099f7d65f7b7361] +Signed-off-by: Ross Burton +--- + squashfs-tools/thread.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/squashfs-tools/thread.h b/squashfs-tools/thread.h +index 5a22fc43..e56a58cf 100644 +--- a/squashfs-tools/thread.h ++++ b/squashfs-tools/thread.h +@@ -22,6 +22,7 @@ + * + * thread.h + */ ++#include + + #define TRUE 1 + #define FALSE 0 diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb similarity index 77% rename from meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb rename to meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb index 51a2fbdb934..ae6845ddacf 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.1.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb @@ -7,8 +7,9 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1" -SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184" +SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master;tag=${PV} \ + file://thread.patch" +SRCREV = "2e87d42ed089dc31990d83eeb07437b9d085d6d1" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" @@ -16,7 +17,7 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" -PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd reproducible" +PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd" PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib" PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz" PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo" @@ -24,17 +25,15 @@ PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4" PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz" PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd" -PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0," do_compile() { - cd ${S}/squashfs-tools - oe_runmake all + oe_runmake -C ${S}/squashfs-tools all } do_install() { - cd ${S}/squashfs-tools + oe_runmake -C ${S}/squashfs-tools install INSTALL_PREFIX=${D}${prefix} INSTALL_MANPAGES_DIR=${D}${datadir}/man/man1 + install -d "${D}${includedir}" - oe_runmake install INSTALL_PREFIX=${D}${prefix} INSTALL_MANPAGES_DIR=${D}${datadir}/man/man1 install -m 0644 "${S}"/squashfs-tools/squashfs_fs.h "${D}${includedir}" } From patchwork Fri Jun 6 14:28:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64459 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 6BC3FC5B555 for ; Fri, 6 Jun 2025 14:28:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.34909.1749220112390863189 for ; Fri, 06 Jun 2025 07:28:32 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 37BA7152B for ; Fri, 6 Jun 2025 07:28:14 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A69433F673 for ; Fri, 6 Jun 2025 07:28:31 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 10/16] squashfs-tools: clean up PACKAGECONFIG Date: Fri, 6 Jun 2025 15:28:15 +0100 Message-ID: <20250606142822.3387675-10-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218151 LZMA isn't supported by the mainline kernel driver, so there's no real point in enabling it. Disable LZO by default, as LZO is very obsolete (last released in 2017) and there are better algorithms available. Move xattr to the end so it's separate from the compression algorithms. Signed-off-by: Ross Burton --- meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb index ae6845ddacf..3dc4e5f0a5a 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb @@ -1,5 +1,3 @@ -# Note, we can probably remove the lzma option as it has be replaced with xz, -# and I don't think the kernel supports it any more. SUMMARY = "Tools for manipulating SquashFS filesystems" HOMEPAGE = "https://github.com/plougher/squashfs-tools" DESCRIPTION = "Tools to create and extract Squashfs filesystems." @@ -17,14 +15,14 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" -PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd" +PACKAGECONFIG ??= "gzip lz4 xz zstd xattr" PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib" PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz" PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo" PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4" PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz" -PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd" +PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" do_compile() { oe_runmake -C ${S}/squashfs-tools all From patchwork Fri Jun 6 14:28:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64460 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 6A9F5C5AD49 for ; Fri, 6 Jun 2025 14:28:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34873.1749220113033848348 for ; Fri, 06 Jun 2025 07:28:33 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DCE8C152B for ; Fri, 6 Jun 2025 07:28:14 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4E15F3F673 for ; Fri, 6 Jun 2025 07:28:32 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 11/16] unfs3: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:16 +0100 Message-ID: <20250606142822.3387675-11-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218152 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename, and drop the explicit PV. Signed-off-by: Ross Burton --- meta/recipes-devtools/unfs3/{unfs3_git.bb => unfs3_0.10.0.bb} | 2 -- 1 file changed, 2 deletions(-) rename meta/recipes-devtools/unfs3/{unfs3_git.bb => unfs3_0.10.0.bb} (98%) diff --git a/meta/recipes-devtools/unfs3/unfs3_git.bb b/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb similarity index 98% rename from meta/recipes-devtools/unfs3/unfs3_git.bb rename to meta/recipes-devtools/unfs3/unfs3_0.10.0.bb index 0a274d6ffd4..045e496ccdb 100644 --- a/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb @@ -22,8 +22,6 @@ SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \ SRCREV = "c8f2d2cd4529955419bad0e163f88d47ff176b8d" UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P\d+(\.\d+)+)" -PV = "0.10.0" - BBCLASSEXTEND = "native nativesdk" inherit autotools pkgconfig From patchwork Fri Jun 6 14:28:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64461 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 77403C61DB8 for ; Fri, 6 Jun 2025 14:28:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.34910.1749220113719306779 for ; Fri, 06 Jun 2025 07:28:33 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8D55A152B for ; Fri, 6 Jun 2025 07:28:15 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id F32B13F673 for ; Fri, 6 Jun 2025 07:28:32 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 12/16] unfs3: clean up DEPENDS Date: Fri, 6 Jun 2025 15:28:17 +0100 Message-ID: <20250606142822.3387675-12-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218153 flex-nativesdk is both the wrong name (should be nativesdk-flex), and in nativesdk builds it will be a dependency anyway thanks to the DEPENDS remapping. Merge multiple assignments into a single line. Signed-off-by: Ross Burton --- meta/recipes-devtools/unfs3/unfs3_0.10.0.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb b/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb index 045e496ccdb..d5c2a03371c 100644 --- a/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb +++ b/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb @@ -7,9 +7,7 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" -DEPENDS = "flex-native bison-native flex" -DEPENDS += "libtirpc" -DEPENDS:append:class-nativesdk = " flex-nativesdk" +DEPENDS = "flex-native bison-native flex libtirpc" S = "${WORKDIR}/git" SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \ From patchwork Fri Jun 6 14:28:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64463 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 80480C677C4 for ; Fri, 6 Jun 2025 14:28:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34874.1749220114351193490 for ; Fri, 06 Jun 2025 07:28:34 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 36FD6152B for ; Fri, 6 Jun 2025 07:28:16 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A406F3F673 for ; Fri, 6 Jun 2025 07:28:33 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 13/16] unfs3: upgrade to 0.11 Date: Fri, 6 Jun 2025 15:28:18 +0100 Message-ID: <20250606142822.3387675-13-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218154 Drop all of the patches that have been merged upstream. The build no longer needs the flex runtime library so remove flex from DEPENDS. License-Update: contributor list updated. Signed-off-by: Ross Burton --- ...4_t-to-off_t-on-linux-if-not-defined.patch | 28 ------ .../0001-attr-fix-utime-for-symlink.patch | 88 ------------------- ...e-window-for-writing-of-the-pid-file.patch | 68 -------------- .../unfs3/0001-fix-building-on-macOS.patch | 27 ------ .../unfs3/0001-locate.c-Include-attr.h.patch | 28 ------ .../{unfs3_0.10.0.bb => unfs3_0.11.0.bb} | 19 ++-- 6 files changed, 7 insertions(+), 251 deletions(-) delete mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch delete mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch delete mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch delete mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch delete mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch rename meta/recipes-devtools/unfs3/{unfs3_0.10.0.bb => unfs3_0.11.0.bb} (54%) diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch b/meta/recipes-devtools/unfs3/unfs3/0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch deleted file mode 100644 index 91909fa2369..00000000000 --- a/meta/recipes-devtools/unfs3/unfs3/0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 949db882e487d728c44bb68139682b38396dd275 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 14 Dec 2022 14:50:10 -0800 -Subject: [PATCH] Alias off64_t to off_t on linux if not defined - -Musl C library does not define off64_t and has 64-bit default off_t -therefore define off64_t as an alias on linux as well when configure -detects that off64_t is not provided by a linux system - -Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/29] -Signed-off-by: Khem Raj ---- - nfs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nfs.h b/nfs.h -index aded011..7996c67 100644 ---- a/nfs.h -+++ b/nfs.h -@@ -62,7 +62,7 @@ typedef int32_t int32; - #endif - - #ifndef HAVE_OFF64_T --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__linux__) - typedef off_t off64_t; - #endif - #endif diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch b/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch deleted file mode 100644 index a0f3740d6a6..00000000000 --- a/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 7e789895919d57d573ebb8faa147d1286104cd01 Mon Sep 17 00:00:00 2001 -From: Rui Wang -Date: Mon, 24 Apr 2023 02:57:57 -0700 -Subject: [PATCH] attr: fix utime for symlink - -unfs3 has an old defect that it can not change the timestamps of a -symlink file because it only uses utime(), which will follow the -symlink. This will not cause an error if the symlink points to an -existent file. But under some special situation, such as installing -a rpm package, rpm tool will create the symlink first and try to -modify the timestamps of it, when the target file is non-existent. -This will cause an ESTALE error. Making rpm tool ignore this error -is a solution, but not the best one. An acceptable approach is -Making unfs3 support lutimes(), which can modify the symlink file -itself. Considering not every system support this function, so a -function checking is necessary. - -Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/35] - -Signed-off-by: Chen Qi ---- - attr.c | 15 +++++++++++---- - backend_unix.h | 2 ++ - configure.ac | 1 + - 3 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/attr.c b/attr.c -index 0ce9375..930ce6e 100644 ---- a/attr.c -+++ b/attr.c -@@ -285,7 +285,7 @@ post_op_attr get_post_cached(struct svc_req * req) - static nfsstat3 set_time(const char *path, backend_statstruct buf, sattr3 new) - { - time_t new_atime, new_mtime; -- struct utimbuf utim; -+ struct timeval stamps[2]; - int res; - - /* set atime and mtime */ -@@ -307,10 +307,17 @@ static nfsstat3 set_time(const char *path, backend_statstruct buf, sattr3 new) - else /* DONT_CHANGE */ - new_mtime = buf.st_mtime; - -- utim.actime = new_atime; -- utim.modtime = new_mtime; -+ stamps[0].tv_sec = new_atime; -+ stamps[0].tv_usec = 0; -+ stamps[1].tv_sec = new_mtime; -+ stamps[1].tv_usec = 0; -+ -+#if HAVE_LUTIMES -+ res = backend_lutimes(path, stamps); -+#else -+ res = backend_utimes(path, stamps); -+#endif - -- res = backend_utime(path, &utim); - if (res == -1) - return setattr_err(); - } -diff --git a/backend_unix.h b/backend_unix.h -index 4db72ae..9cce9ab 100644 ---- a/backend_unix.h -+++ b/backend_unix.h -@@ -61,6 +61,8 @@ - #define backend_symlink symlink - #define backend_truncate truncate - #define backend_utime utime -+#define backend_utimes utimes -+#define backend_lutimes lutimes - #define backend_statstruct struct stat - #define backend_dirstream DIR - #define backend_statvfsstruct struct statvfs -diff --git a/configure.ac b/configure.ac -index d46c905..c21afe3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,6 +32,7 @@ AC_CHECK_FUNCS(setresuid setresgid) - AC_CHECK_FUNCS(vsyslog) - AC_CHECK_FUNCS(lchown) - AC_CHECK_FUNCS(setgroups) -+AC_CHECK_FUNCS(lutimes) - UNFS3_COMPILE_WARNINGS - - PKG_CHECK_MODULES([TIRPC], [libtirpc]) --- -2.40.0 - diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch b/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch deleted file mode 100644 index 20bbee90a08..00000000000 --- a/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 212a947e776e7a25c1f2259615f461179bcb3663 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 23 Nov 2022 21:38:38 +0100 -Subject: [PATCH] daemon.c: Fix race window for writing of the pid file - -The parent process should write the pid file such that the pid file -will can be checked immediately following exit of the fork from the -parent. - -This allows external monitoring applications to watch the daemon -without having to add sleep calls to wait for the pid file be written -on a busy system. - -Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/28] -Signed-off-by: Jason Wessel -Signed-off-by: Alexander Kanavin ---- - daemon.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/daemon.c b/daemon.c -index ff53b7a..13b06a4 100644 ---- a/daemon.c -+++ b/daemon.c -@@ -166,7 +166,7 @@ int get_socket_type(struct svc_req *rqstp) - /* - * write current pid to a file - */ --static void create_pid_file(void) -+static void create_pid_file(int pid) - { - char buf[16]; - int fd, res, len; -@@ -188,7 +188,7 @@ static void create_pid_file(void) - } - #endif - -- sprintf(buf, "%i\n", backend_getpid()); -+ sprintf(buf, "%i\n", pid); - len = strlen(buf); - - res = backend_pwrite(fd, buf, len, 0); -@@ -1122,6 +1122,10 @@ int main(int argc, char **argv) - fprintf(stderr, "could not fork into background\n"); - daemon_exit(0); - } -+ if (pid) -+ create_pid_file(pid); -+ } else { -+ create_pid_file(backend_getpid()); - } - #endif /* WIN32 */ - -@@ -1161,8 +1165,10 @@ int main(int argc, char **argv) - /* no umask to not screw up create modes */ - umask(0); - -+#ifdef WIN32 - /* create pid file if wanted */ -- create_pid_file(); -+ create_pid_file(backend_getpid()); -+#endif - - /* initialize internal stuff */ - fh_cache_init(); --- -2.30.2 - diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch b/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch deleted file mode 100644 index f18ffd37110..00000000000 --- a/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 989b87ae46b3183a742031373fbb3e912ab9b666 Mon Sep 17 00:00:00 2001 -From: Andrey Filipenkov -Date: Wed, 2 Nov 2022 13:38:40 +0300 -Subject: [PATCH] fix building on macOS - -Signed-off-by: Khem Raj -Upstream-Status: Backport [https://github.com/unfs3/unfs3/commit/989b87ae46b3183a742031373fbb3e912ab9b666] ---- - attr.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/attr.c b/attr.c -index 6253e84..0ce9375 100644 ---- a/attr.c -+++ b/attr.c -@@ -18,6 +18,8 @@ - #include - #include - #include -+#include -+#include - - #include "backend.h" - #include "nfs.h" --- -2.39.1 - diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch b/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch deleted file mode 100644 index 076e08fadc7..00000000000 --- a/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 63e0785bb379a8f2c41f34f5cd938ca38555e605 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 13 Jan 2023 23:41:01 -0800 -Subject: [PATCH] locate.c: Include attr.h - -Its needed for fix_dir_times() API declarations - -Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/32] -Signed-off-by: Khem Raj ---- - locate.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/locate.c b/locate.c -index 6bbe71f..84e0fe5 100644 ---- a/locate.c -+++ b/locate.c -@@ -27,6 +27,7 @@ - #include "nfs.h" - #include "fh.h" - #include "daemon.h" -+#include "attr.h" - - /* - * these are the brute-force file searching routines that are used --- -2.39.0 - diff --git a/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb b/meta/recipes-devtools/unfs3/unfs3_0.11.0.bb similarity index 54% rename from meta/recipes-devtools/unfs3/unfs3_0.10.0.bb rename to meta/recipes-devtools/unfs3/unfs3_0.11.0.bb index d5c2a03371c..da5ca45277d 100644 --- a/meta/recipes-devtools/unfs3/unfs3_0.10.0.bb +++ b/meta/recipes-devtools/unfs3/unfs3_0.11.0.bb @@ -5,22 +5,17 @@ are used by NFS clients for accessing files on the server." HOMEPAGE = "https://github.com/unfs3/unfs3" SECTION = "console/network" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c621cd2786a3a1344a60a0d608c910" -DEPENDS = "flex-native bison-native flex libtirpc" +DEPENDS = "bison-native flex-native libtirpc" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \ - file://0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch \ - file://0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch \ - file://0001-locate.c-Include-attr.h.patch \ - file://0001-fix-building-on-macOS.patch \ - file://0001-attr-fix-utime-for-symlink.patch \ - " -SRCREV = "c8f2d2cd4529955419bad0e163f88d47ff176b8d" +SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master;tag=${BP}" +SRCREV = "ec1660ba33c80d5c67131e163e68834c1a10e243" UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P\d+(\.\d+)+)" -BBCLASSEXTEND = "native nativesdk" - inherit autotools pkgconfig + EXTRA_OECONF:append:class-native = " --sbindir=${bindir}" + +BBCLASSEXTEND = "native nativesdk" From patchwork Fri Jun 6 14:28:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64465 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 85731C678DA for ; Fri, 6 Jun 2025 14:28:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34875.1749220115093622965 for ; Fri, 06 Jun 2025 07:28:35 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D9680152B for ; Fri, 6 Jun 2025 07:28:16 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4B7543F673 for ; Fri, 6 Jun 2025 07:28:34 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 14/16] tcf-agent: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:19 +0100 Message-ID: <20250606142822.3387675-14-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218155 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename and drop the explicit PV. Signed-off-by: Ross Burton --- .../tcf-agent/{tcf-agent_git.bb => tcf-agent_1.8.0.bb} | 1 - 1 file changed, 1 deletion(-) rename meta/recipes-devtools/tcf-agent/{tcf-agent_git.bb => tcf-agent_1.8.0.bb} (99%) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb similarity index 99% rename from meta/recipes-devtools/tcf-agent/tcf-agent_git.bb rename to meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb index 235936288ba..b02fcb9cad1 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb @@ -7,7 +7,6 @@ LICENSE = "EPL-1.0 | BSD-3-Clause" LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" SRCREV = "1f11747e83ebf4f53e8d17f430136f92ec378709" -PV = "1.8.0+git" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" SRC_URI = "git://gitlab.eclipse.org/eclipse/tcf/tcf.agent.git;protocol=https;branch=master \ From patchwork Fri Jun 6 14:28:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64462 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 7800CC61CE7 for ; Fri, 6 Jun 2025 14:28:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34876.1749220115697957480 for ; Fri, 06 Jun 2025 07:28:35 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 88230152B for ; Fri, 6 Jun 2025 07:28:17 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EFF453F673 for ; Fri, 6 Jun 2025 07:28:34 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 15/16] systemtap: put version in recipe filename Date: Fri, 6 Jun 2025 15:28:20 +0100 Message-ID: <20250606142822.3387675-15-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218156 A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename and drop the explicit PV. Signed-off-by: Ross Burton --- .../{systemtap-native_git.bb => systemtap-native_5.2.bb} | 3 +-- .../systemtap/{systemtap_git.bb => systemtap_5.2.bb} | 0 meta/recipes-kernel/systemtap/systemtap_git.inc | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename meta/recipes-kernel/systemtap/{systemtap-native_git.bb => systemtap-native_5.2.bb} (77%) rename meta/recipes-kernel/systemtap/{systemtap_git.bb => systemtap_5.2.bb} (100%) diff --git a/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb similarity index 77% rename from meta/recipes-kernel/systemtap/systemtap-native_git.bb rename to meta/recipes-kernel/systemtap/systemtap-native_5.2.bb index 2690b259c8b..8befa7a7eac 100644 --- a/meta/recipes-kernel/systemtap/systemtap-native_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb @@ -1,5 +1,4 @@ - -require systemtap_git.bb +require systemtap_${PV}.bb inherit_defer native diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_5.2.bb similarity index 100% rename from meta/recipes-kernel/systemtap/systemtap_git.bb rename to meta/recipes-kernel/systemtap/systemtap_5.2.bb diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index bbb2105b5ac..a6688f26042 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,14 +1,14 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" -PV = "5.2" -SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ +SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ " +SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" + COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' COMPATIBLE_HOST:libc-musl = 'null' From patchwork Fri Jun 6 14:28:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64464 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 935D1C67861 for ; Fri, 6 Jun 2025 14:28:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.34911.1749220116508277914 for ; Fri, 06 Jun 2025 07:28:36 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 28889152B for ; Fri, 6 Jun 2025 07:28:18 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 977F53F673 for ; Fri, 6 Jun 2025 07:28:35 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 16/16] xinput-calibrator: upgrade to 0.8.0 Date: Fri, 6 Jun 2025 15:28:21 +0100 Message-ID: <20250606142822.3387675-16-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250606142822.3387675-1-ross.burton@arm.com> References: <20250606142822.3387675-1-ross.burton@arm.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 ; Fri, 06 Jun 2025 14:28:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218157 Development has moved to freedesktop.org, so switch SRC_URI. Drop an upstreamed patch. Signed-off-by: Ross Burton --- ....hh-Include-string-to-get-std-string.patch | 28 ------------------- ...ibrator_pointercal.sh-to-be-run-as-n.patch | 2 +- ...ator_git.bb => xinput-calibrator_0.8.0.bb} | 10 ++----- 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch rename meta/recipes-graphics/xinput-calibrator/{xinput-calibrator_git.bb => xinput-calibrator_0.8.0.bb} (78%) diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch deleted file mode 100644 index 37617600d5d..00000000000 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 79bc507b48d4acd3dec8a85ab6b341b872d44a05 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 29 Jan 2019 22:40:24 -0800 -Subject: [PATCH] calibrator.hh: Include to get std::string - -Found with libc++ - -Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/76] -Signed-off-by: Khem Raj ---- - src/calibrator.hh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/calibrator.hh b/src/calibrator.hh -index a6f9504..e75bcef 100644 ---- a/src/calibrator.hh -+++ b/src/calibrator.hh -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - // XXX: we currently don't handle lines that are longer than this - #define MAX_LINE_LEN 1024 --- -2.20.1 - diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch index de0862599d7..86982924a81 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch @@ -1,4 +1,4 @@ -Upstream-Status: Inactive-Upstream [last commits over a decade ago] +Upstream-Status: Pending From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb similarity index 78% rename from meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb rename to meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb index 0516928a76b..c37b36897b6 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb @@ -4,22 +4,18 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" DEPENDS = "virtual/libx11 libxi libxrandr" -PV = "0.7.5+git" - inherit autotools pkgconfig features_check -# depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRCREV = "18ec53f1cada39f905614ebfaffed5c7754ecf46" -SRC_URI = "git://github.com/kreijack/xinput_calibrator.git;branch=libinput;protocol=https \ +SRCREV = "970b574b8f7b0d6f2613d343191f47814f2dfaa4" + +SRC_URI = "git://gitlab.freedesktop.org/xorg/app/xinput-calibrator;protocol=https;branch=master;tag=v${PV} \ file://30xinput_calibrate.sh \ file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \ - file://0001-calibrator.hh-Include-string-to-get-std-string.patch \ " S = "${WORKDIR}/git" -# force native X11 ui as we don't have gtk+ in DEPENDS EXTRA_OECONF += "--with-gui=x11" do_install:append() {