| Message ID | 20240802160916.3441166-1-ross.burton@arm.com |
|---|---|
| State | Accepted, archived |
| Commit | 145644c8c8318144ba12ed36c9a51924f1f58ad2 |
| Headers | show |
| Series | meson: upgrade 1.4.0 -> 1.5.1 | expand |
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/meson-upgrade-1.4.0---1.5.1.patch FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
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 94129b2f25f..04abb8b314f 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 c61c93f43b70ba0670d41e841bff9f2a7186cc2f Mon Sep 17 00:00:00 2001 +From 33bc81d5a262e0fa1a346ac1667a3679a17c0997 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> 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 <ross.burton@intel.com> 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 0e9cd23..b44e60c 100644 +index 86bad9b..9703315 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -276,8 +276,8 @@ class MachineInfo(HoldableObject): +@@ -277,8 +277,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -26,10 +26,10 @@ index 0e9cd23..b44e60c 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index af69f64..248d6dd 100644 +index 5bccb90..6aa4b15 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -379,10 +379,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -387,10 +387,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 9f3f516a5c1..b4671f591fc 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 b4c0602a56d3517ab66b98a7dbb69defe77d29a3 Mon Sep 17 00:00:00 2001 +From 66e350bbbd65e56a0d19c75710f61503e15e24a2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> 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 <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index b9b17f8..a305afb 100644 +index 883a29a..52bfbf3 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -381,9 +381,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -399,9 +399,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -24,7 +24,7 @@ index b9b17f8..a305afb 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -392,8 +389,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -410,8 +407,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 fa5ea57d5b9..5149d61af4e 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 7f69bfabb87d311d7409ea6699f7dee8e9b3a95b Mon Sep 17 00:00:00 2001 +From 61430cf9a80e24eb33d72c6eae4e8d536d308e08 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <pkj@axis.com> Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -12,7 +12,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index b44e60c..c70e8cb 100644 +index 9703315..74f2477 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -28,6 +28,7 @@ from pathlib import Path diff --git a/meta/recipes-devtools/meson/meson_1.4.0.bb b/meta/recipes-devtools/meson/meson_1.5.1.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.4.0.bb rename to meta/recipes-devtools/meson/meson_1.5.1.bb index a0c2ee633ae..4f68a22fa9e 100644 --- a/meta/recipes-devtools/meson/meson_1.4.0.bb +++ b/meta/recipes-devtools/meson/meson_1.5.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] = "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d" +SRC_URI[sha256sum] = "567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases
Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../meson/0001-Make-CPU-family-warnings-fatal.patch | 10 +++++----- ...module-do-not-manipulate-the-environment-when.patch | 8 ++++---- .../0002-Support-building-allarch-recipes-again.patch | 4 ++-- .../meson/{meson_1.4.0.bb => meson_1.5.1.bb} | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) rename meta/recipes-devtools/meson/{meson_1.4.0.bb => meson_1.5.1.bb} (98%)