From patchwork Sat Sep 2 10:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 29820 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 4AE67CA1012 for ; Sat, 2 Sep 2023 10:29:14 +0000 (UTC) Received: from a27-191.smtp-out.us-west-2.amazonses.com (a27-191.smtp-out.us-west-2.amazonses.com [54.240.27.191]) by mx.groups.io with SMTP id smtpd.web10.5669.1693650552490806249 for ; Sat, 02 Sep 2023 03:29:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=fmkZ9UWY; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=Hsr0i1Al; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018a55708728-46d4b2c7-840a-4275-afb3-1aade5cdcc1d-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=1693650552; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=6EIZW3OHI/rLqUaqTjT82qmweLZ34ksbAoprFDuw+Eo=; b=fmkZ9UWYfSOy4+wu8azgtXK5LiIKXYcFo3XlAIChlv76zDY25ruAWCml6l6T03TL ahTocWk49Ih10UkuRH55LjhuduhF+gk+XCHM2K9uOkEPFx5aBBswNcMtIEkcyMTQ6sT CAqxvuJ186IphahpyloEGGkngciO1ILe5DtjO82o= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1693650552; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=6EIZW3OHI/rLqUaqTjT82qmweLZ34ksbAoprFDuw+Eo=; b=Hsr0i1AlOR4IqVsE5D7C0EP1MbEF6o3EoNJ8YL7Ni+aOuVtqfMAZL3C/YhblVHaD ob9Q6l14/KNsMsoj4VxI9FXu+hmFNL8xnr6iOxvm0lwPvQafwgjv80Vn28bDdVKu1zc AwAuKD9B0yvthUQFGIyZsnJeqREK1DMRFbdo6++M= MIME-Version: 1.0 From: auh@yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] meson: upgrading to 1.2.1 SUCCEEDED Message-ID: <0101018a55708728-46d4b2c7-840a-4275-afb3-1aade5cdcc1d-000000@us-west-2.amazonses.com> Date: Sat, 2 Sep 2023 10:29:12 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.09.02-54.240.27.191 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 ; Sat, 02 Sep 2023 10:29:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187060 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *meson* to *1.2.1* has Succeeded. Next steps: - apply the patch: git am 0001-meson-upgrade-1.1.1-1.2.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 b54ee37ca9ba0bf64f3227b9e30a3c3f46dd9452 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 1 Sep 2023 13:34:01 +0000 Subject: [PATCH] meson: upgrade 1.1.1 -> 1.2.1 --- .../0001-Make-CPU-family-warnings-fatal.patch | 32 +++++++++---------- .../meson/{meson_1.1.1.bb => meson_1.2.1.bb} | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) rename meta/recipes-devtools/meson/{meson_1.1.1.bb => meson_1.2.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 848dccfbe7..2474f6e74a 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 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 +From 84322316c74dba244a2924d0787cfa61989bbbde 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 @@ -7,15 +7,15 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton --- - mesonbuild/envconfig.py | 2 +- - mesonbuild/environment.py | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) + mesonbuild/envconfig.py | 4 ++-- + mesonbuild/environment.py | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) -Index: meson-0.60.2/mesonbuild/envconfig.py -=================================================================== ---- meson-0.60.2.orig/mesonbuild/envconfig.py -+++ meson-0.60.2/mesonbuild/envconfig.py -@@ -266,8 +266,8 @@ class MachineInfo(HoldableObject): +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index 7e0c567..a180065 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -284,8 +284,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -26,13 +26,13 @@ Index: meson-0.60.2/mesonbuild/envconfig.py endian = literal['endian'] if endian not in ('little', 'big'): -Index: meson-0.60.2/mesonbuild/environment.py -=================================================================== ---- meson-0.60.2.orig/mesonbuild/environment.py -+++ meson-0.60.2/mesonbuild/environment.py -@@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile - if any_compiler_has_define(compilers, '__64BIT__'): - trial = 'ppc64' +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index e212c7a..9d2bff3 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -345,10 +345,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: + if compilers and not any_compiler_has_define(compilers, '__mips64'): + trial = 'mips' - if trial not in known_cpu_families: - mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' diff --git a/meta/recipes-devtools/meson/meson_1.1.1.bb b/meta/recipes-devtools/meson/meson_1.2.1.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.1.1.bb rename to meta/recipes-devtools/meson/meson_1.2.1.bb index 500e13775f..75f4c99a14 100644 --- a/meta/recipes-devtools/meson/meson_1.1.1.bb +++ b/meta/recipes-devtools/meson/meson_1.2.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] = "d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c" +SRC_URI[sha256sum] = "b1db3a153087549497ee52b1c938d2134e0338214fe14f7efd16fecd57b639f5" inherit python_setuptools_build_meta github-releases