Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
Perhaps directly is simplest, with a note on their origin above SRC_URI. Alex On Thu, 28 May 2020 at 23:12, Gregor Zatko wrote: > On Sun, 2020-05-24 at 16:24 +0100, Richard Purdie wrote: > > On Sat, 2020-05-23 at 21:12 +0200, Gregor Zatko wrote: > > From: Gregor Zatko < > > gza...@zoznam.sk > > > > > > Until now a Debian package has been used as a source. > > This change just switches it to project's upstream. > > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > > > Signed-off-by: Gregor Zatko < > > gza...@gmail.com > > > > > --- > > .../docbook-xml-update-catalog.xml.patch | 515 -- > > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 65 ++- > > 2 files changed, 36 insertions(+), 544 deletions(-) > > delete mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch > > > Unfortunately test builds failed: > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/2176 > > > > Cheers, > > > Richard > > > > The catalogs of versions 4.0 and 4.1.2 are not present standalone in the > docbook.org page. > > A question is what is the best choice to include them into the file tree: > > 1) add them directly > > 2) add them as a patch > > 3) extract from a Ubuntu/Debian package where they are present > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138908): https://lists.openembedded.org/g/openembedded-core/message/138908 Mute This Topic: https://lists.openembedded.org/mt/74423806/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
On Sun, 2020-05-24 at 16:24 +0100, Richard Purdie wrote: > On Sat, 2020-05-23 at 21:12 +0200, Gregor Zatko wrote: > > From: Gregor Zatko > > Until now a Debian package has been used as a source.This change > > just switches it to project's upstream. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > > > Signed-off-by: Gregor Zatko --- .../docbook-xml- > > update-catalog.xml.patch | 515 -- .../docbook- > > xml/docbook-xml-dtd4_4.5.bb | 65 ++- 2 files changed, 36 > > insertions(+), 544 deletions(-) delete mode 100644 meta/recipes- > > devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update- > > catalog.xml.patch > > Unfortunately test builds failed: > https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/2176 > > Cheers, > Richard The catalogs of versions 4.0 and 4.1.2 are not present standalone in the docbook.org page.A question is what is the best choice to include them into the file tree:1) add them directly2) add them as a patch3) extract from a Ubuntu/Debian package where they are present -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138863): https://lists.openembedded.org/g/openembedded-core/message/138863 Mute This Topic: https://lists.openembedded.org/mt/74423806/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
On Sat, 2020-05-23 at 21:12 +0200, Gregor Zatko wrote: > From: Gregor Zatko > > Until now a Debian package has been used as a source. > This change just switches it to project's upstream. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > Signed-off-by: Gregor Zatko > --- > .../docbook-xml-update-catalog.xml.patch | 515 -- > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 65 ++- > 2 files changed, 36 insertions(+), 544 deletions(-) > delete mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch Unfortunately test builds failed: https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/2176 Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138644): https://lists.openembedded.org/g/openembedded-core/message/138644 Mute This Topic: https://lists.openembedded.org/mt/74423806/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
Thanks, this looks fine now. Alex On Sat, 23 May 2020 at 21:12, Gregor Zatko wrote: > From: Gregor Zatko > > Until now a Debian package has been used as a source. > This change just switches it to project's upstream. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > Signed-off-by: Gregor Zatko > --- > .../docbook-xml-update-catalog.xml.patch | 515 -- > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 65 ++- > 2 files changed, 36 insertions(+), 544 deletions(-) > delete mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch > > diff --git > a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch > b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch > deleted file mode 100644 > index 59703609ca..00 > --- > a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch > +++ /dev/null > @@ -1,515 +0,0 @@ > -docbook-xml: update catalog.xml > - > -Refer Ubuntu 13.04 to update catalog.xml > - > -Upstream-Status: Pending > -Signed-off-by: Hongxu Jia > > - docbook-4.0/catalog.xml | 72 > +++ > - docbook-4.1.2/catalog.xml | 66 > +++ > - docbook-4.2/catalog.xml | 69 > ++--- > - docbook-4.3/catalog.xml | 72 > --- > - docbook-4.4/catalog.xml | 63 ++--- > - docbook-4.5/catalog.xml | 63 ++--- > - 6 files changed, 165 insertions(+), 240 deletions(-) > - create mode 100644 docbook-4.0/catalog.xml > - create mode 100644 docbook-4.1.2/catalog.xml > - > -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml > -new file mode 100644 > /dev/null > -+++ b/docbook-4.0/catalog.xml > -@@ -0,0 +1,72 @@ > -+ > -+ V1.0//EN" > -+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd > "> > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ -+uri="docbookx.dtd"/> > -+ > -+ > -+ -+uri="docbookx.dtd"/> > -+ > -+http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd > " > -+uri="docbookx.dtd"/> > -+ > -+ > -+ > -+ > -+ -+uri="dbnotnx.mod"/> > -+ > -+ -+uri="dbcentx.mod"/> > -+ > -+ -+uri="dbpoolx.mod"/> > -+ > -+ -+uri="dbhierx.mod"/> > -+ > -+ -+uri="dbgenent.mod"/> > -+ > -+ -+uri="calstblx.dtd"/> > -+ > -+ > -+ > -+ -+uri="soextblx.dtd"/> > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml > -new file mode 100644 > /dev/null > -+++ b/docbook-4.1.2/catalog.xml > -@@ -0,0 +1,66 @@ > -+ > -+ V1.0//EN" > -+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd > "> > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ -+uri="docbookx.dtd"/> > -+ > -+http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd; > -+uri="docbookx.dtd"/> > -+ > -+http://docbook.org/xml/4.1.2/docbookx.dtd; > -+uri="docbookx.dtd"/> > -+ > -+ > -+ > -+ > -+ -+uri="calstblx.dtd"/> > -+ > -+ > -+ > -+ -+uri="dbpoolx.mod"/> > -+ > -+ -+uri="dbhierx.mod"/> > -+ > -+ -+uri="dbgenent.mod"/> > -+ > -+ -+uri="dbnotnx.mod"/> > -+ > -+ -+uri="dbcentx.mod"/> > -+ > -+ > -+ > -+ > -+ > -+ > -diff --git a/docbook-4.2/catalog.xml b/docbook-4.2/catalog.xml > a/docbook-4.2/catalog.xml > -+++ b/docbook-4.2/catalog.xml > -@@ -1,4 +1,7 @@ > - > -+ V1.0//EN" > -+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd > "> > -+ > - > - > - > -@@ -25,6 +28,12 @@ > - - uri="docbookx.dtd"/> > - > -+http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd > " > -+uri="docbookx.dtd"/> > -+ > -+http://docbook.org/xml/4.2/docbookx.dtd; > -+uri="docbookx.dtd"/> > -+ > - > - > - > -@@ -49,66 +58,6 @@ > - - uri="dbcentx.mod"/> > - > -- > -- > -- > -- --uri="ent/iso-dia.ent"/> > -- > -- --uri="ent/iso-num.ent"/> > -- > -- --uri="ent/iso-pub.ent"/> > -- > -- --uri="ent/iso-tech.ent"/> > -- > -- --uri="ent/iso-lat1.ent"/> > -- > -- --uri="ent/iso-lat2.ent"/> > -- > -- --uri="ent/iso-grk1.ent"/> > -- > -- --uri="ent/iso-grk2.ent"/> > -- > -- --uri="ent/iso-grk3.ent"/> > -- > -- --uri="ent/iso-grk4.ent"/> > -- > -- --uri="ent/iso-amsa.ent"/> > -- > -- --uri="ent/iso-amsb.ent"/> > -- > -- --uri="ent/iso-amsc.ent"/> > -- > -- --uri="ent/iso-amsn.ent"/> > -- > -- --uri="ent/iso-amso.ent"/> > -- > -- --uri="ent/iso-amsr.ent"/> > -- > -- --uri="ent/iso-box.ent"/> > -- > -- --uri="ent/iso-cyr1.ent"/> > -- > -- --uri="ent/iso-cyr2.ent"/> > -- > - > -
[OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
From: Gregor Zatko Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko --- .../docbook-xml-update-catalog.xml.patch | 515 -- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 65 ++- 2 files changed, 36 insertions(+), 544 deletions(-) delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted file mode 100644 index 59703609ca..00 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch +++ /dev/null @@ -1,515 +0,0 @@ -docbook-xml: update catalog.xml - -Refer Ubuntu 13.04 to update catalog.xml - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia - docbook-4.0/catalog.xml | 72 +++ - docbook-4.1.2/catalog.xml | 66 +++ - docbook-4.2/catalog.xml | 69 ++--- - docbook-4.3/catalog.xml | 72 --- - docbook-4.4/catalog.xml | 63 ++--- - docbook-4.5/catalog.xml | 63 ++--- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml - -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.1.2/catalog.xml -@@ -0,0 +1,66 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.1.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/docbook-4.2/catalog.xml b/docbook-4.2/catalog.xml a/docbook-4.2/catalog.xml -+++ b/docbook-4.2/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -25,6 +28,12 @@ - - -+http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ - - - -@@ -49,66 +58,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/docbook-4.3/catalog.xml b/docbook-4.3/catalog.xml a/docbook-4.3/catalog.xml -+++ b/docbook-4.3/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -25,12 +28,21 @@ - - -+http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.3/docbookx.dtd; -+uri="docbookx.dtd"/> -+ - - - - - -+ -+ - - -@@ -49,66 +61,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/docbook-4.4/catalog.xml b/docbook-4.4/catalog.xml a/docbook-4.4/catalog.xml -+++ b/docbook-4.4/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -58,66 +61,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/docbook-4.5/catalog.xml b/docbook-4.5/catalog.xml a/docbook-4.5/catalog.xml -+++ b/docbook-4.5/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -58,66 +61,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - --- -1.8.1.2 - 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 6452c8d99f..39c4da418b 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,9 +1,10 @@ SUMMARY = "Document type definitions for verification of XML data files"
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
Yes I think so. I supposed that if there's only 4 catalogs it can be done this way but if the policy is to download everything then OK - I'll rewrite the recipe, hope this time finally well. G. On Sat, 2020-05-23 at 20:50 +0200, Alexander Kanavin wrote: > Can the original source be fetched though? Copying things over into > the layer itself is not the best option. > > Alex > > > On Sat, 23 May 2020 at 19:20, Gregor Zatko wrote: > > From: Gregor Zatko > > > > > > > > Until now a Debian package has been used as a source. > > > > This change just switches it to project's upstream. > > > > > > > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > > > > > > > Signed-off-by: Gregor Zatko > > > > --- > > > > .../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 > > > > .../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 > > > > .../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 + > > > > .../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 + > > > > .../docbook-xml-update-catalog.xml.patch | 515 -- > > > > > > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +- > > > > 6 files changed, 502 insertions(+), 543 deletions(-) > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.2.xml > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.3.xml > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.4.xml > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.5.xml > > > > delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/docbook-xml-update-catalog.xml.patch > > > > > > > > diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.2.xml b/meta/recipes-devtools/docbook- > > xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml > > > > new file mode 100644 > > > > index 00..6920c2f7e0 > > > > --- /dev/null > > > > +++ b/meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.2.xml > > > > @@ -0,0 +1,115 @@ > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="docbookx.dtd"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="calstblx.dtd"/> > > > > + > > > > + > > > +uri="soextblx.dtd"/> > > > > + > > > > + > > > +uri="dbpoolx.mod"/> > > > > + > > > > + > > > +uri="dbhierx.mod"/> > > > > + > > > > + > > > +uri="dbgenent.mod"/> > > > > + > > > > + > > > +uri="dbnotnx.mod"/> > > > > + > > > > + > > > +uri="dbcentx.mod"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="ent/iso-dia.ent"/> > > > > + > > > > + > > > +uri="ent/iso-num.ent"/> > > > > + > > > > + > > > +uri="ent/iso-pub.ent"/> > > > > + > > > > + > > > +uri="ent/iso-tech.ent"/> > > > > + > > > > + > > > +uri="ent/iso-lat1.ent"/> > > > > + > > > > + > > > +uri="ent/iso-lat2.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk1.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk2.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk3.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk4.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsa.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsb.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsc.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsn.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amso.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsr.ent"/> > > > > + > > > > + > > > +uri="ent/iso-box.ent"/> > > > > + > > > > + > > > +uri="ent/iso-cyr1.ent"/> > > > > + > > > > + > > > +uri="ent/iso-cyr2.ent"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > > diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.3.xml b/meta/recipes-devtools/docbook- > > xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml > > > > new file mode 100644 > > > > index 00..34d1afdd94 > > > > --- /dev/null > > > > +++ b/meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.3.xml > > > > @@ -0,0 +1,115 @@ > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="docbookx.dtd"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="calstblx.dtd"/> > > > > + > > > > + > > > +uri="soextblx.dtd"/> > > > > + > > > > + > > > +uri="dbpoolx.mod"/> > > > > + > > > > + > > > +uri="dbhierx.mod"/> > > > > + > > >
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
Can the original source be fetched though? Copying things over into the layer itself is not the best option. Alex On Sat, 23 May 2020 at 19:20, Gregor Zatko wrote: > From: Gregor Zatko > > Until now a Debian package has been used as a source. > This change just switches it to project's upstream. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > Signed-off-by: Gregor Zatko > --- > .../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 > .../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 > .../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 + > .../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 + > .../docbook-xml-update-catalog.xml.patch | 515 -- > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +- > 6 files changed, 502 insertions(+), 543 deletions(-) > create mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml > create mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml > create mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml > create mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml > delete mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch > > diff --git > a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml > b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml > new file mode 100644 > index 00..6920c2f7e0 > --- /dev/null > +++ > b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml > @@ -0,0 +1,115 @@ > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + +uri="docbookx.dtd"/> > + > + > + > + > + +uri="calstblx.dtd"/> > + > + +uri="soextblx.dtd"/> > + > + +uri="dbpoolx.mod"/> > + > + +uri="dbhierx.mod"/> > + > + +uri="dbgenent.mod"/> > + > + +uri="dbnotnx.mod"/> > + > + +uri="dbcentx.mod"/> > + > + > + > + > + +uri="ent/iso-dia.ent"/> > + > + +uri="ent/iso-num.ent"/> > + > + +uri="ent/iso-pub.ent"/> > + > + +uri="ent/iso-tech.ent"/> > + > + +uri="ent/iso-lat1.ent"/> > + > + +uri="ent/iso-lat2.ent"/> > + > + +uri="ent/iso-grk1.ent"/> > + > + +uri="ent/iso-grk2.ent"/> > + > + +uri="ent/iso-grk3.ent"/> > + > + +uri="ent/iso-grk4.ent"/> > + > + +uri="ent/iso-amsa.ent"/> > + > + +uri="ent/iso-amsb.ent"/> > + > + +uri="ent/iso-amsc.ent"/> > + > + +uri="ent/iso-amsn.ent"/> > + > + +uri="ent/iso-amso.ent"/> > + > + +uri="ent/iso-amsr.ent"/> > + > + +uri="ent/iso-box.ent"/> > + > + +uri="ent/iso-cyr1.ent"/> > + > + +uri="ent/iso-cyr2.ent"/> > + > + > + > + > + > diff --git > a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml > b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml > new file mode 100644 > index 00..34d1afdd94 > --- /dev/null > +++ > b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml > @@ -0,0 +1,115 @@ > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + +uri="docbookx.dtd"/> > + > + > + > + > + +uri="calstblx.dtd"/> > + > + +uri="soextblx.dtd"/> > + > + +uri="dbpoolx.mod"/> > + > + +uri="dbhierx.mod"/> > + > + +uri="dbgenent.mod"/> > + > + +uri="dbnotnx.mod"/> > + > + +uri="dbcentx.mod"/> > + > + > + > + > + +uri="ent/iso-dia.ent"/> > + > + +uri="ent/iso-num.ent"/> > + > + +uri="ent/iso-pub.ent"/> > + > + +uri="ent/iso-tech.ent"/> > + > + +uri="ent/iso-lat1.ent"/> > + > + +uri="ent/iso-lat2.ent"/> > + > + +uri="ent/iso-grk1.ent"/> > + > + +uri="ent/iso-grk2.ent"/> > + > + +uri="ent/iso-grk3.ent"/> > + > + +uri="ent/iso-grk4.ent"/> > + > + +uri="ent/iso-amsa.ent"/> > + > + +uri="ent/iso-amsb.ent"/> > + > + +uri="ent/iso-amsc.ent"/> > + > + +uri="ent/iso-amsn.ent"/> > + > + +uri="ent/iso-amso.ent"/> > + > + +uri="ent/iso-amsr.ent"/> > + > + +uri="ent/iso-box.ent"/> > + > + +uri="ent/iso-cyr1.ent"/> > + > + +uri="ent/iso-cyr2.ent"/> > + > + > + > + > + > diff --git > a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml > b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml > new file mode 100644 > index 00..8d709ba102 > --- /dev/null > +++ > b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml > @@ -0,0 +1,124 @@ > + > + prefer="public"> > + > + > + > + > + > + > + > + > + > + > + > + > + +uri="docbookx.dtd"/> > + > +http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; > + uri="docbookx.dtd"/> > + >
[OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
From: Gregor Zatko Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko --- .../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 .../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 .../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 + .../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 + .../docbook-xml-update-catalog.xml.patch | 515 -- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +- 6 files changed, 502 insertions(+), 543 deletions(-) create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file mode 100644 index 00..6920c2f7e0 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml new file mode 100644 index 00..34d1afdd94 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file mode 100644 index 00..8d709ba102 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + +http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; + uri="docbookx.dtd"/> + +http://docbook.org/xml/4.4/docbookx.dtd; + uri="docbookx.dtd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml new file mode 100644 index 00..f75c1d764d --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + +http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd; + uri="docbookx.dtd"/> + +http://docbook.org/xml/4.5/docbookx.dtd; + uri="docbookx.dtd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted file mode 100644 index 59703609ca..00 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch +++ /dev/null @@ -1,515 +0,0 @@ -docbook-xml: update catalog.xml - -Refer Ubuntu 13.04 to update catalog.xml - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia - docbook-4.0/catalog.xml | 72 +++ - docbook-4.1.2/catalog.xml | 66 +++ - docbook-4.2/catalog.xml | 69 ++--- - docbook-4.3/catalog.xml | 72 --- - docbook-4.4/catalog.xml | 63 ++--- - docbook-4.5/catalog.xml | 63 ++--- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml - -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
On Sun, 2020-02-23 at 14:22 +0100, gza...@gmail.com wrote: > From: Gregor Zatko > > Until now a Debian package has been used as a source. > This change just switches it to project's upstream. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > Signed-off-by: Gregor Zatko > --- > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +-- > 1 file changed, 29 insertions(+), 31 deletions(-) I know this was discussed in the bug and the older entries were removed as a test. Unfortunately this does break builds: https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/1851 (so far) We may need to rethink that. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
From: Gregor Zatko
Until now a Debian package has been used as a source.
This change just switches it to project's upstream.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
Signed-off-by: Gregor Zatko
---
.../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +--
1 file changed, 29 insertions(+), 31 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 6452c8d99f..dbea697edd 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,52 +1,50 @@
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. It ships with the latest DocBook 4.5 \
+XML DTD."
+HOMEPAGE = "https://www.docbook.org/xml/;
+
+PR = "r1"
LICENSE = "OASIS"
LIC_FILES_CHKSUM =
"file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
+ARCHIVE_NAME = "docbook-xml-${PV}.zip"
+
# 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 \
+SRC_URI = "\
+https://docbook.org/xml/${PV}/${ARCHIVE_NAME} \
+file://LICENSE-OASIS \
"
+SRC_URI[md5sum] = "03083e288e87a7e829e437358da7ef9e"
+SRC_URI[sha256sum] =
"4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4"
-SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e"
-SRC_URI[sha256sum] =
"b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f"
-
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/"
-
-S = "${WORKDIR}/docbook-xml-4.5.c31424"
+UPSTREAM_CHECK_URI = "https://docbook.org/xml/${PV}/;
-inherit allarch
+inherit allarch xmlcatalog
BBCLASSEXTEND = "native"
-do_configure (){
-:
-}
+# the XMLCATALOGS variable is used in xmlcatalog BB class
+XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml"
-do_compile (){
-:
-}
+S = "${WORKDIR}"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
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
-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
-done
+DEST=${datadir}/xml/docbook/schema/dtd/${PV}
+install -d -m 755 ${D}$DEST
+cp -v catalog.xml ${D}$DEST
+xmlcatalog --verbose --noout --add nextCatalog unused
file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml
}
-XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml"
-inherit xmlcatalog
-
-FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml"
+FILES_${PN} = "\
+${datadir}/* \
+${XMLCATALOGS} \
+"
--
2.25.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
