From patchwork Fri Mar 15 17:00:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 41029 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 D3BAAC54EC7 for ; Fri, 15 Mar 2024 17:00:13 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.1236.1710522010877365333 for ; Fri, 15 Mar 2024 10:00:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=bRb+pWMp; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=TqfLtdTr; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 0101018e430e8c42-a552ee46-423c-4177-83e0-fd61cfe6d5ee-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1710522010; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=/FSkh8b2PVRRrLXmFXg7/ic052IUMhdRGpWxEpKCY8s=; b=bRb+pWMp72v695H+nABDfU4Rj4hjJ6AWOka/p/Bzzl5xuIOgq08YUru21l+va7kU xJVxx3VL0E0DpFO/90kQ5DKzpAbp8wvdqxesT76UxMfPemLFCH76rry/Pql6bvnfQdq LRh7Qo8BS2B/ZIHj1ziUG4dp6g1VFS7qcWLZGrdI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1710522010; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=/FSkh8b2PVRRrLXmFXg7/ic052IUMhdRGpWxEpKCY8s=; b=TqfLtdTrmS2wV3Axloc0Dnc7nwXzJR/XmJddOl/5s47fWwPgn+qLCi++PFT08/rG 3oWWDTpDH/Jlcg59Rna+vFZaKitNo3HirAuWjBUCxfHBRTsuCugTYWxGXOH5dj7Vdzp tiwjyu+WcVdAcrdMbASuauJJXqwhUwZfps4HLK+k= MIME-Version: 1.0 From: auh@yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] meson: upgrading to 1.4.0 SUCCEEDED Message-ID: <0101018e430e8c42-a552ee46-423c-4177-83e0-fd61cfe6d5ee-000000@us-west-2.amazonses.com> Date: Fri, 15 Mar 2024 17:00:10 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.03.15-54.240.27.193 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, 15 Mar 2024 17:00:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/197153 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *meson* to *1.4.0* has Succeeded. Next steps: - apply the patch: git am 0001-meson-upgrade-1.3.1-1.4.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 38f7038b83c2bfc654033ed872f06f7b3b204b7e Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 Mar 2024 07:39:24 +0000 Subject: [PATCH] meson: upgrade 1.3.1 -> 1.4.0 --- .../meson/0001-Make-CPU-family-warnings-fatal.patch | 11 +++++------ ...odule-do-not-manipulate-the-environment-when.patch | 9 ++++----- .../0002-Support-building-allarch-recipes-again.patch | 7 +++---- .../meson/{meson_1.3.1.bb => meson_1.4.0.bb} | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) rename meta/recipes-devtools/meson/{meson_1.3.1.bb => meson_1.4.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 8ea7c35950..9ec3ce2538 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,21 +1,20 @@ -From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001 +From e8b02d14cb7ba99ad5fa8ff70901fd31d2506503 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 Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton - --- mesonbuild/envconfig.py | 4 ++-- mesonbuild/environment.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 07f1229..a35c356 100644 +index 0e9cd23..b44e60c 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): +@@ -276,8 +276,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -27,10 +26,10 @@ index 07f1229..a35c356 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 2ba2054..d798e3b 100644 +index af69f64..248d6dd 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -379,10 +379,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 2e0a4b1bbe..13257ff97f 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 e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001 +From 5b1c897d5b6e688f901043fda21502cca26bb08b 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 @@ -6,16 +6,15 @@ Subject: [PATCH] python module: do not manipulate the environment when calling Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin - --- mesonbuild/dependencies/python.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 9aea6bd..8c13ede 100644 +index b9b17f8..a305afb 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -381,9 +381,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -25,7 +24,7 @@ index 9aea6bd..8c13ede 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -392,8 +389,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', os.environ[name] = value elif name in os.environ: del os.environ[name] 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 a8396f30bb..c82aa66651 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 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001 +From 2f2cd2781dd3af6daf6e98b4476aa5f659f721f0 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 @@ -7,16 +7,15 @@ This registers "allarch" as a known CPU family. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Peter Kjellerstedt - --- mesonbuild/envconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index a35c356..436355f 100644 +index b44e60c..c70e8cb 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -38,6 +38,7 @@ from pathlib import Path +@@ -28,6 +28,7 @@ from pathlib import Path known_cpu_families = ( diff --git a/meta/recipes-devtools/meson/meson_1.3.1.bb b/meta/recipes-devtools/meson/meson_1.4.0.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.3.1.bb rename to meta/recipes-devtools/meson/meson_1.4.0.bb index 3a4bb14f09..8011fdbc15 100644 --- a/meta/recipes-devtools/meson/meson_1.3.1.bb +++ b/meta/recipes-devtools/meson/meson_1.4.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] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" +SRC_URI[sha256sum] = "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d" inherit python_setuptools_build_meta github-releases