Message ID | 20240614073729.269-1-egyszeregy@freemail.hu |
---|---|
State | Accepted, archived |
Commit | 9191aa685418af32f003e067ef7c5737a271e3a5 |
Headers | show |
Series | [v2] archiver.bbclass: Fix work-shared checking for kernel recipes | 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/v2-archiver.bbclass-Fix-work-shared-checking-for-kernel-recipes.patch FAIL: test mbox format: Series has malformed diff lines. Create the series again using git-format-patch and ensure it applies using git am (test_mbox.TestMbox.test_mbox_format) 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 commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) 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 target mailing list (test_mbox.TestMbox.test_target_mailing_list) SKIP: pretest pylint: Python-unidiff parse error (test_python_pylint.PyLint.pretest_pylint) SKIP: pretest src uri left files: Patch cannot be merged (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: Parse error Target without source: +++ b/meta/classes/archiver.bbclass SKIP: test Signed-off-by presence: Parse error Target without source: +++ b/meta/classes/archiver.bbclass SKIP: test Upstream-Status presence: Parse error Target without source: +++ b/meta/classes/archiver.bbclass 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: Python-unidiff parse error (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: Patch cannot be merged (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- 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!
s=20181004; d=freemail.hu; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; l=1635; bh=1fiJfW0V1C8Kq/Y/NPXYkrKrLuICcukhIYXs2WOdy98=; b=Xt+reNZdPVpuwwNchfeGSWuAPV5ELO4b4uUn8hYMqjn+mG23CyxrueMMzMLatnto 1co0/woyq0SOoq+6syRfuPeYTirF3jYskOhLCYYuIwtcHEtl5iO5GdB28XZakSQ2X74 yOpevSV0yxyd/5VFEVo/rIBy700DU5Q1FXkllXaUlJrpW7doN6C1yXBNH9cUAjS4+5f 7eqYJkHodDizKI6zkPuDOksSda0uPZ6zuMyy1aWjAaDqjeKTLeNhrFMJRvsu9O7IorS L8yKZKQz2tJYnz4TKT/D8vbs1g1lG4LSXF6uI7M+prxeXGezjUFWNHysogZY0QEnAuq YhX4bbfcEw== Content-Transfer-Encoding: quoted-printable 2024. 06. 14. 9:37 keltez=C3=A9ssel, egyszeregy@freemail.hu =C3=ADrta: > From: Benjamin Sz=C5=91ke <egyszeregy@freemail.hu> >=20 > Source dir can be a symbolic link in some BSP's linux kernel recipe > which points to work-shared path (like linux-fslc in meta-freescale). > Change to use os.path.realpath() in order to get real path of > source dir. >=20 > Signed-off-by: Benjamin Sz=C5=91ke <egyszeregy@freemail.hu> > --- > meta/classes/archiver.bbclass | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbcl= ass > index 2d0bbfbd42..9d286224d6 100644 > --- a/meta/classes/archiver.bbclass > +++ b/meta/classes/archiver.bbclass > @@ -473,7 +473,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir): > =20 > def is_work_shared(d): > sharedworkdir =3D os.path.join(d.getVar('TMPDIR'), 'work-shared') > - return d.getVar('S').startswith(sharedworkdir) > + sourcedir =3D os.path.realpath(d.getVar('S')) > + return sourcedir.startswith(sharedworkdir) > =20 > # Run do_unpack and do_patch > python do_unpack_and_patch() { Hi, As i see my first patch is already applied to master-next branch of=20 openembedded-core. https://github.com/openembedded/openembedded-core/commit/6d86b3436cb83574= e49441d32af35aa69b56d918 Can you replace it with my [PATCH v2]? V2 is much better in solution with= usage=20 of os.path.realpath() to check what is the real path of the symbolic link= git=20 folder. When it points to work-shared it is os.path.realpath() solve it t= o check=20 properly. This is a much more elegant solution than having to check inher= ited=20 kernel class usage all the time.
Can backport this fix to scarthgap LTS also?
Will this bug-fix be backported to scarthgap?
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclas= s index 2d0bbfbd42..9d286224d6 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -473,7 +473,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir): =20 def is_work_shared(d): sharedworkdir =3D os.path.join(d.getVar('TMPDIR'), 'work-shared') - return d.getVar('S').startswith(sharedworkdir) + sourcedir =3D os.path.realpath(d.getVar('S')) + return sourcedir.startswith(sharedworkdir) =20 # Run do_unpack and do_patch python do_unpack_and_patch() {