From 6c8a1acd3ee6829bc242102db8c67f23dff23ee4 Mon Sep 17 00:00:00 2001 From: Ben Brewer Date: Wed, 18 Jul 2018 13:53:44 +0100 Subject: Remove docutils dependency from NASM --- elements/bsp-generic/nasm.bst | 10 ++-- elements/docutils.bst | 8 --- elements/docutils/asciidoc.bst | 10 ---- elements/docutils/docbook-xml.bst | 107 -------------------------------------- elements/docutils/docbook-xsl.bst | 52 ------------------ elements/docutils/xml-catalog.bst | 12 ----- elements/docutils/xmlto.bst | 10 ---- 7 files changed, 4 insertions(+), 205 deletions(-) delete mode 100644 elements/docutils.bst delete mode 100644 elements/docutils/asciidoc.bst delete mode 100644 elements/docutils/docbook-xml.bst delete mode 100644 elements/docutils/docbook-xsl.bst delete mode 100644 elements/docutils/xml-catalog.bst delete mode 100644 elements/docutils/xmlto.bst diff --git a/elements/bsp-generic/nasm.bst b/elements/bsp-generic/nasm.bst index e78d422d..53bc68a4 100644 --- a/elements/bsp-generic/nasm.bst +++ b/elements/bsp-generic/nasm.bst @@ -4,17 +4,15 @@ depends: - gnu-toolchain.bst - filename: core/autoconf.bst type: build -- filename: docutils/asciidoc.bst - type: build -- filename: docutils/xmlto.bst - type: build sources: - kind: git url: upstream:nasm - track: nasm-2.11.08 - ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + track: nasm-2.13.03 + ref: ef7d18bfbb899fe8e44f4fae8d6a12e2742f69f5 config: install-commands: + # Remove manpages from install, as there is no config option. + - sed -i '/man1/d' Makefile - make INSTALLROOT="%{install-root}" install diff --git a/elements/docutils.bst b/elements/docutils.bst deleted file mode 100644 index e9632049..00000000 --- a/elements/docutils.bst +++ /dev/null @@ -1,8 +0,0 @@ -kind: stack -description: Stuff for generating documentation -depends: -- docutils/xml-catalog.bst -- docutils/docbook-xml.bst -- docutils/docbook-xsl.bst -- docutils/asciidoc.bst -- docutils/xmlto.bst diff --git a/elements/docutils/asciidoc.bst b/elements/docutils/asciidoc.bst deleted file mode 100644 index 89d07469..00000000 --- a/elements/docutils/asciidoc.bst +++ /dev/null @@ -1,10 +0,0 @@ -kind: autotools -depends: -- python2-core.bst -- docutils/docbook-xml.bst -- docutils/docbook-xsl.bst -sources: -- kind: git - url: upstream:asciidoc - track: 8.6.9 - ref: d3a6df0caa94edaf8180bd71bf2fc68390f56520 diff --git a/elements/docutils/docbook-xml.bst b/elements/docutils/docbook-xml.bst deleted file mode 100644 index dcecfde8..00000000 --- a/elements/docutils/docbook-xml.bst +++ /dev/null @@ -1,107 +0,0 @@ -kind: manual -depends: -- python2-core.bst -- docutils/xml-catalog.bst -sources: -- kind: git - url: upstream:docbook-xml - track: docbook-xml-4.5 - ref: c8f0ce32a8075e9ab21e5cf734fb96195455264d -config: - install-commands: - - install -v -d -m755 "%{install-root}%{prefix}/share/xml/docbook/xml-dtd-4.5" - - install -v -d -m755 "%{install-root}/etc/xml" - - | - cp -v -af docbook.cat *.dtd ent/ *.mod \ - "%{install-root}%{prefix}/share/xml/docbook/xml-dtd-4.5" - - | - # Create (or update) and populate the "%{install-root}/etc/xml/docbook" catalog file - if [ ! -e /etc/xml/docbook ]; then - xmlcatalog --noout --create "%{install-root}/etc/xml/docbook" - else - # Copy the existing catalog so we can update it - cp /etc/xml/docbook "%{install-root}/etc/xml/docbook" - fi - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - "%{install-root}/etc/xml/docbook" - - | - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - "%{install-root}/etc/xml/docbook" - - | - # Create (or update) and populate the "%{install-root}/etc/xml/catalog" catalog file - if [ ! -e /etc/xml/catalog ]; then - echo 'Creating new xml catalog' - xmlcatalog --noout --create "%{install-root}/etc/xml/catalog" - else - # Copy the existing catalog so we can update it - cp /etc/xml/catalog "%{install-root}/etc/xml/catalog" - fi - - | - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//ENTITIES DocBook XML" \ - "file:///etc/xml/docbook" \ - "%{install-root}/etc/xml/catalog" - - | - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//DTD DocBook XML" \ - "file:///etc/xml/docbook" \ - "%{install-root}/etc/xml/catalog" - - | - xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - "%{install-root}/etc/xml/catalog" - - | - xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - "%{install-root}/etc/xml/catalog" diff --git a/elements/docutils/docbook-xsl.bst b/elements/docutils/docbook-xsl.bst deleted file mode 100644 index 7a07ef97..00000000 --- a/elements/docutils/docbook-xsl.bst +++ /dev/null @@ -1,52 +0,0 @@ -kind: manual -depends: -- python2-core.bst -- docutils/docbook-xml.bst -sources: -- kind: git - url: upstream:docbook-xsl - track: docbook-xsl-1.78.1 - ref: 802da9dd5d4bc18f46a916eedc0c5c1980a15e59 -config: - install-commands: - - install -v -m755 -d "%{install-root}%{prefix}/share/xml/docbook/xsl-stylesheets-1.78.1" - - | - cp -v -R VERSION common eclipse epub extensions fo highlighting html \ - htmlhelp images javahelp lib manpages params profiling \ - roundtrip slides template tests tools webhelp website \ - xhtml xhtml-1_1 \ - "%{install-root}%{prefix}/share/xml/docbook/xsl-stylesheets-1.78.1" - - ln -s VERSION "%{install-root}%{prefix}/share/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl" - - install -v -m644 -D README "%{install-root}%{prefix}/share/doc/docbook-xsl-1.78.1/README.txt" - - | - install -v -m644 RELEASE-NOTES* NEWS* \ - "%{install-root}%{prefix}/share/doc/docbook-xsl-1.78.1" - - if [ ! -d "%{install-root}/etc/xml" ]; then install -v -m755 -d "%{install-root}/etc/xml"; - fi - - | - if [ ! -e /etc/xml/catalog ]; then - echo "Creating new xml catalog" - xmlcatalog --noout --create "%{install-root}/etc/xml/catalog" - else - cp /etc/xml/catalog "%{install-root}/etc/xml/catalog" - fi - - | - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/1.78.1" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ - "%{install-root}/etc/xml/catalog" - - | - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/1.78.1" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ - "%{install-root}/etc/xml/catalog" - - | - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ - "%{install-root}/etc/xml/catalog" - - | - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ - "%{install-root}/etc/xml/catalog" diff --git a/elements/docutils/xml-catalog.bst b/elements/docutils/xml-catalog.bst deleted file mode 100644 index 57076328..00000000 --- a/elements/docutils/xml-catalog.bst +++ /dev/null @@ -1,12 +0,0 @@ -kind: manual -depends: -- python2-core.bst -sources: -- kind: git - url: baserock:baserock/xml-catalog - track: master - ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b -config: - install-commands: - - make DESTDIR="%{install-root}" install - - DESTDIR="%{install-root}" ./post-install.sh diff --git a/elements/docutils/xmlto.bst b/elements/docutils/xmlto.bst deleted file mode 100644 index 45c5f7db..00000000 --- a/elements/docutils/xmlto.bst +++ /dev/null @@ -1,10 +0,0 @@ -kind: autotools -depends: -- python2-core.bst -- docutils/docbook-xml.bst -- docutils/docbook-xsl.bst -sources: -- kind: git - url: upstream:xmlto-tarball - track: xmlto-0.0.26 - ref: 6a590aba95cbcce0f184381fb19d16558e56832d -- cgit v1.2.1