From patchwork Mon Jan 1 13:11:58 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: 37214 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 B98A8C48BC1 for ; Mon, 1 Jan 2024 13:12:08 +0000 (UTC) Received: from a27-192.smtp-out.us-west-2.amazonses.com (a27-192.smtp-out.us-west-2.amazonses.com [54.240.27.192]) by mx.groups.io with SMTP id smtpd.web11.4633.1704114719706820348 for ; Mon, 01 Jan 2024 05:11:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=G/ue2GDL; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=ndzJOLLt; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.192, mailfrom: 0101018cc527087e-0cf3b7ff-5127-40c5-b8fa-cab8d101d12c-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=1704114719; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=UmNOY6nMJHvh+T89OaHZMiaUrbgGABZLZXgtfblYB9o=; b=G/ue2GDLsJfxoGhxnbTVVMSzuQ8LVDpz5BuBEkI24Gg3pOvmm+1B2Muz/zSQEO7W /crT7fq1ABbnS+QFvAYaHE+FZ0TC6Me5CDdvwCdhF4UdFhSVYLukw+LPIF1mNNtOOK+ AnFav6KveYq5EknP4EKwR6Vw2a/4whGxuvsgdpqQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1704114719; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=UmNOY6nMJHvh+T89OaHZMiaUrbgGABZLZXgtfblYB9o=; b=ndzJOLLtQq7qvFeu29MIiBE+g3ydP+vdZrPDnvQrdCtinU2cyTmbxtaydnYuc4XQ U7oDAGMyH9vyu+56AuAEShKfOImJ0kBhzMvxCQ6rlsAeOABniHO3duGWZr/e+6tv9O8 h0X4xyiw7afS/jvJtBd9IUFXmR+2Eglc+IwqH3Us= MIME-Version: 1.0 From: auh@yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] meson: upgrading to 1.3.1 SUCCEEDED Message-ID: <0101018cc527087e-0cf3b7ff-5127-40c5-b8fa-cab8d101d12c-000000@us-west-2.amazonses.com> Date: Mon, 1 Jan 2024 13:11:58 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.01.01-54.240.27.192 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 ; Mon, 01 Jan 2024 13:12:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193123 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *meson* to *1.3.1* has Succeeded. Next steps: - apply the patch: git am 0001-meson-upgrade-1.3.0-1.3.1.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 1a1f39a296a22503135543ecd05027ba8f87590e Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 1 Jan 2024 06:34:12 +0000 Subject: [PATCH] meson: upgrade 1.3.0 -> 1.3.1 --- .../meson/0001-Make-CPU-family-warnings-fatal.patch | 10 +++++----- ...dule-do-not-manipulate-the-environment-when.patch | 8 ++++---- ...0002-Support-building-allarch-recipes-again.patch | 12 +++++------- .../meson/{meson_1.3.0.bb => meson_1.3.1.bb} | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) rename meta/recipes-devtools/meson/{meson_1.3.0.bb => meson_1.3.1.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 8fbcb5a0a2..0c1ff5bf3c 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 fcd3260c03f313676720e6219c5953d412fb0a2c Mon Sep 17 00:00:00 2001 +From 5c5737f40b8b7971d1108501831a2072d96d097b 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 @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 7e0c567..a180065 100644 +index 07f1229..a35c356 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -284,8 +284,8 @@ class MachineInfo(HoldableObject): +@@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -27,10 +27,10 @@ index 7e0c567..a180065 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index e212c7a..9d2bff3 100644 +index 2ba2054..d798e3b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -345,10 +345,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -359,10 +359,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 19502fa9cd..07dddac30e 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 a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 +From ba65fd219047eb4c2c39221ef45926caffb073a4 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 @@ -12,10 +12,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 14386f9..118a15f 100644 +index 9aea6bd..8c13ede 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -25,7 +25,7 @@ index 14386f9..118a15f 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -391,8 +388,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 dcc1ce9c27..0962f407a3 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,21 +1,22 @@ -From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001 +From ea6bfbfe2257eba50d9e0f142c7993ddc285654e Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 -Subject: [PATCH 2/2] Support building allarch recipes again +Subject: [PATCH] Support building allarch recipes again 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 4d58c91..ff01ad1 100644 +index a35c356..436355f 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -36,6 +36,7 @@ from pathlib import Path +@@ -38,6 +38,7 @@ from pathlib import Path known_cpu_families = ( @@ -23,6 +24,3 @@ index 4d58c91..ff01ad1 100644 'aarch64', 'alpha', 'arc', --- -2.24.0 - diff --git a/meta/recipes-devtools/meson/meson_1.3.0.bb b/meta/recipes-devtools/meson/meson_1.3.1.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.3.0.bb rename to meta/recipes-devtools/meson/meson_1.3.1.bb index e794bb28a5..3a4bb14f09 100644 --- a/meta/recipes-devtools/meson/meson_1.3.0.bb +++ b/meta/recipes-devtools/meson/meson_1.3.1.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] = "4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc" +SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" inherit python_setuptools_build_meta github-releases