[PATCH] docbook-xml-dtd4: correct license name

[PATCH] docbook-xml-dtd4: correct license name

[Hongxu Jia]

- Use license in source file to instead local file LICENSE-OASIS

- Refer debian[1], rename license LICENSE-OASIS to DocBook

The content of license has no change

License-Update: rename license LICENSE-OASIS -> DocBook

[1] https://salsa.debian.org/debian/docbook-xml/-/blob/debian/master/debian/copyright?ref_type=heads#L28

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../common-licenses/DocBook}                     |  2 +-
 meta/files/common-licenses/OASIS                 | 13 -------------
 .../docbook-xml/docbook-xml-dtd4_4.5.bb          | 16 +++++++++-------
 3 files changed, 10 insertions(+), 21 deletions(-)
 rename meta/{recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS => files/common-licenses/DocBook} (92%)
 delete mode 100644 meta/files/common-licenses/OASIS

diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS b/meta/files/common-licenses/DocBook
similarity index 92%
rename from meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
rename to meta/files/common-licenses/DocBook
index 6da7f5b8c74..822a0f07e40 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
+++ b/meta/files/common-licenses/DocBook
@@ -11,6 +11,6 @@ referencing additional sets of general entities and declaring
 additional notations, label your DTD as a variant of DocBook.  See
 the maintenance documentation for more information.
 
-Please direct all questions, bug reports, or suggestions for 
+Please direct all questions, bug reports, or suggestions for
 changes to the docbook@lists.oasis-open.org mailing list. For more
 information, see http://www.oasis-open.org/docbook/.
diff --git a/meta/files/common-licenses/OASIS b/meta/files/common-licenses/OASIS
deleted file mode 100644
index f93df7af270..00000000000
--- a/meta/files/common-licenses/OASIS
+++ /dev/null
@@ -1,13 +0,0 @@
-  Permission to use, copy, modify and distribute the DocBook DTD and
-  its accompanying documentation for any purpose and without fee is
-  hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-
-  If you modify the DocBook DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook.  See
-  the maintenance documentation for more information.
-
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
index 5229a0366c2..d858d09630d 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
+++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
@@ -3,12 +3,14 @@ DESCRIPTION = "Document type definitions for verification of XML data \
 files against the DocBook rule set."
 HOMEPAGE = "https://docbook.org"
 
-# The upstream sources are not distributed with a license file.
-# LICENSE-OASIS is included as a "patch" to workaround this. When
-# upgrading this recipe, please verify whether this is still needed.
-
-LICENSE = "OASIS"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
+LICENSE = "DocBook"
+LIC_FILES_CHKSUM = "\
+    file://docbook-4.1.2/docbookx.dtd;beginline=12;endline=27;md5=21a24edab68530fae39dd512ba69840e \
+    file://docbook-4.2/docbookx.dtd;beginline=13;endline=28;md5=ab12da76ad94a41d04e1587693ebd9b6 \
+    file://docbook-4.3/docbookx.dtd;beginline=13;endline=28;md5=ab12da76ad94a41d04e1587693ebd9b6 \
+    file://docbook-4.4/docbookx.dtd;beginline=15;endline=30;md5=ab12da76ad94a41d04e1587693ebd9b6 \
+    file://docbook-4.5/docbookx.dtd;beginline=15;endline=30;md5=ab12da76ad94a41d04e1587693ebd9b6 \
+"
 
 # To support apps with xml schema backward compatibility, we must
 # install a set of schemas. Install the latest based on PV and then
@@ -31,7 +33,7 @@ SRC_URI = "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=do
            https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-4.4 \
            https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-${PV} \
            file://docbook-xml-update-catalog.xml.patch \
-           file://LICENSE-OASIS"
+           "
 
 SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772"
 SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2"
-- 
2.34.1

Patchtest results for [PATCH] docbook-xml-dtd4: correct license name

[patchtest]

[-- Attachment #1: Type: text/plain, Size: 3000 bytes --]

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/docbook-xml-dtd4-correct-license-name.patch

FAIL: test src uri left files: Patches not removed from tree. Remove them and amend the submitted mbox (test_metadata.TestMetadata.test_src_uri_left_files)

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 commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
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 target mailing list (test_mbox.TestMbox.test_target_mailing_list)

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)

---

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!

Re: Patchtest results for [PATCH] docbook-xml-dtd4: correct license name

[Hongxu Jia]

[-- Attachment #1: Type: text/plain, Size: 3898 bytes --]

On 3/10/25 15:16, patchtest@automation.yoctoproject.org wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> 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/docbook-xml-dtd4-correct-license-name.patch
>
> FAIL: test src uri left files: Patches not removed from tree. Remove them and amend the submitted mbox (test_metadata.TestMetadata.test_src_uri_left_files)

I am afraid it is a false alarm,

the local file 
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS was 
removed,

and rename meta/files/common-licenses/OASIS to 
meta/files/common-licenses/DocBook

But the review patch renamed 
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS to 
meta/files/common-licenses/DocBook

and remove meta/files/common-licenses/OASIS

rename from meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
rename to meta/files/common-licenses/DocBook
...
--- a/meta/files/common-licenses/OASIS
+++ /dev/null

//Hongxu

> 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 commit message presence (test_mbox.TestMbox.test_commit_message_presence)
> PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
> 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 target mailing list (test_mbox.TestMbox.test_target_mailing_list)
>
> 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)
>
> ---
>
> 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 athttps://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!


[-- Attachment #2: Type: text/html, Size: 7428 bytes --]

Re: [OE-core] [PATCH] docbook-xml-dtd4: correct license name

[Ross Burton]

On 10 Mar 2025, at 07:12, hongxu via lists.openembedded.org <hongxu.jia=eng.windriver.com@lists.openembedded.org> wrote:
> 
> - Use license in source file to instead local file LICENSE-OASIS
> 
> - Refer debian[1], rename license LICENSE-OASIS to DocBook
> 
> The content of license has no change
> 
> License-Update: rename license LICENSE-OASIS -> DocBook
> 
> [1] https://salsa.debian.org/debian/docbook-xml/-/blob/debian/master/debian/copyright?ref_type=heads#L28

This license is essentially used in just one recipe, docbook-xml-dtd4, so it doesn’t really count as “common” to me.  Future releases use a license that is in the SPDX database, but this is a bespoke license.

In this case I’d prefer to clean it up by using NO_GENERIC_LICENSE, and remove the OASIS license from the common license list.  I have a patch I was testing, I’ll send it.

Ross

Re: [OE-core] [PATCH] docbook-xml-dtd4: correct license name

[Hongxu Jia]

On 3/17/25 20:43, Ross Burton wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On 10 Mar 2025, at 07:12, hongxu via lists.openembedded.org <hongxu.jia=eng.windriver.com@lists.openembedded.org> wrote:
>> - Use license in source file to instead local file LICENSE-OASIS
>>
>> - Refer debian[1], rename license LICENSE-OASIS to DocBook
>>
>> The content of license has no change
>>
>> License-Update: rename license LICENSE-OASIS -> DocBook
>>
>> [1] https://salsa.debian.org/debian/docbook-xml/-/blob/debian/master/debian/copyright?ref_type=heads#L28
> This license is essentially used in just one recipe, docbook-xml-dtd4, so it doesn’t really count as “common” to me.  Future releases use a license that is in the SPDX database, but this is a bespoke license.
>
> In this case I’d prefer to clean it up by using NO_GENERIC_LICENSE, and remove the OASIS license from the common license list.  I have a patch I was testing, I’ll send it.

Understood, it makes sense

//Hongxu

> Ross