From 490f87c9ccc4046caeb3ab41a067a9a5ad3ad95c Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Thu, 2 Jul 2015 09:50:57 +0000 Subject: Upgrade perl to v5.22 Change-Id: I309f2ee3d9ff0569907c51ee9984b365b31cdbf5 --- strata/bsp-x86_32-generic.morph | 8 ++- strata/bsp-x86_64-generic.morph | 8 ++- strata/bsp-x86_both-tools.morph | 8 ++- strata/core.morph | 4 +- strata/docutils.morph | 50 +++++++++++++++ strata/docutils/docbook-xml.morph | 104 ++++++++++++++++++++++++++++++++ strata/docutils/docbook-xsl.morph | 50 +++++++++++++++ strata/docutils/xml-catalog.morph | 6 ++ strata/lorry.morph | 17 +++--- strata/lorry/swig-tarball.morph | 7 --- strata/lorry/swig.morph | 7 +++ strata/virtualization.morph | 6 +- strata/virtualization/xml-catalog.morph | 6 -- 13 files changed, 244 insertions(+), 37 deletions(-) create mode 100644 strata/docutils.morph create mode 100644 strata/docutils/docbook-xml.morph create mode 100644 strata/docutils/docbook-xsl.morph create mode 100644 strata/docutils/xml-catalog.morph delete mode 100644 strata/lorry/swig-tarball.morph create mode 100644 strata/lorry/swig.morph delete mode 100644 strata/virtualization/xml-catalog.morph diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 41003643..05d179b5 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -3,7 +3,9 @@ kind: stratum description: The set of platform specific components required for booting a 32-bit x86 based system. build-depends: -- morph: strata/core.morph +# nasm wants asciidoc and xmlto for generating its docs +# so include docutils here +- morph: strata/docutils.morph chunks: - name: linux-x86-32-generic morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -13,8 +15,8 @@ chunks: - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm - ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 - unpetrify-ref: baserock/morph + ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + unpetrify-ref: nasm-2.11.08 - name: syslinux morph: strata/bsp-x86_32-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 799af9d2..31d8374c 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -3,7 +3,9 @@ kind: stratum description: The set of platform specific components required for booting a 64-bit x86 based system. build-depends: -- morph: strata/core.morph +# nasm wants asciidoc and xmlto for generating its docs +# so include docutils here +- morph: strata/docutils.morph chunks: - name: linux-x86-64-generic morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -13,8 +15,8 @@ chunks: - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm - ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 - unpetrify-ref: baserock/morph + ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + unpetrify-ref: nasm-2.11.08 - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index 6ba8a753..0d159ce6 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -3,13 +3,15 @@ kind: stratum description: The set of platform specific components required for configuring a bootable x86 based system. build-depends: -- morph: strata/core.morph +# nasm wants asciidoc and xmlto for generating its docs +# so include docutils here +- morph: strata/docutils.morph chunks: - name: nasm morph: strata/bsp-x86_both-tools/nasm.morph repo: upstream:nasm - ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 - unpetrify-ref: baserock/morph + ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + unpetrify-ref: nasm-2.11.08 - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux diff --git a/strata/core.morph b/strata/core.morph index c6e39bd6..a435c051 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -32,8 +32,8 @@ chunks: - name: perl morph: strata/core/perl.morph repo: upstream:perl - ref: 78f9a3c880f11578fb9ff9c7d5f7e34b602d2ad1 - unpetrify-ref: baserock/morph + ref: 70f63a4c7dba89e8e48b44de7978faae4319e693 + unpetrify-ref: v5.22.0 build-depends: - gdbm - name: texinfo-tarball diff --git a/strata/docutils.morph b/strata/docutils.morph new file mode 100644 index 00000000..6c5ac67b --- /dev/null +++ b/strata/docutils.morph @@ -0,0 +1,50 @@ +name: docutils +kind: stratum +description: Stuff for generating documentation +build-depends: +- morph: strata/core.morph +chunks: +- name: xml-catalog + morph: strata/docutils/xml-catalog.morph + repo: baserock:baserock/xml-catalog + ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b + unpetrify-ref: master +- name: docbook-xml + morph: strata/docutils/docbook-xml.morph + repo: upstream:docbook-xml + ref: c8f0ce32a8075e9ab21e5cf734fb96195455264d + unpetrify-ref: docbook-xml-4.5 + build-depends: + # This is a little awkward, we don't really build-depend on xml-catalog, + # but if we don't include it as a build dependency + # then we won't have the existing xml catalog in our staging area + # which would cause this chunk to create a new catalog which would + # overwrite the catalog created by the 'xml-catalog' chunk. + # + # construction of the catalog cannot be done at system-integration time + # because we need the catalog *here* in order to build nasm complete with + # man pages. + - xml-catalog +- name: docbook-xsl + morph: strata/docutils/docbook-xsl.morph + repo: upstream:docbook-xsl + ref: 802da9dd5d4bc18f46a916eedc0c5c1980a15e59 + unpetrify-ref: docbook-xsl-1.78.1 + build-depends: + # Same issue as above, except this time we don't want to overwrite + # the catalog that now contains the XML DTDs. + - docbook-xml +- name: asciidoc + repo: upstream:asciidoc + ref: d3a6df0caa94edaf8180bd71bf2fc68390f56520 + unpetrify-ref: 8.6.9 + build-depends: + - docbook-xml + - docbook-xsl +- name: xmlto + repo: upstream:xmlto-tarball + ref: 6a590aba95cbcce0f184381fb19d16558e56832d + unpetrify-ref: xmlto-0.0.26 + build-depends: + - docbook-xml + - docbook-xsl diff --git a/strata/docutils/docbook-xml.morph b/strata/docutils/docbook-xml.morph new file mode 100644 index 00000000..f18acaba --- /dev/null +++ b/strata/docutils/docbook-xml.morph @@ -0,0 +1,104 @@ +name: docbook-xml +kind: chunk +build-system: manual +install-commands: +- install -v -d -m755 "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5" +- install -v -d -m755 "$DESTDIR/etc/xml" +- | + cp -v -af docbook.cat *.dtd ent/ *.mod \ + "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5" +post-install-commands: +- | + # Create (or update) and populate the "$DESTDIR/etc/xml/docbook" catalog file + if [ ! -e /etc/xml/docbook ]; then + xmlcatalog --noout --create "$DESTDIR/etc/xml/docbook" + else + # Copy the existing catalog so we can update it + cp /etc/xml/docbook "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/etc/xml/docbook" + +- | + # Create (or update) and populate the "$DESTDIR/etc/xml/catalog" catalog file + if [ ! -e /etc/xml/catalog ]; then + echo 'Creating new xml catalog' + xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog" + else + # Copy the existing catalog so we can update it + cp /etc/xml/catalog "$DESTDIR/etc/xml/catalog" + fi + +- | + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" +- | + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" +- | + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" +- | + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook" \ + "$DESTDIR/etc/xml/catalog" diff --git a/strata/docutils/docbook-xsl.morph b/strata/docutils/docbook-xsl.morph new file mode 100644 index 00000000..b3bf396d --- /dev/null +++ b/strata/docutils/docbook-xsl.morph @@ -0,0 +1,50 @@ +name: docbook-xsl +kind: chunk +install-commands: +- install -v -m755 -d "$DESTDIR$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 \ + "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1" + +- ln -s VERSION "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl" + +- install -v -m644 -D README "$DESTDIR$PREFIX/share/doc/docbook-xsl-1.78.1/README.txt" +- | + install -v -m644 RELEASE-NOTES* NEWS* \ + "$DESTDIR$PREFIX/share/doc/docbook-xsl-1.78.1" +post-install-commands: +- if [ ! -d "$DESTDIR/etc/xml" ]; then install -v -m755 -d "$DESTDIR/etc/xml"; fi +- | + if [ ! -e /etc/xml/catalog ]; then + echo "Creating new xml catalog" + xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog" + else + cp /etc/xml/catalog "$DESTDIR/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" \ + "$DESTDIR/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" \ + "$DESTDIR/etc/xml/catalog" + +- | + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ + "$DESTDIR/etc/xml/catalog" + +- | + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \ + "$DESTDIR/etc/xml/catalog" diff --git a/strata/docutils/xml-catalog.morph b/strata/docutils/xml-catalog.morph new file mode 100644 index 00000000..34ba0306 --- /dev/null +++ b/strata/docutils/xml-catalog.morph @@ -0,0 +1,6 @@ +name: xml-catalog +kind: chunk +install-commands: +- make DESTDIR="$DESTDIR" install +post-install-commands: +- ./post-install.sh diff --git a/strata/lorry.morph b/strata/lorry.morph index 8b2e7714..3f5722ee 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -12,6 +12,7 @@ description: | build-depends: - morph: strata/foundation.morph - morph: strata/python-cliapp.morph +- morph: strata/pcre-utils.morph # for swig chunks: - name: bzr-tarball repo: upstream:bzr-tarball @@ -64,11 +65,11 @@ chunks: build-depends: - libapr - libapr-util -- name: swig-tarball - morph: strata/lorry/swig-tarball.morph - repo: upstream:swig-tarball - ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b - unpetrify-ref: baserock/morph +- name: swig + morph: strata/lorry/swig.morph + repo: upstream:swig + ref: 4e23595704d6ddffe4e50ca41bbc90e4b8893f4d + unpetrify-ref: rel-3.0.6 - name: neon morph: strata/lorry/neon.morph repo: upstream:neon @@ -77,10 +78,10 @@ chunks: - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball - ref: 2d02ea6f31311bf1b72f28c48d784b8d851ff2e0 - unpetrify-ref: baserock/morph + ref: bb0ef45f7c46b0ae221b26265ef98a768c33f820 + unpetrify-ref: subversion-1.8.13 build-depends: - - swig-tarball + - swig - libapr - libapr-util - libserf diff --git a/strata/lorry/swig-tarball.morph b/strata/lorry/swig-tarball.morph deleted file mode 100644 index 7d16d85b..00000000 --- a/strata/lorry/swig-tarball.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: swig-tarball -kind: chunk -build-system: autotools -pre-configure-commands: -- ./autogen.sh -configure-commands: -- ./configure --prefix="$PREFIX" --disable-ccache diff --git a/strata/lorry/swig.morph b/strata/lorry/swig.morph new file mode 100644 index 00000000..8a7d51b6 --- /dev/null +++ b/strata/lorry/swig.morph @@ -0,0 +1,7 @@ +name: swig +kind: chunk +build-system: autotools +pre-configure-commands: +- ./autogen.sh +configure-commands: +- ./configure --prefix="$PREFIX" --disable-ccache diff --git a/strata/virtualization.morph b/strata/virtualization.morph index ae9a7ea5..9e9eae48 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -13,17 +13,13 @@ build-depends: - morph: strata/lvm.morph - morph: strata/xorg-util-macros-common.morph - morph: strata/networking-utils.morph +- morph: strata/docutils.morph chunks: - name: yajl morph: strata/virtualization/yajl.morph repo: upstream:yajl ref: 52fc681857228c65c1cb439782da485554875481 unpetrify-ref: baserock/morph -- name: xml-catalog - morph: strata/virtualization/xml-catalog.morph - repo: baserock:baserock/xml-catalog - ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b - unpetrify-ref: master - name: dnsmasq morph: strata/virtualization/dnsmasq.morph repo: upstream:dnsmasq diff --git a/strata/virtualization/xml-catalog.morph b/strata/virtualization/xml-catalog.morph deleted file mode 100644 index 34ba0306..00000000 --- a/strata/virtualization/xml-catalog.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: xml-catalog -kind: chunk -install-commands: -- make DESTDIR="$DESTDIR" install -post-install-commands: -- ./post-install.sh -- cgit v1.2.1