| Message ID | 20190404221644.20496-6-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | e60ec1dc23df918a7ec2e4572233ee12e73f4aff |
| Headers | show |
| Series | [v2,1/9] xmlcatalog: new class to update the XML catalogue | expand |
thanks for this patchset and it fixed my builders failing to build asciidoc On Thu, Apr 4, 2019 at 3:17 PM Ross Burton <ross.burton@intel.com> wrote: > > Now that docbook-xml and docbook-xsl are writing catalog files, tell > xmllint/xsltproc where the catalog is. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb > index f684f12dc72..751bf0f19f7 100644 > --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb > +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb > @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" > > # Tell xmllint where to find the DocBook XML catalogue, because right now it > # opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch > -export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xml.xml file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xsl.xml" > +export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" > > # Not using automake > inherit autotools-brokensep > -- > 2.11.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb index f684f12dc72..751bf0f19f7 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" # Tell xmllint where to find the DocBook XML catalogue, because right now it # opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch -export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xml.xml file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xsl.xml" +export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" # Not using automake inherit autotools-brokensep
Now that docbook-xml and docbook-xsl are writing catalog files, tell xmllint/xsltproc where the catalog is. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core