| Message ID | 01000186696bfbd6-6ba3a526-b53d-4775-94cf-0b29b19f44dc-000000@email.amazonses.com |
|---|---|
| State | New |
| Headers | show |
| Series | [YOCTO,#13270] Refactor the docbook-xml recipe to use docbook.org packages rather than hacked up debian package | expand |
Can you please set SRC_URI with a single assignment; there is no reason to += it multiple times. Verifying that 'devtool latest-version works' would be also appreciated. Alex On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: > > --- > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- > 1 file changed, 49 insertions(+), 25 deletions(-) > > 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 2bec1442af..71aa8c14ec 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 > @@ -1,30 +1,54 @@ > SUMMARY = "Document type definitions for verification of XML data files" > DESCRIPTION = "Document type definitions for verification of XML data \ > -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ > -XML DTD, as well as a selected set of legacy DTDs for use with older \ > -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" > -HOMEPAGE = "http://www.docbook.org/xml/" > +files against the DocBook rule set." > +HOMEPAGE = "https://docbook.org" > > -LICENSE = "OASIS" > -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > +inherit allarch > +BBCLASSEXTEND = "native" > > -# Note: 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. > -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ > - file://LICENSE-OASIS \ > - file://docbook-xml-update-catalog.xml.patch \ > -" > +# To support apps with xml schema backward compatibility, we must > +# install a set of schemas. Install the latest based on PV and then > +# name any specific versions as required. TODO: Figure out a mechanism > +# to filter exactly which versions are necessary, if that's even > +# possible. > +# > +# DocBook.org lists available packages at https://docbook.org/xml/ > +# > +# These packages are available as source but it requires the ability > +# to use the Gradle build system to do so. It might be safer to use > +# the source tree which would also enable proper SBOM generation > +# through the bitbake build system. https://github.com/docbook/docbook > +# > > -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" > -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" > +S = "${WORKDIR}" > > -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" > +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" > +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" > +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" > > -S = "${WORKDIR}/docbook-xml-4.5.c31424" > +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" > +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" > +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" > > -inherit allarch > -BBCLASSEXTEND = "native" > +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" > +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" > +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" > + > +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" > +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" > +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" > + > +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" > +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" > +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" > + > +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > +SRC_URI += "file://LICENSE-OASIS" > > do_configure (){ > : > @@ -34,19 +58,19 @@ do_compile (){ > : > } > > +inherit xmlcatalog > + > do_install () { > install -d ${D}${sysconfdir}/xml/ > xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml > > - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do > + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do > DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION > install -d -m 755 ${D}$DEST > - cp -v -R docbook-$DTDVERSION/* ${D}$DEST > - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST > + xmlcatalog --verbose --noout --add nextCatalog unused \ > + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > done > } > > -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" > -inherit xmlcatalog > - > FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" > -- > 2.34.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#177325): https://lists.openembedded.org/g/openembedded-core/message/177325 > Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
For multiple assignment: the reason is maintainability. The supported versions will change over time. Please confirm if there are any other appreciations I must cover - I was unaware of this one and would like to batch them. If the appreciations are listed on a wiki please school me about that. On 2/19/23 10:52, Alexander Kanavin wrote: > Can you please set SRC_URI with a single assignment; there is no > reason to += it multiple times. > > Verifying that 'devtool latest-version works' would be also appreciated. > > Alex > > On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: >> --- >> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- >> 1 file changed, 49 insertions(+), 25 deletions(-) >> >> 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 2bec1442af..71aa8c14ec 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 >> @@ -1,30 +1,54 @@ >> SUMMARY = "Document type definitions for verification of XML data files" >> DESCRIPTION = "Document type definitions for verification of XML data \ >> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ >> -XML DTD, as well as a selected set of legacy DTDs for use with older \ >> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" >> -HOMEPAGE = "http://www.docbook.org/xml/" >> +files against the DocBook rule set." >> +HOMEPAGE = "https://docbook.org" >> >> -LICENSE = "OASIS" >> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >> +inherit allarch >> +BBCLASSEXTEND = "native" >> >> -# Note: 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. >> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ >> - file://LICENSE-OASIS \ >> - file://docbook-xml-update-catalog.xml.patch \ >> -" >> +# To support apps with xml schema backward compatibility, we must >> +# install a set of schemas. Install the latest based on PV and then >> +# name any specific versions as required. TODO: Figure out a mechanism >> +# to filter exactly which versions are necessary, if that's even >> +# possible. >> +# >> +# DocBook.org lists available packages at https://docbook.org/xml/ >> +# >> +# These packages are available as source but it requires the ability >> +# to use the Gradle build system to do so. It might be safer to use >> +# the source tree which would also enable proper SBOM generation >> +# through the bitbake build system. https://github.com/docbook/docbook >> +# >> >> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" >> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" >> +S = "${WORKDIR}" >> >> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" >> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" >> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" >> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" >> >> -S = "${WORKDIR}/docbook-xml-4.5.c31424" >> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" >> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" >> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" >> >> -inherit allarch >> -BBCLASSEXTEND = "native" >> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" >> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" >> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" >> + >> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" >> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" >> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" >> + >> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" >> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" >> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" >> + >> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >> +SRC_URI += "file://LICENSE-OASIS" >> >> do_configure (){ >> : >> @@ -34,19 +58,19 @@ do_compile (){ >> : >> } >> >> +inherit xmlcatalog >> + >> do_install () { >> install -d ${D}${sysconfdir}/xml/ >> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml >> >> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do >> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do >> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION >> install -d -m 755 ${D}$DEST >> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST >> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST >> + xmlcatalog --verbose --noout --add nextCatalog unused \ >> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >> done >> } >> >> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" >> -inherit xmlcatalog >> - >> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" >> -- >> 2.34.1 >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#177325): https://lists.openembedded.org/g/openembedded-core/message/177325 >> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: > For multiple assignment: the reason is maintainability. The supported > versions will change over time. You can still place them in a newline-separated single assignment, which is a lot more readable as the list of fetched items is then in a single location in the recipe. This is how all recipes in oe-core are structured. > Please confirm if there are any other appreciations I must cover - I was > unaware of this one and would like to batch them. If the appreciations > are listed on a wiki please school me about that. For now I do not have any others. I'd like to see a v2 first, as v1 makes it hard to understand how the final recipe looks like with the multiple SRC_URI approach. We used to have a bot that points out common issues but it's unmaintained and falled into disrepair. There are numerous pages on the wiki collecting style and message tips: https://www.openembedded.org/wiki/Styleguide https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded Alex > On 2/19/23 10:52, Alexander Kanavin wrote: > > Can you please set SRC_URI with a single assignment; there is no > > reason to += it multiple times. > > > > Verifying that 'devtool latest-version works' would be also appreciated. > > > > Alex > > > > On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: > >> --- > >> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- > >> 1 file changed, 49 insertions(+), 25 deletions(-) > >> > >> 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 2bec1442af..71aa8c14ec 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 > >> @@ -1,30 +1,54 @@ > >> SUMMARY = "Document type definitions for verification of XML data files" > >> DESCRIPTION = "Document type definitions for verification of XML data \ > >> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ > >> -XML DTD, as well as a selected set of legacy DTDs for use with older \ > >> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" > >> -HOMEPAGE = "http://www.docbook.org/xml/" > >> +files against the DocBook rule set." > >> +HOMEPAGE = "https://docbook.org" > >> > >> -LICENSE = "OASIS" > >> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >> +inherit allarch > >> +BBCLASSEXTEND = "native" > >> > >> -# Note: 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. > >> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ > >> - file://LICENSE-OASIS \ > >> - file://docbook-xml-update-catalog.xml.patch \ > >> -" > >> +# To support apps with xml schema backward compatibility, we must > >> +# install a set of schemas. Install the latest based on PV and then > >> +# name any specific versions as required. TODO: Figure out a mechanism > >> +# to filter exactly which versions are necessary, if that's even > >> +# possible. > >> +# > >> +# DocBook.org lists available packages at https://docbook.org/xml/ > >> +# > >> +# These packages are available as source but it requires the ability > >> +# to use the Gradle build system to do so. It might be safer to use > >> +# the source tree which would also enable proper SBOM generation > >> +# through the bitbake build system. https://github.com/docbook/docbook > >> +# > >> > >> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" > >> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" > >> +S = "${WORKDIR}" > >> > >> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" > >> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" > >> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" > >> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" > >> > >> -S = "${WORKDIR}/docbook-xml-4.5.c31424" > >> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" > >> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" > >> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" > >> > >> -inherit allarch > >> -BBCLASSEXTEND = "native" > >> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" > >> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" > >> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" > >> + > >> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" > >> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" > >> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" > >> + > >> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" > >> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" > >> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" > >> + > >> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >> +SRC_URI += "file://LICENSE-OASIS" > >> > >> do_configure (){ > >> : > >> @@ -34,19 +58,19 @@ do_compile (){ > >> : > >> } > >> > >> +inherit xmlcatalog > >> + > >> do_install () { > >> install -d ${D}${sysconfdir}/xml/ > >> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml > >> > >> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do > >> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do > >> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION > >> install -d -m 755 ${D}$DEST > >> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST > >> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST > >> + xmlcatalog --verbose --noout --add nextCatalog unused \ > >> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >> done > >> } > >> > >> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" > >> -inherit xmlcatalog > >> - > >> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" > >> -- > >> 2.34.1 > >> > >> > >> > >> -=-=-=-=-=-=-=-=-=-=-=- > >> Links: You receive all messages sent to this group. > >> View/Reply Online (#177325): https://lists.openembedded.org/g/openembedded-core/message/177325 > >> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 > >> Group Owner: openembedded-core+owner@lists.openembedded.org > >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > >> -=-=-=-=-=-=-=-=-=-=-=- > >> >
I tried `devtool latest-version` and it failed on one version - 5.2 - because it's still in RC. Note that there are massive breaking changes between Docbook 4x and 5x. Given the defect I'm fixing is to change the upstream source - and not refactor the entire recipe - I believe the scope should keep to that and another defect filed for future versions. Please confirm this is reasonable. I did the other beatification changes per style guide and will resubmit once I get confirmation. On 2/19/23 12:31, Alexander Kanavin wrote: > On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: > >> For multiple assignment: the reason is maintainability. The supported >> versions will change over time. > You can still place them in a newline-separated single assignment, > which is a lot more readable as the list of fetched items is then in a > single location in the recipe. > This is how all recipes in oe-core are structured. > >> Please confirm if there are any other appreciations I must cover - I was >> unaware of this one and would like to batch them. If the appreciations >> are listed on a wiki please school me about that. > For now I do not have any others. I'd like to see a v2 first, as v1 > makes it hard to understand how the final recipe looks like with the > multiple SRC_URI approach. We used to have a bot that points out > common issues but it's unmaintained and falled into disrepair. > > There are numerous pages on the wiki collecting style and message tips: > https://www.openembedded.org/wiki/Styleguide > https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded > > Alex > >> On 2/19/23 10:52, Alexander Kanavin wrote: >>> Can you please set SRC_URI with a single assignment; there is no >>> reason to += it multiple times. >>> >>> Verifying that 'devtool latest-version works' would be also appreciated. >>> >>> Alex >>> >>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: >>>> --- >>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- >>>> 1 file changed, 49 insertions(+), 25 deletions(-) >>>> >>>> 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 2bec1442af..71aa8c14ec 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 >>>> @@ -1,30 +1,54 @@ >>>> SUMMARY = "Document type definitions for verification of XML data files" >>>> DESCRIPTION = "Document type definitions for verification of XML data \ >>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ >>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ >>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" >>>> -HOMEPAGE = "http://www.docbook.org/xml/" >>>> +files against the DocBook rule set." >>>> +HOMEPAGE = "https://docbook.org" >>>> >>>> -LICENSE = "OASIS" >>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>> +inherit allarch >>>> +BBCLASSEXTEND = "native" >>>> >>>> -# Note: 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. >>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ >>>> - file://LICENSE-OASIS \ >>>> - file://docbook-xml-update-catalog.xml.patch \ >>>> -" >>>> +# To support apps with xml schema backward compatibility, we must >>>> +# install a set of schemas. Install the latest based on PV and then >>>> +# name any specific versions as required. TODO: Figure out a mechanism >>>> +# to filter exactly which versions are necessary, if that's even >>>> +# possible. >>>> +# >>>> +# DocBook.org lists available packages at https://docbook.org/xml/ >>>> +# >>>> +# These packages are available as source but it requires the ability >>>> +# to use the Gradle build system to do so. It might be safer to use >>>> +# the source tree which would also enable proper SBOM generation >>>> +# through the bitbake build system. https://github.com/docbook/docbook >>>> +# >>>> >>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" >>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" >>>> +S = "${WORKDIR}" >>>> >>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" >>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" >>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" >>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" >>>> >>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" >>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" >>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" >>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" >>>> >>>> -inherit allarch >>>> -BBCLASSEXTEND = "native" >>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" >>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" >>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" >>>> + >>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" >>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" >>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" >>>> + >>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" >>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" >>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" >>>> + >>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>> +SRC_URI += "file://LICENSE-OASIS" >>>> >>>> do_configure (){ >>>> : >>>> @@ -34,19 +58,19 @@ do_compile (){ >>>> : >>>> } >>>> >>>> +inherit xmlcatalog >>>> + >>>> do_install () { >>>> install -d ${D}${sysconfdir}/xml/ >>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml >>>> >>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do >>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do >>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION >>>> install -d -m 755 ${D}$DEST >>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST >>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST >>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ >>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>> done >>>> } >>>> >>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" >>>> -inherit xmlcatalog >>>> - >>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" >>>> -- >>>> 2.34.1 >>>> >>>> >>>> >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>> Links: You receive all messages sent to this group. >>>> View/Reply Online (#177325): https://lists.openembedded.org/g/openembedded-core/message/177325 >>>> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 >>>> Group Owner: openembedded-core+owner@lists.openembedded.org >>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>
It helps if you provide devtool's output. I think it's possible to exclude rc versions from the check with UPSTREAM_CHECK_REGEX. Alex On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: > > I tried `devtool latest-version` and it failed on one version - 5.2 - > because it's still in RC. > > Note that there are massive breaking changes between Docbook 4x and 5x. > Given the defect I'm fixing is to change the upstream source - and not > refactor the entire recipe - I believe the scope should keep to that and > another defect filed for future versions. Please confirm this is > reasonable. > > I did the other beatification changes per style guide and will resubmit > once I get confirmation. > > On 2/19/23 12:31, Alexander Kanavin wrote: > > On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: > > > >> For multiple assignment: the reason is maintainability. The supported > >> versions will change over time. > > You can still place them in a newline-separated single assignment, > > which is a lot more readable as the list of fetched items is then in a > > single location in the recipe. > > This is how all recipes in oe-core are structured. > > > >> Please confirm if there are any other appreciations I must cover - I was > >> unaware of this one and would like to batch them. If the appreciations > >> are listed on a wiki please school me about that. > > For now I do not have any others. I'd like to see a v2 first, as v1 > > makes it hard to understand how the final recipe looks like with the > > multiple SRC_URI approach. We used to have a bot that points out > > common issues but it's unmaintained and falled into disrepair. > > > > There are numerous pages on the wiki collecting style and message tips: > > https://www.openembedded.org/wiki/Styleguide > > https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > > https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded > > > > Alex > > > >> On 2/19/23 10:52, Alexander Kanavin wrote: > >>> Can you please set SRC_URI with a single assignment; there is no > >>> reason to += it multiple times. > >>> > >>> Verifying that 'devtool latest-version works' would be also appreciated. > >>> > >>> Alex > >>> > >>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: > >>>> --- > >>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- > >>>> 1 file changed, 49 insertions(+), 25 deletions(-) > >>>> > >>>> 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 2bec1442af..71aa8c14ec 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 > >>>> @@ -1,30 +1,54 @@ > >>>> SUMMARY = "Document type definitions for verification of XML data files" > >>>> DESCRIPTION = "Document type definitions for verification of XML data \ > >>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ > >>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ > >>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" > >>>> -HOMEPAGE = "http://www.docbook.org/xml/" > >>>> +files against the DocBook rule set." > >>>> +HOMEPAGE = "https://docbook.org" > >>>> > >>>> -LICENSE = "OASIS" > >>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>> +inherit allarch > >>>> +BBCLASSEXTEND = "native" > >>>> > >>>> -# Note: 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. > >>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ > >>>> - file://LICENSE-OASIS \ > >>>> - file://docbook-xml-update-catalog.xml.patch \ > >>>> -" > >>>> +# To support apps with xml schema backward compatibility, we must > >>>> +# install a set of schemas. Install the latest based on PV and then > >>>> +# name any specific versions as required. TODO: Figure out a mechanism > >>>> +# to filter exactly which versions are necessary, if that's even > >>>> +# possible. > >>>> +# > >>>> +# DocBook.org lists available packages at https://docbook.org/xml/ > >>>> +# > >>>> +# These packages are available as source but it requires the ability > >>>> +# to use the Gradle build system to do so. It might be safer to use > >>>> +# the source tree which would also enable proper SBOM generation > >>>> +# through the bitbake build system. https://github.com/docbook/docbook > >>>> +# > >>>> > >>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" > >>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" > >>>> +S = "${WORKDIR}" > >>>> > >>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" > >>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" > >>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" > >>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" > >>>> > >>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" > >>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" > >>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" > >>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" > >>>> > >>>> -inherit allarch > >>>> -BBCLASSEXTEND = "native" > >>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" > >>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" > >>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" > >>>> + > >>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" > >>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" > >>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" > >>>> + > >>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" > >>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" > >>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" > >>>> + > >>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>> +SRC_URI += "file://LICENSE-OASIS" > >>>> > >>>> do_configure (){ > >>>> : > >>>> @@ -34,19 +58,19 @@ do_compile (){ > >>>> : > >>>> } > >>>> > >>>> +inherit xmlcatalog > >>>> + > >>>> do_install () { > >>>> install -d ${D}${sysconfdir}/xml/ > >>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml > >>>> > >>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do > >>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do > >>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION > >>>> install -d -m 755 ${D}$DEST > >>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST > >>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST > >>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ > >>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>> done > >>>> } > >>>> > >>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" > >>>> -inherit xmlcatalog > >>>> - > >>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" > >>>> -- > >>>> 2.34.1 > >>>> > >>>> > >>>> > >>>> -=-=-=-=-=-=-=-=-=-=-=- > >>>> Links: You receive all messages sent to this group. > >>>> View/Reply Online (#177325): https://lists.openembedded.org/g/openembedded-core/message/177325 > >>>> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 > >>>> Group Owner: openembedded-core+owner@lists.openembedded.org > >>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > >>>> -=-=-=-=-=-=-=-=-=-=-=- > >>>> >
If the check goes over https://docbook.org/xml/ I guess you can set the regex to 4.x versions only, as the recipe name itself pins it to 4.x. I'm not sure we're even going to need 5.x, ever. You can grep for UPSTREAM_CHECK_REGEX in core for examples. Alex On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > > It helps if you provide devtool's output. I think it's possible to > exclude rc versions from the check with UPSTREAM_CHECK_REGEX. > > Alex > > On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: > > > > I tried `devtool latest-version` and it failed on one version - 5.2 - > > because it's still in RC. > > > > Note that there are massive breaking changes between Docbook 4x and 5x. > > Given the defect I'm fixing is to change the upstream source - and not > > refactor the entire recipe - I believe the scope should keep to that and > > another defect filed for future versions. Please confirm this is > > reasonable. > > > > I did the other beatification changes per style guide and will resubmit > > once I get confirmation. > > > > On 2/19/23 12:31, Alexander Kanavin wrote: > > > On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: > > > > > >> For multiple assignment: the reason is maintainability. The supported > > >> versions will change over time. > > > You can still place them in a newline-separated single assignment, > > > which is a lot more readable as the list of fetched items is then in a > > > single location in the recipe. > > > This is how all recipes in oe-core are structured. > > > > > >> Please confirm if there are any other appreciations I must cover - I was > > >> unaware of this one and would like to batch them. If the appreciations > > >> are listed on a wiki please school me about that. > > > For now I do not have any others. I'd like to see a v2 first, as v1 > > > makes it hard to understand how the final recipe looks like with the > > > multiple SRC_URI approach. We used to have a bot that points out > > > common issues but it's unmaintained and falled into disrepair. > > > > > > There are numerous pages on the wiki collecting style and message tips: > > > https://www.openembedded.org/wiki/Styleguide > > > https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > > > https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded > > > > > > Alex > > > > > >> On 2/19/23 10:52, Alexander Kanavin wrote: > > >>> Can you please set SRC_URI with a single assignment; there is no > > >>> reason to += it multiple times. > > >>> > > >>> Verifying that 'devtool latest-version works' would be also appreciated. > > >>> > > >>> Alex > > >>> > > >>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: > > >>>> --- > > >>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- > > >>>> 1 file changed, 49 insertions(+), 25 deletions(-) > > >>>> > > >>>> 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 2bec1442af..71aa8c14ec 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 > > >>>> @@ -1,30 +1,54 @@ > > >>>> SUMMARY = "Document type definitions for verification of XML data files" > > >>>> DESCRIPTION = "Document type definitions for verification of XML data \ > > >>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ > > >>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ > > >>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" > > >>>> -HOMEPAGE = "http://www.docbook.org/xml/" > > >>>> +files against the DocBook rule set." > > >>>> +HOMEPAGE = "https://docbook.org" > > >>>> > > >>>> -LICENSE = "OASIS" > > >>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > > >>>> +inherit allarch > > >>>> +BBCLASSEXTEND = "native" > > >>>> > > >>>> -# Note: 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. > > >>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ > > >>>> - file://LICENSE-OASIS \ > > >>>> - file://docbook-xml-update-catalog.xml.patch \ > > >>>> -" > > >>>> +# To support apps with xml schema backward compatibility, we must > > >>>> +# install a set of schemas. Install the latest based on PV and then > > >>>> +# name any specific versions as required. TODO: Figure out a mechanism > > >>>> +# to filter exactly which versions are necessary, if that's even > > >>>> +# possible. > > >>>> +# > > >>>> +# DocBook.org lists available packages at https://docbook.org/xml/ > > >>>> +# > > >>>> +# These packages are available as source but it requires the ability > > >>>> +# to use the Gradle build system to do so. It might be safer to use > > >>>> +# the source tree which would also enable proper SBOM generation > > >>>> +# through the bitbake build system. https://github.com/docbook/docbook > > >>>> +# > > >>>> > > >>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" > > >>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" > > >>>> +S = "${WORKDIR}" > > >>>> > > >>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" > > >>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" > > >>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" > > >>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" > > >>>> > > >>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" > > >>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" > > >>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" > > >>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" > > >>>> > > >>>> -inherit allarch > > >>>> -BBCLASSEXTEND = "native" > > >>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" > > >>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" > > >>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" > > >>>> + > > >>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" > > >>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" > > >>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" > > >>>> + > > >>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" > > >>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" > > >>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" > > >>>> + > > >>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > > >>>> +SRC_URI += "file://LICENSE-OASIS" > > >>>> > > >>>> do_configure (){ > > >>>> : > > >>>> @@ -34,19 +58,19 @@ do_compile (){ > > >>>> : > > >>>> } > > >>>> > > >>>> +inherit xmlcatalog > > >>>> + > > >>>> do_install () { > > >>>> install -d ${D}${sysconfdir}/xml/ > > >>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml > > >>>> > > >>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do > > >>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do > > >>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION > > >>>> install -d -m 755 ${D}$DEST > > >>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST > > >>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > > >>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST > > >>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ > > >>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > > >>>> done > > >>>> } > > >>>> > > >>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" > > >>>> -inherit xmlcatalog > > >>>> - > > >>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" > > >>>> -- > > >>>> 2.34.1 > > >>>> > > >>>> > > >>>> > > >>>> > > >>>> > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 > Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
I have been working on it, but after a while I realized that this version upgrade will not work anyway - even for 4.x The reason is they have a folder named "412" which is actually 4.1.2 which I we probably still need to have in. Even though the tool cannot find 5.2 it still exits zero ... but still, it thinks that 412 > 5.2 I see one of two things a/ do not autoupgrade and somehow mark for manual cyclical update b/ somehow apply a map capability Also given that multiple versions must be delivered in the same version I don't think that this falls under typical autoupgrade scenario. What are your thoughts? On 2/19/23 13:54, Alexander Kanavin wrote: > If the check goes over https://docbook.org/xml/ I guess you can set > the regex to 4.x versions only, as the recipe name itself pins it to > 4.x. I'm not sure we're even going to need 5.x, ever. > You can grep for UPSTREAM_CHECK_REGEX in core for examples. > > Alex > > On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via > lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> > wrote: >> It helps if you provide devtool's output. I think it's possible to >> exclude rc versions from the check with UPSTREAM_CHECK_REGEX. >> >> Alex >> >> On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: >>> I tried `devtool latest-version` and it failed on one version - 5.2 - >>> because it's still in RC. >>> >>> Note that there are massive breaking changes between Docbook 4x and 5x. >>> Given the defect I'm fixing is to change the upstream source - and not >>> refactor the entire recipe - I believe the scope should keep to that and >>> another defect filed for future versions. Please confirm this is >>> reasonable. >>> >>> I did the other beatification changes per style guide and will resubmit >>> once I get confirmation. >>> >>> On 2/19/23 12:31, Alexander Kanavin wrote: >>>> On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: >>>> >>>>> For multiple assignment: the reason is maintainability. The supported >>>>> versions will change over time. >>>> You can still place them in a newline-separated single assignment, >>>> which is a lot more readable as the list of fetched items is then in a >>>> single location in the recipe. >>>> This is how all recipes in oe-core are structured. >>>> >>>>> Please confirm if there are any other appreciations I must cover - I was >>>>> unaware of this one and would like to batch them. If the appreciations >>>>> are listed on a wiki please school me about that. >>>> For now I do not have any others. I'd like to see a v2 first, as v1 >>>> makes it hard to understand how the final recipe looks like with the >>>> multiple SRC_URI approach. We used to have a bot that points out >>>> common issues but it's unmaintained and falled into disrepair. >>>> >>>> There are numerous pages on the wiki collecting style and message tips: >>>> https://www.openembedded.org/wiki/Styleguide >>>> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines >>>> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded >>>> >>>> Alex >>>> >>>>> On 2/19/23 10:52, Alexander Kanavin wrote: >>>>>> Can you please set SRC_URI with a single assignment; there is no >>>>>> reason to += it multiple times. >>>>>> >>>>>> Verifying that 'devtool latest-version works' would be also appreciated. >>>>>> >>>>>> Alex >>>>>> >>>>>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: >>>>>>> --- >>>>>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- >>>>>>> 1 file changed, 49 insertions(+), 25 deletions(-) >>>>>>> >>>>>>> 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 2bec1442af..71aa8c14ec 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 >>>>>>> @@ -1,30 +1,54 @@ >>>>>>> SUMMARY = "Document type definitions for verification of XML data files" >>>>>>> DESCRIPTION = "Document type definitions for verification of XML data \ >>>>>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ >>>>>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ >>>>>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" >>>>>>> -HOMEPAGE = "http://www.docbook.org/xml/" >>>>>>> +files against the DocBook rule set." >>>>>>> +HOMEPAGE = "https://docbook.org" >>>>>>> >>>>>>> -LICENSE = "OASIS" >>>>>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>> +inherit allarch >>>>>>> +BBCLASSEXTEND = "native" >>>>>>> >>>>>>> -# Note: 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. >>>>>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ >>>>>>> - file://LICENSE-OASIS \ >>>>>>> - file://docbook-xml-update-catalog.xml.patch \ >>>>>>> -" >>>>>>> +# To support apps with xml schema backward compatibility, we must >>>>>>> +# install a set of schemas. Install the latest based on PV and then >>>>>>> +# name any specific versions as required. TODO: Figure out a mechanism >>>>>>> +# to filter exactly which versions are necessary, if that's even >>>>>>> +# possible. >>>>>>> +# >>>>>>> +# DocBook.org lists available packages at https://docbook.org/xml/ >>>>>>> +# >>>>>>> +# These packages are available as source but it requires the ability >>>>>>> +# to use the Gradle build system to do so. It might be safer to use >>>>>>> +# the source tree which would also enable proper SBOM generation >>>>>>> +# through the bitbake build system. https://github.com/docbook/docbook >>>>>>> +# >>>>>>> >>>>>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" >>>>>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" >>>>>>> +S = "${WORKDIR}" >>>>>>> >>>>>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" >>>>>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" >>>>>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" >>>>>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" >>>>>>> >>>>>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" >>>>>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" >>>>>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" >>>>>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" >>>>>>> >>>>>>> -inherit allarch >>>>>>> -BBCLASSEXTEND = "native" >>>>>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" >>>>>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" >>>>>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" >>>>>>> + >>>>>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" >>>>>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" >>>>>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" >>>>>>> + >>>>>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" >>>>>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" >>>>>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" >>>>>>> + >>>>>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>> +SRC_URI += "file://LICENSE-OASIS" >>>>>>> >>>>>>> do_configure (){ >>>>>>> : >>>>>>> @@ -34,19 +58,19 @@ do_compile (){ >>>>>>> : >>>>>>> } >>>>>>> >>>>>>> +inherit xmlcatalog >>>>>>> + >>>>>>> do_install () { >>>>>>> install -d ${D}${sysconfdir}/xml/ >>>>>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>> >>>>>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION >>>>>>> install -d -m 755 ${D}$DEST >>>>>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST >>>>>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST >>>>>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ >>>>>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>> done >>>>>>> } >>>>>>> >>>>>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" >>>>>>> -inherit xmlcatalog >>>>>>> - >>>>>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" >>>>>>> -- >>>>>>> 2.34.1 >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 >> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
412 can be specifically excluded as a 'bogus' version, examples exist in oe-core. Version checks are used for manual upgrades too, as maintainers want to be notified there's a new version, even if autoupgrade can't handle it. We just need to know if there's a 4.x release newer than 4.5, and that can be covered by the check. Alex On Sun, 19 Feb 2023 at 21:27, Richard Elberger <rich@richelberger.com> wrote: > > I have been working on it, but after a while I realized that this > version upgrade will not work anyway - even for 4.x > > The reason is they have a folder named "412" which is actually 4.1.2 > which I we probably still need to have in. > > Even though the tool cannot find 5.2 it still exits zero ... but still, > it thinks that 412 > 5.2 > > I see one of two things a/ do not autoupgrade and somehow mark for > manual cyclical update b/ somehow apply a map capability > > Also given that multiple versions must be delivered in the same version > I don't think that this falls under typical autoupgrade scenario. > > What are your thoughts? > > On 2/19/23 13:54, Alexander Kanavin wrote: > > If the check goes over https://docbook.org/xml/ I guess you can set > > the regex to 4.x versions only, as the recipe name itself pins it to > > 4.x. I'm not sure we're even going to need 5.x, ever. > > You can grep for UPSTREAM_CHECK_REGEX in core for examples. > > > > Alex > > > > On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via > > lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> > > wrote: > >> It helps if you provide devtool's output. I think it's possible to > >> exclude rc versions from the check with UPSTREAM_CHECK_REGEX. > >> > >> Alex > >> > >> On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: > >>> I tried `devtool latest-version` and it failed on one version - 5.2 - > >>> because it's still in RC. > >>> > >>> Note that there are massive breaking changes between Docbook 4x and 5x. > >>> Given the defect I'm fixing is to change the upstream source - and not > >>> refactor the entire recipe - I believe the scope should keep to that and > >>> another defect filed for future versions. Please confirm this is > >>> reasonable. > >>> > >>> I did the other beatification changes per style guide and will resubmit > >>> once I get confirmation. > >>> > >>> On 2/19/23 12:31, Alexander Kanavin wrote: > >>>> On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: > >>>> > >>>>> For multiple assignment: the reason is maintainability. The supported > >>>>> versions will change over time. > >>>> You can still place them in a newline-separated single assignment, > >>>> which is a lot more readable as the list of fetched items is then in a > >>>> single location in the recipe. > >>>> This is how all recipes in oe-core are structured. > >>>> > >>>>> Please confirm if there are any other appreciations I must cover - I was > >>>>> unaware of this one and would like to batch them. If the appreciations > >>>>> are listed on a wiki please school me about that. > >>>> For now I do not have any others. I'd like to see a v2 first, as v1 > >>>> makes it hard to understand how the final recipe looks like with the > >>>> multiple SRC_URI approach. We used to have a bot that points out > >>>> common issues but it's unmaintained and falled into disrepair. > >>>> > >>>> There are numerous pages on the wiki collecting style and message tips: > >>>> https://www.openembedded.org/wiki/Styleguide > >>>> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > >>>> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded > >>>> > >>>> Alex > >>>> > >>>>> On 2/19/23 10:52, Alexander Kanavin wrote: > >>>>>> Can you please set SRC_URI with a single assignment; there is no > >>>>>> reason to += it multiple times. > >>>>>> > >>>>>> Verifying that 'devtool latest-version works' would be also appreciated. > >>>>>> > >>>>>> Alex > >>>>>> > >>>>>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: > >>>>>>> --- > >>>>>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- > >>>>>>> 1 file changed, 49 insertions(+), 25 deletions(-) > >>>>>>> > >>>>>>> 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 2bec1442af..71aa8c14ec 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 > >>>>>>> @@ -1,30 +1,54 @@ > >>>>>>> SUMMARY = "Document type definitions for verification of XML data files" > >>>>>>> DESCRIPTION = "Document type definitions for verification of XML data \ > >>>>>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ > >>>>>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ > >>>>>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" > >>>>>>> -HOMEPAGE = "http://www.docbook.org/xml/" > >>>>>>> +files against the DocBook rule set." > >>>>>>> +HOMEPAGE = "https://docbook.org" > >>>>>>> > >>>>>>> -LICENSE = "OASIS" > >>>>>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>>>>> +inherit allarch > >>>>>>> +BBCLASSEXTEND = "native" > >>>>>>> > >>>>>>> -# Note: 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. > >>>>>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ > >>>>>>> - file://LICENSE-OASIS \ > >>>>>>> - file://docbook-xml-update-catalog.xml.patch \ > >>>>>>> -" > >>>>>>> +# To support apps with xml schema backward compatibility, we must > >>>>>>> +# install a set of schemas. Install the latest based on PV and then > >>>>>>> +# name any specific versions as required. TODO: Figure out a mechanism > >>>>>>> +# to filter exactly which versions are necessary, if that's even > >>>>>>> +# possible. > >>>>>>> +# > >>>>>>> +# DocBook.org lists available packages at https://docbook.org/xml/ > >>>>>>> +# > >>>>>>> +# These packages are available as source but it requires the ability > >>>>>>> +# to use the Gradle build system to do so. It might be safer to use > >>>>>>> +# the source tree which would also enable proper SBOM generation > >>>>>>> +# through the bitbake build system. https://github.com/docbook/docbook > >>>>>>> +# > >>>>>>> > >>>>>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" > >>>>>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" > >>>>>>> +S = "${WORKDIR}" > >>>>>>> > >>>>>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" > >>>>>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" > >>>>>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" > >>>>>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" > >>>>>>> > >>>>>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" > >>>>>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" > >>>>>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" > >>>>>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" > >>>>>>> > >>>>>>> -inherit allarch > >>>>>>> -BBCLASSEXTEND = "native" > >>>>>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" > >>>>>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" > >>>>>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" > >>>>>>> + > >>>>>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" > >>>>>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" > >>>>>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" > >>>>>>> + > >>>>>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" > >>>>>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" > >>>>>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" > >>>>>>> + > >>>>>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>>>>> +SRC_URI += "file://LICENSE-OASIS" > >>>>>>> > >>>>>>> do_configure (){ > >>>>>>> : > >>>>>>> @@ -34,19 +58,19 @@ do_compile (){ > >>>>>>> : > >>>>>>> } > >>>>>>> > >>>>>>> +inherit xmlcatalog > >>>>>>> + > >>>>>>> do_install () { > >>>>>>> install -d ${D}${sysconfdir}/xml/ > >>>>>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>> > >>>>>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do > >>>>>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do > >>>>>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION > >>>>>>> install -d -m 755 ${D}$DEST > >>>>>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST > >>>>>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST > >>>>>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ > >>>>>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>> done > >>>>>>> } > >>>>>>> > >>>>>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" > >>>>>>> -inherit xmlcatalog > >>>>>>> - > >>>>>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" > >>>>>>> -- > >>>>>>> 2.34.1 > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >> -=-=-=-=-=-=-=-=-=-=-=- > >> Links: You receive all messages sent to this group. > >> View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 > >> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 > >> Group Owner: openembedded-core+owner@lists.openembedded.org > >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > >> -=-=-=-=-=-=-=-=-=-=-=- > >> >
I think doing this is out of scope of the bugfix. The latest-version check was not a constraint in the prior version. I suggest that we get the bug fixed and file another workitem for this particular ask. On 2/19/23 15:39, Alexander Kanavin wrote: > 412 can be specifically excluded as a 'bogus' version, examples exist > in oe-core. > > Version checks are used for manual upgrades too, as maintainers want > to be notified there's a new version, even if autoupgrade can't handle > it. We just need to know if there's a 4.x release newer than 4.5, and > that can be covered by the check. > > Alex > > On Sun, 19 Feb 2023 at 21:27, Richard Elberger <rich@richelberger.com> wrote: >> I have been working on it, but after a while I realized that this >> version upgrade will not work anyway - even for 4.x >> >> The reason is they have a folder named "412" which is actually 4.1.2 >> which I we probably still need to have in. >> >> Even though the tool cannot find 5.2 it still exits zero ... but still, >> it thinks that 412 > 5.2 >> >> I see one of two things a/ do not autoupgrade and somehow mark for >> manual cyclical update b/ somehow apply a map capability >> >> Also given that multiple versions must be delivered in the same version >> I don't think that this falls under typical autoupgrade scenario. >> >> What are your thoughts? >> >> On 2/19/23 13:54, Alexander Kanavin wrote: >>> If the check goes over https://docbook.org/xml/ I guess you can set >>> the regex to 4.x versions only, as the recipe name itself pins it to >>> 4.x. I'm not sure we're even going to need 5.x, ever. >>> You can grep for UPSTREAM_CHECK_REGEX in core for examples. >>> >>> Alex >>> >>> On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via >>> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> >>> wrote: >>>> It helps if you provide devtool's output. I think it's possible to >>>> exclude rc versions from the check with UPSTREAM_CHECK_REGEX. >>>> >>>> Alex >>>> >>>> On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: >>>>> I tried `devtool latest-version` and it failed on one version - 5.2 - >>>>> because it's still in RC. >>>>> >>>>> Note that there are massive breaking changes between Docbook 4x and 5x. >>>>> Given the defect I'm fixing is to change the upstream source - and not >>>>> refactor the entire recipe - I believe the scope should keep to that and >>>>> another defect filed for future versions. Please confirm this is >>>>> reasonable. >>>>> >>>>> I did the other beatification changes per style guide and will resubmit >>>>> once I get confirmation. >>>>> >>>>> On 2/19/23 12:31, Alexander Kanavin wrote: >>>>>> On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: >>>>>> >>>>>>> For multiple assignment: the reason is maintainability. The supported >>>>>>> versions will change over time. >>>>>> You can still place them in a newline-separated single assignment, >>>>>> which is a lot more readable as the list of fetched items is then in a >>>>>> single location in the recipe. >>>>>> This is how all recipes in oe-core are structured. >>>>>> >>>>>>> Please confirm if there are any other appreciations I must cover - I was >>>>>>> unaware of this one and would like to batch them. If the appreciations >>>>>>> are listed on a wiki please school me about that. >>>>>> For now I do not have any others. I'd like to see a v2 first, as v1 >>>>>> makes it hard to understand how the final recipe looks like with the >>>>>> multiple SRC_URI approach. We used to have a bot that points out >>>>>> common issues but it's unmaintained and falled into disrepair. >>>>>> >>>>>> There are numerous pages on the wiki collecting style and message tips: >>>>>> https://www.openembedded.org/wiki/Styleguide >>>>>> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines >>>>>> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded >>>>>> >>>>>> Alex >>>>>> >>>>>>> On 2/19/23 10:52, Alexander Kanavin wrote: >>>>>>>> Can you please set SRC_URI with a single assignment; there is no >>>>>>>> reason to += it multiple times. >>>>>>>> >>>>>>>> Verifying that 'devtool latest-version works' would be also appreciated. >>>>>>>> >>>>>>>> Alex >>>>>>>> >>>>>>>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: >>>>>>>>> --- >>>>>>>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- >>>>>>>>> 1 file changed, 49 insertions(+), 25 deletions(-) >>>>>>>>> >>>>>>>>> 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 2bec1442af..71aa8c14ec 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 >>>>>>>>> @@ -1,30 +1,54 @@ >>>>>>>>> SUMMARY = "Document type definitions for verification of XML data files" >>>>>>>>> DESCRIPTION = "Document type definitions for verification of XML data \ >>>>>>>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ >>>>>>>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ >>>>>>>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" >>>>>>>>> -HOMEPAGE = "http://www.docbook.org/xml/" >>>>>>>>> +files against the DocBook rule set." >>>>>>>>> +HOMEPAGE = "https://docbook.org" >>>>>>>>> >>>>>>>>> -LICENSE = "OASIS" >>>>>>>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>>>> +inherit allarch >>>>>>>>> +BBCLASSEXTEND = "native" >>>>>>>>> >>>>>>>>> -# Note: 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. >>>>>>>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ >>>>>>>>> - file://LICENSE-OASIS \ >>>>>>>>> - file://docbook-xml-update-catalog.xml.patch \ >>>>>>>>> -" >>>>>>>>> +# To support apps with xml schema backward compatibility, we must >>>>>>>>> +# install a set of schemas. Install the latest based on PV and then >>>>>>>>> +# name any specific versions as required. TODO: Figure out a mechanism >>>>>>>>> +# to filter exactly which versions are necessary, if that's even >>>>>>>>> +# possible. >>>>>>>>> +# >>>>>>>>> +# DocBook.org lists available packages at https://docbook.org/xml/ >>>>>>>>> +# >>>>>>>>> +# These packages are available as source but it requires the ability >>>>>>>>> +# to use the Gradle build system to do so. It might be safer to use >>>>>>>>> +# the source tree which would also enable proper SBOM generation >>>>>>>>> +# through the bitbake build system. https://github.com/docbook/docbook >>>>>>>>> +# >>>>>>>>> >>>>>>>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" >>>>>>>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" >>>>>>>>> +S = "${WORKDIR}" >>>>>>>>> >>>>>>>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" >>>>>>>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" >>>>>>>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" >>>>>>>>> >>>>>>>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" >>>>>>>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" >>>>>>>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" >>>>>>>>> >>>>>>>>> -inherit allarch >>>>>>>>> -BBCLASSEXTEND = "native" >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" >>>>>>>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" >>>>>>>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" >>>>>>>>> + >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" >>>>>>>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" >>>>>>>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" >>>>>>>>> + >>>>>>>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" >>>>>>>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" >>>>>>>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" >>>>>>>>> + >>>>>>>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>>>> +SRC_URI += "file://LICENSE-OASIS" >>>>>>>>> >>>>>>>>> do_configure (){ >>>>>>>>> : >>>>>>>>> @@ -34,19 +58,19 @@ do_compile (){ >>>>>>>>> : >>>>>>>>> } >>>>>>>>> >>>>>>>>> +inherit xmlcatalog >>>>>>>>> + >>>>>>>>> do_install () { >>>>>>>>> install -d ${D}${sysconfdir}/xml/ >>>>>>>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>> >>>>>>>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION >>>>>>>>> install -d -m 755 ${D}$DEST >>>>>>>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST >>>>>>>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST >>>>>>>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ >>>>>>>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>> done >>>>>>>>> } >>>>>>>>> >>>>>>>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" >>>>>>>>> -inherit xmlcatalog >>>>>>>>> - >>>>>>>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" >>>>>>>>> -- >>>>>>>>> 2.34.1 >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>> Links: You receive all messages sent to this group. >>>> View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 >>>> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 >>>> Group Owner: openembedded-core+owner@lists.openembedded.org >>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>
The version check is working fine with the existing recipe, and it will stop working with your patch. So you need to get it fixed. Alex On Sun, 19 Feb 2023 at 21:45, Richard Elberger <rich@richelberger.com> wrote: > > I think doing this is out of scope of the bugfix. The latest-version > check was not a constraint in the prior version. > > I suggest that we get the bug fixed and file another workitem for this > particular ask. > > On 2/19/23 15:39, Alexander Kanavin wrote: > > 412 can be specifically excluded as a 'bogus' version, examples exist > > in oe-core. > > > > Version checks are used for manual upgrades too, as maintainers want > > to be notified there's a new version, even if autoupgrade can't handle > > it. We just need to know if there's a 4.x release newer than 4.5, and > > that can be covered by the check. > > > > Alex > > > > On Sun, 19 Feb 2023 at 21:27, Richard Elberger <rich@richelberger.com> wrote: > >> I have been working on it, but after a while I realized that this > >> version upgrade will not work anyway - even for 4.x > >> > >> The reason is they have a folder named "412" which is actually 4.1.2 > >> which I we probably still need to have in. > >> > >> Even though the tool cannot find 5.2 it still exits zero ... but still, > >> it thinks that 412 > 5.2 > >> > >> I see one of two things a/ do not autoupgrade and somehow mark for > >> manual cyclical update b/ somehow apply a map capability > >> > >> Also given that multiple versions must be delivered in the same version > >> I don't think that this falls under typical autoupgrade scenario. > >> > >> What are your thoughts? > >> > >> On 2/19/23 13:54, Alexander Kanavin wrote: > >>> If the check goes over https://docbook.org/xml/ I guess you can set > >>> the regex to 4.x versions only, as the recipe name itself pins it to > >>> 4.x. I'm not sure we're even going to need 5.x, ever. > >>> You can grep for UPSTREAM_CHECK_REGEX in core for examples. > >>> > >>> Alex > >>> > >>> On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via > >>> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> > >>> wrote: > >>>> It helps if you provide devtool's output. I think it's possible to > >>>> exclude rc versions from the check with UPSTREAM_CHECK_REGEX. > >>>> > >>>> Alex > >>>> > >>>> On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: > >>>>> I tried `devtool latest-version` and it failed on one version - 5.2 - > >>>>> because it's still in RC. > >>>>> > >>>>> Note that there are massive breaking changes between Docbook 4x and 5x. > >>>>> Given the defect I'm fixing is to change the upstream source - and not > >>>>> refactor the entire recipe - I believe the scope should keep to that and > >>>>> another defect filed for future versions. Please confirm this is > >>>>> reasonable. > >>>>> > >>>>> I did the other beatification changes per style guide and will resubmit > >>>>> once I get confirmation. > >>>>> > >>>>> On 2/19/23 12:31, Alexander Kanavin wrote: > >>>>>> On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: > >>>>>> > >>>>>>> For multiple assignment: the reason is maintainability. The supported > >>>>>>> versions will change over time. > >>>>>> You can still place them in a newline-separated single assignment, > >>>>>> which is a lot more readable as the list of fetched items is then in a > >>>>>> single location in the recipe. > >>>>>> This is how all recipes in oe-core are structured. > >>>>>> > >>>>>>> Please confirm if there are any other appreciations I must cover - I was > >>>>>>> unaware of this one and would like to batch them. If the appreciations > >>>>>>> are listed on a wiki please school me about that. > >>>>>> For now I do not have any others. I'd like to see a v2 first, as v1 > >>>>>> makes it hard to understand how the final recipe looks like with the > >>>>>> multiple SRC_URI approach. We used to have a bot that points out > >>>>>> common issues but it's unmaintained and falled into disrepair. > >>>>>> > >>>>>> There are numerous pages on the wiki collecting style and message tips: > >>>>>> https://www.openembedded.org/wiki/Styleguide > >>>>>> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > >>>>>> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded > >>>>>> > >>>>>> Alex > >>>>>> > >>>>>>> On 2/19/23 10:52, Alexander Kanavin wrote: > >>>>>>>> Can you please set SRC_URI with a single assignment; there is no > >>>>>>>> reason to += it multiple times. > >>>>>>>> > >>>>>>>> Verifying that 'devtool latest-version works' would be also appreciated. > >>>>>>>> > >>>>>>>> Alex > >>>>>>>> > >>>>>>>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: > >>>>>>>>> --- > >>>>>>>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- > >>>>>>>>> 1 file changed, 49 insertions(+), 25 deletions(-) > >>>>>>>>> > >>>>>>>>> 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 2bec1442af..71aa8c14ec 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 > >>>>>>>>> @@ -1,30 +1,54 @@ > >>>>>>>>> SUMMARY = "Document type definitions for verification of XML data files" > >>>>>>>>> DESCRIPTION = "Document type definitions for verification of XML data \ > >>>>>>>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ > >>>>>>>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ > >>>>>>>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" > >>>>>>>>> -HOMEPAGE = "http://www.docbook.org/xml/" > >>>>>>>>> +files against the DocBook rule set." > >>>>>>>>> +HOMEPAGE = "https://docbook.org" > >>>>>>>>> > >>>>>>>>> -LICENSE = "OASIS" > >>>>>>>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>>>>>>> +inherit allarch > >>>>>>>>> +BBCLASSEXTEND = "native" > >>>>>>>>> > >>>>>>>>> -# Note: 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. > >>>>>>>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ > >>>>>>>>> - file://LICENSE-OASIS \ > >>>>>>>>> - file://docbook-xml-update-catalog.xml.patch \ > >>>>>>>>> -" > >>>>>>>>> +# To support apps with xml schema backward compatibility, we must > >>>>>>>>> +# install a set of schemas. Install the latest based on PV and then > >>>>>>>>> +# name any specific versions as required. TODO: Figure out a mechanism > >>>>>>>>> +# to filter exactly which versions are necessary, if that's even > >>>>>>>>> +# possible. > >>>>>>>>> +# > >>>>>>>>> +# DocBook.org lists available packages at https://docbook.org/xml/ > >>>>>>>>> +# > >>>>>>>>> +# These packages are available as source but it requires the ability > >>>>>>>>> +# to use the Gradle build system to do so. It might be safer to use > >>>>>>>>> +# the source tree which would also enable proper SBOM generation > >>>>>>>>> +# through the bitbake build system. https://github.com/docbook/docbook > >>>>>>>>> +# > >>>>>>>>> > >>>>>>>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" > >>>>>>>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" > >>>>>>>>> +S = "${WORKDIR}" > >>>>>>>>> > >>>>>>>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" > >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" > >>>>>>>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" > >>>>>>>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" > >>>>>>>>> > >>>>>>>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" > >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" > >>>>>>>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" > >>>>>>>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" > >>>>>>>>> > >>>>>>>>> -inherit allarch > >>>>>>>>> -BBCLASSEXTEND = "native" > >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" > >>>>>>>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" > >>>>>>>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" > >>>>>>>>> + > >>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" > >>>>>>>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" > >>>>>>>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" > >>>>>>>>> + > >>>>>>>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" > >>>>>>>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" > >>>>>>>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" > >>>>>>>>> + > >>>>>>>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>>>>>>> +SRC_URI += "file://LICENSE-OASIS" > >>>>>>>>> > >>>>>>>>> do_configure (){ > >>>>>>>>> : > >>>>>>>>> @@ -34,19 +58,19 @@ do_compile (){ > >>>>>>>>> : > >>>>>>>>> } > >>>>>>>>> > >>>>>>>>> +inherit xmlcatalog > >>>>>>>>> + > >>>>>>>>> do_install () { > >>>>>>>>> install -d ${D}${sysconfdir}/xml/ > >>>>>>>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>>>> > >>>>>>>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do > >>>>>>>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do > >>>>>>>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION > >>>>>>>>> install -d -m 755 ${D}$DEST > >>>>>>>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST > >>>>>>>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST > >>>>>>>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ > >>>>>>>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>>>> done > >>>>>>>>> } > >>>>>>>>> > >>>>>>>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" > >>>>>>>>> -inherit xmlcatalog > >>>>>>>>> - > >>>>>>>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" > >>>>>>>>> -- > >>>>>>>>> 2.34.1 > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> > >>>> -=-=-=-=-=-=-=-=-=-=-=- > >>>> Links: You receive all messages sent to this group. > >>>> View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 > >>>> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 > >>>> Group Owner: openembedded-core+owner@lists.openembedded.org > >>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > >>>> -=-=-=-=-=-=-=-=-=-=-=- > >>>> >
It is working --- and I don't see how the prior one could have been upgraded at all because it was a debian snapshot package rpcme@proteus:~/elinux/oe-core/meta/recipes-devtools$ devtool latest-version docbook-xml-dtd4 NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... (15:50:43.295558) Loading cache: 100% |############################################| Time: 0:00:00 Loaded 1692 entries from dependency cache. --2023-02-19 15:50:45-- https://docbook.org/xml/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 3929 (3.8K) [text/html] Saving to: ‘/tmp/wget-index-8i8d6pca/wget-listing-8wiusk7e’ 2023-02-19 15:50:45 (17.8 MB/s) - ‘/tmp/wget-index-8i8d6pca/wget-listing-8wiusk7e’ saved [3929/3929] --2023-02-19 15:50:45-- https://docbook.org/xml/4.1.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2092 (2.0K) [text/html] Saving to: ‘/tmp/wget-index-999ij1ye/wget-listing-_3t72jiq’ 2023-02-19 15:50:45 (15.1 MB/s) - ‘/tmp/wget-index-999ij1ye/wget-listing-_3t72jiq’ saved [2092/2092] --2023-02-19 15:50:45-- https://docbook.org/xml/4.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2154 (2.1K) [text/html] Saving to: ‘/tmp/wget-index-s2n3hz3o/wget-listing-_f4795l_’ 2023-02-19 15:50:45 (14.5 MB/s) - ‘/tmp/wget-index-s2n3hz3o/wget-listing-_f4795l_’ saved [2154/2154] --2023-02-19 15:50:45-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-raeil465/wget-listing-p6j4dk72’ 2023-02-19 15:50:45 (15.2 MB/s) - ‘/tmp/wget-index-raeil465/wget-listing-p6j4dk72’ saved [2202/2202] --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-3horis1c/wget-listing-fn4pbojo’ 2023-02-19 15:50:46 (14.8 MB/s) - ‘/tmp/wget-index-3horis1c/wget-listing-fn4pbojo’ saved [2202/2202] --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-dsnyvowx/wget-listing-uwt3tfa2’ 2023-02-19 15:50:46 (10.2 MB/s) - ‘/tmp/wget-index-dsnyvowx/wget-listing-uwt3tfa2’ saved [2202/2202] --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-x2f9ft64/wget-listing-vmk7cdck’ 2023-02-19 15:50:46 (15.9 MB/s) - ‘/tmp/wget-index-x2f9ft64/wget-listing-vmk7cdck’ saved [2202/2202] --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-b00vg6es/wget-listing-kgmlrhsa’ 2023-02-19 15:50:46 (15.5 MB/s) - ‘/tmp/wget-index-b00vg6es/wget-listing-kgmlrhsa’ saved [2202/2202] --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-5vc97isa/wget-listing-efpcncoh’ 2023-02-19 15:50:47 (15.0 MB/s) - ‘/tmp/wget-index-5vc97isa/wget-listing-efpcncoh’ saved [2202/2202] --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-xmml2m_y/wget-listing-bo6wqd4s’ 2023-02-19 15:50:47 (9.54 MB/s) - ‘/tmp/wget-index-xmml2m_y/wget-listing-bo6wqd4s’ saved [2202/2202] --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-am1fly7w/wget-listing-yqkw74hi’ 2023-02-19 15:50:47 (11.1 MB/s) - ‘/tmp/wget-index-am1fly7w/wget-listing-yqkw74hi’ saved [2202/2202] --2023-02-19 15:50:47-- https://docbook.org/xml/4.4/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-staj0ksp/wget-listing-_u2l4jwn’ 2023-02-19 15:50:48 (16.2 MB/s) - ‘/tmp/wget-index-staj0ksp/wget-listing-_u2l4jwn’ saved [2202/2202] --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-gwqtkhi_/wget-listing-jtlali9r’ 2023-02-19 15:50:48 (14.4 MB/s) - ‘/tmp/wget-index-gwqtkhi_/wget-listing-jtlali9r’ saved [2202/2202] --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-2rclefoo/wget-listing-k4gmz4vo’ 2023-02-19 15:50:48 (13.8 MB/s) - ‘/tmp/wget-index-2rclefoo/wget-listing-k4gmz4vo’ saved [2202/2202] --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-hm3mgyno/wget-listing-kzbcd0pc’ 2023-02-19 15:50:48 (3.01 MB/s) - ‘/tmp/wget-index-hm3mgyno/wget-listing-kzbcd0pc’ saved [2202/2202] --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-df5n44fh/wget-listing-rughmkj5’ 2023-02-19 15:50:49 (15.1 MB/s) - ‘/tmp/wget-index-df5n44fh/wget-listing-rughmkj5’ saved [2202/2202] --2023-02-19 15:50:49-- https://docbook.org/xml/4.4/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-73ik2ylt/wget-listing-sp6a189r’ 2023-02-19 15:50:49 (15.2 MB/s) - ‘/tmp/wget-index-73ik2ylt/wget-listing-sp6a189r’ saved [2202/2202] --2023-02-19 15:50:49-- https://docbook.org/xml/4.4/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2202 (2.2K) [text/html] Saving to: ‘/tmp/wget-index-n8427qqd/wget-listing-rp7w_iim’ 2023-02-19 15:50:49 (11.2 MB/s) - ‘/tmp/wget-index-n8427qqd/wget-listing-rp7w_iim’ saved [2202/2202] --2023-02-19 15:50:49-- https://docbook.org/xml/4.5/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2196 (2.1K) [text/html] Saving to: ‘/tmp/wget-index-7kg86ky5/wget-listing-pfq81o04’ 2023-02-19 15:50:49 (15.7 MB/s) - ‘/tmp/wget-index-7kg86ky5/wget-listing-pfq81o04’ saved [2196/2196] --2023-02-19 15:50:49-- https://docbook.org/xml/4.5/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2196 (2.1K) [text/html] Saving to: ‘/tmp/wget-index-5kcb1cwx/wget-listing-y4s7rbeb’ 2023-02-19 15:50:50 (14.7 MB/s) - ‘/tmp/wget-index-5kcb1cwx/wget-listing-y4s7rbeb’ saved [2196/2196] --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2196 (2.1K) [text/html] Saving to: ‘/tmp/wget-index-e9uiwezl/wget-listing-gaak4fjf’ 2023-02-19 15:50:50 (14.3 MB/s) - ‘/tmp/wget-index-e9uiwezl/wget-listing-gaak4fjf’ saved [2196/2196] --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2196 (2.1K) [text/html] Saving to: ‘/tmp/wget-index-ijwig4kk/wget-listing-ubz8ihck’ 2023-02-19 15:50:50 (13.9 MB/s) - ‘/tmp/wget-index-ijwig4kk/wget-listing-ubz8ihck’ saved [2196/2196] --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2196 (2.1K) [text/html] Saving to: ‘/tmp/wget-index-23wg3ce1/wget-listing-po35ctnw’ 2023-02-19 15:50:50 (10.7 MB/s) - ‘/tmp/wget-index-23wg3ce1/wget-listing-po35ctnw’ saved [2196/2196] --2023-02-19 15:50:50-- https://docbook.org/xml/5.0/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1935 (1.9K) [text/html] Saving to: ‘/tmp/wget-index-xbl8kski/wget-listing-lzoxc4q7’ 2023-02-19 15:50:51 (12.9 MB/s) - ‘/tmp/wget-index-xbl8kski/wget-listing-lzoxc4q7’ saved [1935/1935] --2023-02-19 15:50:51-- https://docbook.org/xml/5.0.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1879 (1.8K) [text/html] Saving to: ‘/tmp/wget-index-1witmxd3/wget-listing-7rjy2_0c’ 2023-02-19 15:50:51 (16.5 MB/s) - ‘/tmp/wget-index-1witmxd3/wget-listing-7rjy2_0c’ saved [1879/1879] --2023-02-19 15:50:51-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-95v7zmwh/wget-listing-o2ffmje6’ 2023-02-19 15:50:52 (9.94 MB/s) - ‘/tmp/wget-index-95v7zmwh/wget-listing-o2ffmje6’ saved [1670/1670] --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-j6t46pnp/wget-listing-234d878_’ 2023-02-19 15:50:52 (11.5 MB/s) - ‘/tmp/wget-index-j6t46pnp/wget-listing-234d878_’ saved [1670/1670] --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-g3qisiyq/wget-listing-c6dbllr4’ 2023-02-19 15:50:52 (7.47 MB/s) - ‘/tmp/wget-index-g3qisiyq/wget-listing-c6dbllr4’ saved [1670/1670] --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-x3___c7x/wget-listing-c5ect7a3’ 2023-02-19 15:50:52 (10.2 MB/s) - ‘/tmp/wget-index-x3___c7x/wget-listing-c5ect7a3’ saved [1670/1670] --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-p4qpvb0k/wget-listing-e47qjey4’ 2023-02-19 15:50:53 (10.6 MB/s) - ‘/tmp/wget-index-p4qpvb0k/wget-listing-e47qjey4’ saved [1670/1670] --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-7q9ewbfv/wget-listing-7uupe9yj’ 2023-02-19 15:50:53 (12.6 MB/s) - ‘/tmp/wget-index-7q9ewbfv/wget-listing-7uupe9yj’ saved [1670/1670] --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-608vlaw2/wget-listing-94cdcy4s’ 2023-02-19 15:50:53 (11.6 MB/s) - ‘/tmp/wget-index-608vlaw2/wget-listing-94cdcy4s’ saved [1670/1670] --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-7xlvffk3/wget-listing-t145lptl’ 2023-02-19 15:50:53 (11.7 MB/s) - ‘/tmp/wget-index-7xlvffk3/wget-listing-t145lptl’ saved [1670/1670] --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-xoc60_3a/wget-listing-6tj2x2b2’ 2023-02-19 15:50:53 (11.4 MB/s) - ‘/tmp/wget-index-xoc60_3a/wget-listing-6tj2x2b2’ saved [1670/1670] --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-c3ad8634/wget-listing-lif1thj_’ 2023-02-19 15:50:54 (10.2 MB/s) - ‘/tmp/wget-index-c3ad8634/wget-listing-lif1thj_’ saved [1670/1670] --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-w95mnrrr/wget-listing-3y2adbj2’ 2023-02-19 15:50:54 (11.5 MB/s) - ‘/tmp/wget-index-w95mnrrr/wget-listing-3y2adbj2’ saved [1670/1670] --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-q5kqy628/wget-listing-3puydl8g’ 2023-02-19 15:50:54 (10.2 MB/s) - ‘/tmp/wget-index-q5kqy628/wget-listing-3puydl8g’ saved [1670/1670] --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1670 (1.6K) [text/html] Saving to: ‘/tmp/wget-index-hb8by0i3/wget-listing-uag1u2jt’ 2023-02-19 15:50:54 (11.3 MB/s) - ‘/tmp/wget-index-hb8by0i3/wget-listing-uag1u2jt’ saved [1670/1670] --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:55 ERROR 404: Not Found. --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:55 ERROR 404: Not Found. --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:55 ERROR 404: Not Found. --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:55 ERROR 404: Not Found. --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:56 ERROR 404: Not Found. --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:56 ERROR 404: Not Found. --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:56 ERROR 404: Not Found. --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-02-19 15:50:56 ERROR 404: Not Found. INFO: Current version: 4.5 INFO: Latest version: 412 rpcme@proteus:~/elinux/oe-core/meta/recipes-devtools$ echo $? 0 On 2/19/23 15:47, Alexander Kanavin wrote: > The version check is working fine with the existing recipe, and it > will stop working with your patch. So you need to get it fixed. > > Alex > > On Sun, 19 Feb 2023 at 21:45, Richard Elberger <rich@richelberger.com> wrote: >> I think doing this is out of scope of the bugfix. The latest-version >> check was not a constraint in the prior version. >> >> I suggest that we get the bug fixed and file another workitem for this >> particular ask. >> >> On 2/19/23 15:39, Alexander Kanavin wrote: >>> 412 can be specifically excluded as a 'bogus' version, examples exist >>> in oe-core. >>> >>> Version checks are used for manual upgrades too, as maintainers want >>> to be notified there's a new version, even if autoupgrade can't handle >>> it. We just need to know if there's a 4.x release newer than 4.5, and >>> that can be covered by the check. >>> >>> Alex >>> >>> On Sun, 19 Feb 2023 at 21:27, Richard Elberger <rich@richelberger.com> wrote: >>>> I have been working on it, but after a while I realized that this >>>> version upgrade will not work anyway - even for 4.x >>>> >>>> The reason is they have a folder named "412" which is actually 4.1.2 >>>> which I we probably still need to have in. >>>> >>>> Even though the tool cannot find 5.2 it still exits zero ... but still, >>>> it thinks that 412 > 5.2 >>>> >>>> I see one of two things a/ do not autoupgrade and somehow mark for >>>> manual cyclical update b/ somehow apply a map capability >>>> >>>> Also given that multiple versions must be delivered in the same version >>>> I don't think that this falls under typical autoupgrade scenario. >>>> >>>> What are your thoughts? >>>> >>>> On 2/19/23 13:54, Alexander Kanavin wrote: >>>>> If the check goes over https://docbook.org/xml/ I guess you can set >>>>> the regex to 4.x versions only, as the recipe name itself pins it to >>>>> 4.x. I'm not sure we're even going to need 5.x, ever. >>>>> You can grep for UPSTREAM_CHECK_REGEX in core for examples. >>>>> >>>>> Alex >>>>> >>>>> On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via >>>>> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> >>>>> wrote: >>>>>> It helps if you provide devtool's output. I think it's possible to >>>>>> exclude rc versions from the check with UPSTREAM_CHECK_REGEX. >>>>>> >>>>>> Alex >>>>>> >>>>>> On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: >>>>>>> I tried `devtool latest-version` and it failed on one version - 5.2 - >>>>>>> because it's still in RC. >>>>>>> >>>>>>> Note that there are massive breaking changes between Docbook 4x and 5x. >>>>>>> Given the defect I'm fixing is to change the upstream source - and not >>>>>>> refactor the entire recipe - I believe the scope should keep to that and >>>>>>> another defect filed for future versions. Please confirm this is >>>>>>> reasonable. >>>>>>> >>>>>>> I did the other beatification changes per style guide and will resubmit >>>>>>> once I get confirmation. >>>>>>> >>>>>>> On 2/19/23 12:31, Alexander Kanavin wrote: >>>>>>>> On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: >>>>>>>> >>>>>>>>> For multiple assignment: the reason is maintainability. The supported >>>>>>>>> versions will change over time. >>>>>>>> You can still place them in a newline-separated single assignment, >>>>>>>> which is a lot more readable as the list of fetched items is then in a >>>>>>>> single location in the recipe. >>>>>>>> This is how all recipes in oe-core are structured. >>>>>>>> >>>>>>>>> Please confirm if there are any other appreciations I must cover - I was >>>>>>>>> unaware of this one and would like to batch them. If the appreciations >>>>>>>>> are listed on a wiki please school me about that. >>>>>>>> For now I do not have any others. I'd like to see a v2 first, as v1 >>>>>>>> makes it hard to understand how the final recipe looks like with the >>>>>>>> multiple SRC_URI approach. We used to have a bot that points out >>>>>>>> common issues but it's unmaintained and falled into disrepair. >>>>>>>> >>>>>>>> There are numerous pages on the wiki collecting style and message tips: >>>>>>>> https://www.openembedded.org/wiki/Styleguide >>>>>>>> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines >>>>>>>> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded >>>>>>>> >>>>>>>> Alex >>>>>>>> >>>>>>>>> On 2/19/23 10:52, Alexander Kanavin wrote: >>>>>>>>>> Can you please set SRC_URI with a single assignment; there is no >>>>>>>>>> reason to += it multiple times. >>>>>>>>>> >>>>>>>>>> Verifying that 'devtool latest-version works' would be also appreciated. >>>>>>>>>> >>>>>>>>>> Alex >>>>>>>>>> >>>>>>>>>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: >>>>>>>>>>> --- >>>>>>>>>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- >>>>>>>>>>> 1 file changed, 49 insertions(+), 25 deletions(-) >>>>>>>>>>> >>>>>>>>>>> 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 2bec1442af..71aa8c14ec 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 >>>>>>>>>>> @@ -1,30 +1,54 @@ >>>>>>>>>>> SUMMARY = "Document type definitions for verification of XML data files" >>>>>>>>>>> DESCRIPTION = "Document type definitions for verification of XML data \ >>>>>>>>>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ >>>>>>>>>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ >>>>>>>>>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" >>>>>>>>>>> -HOMEPAGE = "http://www.docbook.org/xml/" >>>>>>>>>>> +files against the DocBook rule set." >>>>>>>>>>> +HOMEPAGE = "https://docbook.org" >>>>>>>>>>> >>>>>>>>>>> -LICENSE = "OASIS" >>>>>>>>>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>>>>>> +inherit allarch >>>>>>>>>>> +BBCLASSEXTEND = "native" >>>>>>>>>>> >>>>>>>>>>> -# Note: 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. >>>>>>>>>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ >>>>>>>>>>> - file://LICENSE-OASIS \ >>>>>>>>>>> - file://docbook-xml-update-catalog.xml.patch \ >>>>>>>>>>> -" >>>>>>>>>>> +# To support apps with xml schema backward compatibility, we must >>>>>>>>>>> +# install a set of schemas. Install the latest based on PV and then >>>>>>>>>>> +# name any specific versions as required. TODO: Figure out a mechanism >>>>>>>>>>> +# to filter exactly which versions are necessary, if that's even >>>>>>>>>>> +# possible. >>>>>>>>>>> +# >>>>>>>>>>> +# DocBook.org lists available packages at https://docbook.org/xml/ >>>>>>>>>>> +# >>>>>>>>>>> +# These packages are available as source but it requires the ability >>>>>>>>>>> +# to use the Gradle build system to do so. It might be safer to use >>>>>>>>>>> +# the source tree which would also enable proper SBOM generation >>>>>>>>>>> +# through the bitbake build system. https://github.com/docbook/docbook >>>>>>>>>>> +# >>>>>>>>>>> >>>>>>>>>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" >>>>>>>>>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" >>>>>>>>>>> +S = "${WORKDIR}" >>>>>>>>>>> >>>>>>>>>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" >>>>>>>>>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" >>>>>>>>>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" >>>>>>>>>>> >>>>>>>>>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" >>>>>>>>>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" >>>>>>>>>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" >>>>>>>>>>> >>>>>>>>>>> -inherit allarch >>>>>>>>>>> -BBCLASSEXTEND = "native" >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" >>>>>>>>>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" >>>>>>>>>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" >>>>>>>>>>> + >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" >>>>>>>>>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" >>>>>>>>>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" >>>>>>>>>>> + >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" >>>>>>>>>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" >>>>>>>>>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" >>>>>>>>>>> + >>>>>>>>>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>>>>>> +SRC_URI += "file://LICENSE-OASIS" >>>>>>>>>>> >>>>>>>>>>> do_configure (){ >>>>>>>>>>> : >>>>>>>>>>> @@ -34,19 +58,19 @@ do_compile (){ >>>>>>>>>>> : >>>>>>>>>>> } >>>>>>>>>>> >>>>>>>>>>> +inherit xmlcatalog >>>>>>>>>>> + >>>>>>>>>>> do_install () { >>>>>>>>>>> install -d ${D}${sysconfdir}/xml/ >>>>>>>>>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>>>> >>>>>>>>>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>>>>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>>>>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION >>>>>>>>>>> install -d -m 755 ${D}$DEST >>>>>>>>>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST >>>>>>>>>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST >>>>>>>>>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ >>>>>>>>>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>>>> done >>>>>>>>>>> } >>>>>>>>>>> >>>>>>>>>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" >>>>>>>>>>> -inherit xmlcatalog >>>>>>>>>>> - >>>>>>>>>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" >>>>>>>>>>> -- >>>>>>>>>>> 2.34.1 >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>>> Links: You receive all messages sent to this group. >>>>>> View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 >>>>>> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 >>>>>> Group Owner: openembedded-core+owner@lists.openembedded.org >>>>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] >>>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>>>
On Sun, 19 Feb 2023 at 21:51, Richard Elberger <rich@richelberger.com> wrote: > > It is working --- and I don't see how the prior one could have been > upgraded at all because it was a debian snapshot package ... > INFO: Current version: 4.5 > INFO: Latest version: 412 It's not working. 412 is a bogus version and needs to be excluded in the version check regex. It would take you less time to fix the issue than to argue that it's ok to break the check. Existing recipe on the other hand does report the latest version correctly, as it takes the tarball from a debian snapshot, but performs the check against the latest debian source: (note that it goes to http://ftp.debian.org/debian/pool/main/d/docbook-xml/ as set by UPSTREAM_CHECK_URI and not to the snapshot directory) alex@Zen2:/srv/work/alex/poky/build-64-alt$ devtool latest-version docbook-xml-dtd4 NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... (21:56:33.306884) Loading cache: 100% |###############################################################################################################################################################################| Time: 0:00:00 Loaded 1693 entries from dependency cache. --2023-02-19 21:56:35-- http://ftp.debian.org/debian/pool/main/d/docbook-xml/ Resolving ftp.debian.org (ftp.debian.org)... 146.75.118.132, 2a04:4e42:8d::644 Connecting to ftp.debian.org (ftp.debian.org)|146.75.118.132|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 3564 (3.5K) [text/html] Saving to: ‘/tmp/wget-index-9yjbq8kv/wget-listing-h7mcuzb7’ 2023-02-19 21:56:35 (17.3 MB/s) - ‘/tmp/wget-index-9yjbq8kv/wget-listing-h7mcuzb7’ saved [3564/3564] INFO: Current version: 4.5 INFO: Latest version: 4.5 As I said, version checks aren't just for automated updates; if auto-upgrader can't do it, at least it will send a notice that a new version is available for a manual update. Alex
Smth. like UPSTREAM_CHECK_REGEX = "docbook-xml-(?P<pver>4(\.\d+)+)\.zip" will probably work. Alex On Sun, 19 Feb 2023 at 21:51, Richard Elberger <rich@richelberger.com> wrote: > > It is working --- and I don't see how the prior one could have been > upgraded at all because it was a debian snapshot package > > > rpcme@proteus:~/elinux/oe-core/meta/recipes-devtools$ devtool > latest-version docbook-xml-dtd4 > NOTE: Starting bitbake server... > NOTE: Reconnecting to bitbake server... > NOTE: Retrying server connection (#1)... (15:50:43.295558) > Loading cache: 100% |############################################| Time: > 0:00:00 > Loaded 1692 entries from dependency cache. > --2023-02-19 15:50:45-- https://docbook.org/xml/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 3929 (3.8K) [text/html] > Saving to: ‘/tmp/wget-index-8i8d6pca/wget-listing-8wiusk7e’ > > > 2023-02-19 15:50:45 (17.8 MB/s) - > ‘/tmp/wget-index-8i8d6pca/wget-listing-8wiusk7e’ saved [3929/3929] > > --2023-02-19 15:50:45-- https://docbook.org/xml/4.1.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2092 (2.0K) [text/html] > Saving to: ‘/tmp/wget-index-999ij1ye/wget-listing-_3t72jiq’ > > > 2023-02-19 15:50:45 (15.1 MB/s) - > ‘/tmp/wget-index-999ij1ye/wget-listing-_3t72jiq’ saved [2092/2092] > > --2023-02-19 15:50:45-- https://docbook.org/xml/4.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2154 (2.1K) [text/html] > Saving to: ‘/tmp/wget-index-s2n3hz3o/wget-listing-_f4795l_’ > > > 2023-02-19 15:50:45 (14.5 MB/s) - > ‘/tmp/wget-index-s2n3hz3o/wget-listing-_f4795l_’ saved [2154/2154] > > --2023-02-19 15:50:45-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-raeil465/wget-listing-p6j4dk72’ > > > 2023-02-19 15:50:45 (15.2 MB/s) - > ‘/tmp/wget-index-raeil465/wget-listing-p6j4dk72’ saved [2202/2202] > > --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-3horis1c/wget-listing-fn4pbojo’ > > > 2023-02-19 15:50:46 (14.8 MB/s) - > ‘/tmp/wget-index-3horis1c/wget-listing-fn4pbojo’ saved [2202/2202] > > --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-dsnyvowx/wget-listing-uwt3tfa2’ > > > 2023-02-19 15:50:46 (10.2 MB/s) - > ‘/tmp/wget-index-dsnyvowx/wget-listing-uwt3tfa2’ saved [2202/2202] > > --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-x2f9ft64/wget-listing-vmk7cdck’ > > > 2023-02-19 15:50:46 (15.9 MB/s) - > ‘/tmp/wget-index-x2f9ft64/wget-listing-vmk7cdck’ saved [2202/2202] > > --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-b00vg6es/wget-listing-kgmlrhsa’ > > > 2023-02-19 15:50:46 (15.5 MB/s) - > ‘/tmp/wget-index-b00vg6es/wget-listing-kgmlrhsa’ saved [2202/2202] > > --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-5vc97isa/wget-listing-efpcncoh’ > > > 2023-02-19 15:50:47 (15.0 MB/s) - > ‘/tmp/wget-index-5vc97isa/wget-listing-efpcncoh’ saved [2202/2202] > > --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-xmml2m_y/wget-listing-bo6wqd4s’ > > > 2023-02-19 15:50:47 (9.54 MB/s) - > ‘/tmp/wget-index-xmml2m_y/wget-listing-bo6wqd4s’ saved [2202/2202] > > --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-am1fly7w/wget-listing-yqkw74hi’ > > > 2023-02-19 15:50:47 (11.1 MB/s) - > ‘/tmp/wget-index-am1fly7w/wget-listing-yqkw74hi’ saved [2202/2202] > > --2023-02-19 15:50:47-- https://docbook.org/xml/4.4/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-staj0ksp/wget-listing-_u2l4jwn’ > > > 2023-02-19 15:50:48 (16.2 MB/s) - > ‘/tmp/wget-index-staj0ksp/wget-listing-_u2l4jwn’ saved [2202/2202] > > --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-gwqtkhi_/wget-listing-jtlali9r’ > > > 2023-02-19 15:50:48 (14.4 MB/s) - > ‘/tmp/wget-index-gwqtkhi_/wget-listing-jtlali9r’ saved [2202/2202] > > --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-2rclefoo/wget-listing-k4gmz4vo’ > > > 2023-02-19 15:50:48 (13.8 MB/s) - > ‘/tmp/wget-index-2rclefoo/wget-listing-k4gmz4vo’ saved [2202/2202] > > --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-hm3mgyno/wget-listing-kzbcd0pc’ > > > 2023-02-19 15:50:48 (3.01 MB/s) - > ‘/tmp/wget-index-hm3mgyno/wget-listing-kzbcd0pc’ saved [2202/2202] > > --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-df5n44fh/wget-listing-rughmkj5’ > > > 2023-02-19 15:50:49 (15.1 MB/s) - > ‘/tmp/wget-index-df5n44fh/wget-listing-rughmkj5’ saved [2202/2202] > > --2023-02-19 15:50:49-- https://docbook.org/xml/4.4/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-73ik2ylt/wget-listing-sp6a189r’ > > > 2023-02-19 15:50:49 (15.2 MB/s) - > ‘/tmp/wget-index-73ik2ylt/wget-listing-sp6a189r’ saved [2202/2202] > > --2023-02-19 15:50:49-- https://docbook.org/xml/4.4/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2202 (2.2K) [text/html] > Saving to: ‘/tmp/wget-index-n8427qqd/wget-listing-rp7w_iim’ > > > 2023-02-19 15:50:49 (11.2 MB/s) - > ‘/tmp/wget-index-n8427qqd/wget-listing-rp7w_iim’ saved [2202/2202] > > --2023-02-19 15:50:49-- https://docbook.org/xml/4.5/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2196 (2.1K) [text/html] > Saving to: ‘/tmp/wget-index-7kg86ky5/wget-listing-pfq81o04’ > > > 2023-02-19 15:50:49 (15.7 MB/s) - > ‘/tmp/wget-index-7kg86ky5/wget-listing-pfq81o04’ saved [2196/2196] > > --2023-02-19 15:50:49-- https://docbook.org/xml/4.5/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2196 (2.1K) [text/html] > Saving to: ‘/tmp/wget-index-5kcb1cwx/wget-listing-y4s7rbeb’ > > > 2023-02-19 15:50:50 (14.7 MB/s) - > ‘/tmp/wget-index-5kcb1cwx/wget-listing-y4s7rbeb’ saved [2196/2196] > > --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2196 (2.1K) [text/html] > Saving to: ‘/tmp/wget-index-e9uiwezl/wget-listing-gaak4fjf’ > > > 2023-02-19 15:50:50 (14.3 MB/s) - > ‘/tmp/wget-index-e9uiwezl/wget-listing-gaak4fjf’ saved [2196/2196] > > --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2196 (2.1K) [text/html] > Saving to: ‘/tmp/wget-index-ijwig4kk/wget-listing-ubz8ihck’ > > > 2023-02-19 15:50:50 (13.9 MB/s) - > ‘/tmp/wget-index-ijwig4kk/wget-listing-ubz8ihck’ saved [2196/2196] > > --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2196 (2.1K) [text/html] > Saving to: ‘/tmp/wget-index-23wg3ce1/wget-listing-po35ctnw’ > > > 2023-02-19 15:50:50 (10.7 MB/s) - > ‘/tmp/wget-index-23wg3ce1/wget-listing-po35ctnw’ saved [2196/2196] > > --2023-02-19 15:50:50-- https://docbook.org/xml/5.0/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1935 (1.9K) [text/html] > Saving to: ‘/tmp/wget-index-xbl8kski/wget-listing-lzoxc4q7’ > > > 2023-02-19 15:50:51 (12.9 MB/s) - > ‘/tmp/wget-index-xbl8kski/wget-listing-lzoxc4q7’ saved [1935/1935] > > --2023-02-19 15:50:51-- https://docbook.org/xml/5.0.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1879 (1.8K) [text/html] > Saving to: ‘/tmp/wget-index-1witmxd3/wget-listing-7rjy2_0c’ > > > 2023-02-19 15:50:51 (16.5 MB/s) - > ‘/tmp/wget-index-1witmxd3/wget-listing-7rjy2_0c’ saved [1879/1879] > > --2023-02-19 15:50:51-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-95v7zmwh/wget-listing-o2ffmje6’ > > > 2023-02-19 15:50:52 (9.94 MB/s) - > ‘/tmp/wget-index-95v7zmwh/wget-listing-o2ffmje6’ saved [1670/1670] > > --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-j6t46pnp/wget-listing-234d878_’ > > > 2023-02-19 15:50:52 (11.5 MB/s) - > ‘/tmp/wget-index-j6t46pnp/wget-listing-234d878_’ saved [1670/1670] > > --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-g3qisiyq/wget-listing-c6dbllr4’ > > > 2023-02-19 15:50:52 (7.47 MB/s) - > ‘/tmp/wget-index-g3qisiyq/wget-listing-c6dbllr4’ saved [1670/1670] > > --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-x3___c7x/wget-listing-c5ect7a3’ > > > 2023-02-19 15:50:52 (10.2 MB/s) - > ‘/tmp/wget-index-x3___c7x/wget-listing-c5ect7a3’ saved [1670/1670] > > --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-p4qpvb0k/wget-listing-e47qjey4’ > > > 2023-02-19 15:50:53 (10.6 MB/s) - > ‘/tmp/wget-index-p4qpvb0k/wget-listing-e47qjey4’ saved [1670/1670] > > --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-7q9ewbfv/wget-listing-7uupe9yj’ > > > 2023-02-19 15:50:53 (12.6 MB/s) - > ‘/tmp/wget-index-7q9ewbfv/wget-listing-7uupe9yj’ saved [1670/1670] > > --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-608vlaw2/wget-listing-94cdcy4s’ > > > 2023-02-19 15:50:53 (11.6 MB/s) - > ‘/tmp/wget-index-608vlaw2/wget-listing-94cdcy4s’ saved [1670/1670] > > --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-7xlvffk3/wget-listing-t145lptl’ > > > 2023-02-19 15:50:53 (11.7 MB/s) - > ‘/tmp/wget-index-7xlvffk3/wget-listing-t145lptl’ saved [1670/1670] > > --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-xoc60_3a/wget-listing-6tj2x2b2’ > > > 2023-02-19 15:50:53 (11.4 MB/s) - > ‘/tmp/wget-index-xoc60_3a/wget-listing-6tj2x2b2’ saved [1670/1670] > > --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-c3ad8634/wget-listing-lif1thj_’ > > > 2023-02-19 15:50:54 (10.2 MB/s) - > ‘/tmp/wget-index-c3ad8634/wget-listing-lif1thj_’ saved [1670/1670] > > --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-w95mnrrr/wget-listing-3y2adbj2’ > > > 2023-02-19 15:50:54 (11.5 MB/s) - > ‘/tmp/wget-index-w95mnrrr/wget-listing-3y2adbj2’ saved [1670/1670] > > --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-q5kqy628/wget-listing-3puydl8g’ > > > 2023-02-19 15:50:54 (10.2 MB/s) - > ‘/tmp/wget-index-q5kqy628/wget-listing-3puydl8g’ saved [1670/1670] > > --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1670 (1.6K) [text/html] > Saving to: ‘/tmp/wget-index-hb8by0i3/wget-listing-uag1u2jt’ > > > 2023-02-19 15:50:54 (11.3 MB/s) - > ‘/tmp/wget-index-hb8by0i3/wget-listing-uag1u2jt’ saved [1670/1670] > > --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:55 ERROR 404: Not Found. > > --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:55 ERROR 404: Not Found. > > --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:55 ERROR 404: Not Found. > > --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:55 ERROR 404: Not Found. > > --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:56 ERROR 404: Not Found. > > --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:56 ERROR 404: Not Found. > > --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:56 ERROR 404: Not Found. > > --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ > Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 > Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. > HTTP request sent, awaiting response... 404 Not Found > 2023-02-19 15:50:56 ERROR 404: Not Found. > > INFO: Current version: 4.5 > INFO: Latest version: 412 > rpcme@proteus:~/elinux/oe-core/meta/recipes-devtools$ echo $? > 0 > > > On 2/19/23 15:47, Alexander Kanavin wrote: > > The version check is working fine with the existing recipe, and it > > will stop working with your patch. So you need to get it fixed. > > > > Alex > > > > On Sun, 19 Feb 2023 at 21:45, Richard Elberger <rich@richelberger.com> wrote: > >> I think doing this is out of scope of the bugfix. The latest-version > >> check was not a constraint in the prior version. > >> > >> I suggest that we get the bug fixed and file another workitem for this > >> particular ask. > >> > >> On 2/19/23 15:39, Alexander Kanavin wrote: > >>> 412 can be specifically excluded as a 'bogus' version, examples exist > >>> in oe-core. > >>> > >>> Version checks are used for manual upgrades too, as maintainers want > >>> to be notified there's a new version, even if autoupgrade can't handle > >>> it. We just need to know if there's a 4.x release newer than 4.5, and > >>> that can be covered by the check. > >>> > >>> Alex > >>> > >>> On Sun, 19 Feb 2023 at 21:27, Richard Elberger <rich@richelberger.com> wrote: > >>>> I have been working on it, but after a while I realized that this > >>>> version upgrade will not work anyway - even for 4.x > >>>> > >>>> The reason is they have a folder named "412" which is actually 4.1.2 > >>>> which I we probably still need to have in. > >>>> > >>>> Even though the tool cannot find 5.2 it still exits zero ... but still, > >>>> it thinks that 412 > 5.2 > >>>> > >>>> I see one of two things a/ do not autoupgrade and somehow mark for > >>>> manual cyclical update b/ somehow apply a map capability > >>>> > >>>> Also given that multiple versions must be delivered in the same version > >>>> I don't think that this falls under typical autoupgrade scenario. > >>>> > >>>> What are your thoughts? > >>>> > >>>> On 2/19/23 13:54, Alexander Kanavin wrote: > >>>>> If the check goes over https://docbook.org/xml/ I guess you can set > >>>>> the regex to 4.x versions only, as the recipe name itself pins it to > >>>>> 4.x. I'm not sure we're even going to need 5.x, ever. > >>>>> You can grep for UPSTREAM_CHECK_REGEX in core for examples. > >>>>> > >>>>> Alex > >>>>> > >>>>> On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via > >>>>> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> > >>>>> wrote: > >>>>>> It helps if you provide devtool's output. I think it's possible to > >>>>>> exclude rc versions from the check with UPSTREAM_CHECK_REGEX. > >>>>>> > >>>>>> Alex > >>>>>> > >>>>>> On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: > >>>>>>> I tried `devtool latest-version` and it failed on one version - 5.2 - > >>>>>>> because it's still in RC. > >>>>>>> > >>>>>>> Note that there are massive breaking changes between Docbook 4x and 5x. > >>>>>>> Given the defect I'm fixing is to change the upstream source - and not > >>>>>>> refactor the entire recipe - I believe the scope should keep to that and > >>>>>>> another defect filed for future versions. Please confirm this is > >>>>>>> reasonable. > >>>>>>> > >>>>>>> I did the other beatification changes per style guide and will resubmit > >>>>>>> once I get confirmation. > >>>>>>> > >>>>>>> On 2/19/23 12:31, Alexander Kanavin wrote: > >>>>>>>> On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: > >>>>>>>> > >>>>>>>>> For multiple assignment: the reason is maintainability. The supported > >>>>>>>>> versions will change over time. > >>>>>>>> You can still place them in a newline-separated single assignment, > >>>>>>>> which is a lot more readable as the list of fetched items is then in a > >>>>>>>> single location in the recipe. > >>>>>>>> This is how all recipes in oe-core are structured. > >>>>>>>> > >>>>>>>>> Please confirm if there are any other appreciations I must cover - I was > >>>>>>>>> unaware of this one and would like to batch them. If the appreciations > >>>>>>>>> are listed on a wiki please school me about that. > >>>>>>>> For now I do not have any others. I'd like to see a v2 first, as v1 > >>>>>>>> makes it hard to understand how the final recipe looks like with the > >>>>>>>> multiple SRC_URI approach. We used to have a bot that points out > >>>>>>>> common issues but it's unmaintained and falled into disrepair. > >>>>>>>> > >>>>>>>> There are numerous pages on the wiki collecting style and message tips: > >>>>>>>> https://www.openembedded.org/wiki/Styleguide > >>>>>>>> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > >>>>>>>> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded > >>>>>>>> > >>>>>>>> Alex > >>>>>>>> > >>>>>>>>> On 2/19/23 10:52, Alexander Kanavin wrote: > >>>>>>>>>> Can you please set SRC_URI with a single assignment; there is no > >>>>>>>>>> reason to += it multiple times. > >>>>>>>>>> > >>>>>>>>>> Verifying that 'devtool latest-version works' would be also appreciated. > >>>>>>>>>> > >>>>>>>>>> Alex > >>>>>>>>>> > >>>>>>>>>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: > >>>>>>>>>>> --- > >>>>>>>>>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- > >>>>>>>>>>> 1 file changed, 49 insertions(+), 25 deletions(-) > >>>>>>>>>>> > >>>>>>>>>>> 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 2bec1442af..71aa8c14ec 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 > >>>>>>>>>>> @@ -1,30 +1,54 @@ > >>>>>>>>>>> SUMMARY = "Document type definitions for verification of XML data files" > >>>>>>>>>>> DESCRIPTION = "Document type definitions for verification of XML data \ > >>>>>>>>>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ > >>>>>>>>>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ > >>>>>>>>>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" > >>>>>>>>>>> -HOMEPAGE = "http://www.docbook.org/xml/" > >>>>>>>>>>> +files against the DocBook rule set." > >>>>>>>>>>> +HOMEPAGE = "https://docbook.org" > >>>>>>>>>>> > >>>>>>>>>>> -LICENSE = "OASIS" > >>>>>>>>>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>>>>>>>>> +inherit allarch > >>>>>>>>>>> +BBCLASSEXTEND = "native" > >>>>>>>>>>> > >>>>>>>>>>> -# Note: 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. > >>>>>>>>>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ > >>>>>>>>>>> - file://LICENSE-OASIS \ > >>>>>>>>>>> - file://docbook-xml-update-catalog.xml.patch \ > >>>>>>>>>>> -" > >>>>>>>>>>> +# To support apps with xml schema backward compatibility, we must > >>>>>>>>>>> +# install a set of schemas. Install the latest based on PV and then > >>>>>>>>>>> +# name any specific versions as required. TODO: Figure out a mechanism > >>>>>>>>>>> +# to filter exactly which versions are necessary, if that's even > >>>>>>>>>>> +# possible. > >>>>>>>>>>> +# > >>>>>>>>>>> +# DocBook.org lists available packages at https://docbook.org/xml/ > >>>>>>>>>>> +# > >>>>>>>>>>> +# These packages are available as source but it requires the ability > >>>>>>>>>>> +# to use the Gradle build system to do so. It might be safer to use > >>>>>>>>>>> +# the source tree which would also enable proper SBOM generation > >>>>>>>>>>> +# through the bitbake build system. https://github.com/docbook/docbook > >>>>>>>>>>> +# > >>>>>>>>>>> > >>>>>>>>>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" > >>>>>>>>>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" > >>>>>>>>>>> +S = "${WORKDIR}" > >>>>>>>>>>> > >>>>>>>>>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" > >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" > >>>>>>>>>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" > >>>>>>>>>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" > >>>>>>>>>>> > >>>>>>>>>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" > >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" > >>>>>>>>>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" > >>>>>>>>>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" > >>>>>>>>>>> > >>>>>>>>>>> -inherit allarch > >>>>>>>>>>> -BBCLASSEXTEND = "native" > >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" > >>>>>>>>>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" > >>>>>>>>>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" > >>>>>>>>>>> + > >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" > >>>>>>>>>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" > >>>>>>>>>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" > >>>>>>>>>>> + > >>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" > >>>>>>>>>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" > >>>>>>>>>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" > >>>>>>>>>>> + > >>>>>>>>>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > >>>>>>>>>>> +SRC_URI += "file://LICENSE-OASIS" > >>>>>>>>>>> > >>>>>>>>>>> do_configure (){ > >>>>>>>>>>> : > >>>>>>>>>>> @@ -34,19 +58,19 @@ do_compile (){ > >>>>>>>>>>> : > >>>>>>>>>>> } > >>>>>>>>>>> > >>>>>>>>>>> +inherit xmlcatalog > >>>>>>>>>>> + > >>>>>>>>>>> do_install () { > >>>>>>>>>>> install -d ${D}${sysconfdir}/xml/ > >>>>>>>>>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>>>>>> > >>>>>>>>>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do > >>>>>>>>>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do > >>>>>>>>>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION > >>>>>>>>>>> install -d -m 755 ${D}$DEST > >>>>>>>>>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST > >>>>>>>>>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>>>>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST > >>>>>>>>>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ > >>>>>>>>>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml > >>>>>>>>>>> done > >>>>>>>>>>> } > >>>>>>>>>>> > >>>>>>>>>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" > >>>>>>>>>>> -inherit xmlcatalog > >>>>>>>>>>> - > >>>>>>>>>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" > >>>>>>>>>>> -- > >>>>>>>>>>> 2.34.1 > >>>>>>>>>>> > >>>>>>>>>>> > >>>>>>>>>>> > >>>>>>>>>>> > >>>>>>>>>>> > >>>>>> -=-=-=-=-=-=-=-=-=-=-=- > >>>>>> Links: You receive all messages sent to this group. > >>>>>> View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 > >>>>>> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 > >>>>>> Group Owner: openembedded-core+owner@lists.openembedded.org > >>>>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > >>>>>> -=-=-=-=-=-=-=-=-=-=-=- > >>>>>> >
Yes I have done it now but checking a could other things. Patch should be coming in about 15 if I don't find issue. On 2/19/23 16:12, Alexander Kanavin wrote: > Smth. like > UPSTREAM_CHECK_REGEX = "docbook-xml-(?P<pver>4(\.\d+)+)\.zip" > will probably work. > > Alex > > On Sun, 19 Feb 2023 at 21:51, Richard Elberger <rich@richelberger.com> wrote: >> It is working --- and I don't see how the prior one could have been >> upgraded at all because it was a debian snapshot package >> >> >> rpcme@proteus:~/elinux/oe-core/meta/recipes-devtools$ devtool >> latest-version docbook-xml-dtd4 >> NOTE: Starting bitbake server... >> NOTE: Reconnecting to bitbake server... >> NOTE: Retrying server connection (#1)... (15:50:43.295558) >> Loading cache: 100% |############################################| Time: >> 0:00:00 >> Loaded 1692 entries from dependency cache. >> --2023-02-19 15:50:45-- https://docbook.org/xml/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 3929 (3.8K) [text/html] >> Saving to: ‘/tmp/wget-index-8i8d6pca/wget-listing-8wiusk7e’ >> >> >> 2023-02-19 15:50:45 (17.8 MB/s) - >> ‘/tmp/wget-index-8i8d6pca/wget-listing-8wiusk7e’ saved [3929/3929] >> >> --2023-02-19 15:50:45-- https://docbook.org/xml/4.1.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2092 (2.0K) [text/html] >> Saving to: ‘/tmp/wget-index-999ij1ye/wget-listing-_3t72jiq’ >> >> >> 2023-02-19 15:50:45 (15.1 MB/s) - >> ‘/tmp/wget-index-999ij1ye/wget-listing-_3t72jiq’ saved [2092/2092] >> >> --2023-02-19 15:50:45-- https://docbook.org/xml/4.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2154 (2.1K) [text/html] >> Saving to: ‘/tmp/wget-index-s2n3hz3o/wget-listing-_f4795l_’ >> >> >> 2023-02-19 15:50:45 (14.5 MB/s) - >> ‘/tmp/wget-index-s2n3hz3o/wget-listing-_f4795l_’ saved [2154/2154] >> >> --2023-02-19 15:50:45-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-raeil465/wget-listing-p6j4dk72’ >> >> >> 2023-02-19 15:50:45 (15.2 MB/s) - >> ‘/tmp/wget-index-raeil465/wget-listing-p6j4dk72’ saved [2202/2202] >> >> --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-3horis1c/wget-listing-fn4pbojo’ >> >> >> 2023-02-19 15:50:46 (14.8 MB/s) - >> ‘/tmp/wget-index-3horis1c/wget-listing-fn4pbojo’ saved [2202/2202] >> >> --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-dsnyvowx/wget-listing-uwt3tfa2’ >> >> >> 2023-02-19 15:50:46 (10.2 MB/s) - >> ‘/tmp/wget-index-dsnyvowx/wget-listing-uwt3tfa2’ saved [2202/2202] >> >> --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-x2f9ft64/wget-listing-vmk7cdck’ >> >> >> 2023-02-19 15:50:46 (15.9 MB/s) - >> ‘/tmp/wget-index-x2f9ft64/wget-listing-vmk7cdck’ saved [2202/2202] >> >> --2023-02-19 15:50:46-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-b00vg6es/wget-listing-kgmlrhsa’ >> >> >> 2023-02-19 15:50:46 (15.5 MB/s) - >> ‘/tmp/wget-index-b00vg6es/wget-listing-kgmlrhsa’ saved [2202/2202] >> >> --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-5vc97isa/wget-listing-efpcncoh’ >> >> >> 2023-02-19 15:50:47 (15.0 MB/s) - >> ‘/tmp/wget-index-5vc97isa/wget-listing-efpcncoh’ saved [2202/2202] >> >> --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-xmml2m_y/wget-listing-bo6wqd4s’ >> >> >> 2023-02-19 15:50:47 (9.54 MB/s) - >> ‘/tmp/wget-index-xmml2m_y/wget-listing-bo6wqd4s’ saved [2202/2202] >> >> --2023-02-19 15:50:47-- https://docbook.org/xml/4.3/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-am1fly7w/wget-listing-yqkw74hi’ >> >> >> 2023-02-19 15:50:47 (11.1 MB/s) - >> ‘/tmp/wget-index-am1fly7w/wget-listing-yqkw74hi’ saved [2202/2202] >> >> --2023-02-19 15:50:47-- https://docbook.org/xml/4.4/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-staj0ksp/wget-listing-_u2l4jwn’ >> >> >> 2023-02-19 15:50:48 (16.2 MB/s) - >> ‘/tmp/wget-index-staj0ksp/wget-listing-_u2l4jwn’ saved [2202/2202] >> >> --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-gwqtkhi_/wget-listing-jtlali9r’ >> >> >> 2023-02-19 15:50:48 (14.4 MB/s) - >> ‘/tmp/wget-index-gwqtkhi_/wget-listing-jtlali9r’ saved [2202/2202] >> >> --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-2rclefoo/wget-listing-k4gmz4vo’ >> >> >> 2023-02-19 15:50:48 (13.8 MB/s) - >> ‘/tmp/wget-index-2rclefoo/wget-listing-k4gmz4vo’ saved [2202/2202] >> >> --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-hm3mgyno/wget-listing-kzbcd0pc’ >> >> >> 2023-02-19 15:50:48 (3.01 MB/s) - >> ‘/tmp/wget-index-hm3mgyno/wget-listing-kzbcd0pc’ saved [2202/2202] >> >> --2023-02-19 15:50:48-- https://docbook.org/xml/4.4/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-df5n44fh/wget-listing-rughmkj5’ >> >> >> 2023-02-19 15:50:49 (15.1 MB/s) - >> ‘/tmp/wget-index-df5n44fh/wget-listing-rughmkj5’ saved [2202/2202] >> >> --2023-02-19 15:50:49-- https://docbook.org/xml/4.4/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-73ik2ylt/wget-listing-sp6a189r’ >> >> >> 2023-02-19 15:50:49 (15.2 MB/s) - >> ‘/tmp/wget-index-73ik2ylt/wget-listing-sp6a189r’ saved [2202/2202] >> >> --2023-02-19 15:50:49-- https://docbook.org/xml/4.4/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2202 (2.2K) [text/html] >> Saving to: ‘/tmp/wget-index-n8427qqd/wget-listing-rp7w_iim’ >> >> >> 2023-02-19 15:50:49 (11.2 MB/s) - >> ‘/tmp/wget-index-n8427qqd/wget-listing-rp7w_iim’ saved [2202/2202] >> >> --2023-02-19 15:50:49-- https://docbook.org/xml/4.5/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2196 (2.1K) [text/html] >> Saving to: ‘/tmp/wget-index-7kg86ky5/wget-listing-pfq81o04’ >> >> >> 2023-02-19 15:50:49 (15.7 MB/s) - >> ‘/tmp/wget-index-7kg86ky5/wget-listing-pfq81o04’ saved [2196/2196] >> >> --2023-02-19 15:50:49-- https://docbook.org/xml/4.5/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2196 (2.1K) [text/html] >> Saving to: ‘/tmp/wget-index-5kcb1cwx/wget-listing-y4s7rbeb’ >> >> >> 2023-02-19 15:50:50 (14.7 MB/s) - >> ‘/tmp/wget-index-5kcb1cwx/wget-listing-y4s7rbeb’ saved [2196/2196] >> >> --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2196 (2.1K) [text/html] >> Saving to: ‘/tmp/wget-index-e9uiwezl/wget-listing-gaak4fjf’ >> >> >> 2023-02-19 15:50:50 (14.3 MB/s) - >> ‘/tmp/wget-index-e9uiwezl/wget-listing-gaak4fjf’ saved [2196/2196] >> >> --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2196 (2.1K) [text/html] >> Saving to: ‘/tmp/wget-index-ijwig4kk/wget-listing-ubz8ihck’ >> >> >> 2023-02-19 15:50:50 (13.9 MB/s) - >> ‘/tmp/wget-index-ijwig4kk/wget-listing-ubz8ihck’ saved [2196/2196] >> >> --2023-02-19 15:50:50-- https://docbook.org/xml/4.5/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 2196 (2.1K) [text/html] >> Saving to: ‘/tmp/wget-index-23wg3ce1/wget-listing-po35ctnw’ >> >> >> 2023-02-19 15:50:50 (10.7 MB/s) - >> ‘/tmp/wget-index-23wg3ce1/wget-listing-po35ctnw’ saved [2196/2196] >> >> --2023-02-19 15:50:50-- https://docbook.org/xml/5.0/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1935 (1.9K) [text/html] >> Saving to: ‘/tmp/wget-index-xbl8kski/wget-listing-lzoxc4q7’ >> >> >> 2023-02-19 15:50:51 (12.9 MB/s) - >> ‘/tmp/wget-index-xbl8kski/wget-listing-lzoxc4q7’ saved [1935/1935] >> >> --2023-02-19 15:50:51-- https://docbook.org/xml/5.0.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1879 (1.8K) [text/html] >> Saving to: ‘/tmp/wget-index-1witmxd3/wget-listing-7rjy2_0c’ >> >> >> 2023-02-19 15:50:51 (16.5 MB/s) - >> ‘/tmp/wget-index-1witmxd3/wget-listing-7rjy2_0c’ saved [1879/1879] >> >> --2023-02-19 15:50:51-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-95v7zmwh/wget-listing-o2ffmje6’ >> >> >> 2023-02-19 15:50:52 (9.94 MB/s) - >> ‘/tmp/wget-index-95v7zmwh/wget-listing-o2ffmje6’ saved [1670/1670] >> >> --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-j6t46pnp/wget-listing-234d878_’ >> >> >> 2023-02-19 15:50:52 (11.5 MB/s) - >> ‘/tmp/wget-index-j6t46pnp/wget-listing-234d878_’ saved [1670/1670] >> >> --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-g3qisiyq/wget-listing-c6dbllr4’ >> >> >> 2023-02-19 15:50:52 (7.47 MB/s) - >> ‘/tmp/wget-index-g3qisiyq/wget-listing-c6dbllr4’ saved [1670/1670] >> >> --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-x3___c7x/wget-listing-c5ect7a3’ >> >> >> 2023-02-19 15:50:52 (10.2 MB/s) - >> ‘/tmp/wget-index-x3___c7x/wget-listing-c5ect7a3’ saved [1670/1670] >> >> --2023-02-19 15:50:52-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-p4qpvb0k/wget-listing-e47qjey4’ >> >> >> 2023-02-19 15:50:53 (10.6 MB/s) - >> ‘/tmp/wget-index-p4qpvb0k/wget-listing-e47qjey4’ saved [1670/1670] >> >> --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-7q9ewbfv/wget-listing-7uupe9yj’ >> >> >> 2023-02-19 15:50:53 (12.6 MB/s) - >> ‘/tmp/wget-index-7q9ewbfv/wget-listing-7uupe9yj’ saved [1670/1670] >> >> --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-608vlaw2/wget-listing-94cdcy4s’ >> >> >> 2023-02-19 15:50:53 (11.6 MB/s) - >> ‘/tmp/wget-index-608vlaw2/wget-listing-94cdcy4s’ saved [1670/1670] >> >> --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-7xlvffk3/wget-listing-t145lptl’ >> >> >> 2023-02-19 15:50:53 (11.7 MB/s) - >> ‘/tmp/wget-index-7xlvffk3/wget-listing-t145lptl’ saved [1670/1670] >> >> --2023-02-19 15:50:53-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-xoc60_3a/wget-listing-6tj2x2b2’ >> >> >> 2023-02-19 15:50:53 (11.4 MB/s) - >> ‘/tmp/wget-index-xoc60_3a/wget-listing-6tj2x2b2’ saved [1670/1670] >> >> --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-c3ad8634/wget-listing-lif1thj_’ >> >> >> 2023-02-19 15:50:54 (10.2 MB/s) - >> ‘/tmp/wget-index-c3ad8634/wget-listing-lif1thj_’ saved [1670/1670] >> >> --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-w95mnrrr/wget-listing-3y2adbj2’ >> >> >> 2023-02-19 15:50:54 (11.5 MB/s) - >> ‘/tmp/wget-index-w95mnrrr/wget-listing-3y2adbj2’ saved [1670/1670] >> >> --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-q5kqy628/wget-listing-3puydl8g’ >> >> >> 2023-02-19 15:50:54 (10.2 MB/s) - >> ‘/tmp/wget-index-q5kqy628/wget-listing-3puydl8g’ saved [1670/1670] >> >> --2023-02-19 15:50:54-- https://docbook.org/xml/5.1/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 200 OK >> Length: 1670 (1.6K) [text/html] >> Saving to: ‘/tmp/wget-index-hb8by0i3/wget-listing-uag1u2jt’ >> >> >> 2023-02-19 15:50:54 (11.3 MB/s) - >> ‘/tmp/wget-index-hb8by0i3/wget-listing-uag1u2jt’ saved [1670/1670] >> >> --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:55 ERROR 404: Not Found. >> >> --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:55 ERROR 404: Not Found. >> >> --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:55 ERROR 404: Not Found. >> >> --2023-02-19 15:50:55-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:55 ERROR 404: Not Found. >> >> --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:56 ERROR 404: Not Found. >> >> --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:56 ERROR 404: Not Found. >> >> --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:56 ERROR 404: Not Found. >> >> --2023-02-19 15:50:56-- https://docbook.org/xml/5.2/ >> Resolving docbook.org (docbook.org)... 18.213.222.111, 35.229.48.116 >> Connecting to docbook.org (docbook.org)|18.213.222.111|:443... connected. >> HTTP request sent, awaiting response... 404 Not Found >> 2023-02-19 15:50:56 ERROR 404: Not Found. >> >> INFO: Current version: 4.5 >> INFO: Latest version: 412 >> rpcme@proteus:~/elinux/oe-core/meta/recipes-devtools$ echo $? >> 0 >> >> >> On 2/19/23 15:47, Alexander Kanavin wrote: >>> The version check is working fine with the existing recipe, and it >>> will stop working with your patch. So you need to get it fixed. >>> >>> Alex >>> >>> On Sun, 19 Feb 2023 at 21:45, Richard Elberger <rich@richelberger.com> wrote: >>>> I think doing this is out of scope of the bugfix. The latest-version >>>> check was not a constraint in the prior version. >>>> >>>> I suggest that we get the bug fixed and file another workitem for this >>>> particular ask. >>>> >>>> On 2/19/23 15:39, Alexander Kanavin wrote: >>>>> 412 can be specifically excluded as a 'bogus' version, examples exist >>>>> in oe-core. >>>>> >>>>> Version checks are used for manual upgrades too, as maintainers want >>>>> to be notified there's a new version, even if autoupgrade can't handle >>>>> it. We just need to know if there's a 4.x release newer than 4.5, and >>>>> that can be covered by the check. >>>>> >>>>> Alex >>>>> >>>>> On Sun, 19 Feb 2023 at 21:27, Richard Elberger <rich@richelberger.com> wrote: >>>>>> I have been working on it, but after a while I realized that this >>>>>> version upgrade will not work anyway - even for 4.x >>>>>> >>>>>> The reason is they have a folder named "412" which is actually 4.1.2 >>>>>> which I we probably still need to have in. >>>>>> >>>>>> Even though the tool cannot find 5.2 it still exits zero ... but still, >>>>>> it thinks that 412 > 5.2 >>>>>> >>>>>> I see one of two things a/ do not autoupgrade and somehow mark for >>>>>> manual cyclical update b/ somehow apply a map capability >>>>>> >>>>>> Also given that multiple versions must be delivered in the same version >>>>>> I don't think that this falls under typical autoupgrade scenario. >>>>>> >>>>>> What are your thoughts? >>>>>> >>>>>> On 2/19/23 13:54, Alexander Kanavin wrote: >>>>>>> If the check goes over https://docbook.org/xml/ I guess you can set >>>>>>> the regex to 4.x versions only, as the recipe name itself pins it to >>>>>>> 4.x. I'm not sure we're even going to need 5.x, ever. >>>>>>> You can grep for UPSTREAM_CHECK_REGEX in core for examples. >>>>>>> >>>>>>> Alex >>>>>>> >>>>>>> On Sun, 19 Feb 2023 at 19:40, Alexander Kanavin via >>>>>>> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> >>>>>>> wrote: >>>>>>>> It helps if you provide devtool's output. I think it's possible to >>>>>>>> exclude rc versions from the check with UPSTREAM_CHECK_REGEX. >>>>>>>> >>>>>>>> Alex >>>>>>>> >>>>>>>> On Sun, 19 Feb 2023 at 19:22, Richard Elberger <rich@richelberger.com> wrote: >>>>>>>>> I tried `devtool latest-version` and it failed on one version - 5.2 - >>>>>>>>> because it's still in RC. >>>>>>>>> >>>>>>>>> Note that there are massive breaking changes between Docbook 4x and 5x. >>>>>>>>> Given the defect I'm fixing is to change the upstream source - and not >>>>>>>>> refactor the entire recipe - I believe the scope should keep to that and >>>>>>>>> another defect filed for future versions. Please confirm this is >>>>>>>>> reasonable. >>>>>>>>> >>>>>>>>> I did the other beatification changes per style guide and will resubmit >>>>>>>>> once I get confirmation. >>>>>>>>> >>>>>>>>> On 2/19/23 12:31, Alexander Kanavin wrote: >>>>>>>>>> On Sun, 19 Feb 2023 at 17:31, Richard Elberger <rich@richelberger.com> wrote: >>>>>>>>>> >>>>>>>>>>> For multiple assignment: the reason is maintainability. The supported >>>>>>>>>>> versions will change over time. >>>>>>>>>> You can still place them in a newline-separated single assignment, >>>>>>>>>> which is a lot more readable as the list of fetched items is then in a >>>>>>>>>> single location in the recipe. >>>>>>>>>> This is how all recipes in oe-core are structured. >>>>>>>>>> >>>>>>>>>>> Please confirm if there are any other appreciations I must cover - I was >>>>>>>>>>> unaware of this one and would like to batch them. If the appreciations >>>>>>>>>>> are listed on a wiki please school me about that. >>>>>>>>>> For now I do not have any others. I'd like to see a v2 first, as v1 >>>>>>>>>> makes it hard to understand how the final recipe looks like with the >>>>>>>>>> multiple SRC_URI approach. We used to have a bot that points out >>>>>>>>>> common issues but it's unmaintained and falled into disrepair. >>>>>>>>>> >>>>>>>>>> There are numerous pages on the wiki collecting style and message tips: >>>>>>>>>> https://www.openembedded.org/wiki/Styleguide >>>>>>>>>> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines >>>>>>>>>> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded >>>>>>>>>> >>>>>>>>>> Alex >>>>>>>>>> >>>>>>>>>>> On 2/19/23 10:52, Alexander Kanavin wrote: >>>>>>>>>>>> Can you please set SRC_URI with a single assignment; there is no >>>>>>>>>>>> reason to += it multiple times. >>>>>>>>>>>> >>>>>>>>>>>> Verifying that 'devtool latest-version works' would be also appreciated. >>>>>>>>>>>> >>>>>>>>>>>> Alex >>>>>>>>>>>> >>>>>>>>>>>> On Sun, 19 Feb 2023 at 12:25, Richard Elberger <rich@richelberger.com> wrote: >>>>>>>>>>>>> --- >>>>>>>>>>>>> .../docbook-xml/docbook-xml-dtd4_4.5.bb | 74 ++++++++++++------- >>>>>>>>>>>>> 1 file changed, 49 insertions(+), 25 deletions(-) >>>>>>>>>>>>> >>>>>>>>>>>>> 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 2bec1442af..71aa8c14ec 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 >>>>>>>>>>>>> @@ -1,30 +1,54 @@ >>>>>>>>>>>>> SUMMARY = "Document type definitions for verification of XML data files" >>>>>>>>>>>>> DESCRIPTION = "Document type definitions for verification of XML data \ >>>>>>>>>>>>> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ >>>>>>>>>>>>> -XML DTD, as well as a selected set of legacy DTDs for use with older \ >>>>>>>>>>>>> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" >>>>>>>>>>>>> -HOMEPAGE = "http://www.docbook.org/xml/" >>>>>>>>>>>>> +files against the DocBook rule set." >>>>>>>>>>>>> +HOMEPAGE = "https://docbook.org" >>>>>>>>>>>>> >>>>>>>>>>>>> -LICENSE = "OASIS" >>>>>>>>>>>>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>>>>>>>> +inherit allarch >>>>>>>>>>>>> +BBCLASSEXTEND = "native" >>>>>>>>>>>>> >>>>>>>>>>>>> -# Note: 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. >>>>>>>>>>>>> -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ >>>>>>>>>>>>> - file://LICENSE-OASIS \ >>>>>>>>>>>>> - file://docbook-xml-update-catalog.xml.patch \ >>>>>>>>>>>>> -" >>>>>>>>>>>>> +# To support apps with xml schema backward compatibility, we must >>>>>>>>>>>>> +# install a set of schemas. Install the latest based on PV and then >>>>>>>>>>>>> +# name any specific versions as required. TODO: Figure out a mechanism >>>>>>>>>>>>> +# to filter exactly which versions are necessary, if that's even >>>>>>>>>>>>> +# possible. >>>>>>>>>>>>> +# >>>>>>>>>>>>> +# DocBook.org lists available packages at https://docbook.org/xml/ >>>>>>>>>>>>> +# >>>>>>>>>>>>> +# These packages are available as source but it requires the ability >>>>>>>>>>>>> +# to use the Gradle build system to do so. It might be safer to use >>>>>>>>>>>>> +# the source tree which would also enable proper SBOM generation >>>>>>>>>>>>> +# through the bitbake build system. https://github.com/docbook/docbook >>>>>>>>>>>>> +# >>>>>>>>>>>>> >>>>>>>>>>>>> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" >>>>>>>>>>>>> -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" >>>>>>>>>>>>> +S = "${WORKDIR}" >>>>>>>>>>>>> >>>>>>>>>>>>> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" >>>>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" >>>>>>>>>>>>> +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" >>>>>>>>>>>>> +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" >>>>>>>>>>>>> >>>>>>>>>>>>> -S = "${WORKDIR}/docbook-xml-4.5.c31424" >>>>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" >>>>>>>>>>>>> +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" >>>>>>>>>>>>> +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" >>>>>>>>>>>>> >>>>>>>>>>>>> -inherit allarch >>>>>>>>>>>>> -BBCLASSEXTEND = "native" >>>>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" >>>>>>>>>>>>> +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" >>>>>>>>>>>>> +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" >>>>>>>>>>>>> + >>>>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" >>>>>>>>>>>>> +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" >>>>>>>>>>>>> +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" >>>>>>>>>>>>> + >>>>>>>>>>>>> +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" >>>>>>>>>>>>> +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" >>>>>>>>>>>>> +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" >>>>>>>>>>>>> + >>>>>>>>>>>>> +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" >>>>>>>>>>>>> +SRC_URI += "file://LICENSE-OASIS" >>>>>>>>>>>>> >>>>>>>>>>>>> do_configure (){ >>>>>>>>>>>>> : >>>>>>>>>>>>> @@ -34,19 +58,19 @@ do_compile (){ >>>>>>>>>>>>> : >>>>>>>>>>>>> } >>>>>>>>>>>>> >>>>>>>>>>>>> +inherit xmlcatalog >>>>>>>>>>>>> + >>>>>>>>>>>>> do_install () { >>>>>>>>>>>>> install -d ${D}${sysconfdir}/xml/ >>>>>>>>>>>>> xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>>>>>> >>>>>>>>>>>>> - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>>>>>>>> + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do >>>>>>>>>>>>> DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION >>>>>>>>>>>>> install -d -m 755 ${D}$DEST >>>>>>>>>>>>> - cp -v -R docbook-$DTDVERSION/* ${D}$DEST >>>>>>>>>>>>> - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>>>>>> + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST >>>>>>>>>>>>> + xmlcatalog --verbose --noout --add nextCatalog unused \ >>>>>>>>>>>>> + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml >>>>>>>>>>>>> done >>>>>>>>>>>>> } >>>>>>>>>>>>> >>>>>>>>>>>>> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" >>>>>>>>>>>>> -inherit xmlcatalog >>>>>>>>>>>>> - >>>>>>>>>>>>> FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" >>>>>>>>>>>>> -- >>>>>>>>>>>>> 2.34.1 >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>>>>> Links: You receive all messages sent to this group. >>>>>>>> View/Reply Online (#177342): https://lists.openembedded.org/g/openembedded-core/message/177342 >>>>>>>> Mute This Topic: https://lists.openembedded.org/mt/97064586/1686489 >>>>>>>> Group Owner: openembedded-core+owner@lists.openembedded.org >>>>>>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] >>>>>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>>>>>
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 2bec1442af..71aa8c14ec 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 @@ -1,30 +1,54 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set." +HOMEPAGE = "https://docbook.org" -LICENSE = "OASIS" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" +inherit allarch +BBCLASSEXTEND = "native" -# Note: 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. -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ - file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ -" +# To support apps with xml schema backward compatibility, we must +# install a set of schemas. Install the latest based on PV and then +# name any specific versions as required. TODO: Figure out a mechanism +# to filter exactly which versions are necessary, if that's even +# possible. +# +# DocBook.org lists available packages at https://docbook.org/xml/ +# +# These packages are available as source but it requires the ability +# to use the Gradle build system to do so. It might be safer to use +# the source tree which would also enable proper SBOM generation +# through the bitbake build system. https://github.com/docbook/docbook +# -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" +S = "${WORKDIR}" -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" +SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" +SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" -S = "${WORKDIR}/docbook-xml-4.5.c31424" +SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" +SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" -inherit allarch -BBCLASSEXTEND = "native" +SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" +SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" + +SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" +SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" + +SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" +SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" + +# 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://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" +SRC_URI += "file://LICENSE-OASIS" do_configure (){ : @@ -34,19 +58,19 @@ do_compile (){ : } +inherit xmlcatalog + do_install () { install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION install -d -m 755 ${D}$DEST - cp -v -R docbook-$DTDVERSION/* ${D}$DEST - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml + cp -v -R docbook-xml-$DTDVERSION/* ${D}$DEST + xmlcatalog --verbose --noout --add nextCatalog unused \ + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml done } -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -inherit xmlcatalog - FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml"