Skip to contentSkip to conversation

selftest: add Upstream-Status to .patch files

PATCH In review Martin Jansa 2 participants 3 messages Jun 5, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 selftest: add Upstream-Status to .patch files

---
v4: use Inappropriate [Test artefact] everywhere as requested
add Upstream-Status to *.patch.expected as well to fix devtool.DevtoolUpdateTests.test_devtool_update_recipe_with_gitignore
devtool.DevtoolUpdateTests.test_devtool_update_recipe_long_filename

 .../recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch | 2 +-
 .../devtool/devtool-patch-overrides/qemuarm/arm.patch           | 2 ++
 .../devtool/devtool-patch-overrides/qemux86/x86.patch           | 2 ++
 .../devtool/devtool-test-ignored/devtool-test-ignored.patch     | 2 ++
 .../devtool-test-ignored/devtool-test-ignored.patch.expected    | 1 +
 ...1-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch | 2 ++
 ...tch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected | 1 +
 .../0001-Add-a-note-line-to-the-quick-reference.patch           | 2 ++
 .../devtool/devtool-upgrade-test1-1.5.3/backported.patch        | 2 ++
 .../recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch   | 2 ++
 .../recipes-test/man-db/files/0001-Test-patch-here.patch        | 2 ++
 meta-selftest/recipes-test/recipetool/files/add-file.patch      | 2 ++
 12 files changed, 21 insertions(+), 1 deletion(-)
meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch +1 -1
index 7569ccef7bb..96be6f4a614 100644
@@ -4,7 +4,7 @@ Date: Wed, 27 Dec 2023 09:55:48 +0000
 Subject: [PATCH] Greet "OE-Core"
 
 Signed-off-by: Alex Kiernan <[email protected]>
-Upstream-Status: Inappropriate
+Upstream-Status: Inappropriate [Test artefact]
 ---
  src/main.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch +2 -0
index e33a2753f9e..17ed5a54f16 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [Test artefact]
+
 --- source.orig	2020-10-06 13:26:10.792688630 +0100
 +++ source	2020-10-06 13:26:18.853424694 +0100
 @@ -1 +1 @@
meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch +2 -0
index 1a0a175fa84..0af5ebbfaf9 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [Test artefact]
+
 --- source.orig	2020-10-06 13:26:10.792688630 +0100
 +++ source	2020-10-06 13:26:18.853424694 +0100
 @@ -1 +1 @@
meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch +2 -0
index 96ea0eb4e3b..bc1ca4bc4a8 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [Test artefact]
+
 diff --git a/ignored b/ignored
 index a579759..e3d7b43 100644
 --- a/ignored
meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected +1 -0
index 68ec6d9875f..8ead9ee1ce6 100644
@@ -3,6 +3,7 @@ From: Martin Jansa <[email protected]>
 Date: Thu, 28 May 2020 01:32:31 +0200
 Subject: [PATCH] meta-selftest: add test of .gitignore in tarball
 
+Upstream-Status: Inappropriate [Test artefact]
 ---
  ignored | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch +2 -0
index 6aaf409ebc5..2b7088e3676 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [Test artefact]
+
 diff --git a/patch-me b/patch-me
 index a20b29a..5e35d1b 100644
 --- a/patch-me
meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected +1 -0
index 1bf25a61d07..52b0df74cef 100644
@@ -3,6 +3,7 @@ From: Martin Jansa <[email protected]>
 Date: Thu, 28 May 2020 02:03:39 +0200
 Subject: [PATCH] meta-selftest: add test for .patch file with long filename
 
+Upstream-Status: Inappropriate [Test artefact]
 ---
  patch-me | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch +2 -0
index 4ea3d74f0f6..db66a284b73 100644
@@ -4,6 +4,8 @@ Date: Wed, 24 Feb 2016 17:43:03 +1300
 Subject: [PATCH] Add a note line to the quick reference
 
 A test patch so we have a file to move around.
+
+Upstream-Status: Inappropriate [Test artefact]
 ---
  doc/quickref.1.in | 1 +
  1 file changed, 1 insertion(+)
meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch +2 -0
index c4f3f12666c..5159652f69f 100644
@@ -4,6 +4,8 @@ Date:   Mon Nov 18 18:43:15 2019 +0100
 
     Backport of the NEWS file from version 1.6.0
 
+Upstream-Status: Inappropriate [Test artefact]
+
 diff --git a/doc/NEWS b/doc/NEWS
 index 69793fc..fd49b1c 100644
 --- a/doc/NEWS
meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch +2 -0
index bccda17ee9c..4f8b745995e 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [Test artefact]
+
 diff --git a/Makefile.am b/Makefile.am
 index 432a9b4..bbf7c74 100644
 --- a/Makefile.am
meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch +2 -0
index b1d5eab2b8c..7df224e5c8c 100644
@@ -4,6 +4,8 @@ Date: Fri, 9 Feb 2018 17:37:48 +0200
 Subject: [PATCH] Test patch here!
 
 This is an invalid patch used by oe-selftest
+
+Upstream-Status: Inappropriate [Test artefact]
 ---
  README | 1 +
  1 file changed, 1 insertion(+)
meta-selftest/recipes-test/recipetool/files/add-file.patch +2 -0
index bdc99c94f0b..cb43cc629d4 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [Test artefact]
+
 diff --git a/file2 b/file2
 new file mode 100644
 index 0000000..049b42e
Signature · 1 line
2.45.2
#1 lore raw

PATCH v4 2/2 insane: add patch-status to default ERROR_QA

* it's enabled for patches in oe-core for very long time and I was using it for many other layers as well, so most layers should be in good shape

* it's also possible to disable it for individual layer as shown by oe-core in:
https://git.openembedded.org/openembedded-core/commit/meta/classes-global/insane.bbclass?h=scarthgap&id=61a881fdbe8b5a21c6276b8a5d06cc30486b1eb3

---
v4: no change

 meta/classes-global/insane.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes-global/insane.bbclass +1 -2
index bd05da0378e..06181d9059e 100644
@@ -45,11 +45,10 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \
             already-stripped installed-vs-shipped ldflags compile-host-path \
             install-host-path pn-overrides unknown-configure-option \
             useless-rpaths rpaths staticdev empty-dirs \
-            patch-fuzz \
+            patch-fuzz patch-status \
             "
 # Add usrmerge QA check based on distro feature
 ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}"
-ERROR_QA:append:layer-core = " patch-status"
 WARN_QA:append:layer-core = " missing-metadata missing-maintainer"
 
 FAKEROOT_QA = "host-user-contaminated"
Signature · 1 line
2.45.2
#2 lore raw

Patchtest results for [PATCH v4 1/2] selftest: add Upstream-Status to .patch files

In reply to Martin Jansa

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/v4-1-2-selftest-add-Upstream-Status-to-.patch-files.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: 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 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)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
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 modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
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 src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files)
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!