diff options
author | Richard Elberger <rich@richelberger.com> | 2023-02-22 13:49:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-26 11:49:00 +0000 |
commit | e13f4fd22fb0d7bda3974c2bd48837985fb9eb8b (patch) | |
tree | 2e2e9edb2742ec387f1f3b3db56bfb849dc60f03 /meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch | |
parent | 454c93d153bddab82073de3098db3416398c11b2 (diff) | |
download | poky-e13f4fd22fb0d7bda3974c2bd48837985fb9eb8b.tar.gz |
docbook-xml: Switch from debian packages to upstream docbook sources
This patch changes the docbook-xml distribution package source from
debian to docbook which aligns the recipe with the source
originator. Other changes made to the recipe include:
This patch resolves [YOCTO #13270].
- removal of version 4.0 given docbook no longer distributes version
4.0
- simplification of the header description.
- inline comments to communicate the rationale behind gathering
multiple versions and LICENSE file handling.
- minor ordering changes to align with styling conventions and better
context to better communicate use
- Added comment about magic XMLCATALOGS variable. This variable and
subsequent inherit might be better placed in recipes that depend on
docbook-xml but leave it for now to not cause a patch landslide.
- Modify the related docbook-xml patch to remove docbook-xml-4.0 since
it is no longer provided.
- Put BBCLASSEXTEND to end of recipe per RP note on convention
(From OE-Core rev: fc4471019313d981f0c951220cc65e8374a7e8e6)
Signed-off-by: Richard Elberger <rich@richelberger.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch')
-rw-r--r-- | meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch | 89 |
1 files changed, 2 insertions, 87 deletions
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 index c1385631d7..1f3364900c 100644 --- 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 | |||
@@ -1,97 +1,12 @@ | |||
1 | 21/3/2023: modified to remove 4.0 | ||
2 | |||
1 | docbook-xml: update catalog.xml | 3 | docbook-xml: update catalog.xml |
2 | 4 | ||
3 | Refer Ubuntu 13.04 to update catalog.xml | 5 | Refer Ubuntu 13.04 to update catalog.xml |
4 | 6 | ||
5 | Upstream-Status: Inappropriate [docbook 4.x development has ceased, docbook 5 is entirely different] | 7 | Upstream-Status: Inappropriate [docbook 4.x development has ceased, docbook 5 is entirely different] |
6 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
7 | --- | ||
8 | docbook-4.0/catalog.xml | 72 +++++++++++++++++++++++++++++++++++++++++++++++ | ||
9 | docbook-4.1.2/catalog.xml | 66 +++++++++++++++++++++++++++++++++++++++++++ | ||
10 | docbook-4.2/catalog.xml | 69 ++++++--------------------------------------- | ||
11 | docbook-4.3/catalog.xml | 72 ++++++++--------------------------------------- | ||
12 | docbook-4.4/catalog.xml | 63 ++--------------------------------------- | ||
13 | docbook-4.5/catalog.xml | 63 ++--------------------------------------- | ||
14 | 6 files changed, 165 insertions(+), 240 deletions(-) | ||
15 | create mode 100644 docbook-4.0/catalog.xml | ||
16 | create mode 100644 docbook-4.1.2/catalog.xml | ||
17 | 9 | ||
18 | diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml | ||
19 | new file mode 100644 | ||
20 | --- /dev/null | ||
21 | +++ b/docbook-4.0/catalog.xml | ||
22 | @@ -0,0 +1,72 @@ | ||
23 | +<?xml version='1.0'?> | ||
24 | +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" | ||
25 | + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> | ||
26 | + | ||
27 | +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> | ||
28 | + | ||
29 | +<!-- ...................................................................... --> | ||
30 | +<!-- XML Catalog data for DocBook XML V4.0............................... --> | ||
31 | +<!-- File catalog.xml ..................................................... --> | ||
32 | + | ||
33 | +<!-- Please direct all questions, bug reports, or suggestions for | ||
34 | + changes to the docbook@lists.oasis-open.org mailing list. For more | ||
35 | + information, see http://www.oasis-open.org/. | ||
36 | + --> | ||
37 | + | ||
38 | +<!-- This is the catalog data file for DocBook V4.0. It is provided as | ||
39 | + a convenience in building your own catalog files. You need not use | ||
40 | + the filenames listed here, and need not use the filename method of | ||
41 | + identifying storage objects at all. See the documentation for | ||
42 | + detailed information on the files associated with the DocBook DTD. | ||
43 | + See XML Catalogs at http://www.oasis-open.org/committees/entity/ for | ||
44 | + detailed information on supplying and using catalog data. | ||
45 | + --> | ||
46 | + | ||
47 | +<!-- ...................................................................... --> | ||
48 | +<!-- DocBook driver file .................................................. --> | ||
49 | + | ||
50 | +<public publicId="-//Norman Walsh//DTD DocBk XML V4.0//EN" | ||
51 | + uri="docbookx.dtd"/> | ||
52 | + | ||
53 | +<!-- Other ways to refer to DocBook XML v4.0............................... --> | ||
54 | +<public publicId="-//Norman Walsh//DTD DocBook XML V4.0//EN" | ||
55 | + uri="docbookx.dtd"/> | ||
56 | + | ||
57 | +<system systemId="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" | ||
58 | + uri="docbookx.dtd"/> | ||
59 | + | ||
60 | +<!-- ...................................................................... --> | ||
61 | +<!-- DocBook modules ...................................................... --> | ||
62 | + | ||
63 | +<public publicId="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" | ||
64 | + uri="dbnotnx.mod"/> | ||
65 | + | ||
66 | +<public publicId="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" | ||
67 | + uri="dbcentx.mod"/> | ||
68 | + | ||
69 | +<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" | ||
70 | + uri="dbpoolx.mod"/> | ||
71 | + | ||
72 | +<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" | ||
73 | + uri="dbhierx.mod"/> | ||
74 | + | ||
75 | +<public publicId="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" | ||
76 | + uri="dbgenent.mod"/> | ||
77 | + | ||
78 | +<public publicId="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" | ||
79 | + uri="calstblx.dtd"/> | ||
80 | + | ||
81 | +<!-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange --> | ||
82 | +<!-- Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model 19960430//EN" --> | ||
83 | +<public publicId="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN" | ||
84 | + uri="soextblx.dtd"/> | ||
85 | + | ||
86 | +<!-- the following FPI is declared for the DTD inside the DTD, but we'll --> | ||
87 | +<!-- use the version from the latest DocBook | ||
88 | +<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" | ||
89 | + uri="soextblx.dtd"/> --> | ||
90 | + | ||
91 | +<!-- End of catalog data for DocBook XML V4.0 ............................. --> | ||
92 | +<!-- ...................................................................... --> | ||
93 | + | ||
94 | +</catalog> | ||
95 | diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml | 10 | diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml |
96 | new file mode 100644 | 11 | new file mode 100644 |
97 | --- /dev/null | 12 | --- /dev/null |