From patchwork Thu May 1 15:33:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 62225 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 AC976C3ABC9 for ; Thu, 1 May 2025 15:33:44 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.web10.1790.1746113616210310166 for ; Thu, 01 May 2025 08:33:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=ZQ7E1iRg; dkim=pass header.i=@amazonses.com header.s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx header.b=JzRwFzb+; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 010101968c7b5d21-53da4c03-563e-4fca-9681-8a7870326abf-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1746113617; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=+c+zpQEXBY/DfvEYL/iAjfqQWEDyrRUT/H2Kopd2Mn4=; b=ZQ7E1iRgUstxdPDDODqgEuuDwmhpdtHFcyym3XTCVXIii3XqrOFun8yaIhvLHLCU +2DGWmf41X1/gvZawsuJNu3LHqmCaBMPg7mJ+loynB1ITmUGS4VKQcV2D1hmz/1Udfm qjhs1DNUYrfQLRoDaZ+HebyLbzE+ZzURUYQWUDjM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx; d=amazonses.com; t=1746113617; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=+c+zpQEXBY/DfvEYL/iAjfqQWEDyrRUT/H2Kopd2Mn4=; b=JzRwFzb+DWVC+BnlJwO9iyou480sl/qexwfO25NUsPAc9qsdu6w2WPlr5hhJoTl0 daRICxCQ+u0vQq1/qZQ4pM87yBHAZgZpHV2hIrOeZZZ+cirxbJo17RcAWU7nF3grDP4 qzJltInKwrO4HQ3HoaKArtLriXjusnWDnytg7s80= MIME-Version: 1.0 From: auh@yoctoproject.org To: Trevor Gamblin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] meson: upgrading to 1.8.0 SUCCEEDED Message-ID: <010101968c7b5d21-53da4c03-563e-4fca-9681-8a7870326abf-000000@us-west-2.amazonses.com> Date: Thu, 1 May 2025 15:33:37 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.05.01-54.240.27.23 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 May 2025 15:33:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215809 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *meson* to *1.8.0* has Succeeded. Next steps: - apply the patch: git am 0001-meson-upgrade-1.7.2-1.8.0.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From be402beb80a819ea8776a02d9d4a181cf32115b1 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 1 May 2025 08:37:08 +0000 Subject: [PATCH] meson: upgrade 1.7.2 -> 1.8.0 --- .../meson/0001-Make-CPU-family-warnings-fatal.patch | 10 +++++----- ...dule-do-not-manipulate-the-environment-when.patch | 12 ++++++------ ...0002-Support-building-allarch-recipes-again.patch | 6 +++--- .../meson/{meson_1.7.2.bb => meson_1.8.0.bb} | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) rename meta/recipes-devtools/meson/{meson_1.7.2.bb => meson_1.8.0.bb} (98%) diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index ca2bcef1ee..3b173800e8 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ba2c1f596206d45e8f14d4f4d2439023a3de9e7 Mon Sep 17 00:00:00 2001 +From 3d4e90fd583f4f3133eb3d3d4658d72132514e3a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -11,10 +11,10 @@ Signed-off-by: Ross Burton 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 6726d4e..844b611 100644 +index 43fad0c..27be871 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -278,8 +278,8 @@ class MachineInfo(HoldableObject): +@@ -287,8 +287,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -26,10 +26,10 @@ index 6726d4e..844b611 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 386316e..b4a0d88 100644 +index f322cda..53a0ac0 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -419,10 +419,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -429,10 +429,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: if compilers and not any_compiler_has_define(compilers, '__mips64'): trial = 'mips' diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index 84a9c18c51..88b87ae82a 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -1,4 +1,4 @@ -From f264b7fd2c86edfd5db77da264e8bf05f5e2bfeb Mon Sep 17 00:00:00 2001 +From b533fc186327ea7f3ac70ceda3edc10431e7ba25 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 326e605..f5eb50f 100644 +index 3dab31c..b9307fc 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -403,9 +403,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -410,9 +410,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -24,7 +24,7 @@ index 326e605..f5eb50f 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -414,8 +411,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -421,8 +418,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', os.environ[name] = value elif name in os.environ: del os.environ[name] @@ -32,5 +32,5 @@ index 326e605..f5eb50f 100644 - set_env('PKG_CONFIG_PATH', old_pkg_path) + pass - candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) - # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, + # Otherwise this doesn't fulfill the interface requirements + wrap_in_pythons_pc_dir.log_tried = PythonPkgConfigDependency.log_tried # type: ignore[attr-defined] diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index d3120e84e8..9e6a0bd786 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From bcdd72ed1956e0a1b1b725e552fa391c549c2099 Mon Sep 17 00:00:00 2001 +From b87e337b0a7c8fdce2d05b6424f84e7a0f1335ed Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -12,10 +12,10 @@ Signed-off-by: Peter Kjellerstedt 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 9703315..74f2477 100644 +index 27be871..994ac77 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -28,6 +28,7 @@ from pathlib import Path +@@ -31,6 +31,7 @@ if T.TYPE_CHECKING: known_cpu_families = ( diff --git a/meta/recipes-devtools/meson/meson_1.7.2.bb b/meta/recipes-devtools/meson/meson_1.8.0.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.7.2.bb rename to meta/recipes-devtools/meson/meson_1.8.0.bb index 45a74612ce..6e3886e0a5 100644 --- a/meta/recipes-devtools/meson/meson_1.7.2.bb +++ b/meta/recipes-devtools/meson/meson_1.8.0.bb @@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "4d40d63aa748a9c139cc41ab9bffe43edd113c5639d78bde81544ca955aea890" +SRC_URI[sha256sum] = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases