From b82afc5237ef590715fb74836d82d9a80c4bc969 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 29 Aug 2017 17:10:24 +0000 Subject: Remove Morph and some of its dependencies It's unmaintained and probably unusable these days. The baserock-import tool depends on Morph and has also been removed. Hopefully it can one day start a new life as a BuildStream importer tool... --- strata/baserock-import.morph | 24 ----------- strata/morph-utils.morph | 46 ---------------------- strata/morph-utils/cmdtest.morph | 6 --- strata/morph-utils/pyfilesystem.morph | 6 --- strata/morph-utils/python-ttystatus.morph | 6 --- strata/tools/git-fat.morph | 4 -- systems/build-system-armv5l-openbmc-aspeed.morph | 2 - ...build-system-armv7l-altera-socfpga-devkit.morph | 2 - systems/build-system-armv7lhf-highbank.morph | 2 - systems/build-system-armv7lhf-jetson.morph | 2 - systems/build-system-armv7lhf-rootfs.morph | 2 - systems/build-system-armv8b64.morph | 2 - systems/build-system-armv8l64.morph | 2 - systems/build-system-ppc64.morph | 2 - systems/build-system-x86_32-chroot.morph | 2 - systems/build-system-x86_32.morph | 2 - systems/build-system-x86_64-chroot.morph | 2 - systems/build-system-x86_64.morph | 2 - .../cross-bootstrap-system-armv5l-generic.morph | 2 - .../cross-bootstrap-system-armv7lhf-generic.morph | 2 - .../cross-bootstrap-system-armv8b64-generic.morph | 2 - .../cross-bootstrap-system-armv8l64-generic.morph | 2 - systems/cross-bootstrap-system-ppc64-generic.morph | 2 - .../cross-bootstrap-system-x86_64-generic.morph | 2 - systems/devel-system-armv7-chroot.morph | 4 -- systems/devel-system-armv7-highbank.morph | 4 -- systems/devel-system-armv7-versatile.morph | 4 -- systems/devel-system-armv7-wandboard.morph | 4 -- systems/devel-system-armv7b-chroot.morph | 4 -- systems/devel-system-armv7b-highbank.morph | 4 -- ...devel-system-armv7l-altera-socfpga-devkit.morph | 4 -- systems/devel-system-armv7lhf-chroot.morph | 4 -- systems/devel-system-armv7lhf-highbank.morph | 4 -- systems/devel-system-armv7lhf-jetson.morph | 4 -- systems/devel-system-armv7lhf-wandboard.morph | 4 -- systems/devel-system-armv8b64.morph | 4 -- systems/devel-system-armv8l64.morph | 4 -- systems/devel-system-ppc64-chroot.morph | 4 -- systems/devel-system-ppc64-generic.morph | 4 -- systems/devel-system-x86_32-chroot.morph | 4 -- systems/devel-system-x86_32-generic.morph | 4 -- systems/devel-system-x86_64-chroot.morph | 4 -- systems/devel-system-x86_64-generic.morph | 4 -- systems/devel-system-x86_64-vagrant.morph | 4 -- systems/installer-system-armv8b64.morph | 2 - systems/installer-system-x86_64.morph | 2 - trove/strata/trove.morph | 2 +- trove/systems/trove-system-x86_64.morph | 4 +- .../systems/ceph-service-x86_64-generic.morph | 6 +-- .../systems/java-build-system-x86_64-generic.morph | 6 +-- unmaintained/systems/xfce-system-x86_64.morph | 4 +- 51 files changed, 9 insertions(+), 225 deletions(-) delete mode 100644 strata/baserock-import.morph delete mode 100644 strata/morph-utils.morph delete mode 100644 strata/morph-utils/cmdtest.morph delete mode 100644 strata/morph-utils/pyfilesystem.morph delete mode 100644 strata/morph-utils/python-ttystatus.morph delete mode 100644 strata/tools/git-fat.morph diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph deleted file mode 100644 index bc01a9a6..00000000 --- a/strata/baserock-import.morph +++ /dev/null @@ -1,24 +0,0 @@ -name: baserock-import -kind: stratum -description: Tools for importing software into Baserock definitions. -build-depends: -- morph: strata/python-common.morph -- morph: strata/morph-utils.morph -chunks: -- name: ansicolor - repo: upstream:python-packages/ansicolor - ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef - unpetrify-ref: 0.2.4 - build-system: python-distutils -- name: requests-cache - repo: upstream:python-packages/requests-cache - ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf - unpetrify-ref: 0.4.6 - build-system: python-distutils -- name: baserock-import - repo: baserock:baserock/import - ref: 6406a6992b709b4ae65de5b2f7b27cb005a2ec8d - unpetrify-ref: master - build-system: python-distutils - build-depends: - - ansicolor diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph deleted file mode 100644 index 4a385623..00000000 --- a/strata/morph-utils.morph +++ /dev/null @@ -1,46 +0,0 @@ -name: morph-utils -kind: stratum -build-depends: -- morph: strata/core.morph -- morph: strata/ostree-core.morph -- morph: strata/python-cliapp.morph -- morph: strata/python2-core.morph -- morph: strata/python-pygobject.morph -- morph: strata/python-wsgi.morph -chunks: -- name: python-ttystatus - morph: strata/morph-utils/python-ttystatus.morph - repo: upstream:python-ttystatus - ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 - unpetrify-ref: baserock/morph -- name: git-fat - morph: strata/tools/git-fat.morph - repo: upstream:git-fat - ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 - unpetrify-ref: baserock/morph -- name: pyfilesystem - morph: strata/morph-utils/pyfilesystem.morph - repo: upstream:pyfilesystem - ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 - unpetrify-ref: baserock/morph -- name: cmdtest - morph: strata/morph-utils/cmdtest.morph - repo: upstream:cmdtest - ref: ac91791842c6e7e6eda3213916af413255999c7b - unpetrify-ref: baserock/morph - build-depends: - - python-ttystatus -- name: pylru - repo: upstream:python-packages/pylru - ref: 221dd259f5c34562c835611d1cf62384b9019da4 - unpetrify-ref: master - build-system: python-distutils -- name: morph - repo: baserock:baserock/morph - ref: 74e8d1b9aeb47d957d526250784d2c0087e59bf9 - unpetrify-ref: master - build-system: python-distutils - build-depends: - - cmdtest - - pyfilesystem - - pylru diff --git a/strata/morph-utils/cmdtest.morph b/strata/morph-utils/cmdtest.morph deleted file mode 100644 index 3e1c71c6..00000000 --- a/strata/morph-utils/cmdtest.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: cmdtest -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/morph-utils/pyfilesystem.morph b/strata/morph-utils/pyfilesystem.morph deleted file mode 100644 index a4931dfa..00000000 --- a/strata/morph-utils/pyfilesystem.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: pyfilesystem -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/morph-utils/python-ttystatus.morph b/strata/morph-utils/python-ttystatus.morph deleted file mode 100644 index e45ef7a8..00000000 --- a/strata/morph-utils/python-ttystatus.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-ttystatus -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/tools/git-fat.morph b/strata/tools/git-fat.morph deleted file mode 100644 index c971b07f..00000000 --- a/strata/tools/git-fat.morph +++ /dev/null @@ -1,4 +0,0 @@ -name: git-fat -kind: chunk -install-commands: -- install -D -m 755 git-fat "$DESTDIR/usr/bin/git-fat" diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph index 98432e02..2d0a731b 100644 --- a/systems/build-system-armv5l-openbmc-aspeed.morph +++ b/systems/build-system-armv5l-openbmc-aspeed.morph @@ -23,8 +23,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: devtools morph: strata/devtools.morph - name: libsoup-common diff --git a/systems/build-system-armv7l-altera-socfpga-devkit.morph b/systems/build-system-armv7l-altera-socfpga-devkit.morph index e5598685..e6ed84fd 100644 --- a/systems/build-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/build-system-armv7l-altera-socfpga-devkit.morph @@ -23,8 +23,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index d1fb1652..926425a1 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-wsgi.morph - name: python-pygobject morph: strata/python-pygobject.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index c6ec46a0..d9baf7e7 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-armv7lhf-rootfs.morph b/systems/build-system-armv7lhf-rootfs.morph index 4e4fc0b8..96fd13c8 100644 --- a/systems/build-system-armv7lhf-rootfs.morph +++ b/systems/build-system-armv7lhf-rootfs.morph @@ -20,8 +20,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph index 93397d6a..a389ca16 100644 --- a/systems/build-system-armv8b64.morph +++ b/systems/build-system-armv8b64.morph @@ -31,8 +31,6 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index d4b8c234..6dbc2865 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -23,8 +23,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index c67d2dc3..8695fa9f 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index ab13ae76..7e6a3787 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -20,8 +20,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index cb6a0207..42eeea38 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 4ecec4a0..74026318 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -20,8 +20,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 8e7f545b..eb0129bf 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph - name: python-common diff --git a/systems/cross-bootstrap-system-armv5l-generic.morph b/systems/cross-bootstrap-system-armv5l-generic.morph index ff151deb..515120d5 100644 --- a/systems/cross-bootstrap-system-armv5l-generic.morph +++ b/systems/cross-bootstrap-system-armv5l-generic.morph @@ -19,7 +19,5 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph index 52ac2de9..dba2e945 100644 --- a/systems/cross-bootstrap-system-armv7lhf-generic.morph +++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph @@ -19,7 +19,5 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-armv8b64-generic.morph b/systems/cross-bootstrap-system-armv8b64-generic.morph index a3c3bc21..baa30176 100644 --- a/systems/cross-bootstrap-system-armv8b64-generic.morph +++ b/systems/cross-bootstrap-system-armv8b64-generic.morph @@ -19,7 +19,5 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph index 0ea68f8a..1e891bab 100644 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -19,7 +19,5 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph index 17e40242..25ecd6be 100644 --- a/systems/cross-bootstrap-system-ppc64-generic.morph +++ b/systems/cross-bootstrap-system-ppc64-generic.morph @@ -19,7 +19,5 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph index 8c597841..dd2f295c 100644 --- a/systems/cross-bootstrap-system-x86_64-generic.morph +++ b/systems/cross-bootstrap-system-x86_64-generic.morph @@ -19,7 +19,5 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 92eee657..0c9c2258 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -21,8 +21,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -33,8 +31,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 465f190a..f7a05920 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -32,8 +30,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 6c2a0631..a0fadae8 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -32,8 +30,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 3904ce01..3b5012c5 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -32,8 +30,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index dd9feae8..6d7bba5f 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -21,12 +21,8 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 0052b9d2..5a414886 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -22,14 +22,10 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph index 6486aa4c..5603a942 100644 --- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph @@ -23,16 +23,12 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: nodejs morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index d0ea1b0b..814e4549 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -21,8 +21,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -33,8 +31,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 7c703093..3d87f210 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -23,8 +23,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -35,8 +33,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 2376a869..4a67152c 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -21,8 +21,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -37,8 +35,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 0a28f15c..e3535211 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -23,8 +23,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -35,8 +33,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph index 0eb2a456..ca539138 100644 --- a/systems/devel-system-armv8b64.morph +++ b/systems/devel-system-armv8b64.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -36,8 +34,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index 93c06263..913db847 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -34,8 +32,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 97467640..f120103c 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -21,8 +21,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -31,8 +29,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index b31ca448..970386f9 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -32,8 +30,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 947c7363..6c3a8dd6 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -21,8 +21,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: bsp-x86_both-tools @@ -33,8 +31,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 42c86b54..90ee9923 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -36,8 +34,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index cecee3f4..6e3750f7 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -21,8 +21,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -35,8 +33,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 3ec72443..fdbb25dc 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -36,8 +34,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index b3d57b0a..b5377541 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -22,8 +22,6 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -36,8 +34,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: python2-core morph: strata/python2-core.morph - name: python-tools diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph index ded674c5..02fb58ec 100644 --- a/systems/installer-system-armv8b64.morph +++ b/systems/installer-system-armv8b64.morph @@ -28,8 +28,6 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: installer-utils morph: strata/installer-utils.morph configuration-extensions: diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 5623f82d..a7b07b6a 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -28,8 +28,6 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph - name: installer-utils morph: strata/installer-utils.morph configuration-extensions: diff --git a/trove/strata/trove.morph b/trove/strata/trove.morph index 8306c630..ad2ce8c1 100644 --- a/trove/strata/trove.morph +++ b/trove/strata/trove.morph @@ -4,7 +4,7 @@ description: Trove software build-depends: - morph: strata/python2-core.morph - morph: strata/tools.morph -- morph: strata/morph-utils.morph +- morph: strata/buildstream-tools.morph - morph: strata/pcre-utils.morph chunks: - name: lua diff --git a/trove/systems/trove-system-x86_64.morph b/trove/systems/trove-system-x86_64.morph index fa691d62..97814982 100644 --- a/trove/systems/trove-system-x86_64.morph +++ b/trove/systems/trove-system-x86_64.morph @@ -31,8 +31,8 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph +- name: buildstream-tools + morph: strata/buildstream-tools.morph - name: lorry morph: strata/lorry.morph - name: lorry-controller diff --git a/unmaintained/systems/ceph-service-x86_64-generic.morph b/unmaintained/systems/ceph-service-x86_64-generic.morph index ba48f0e6..be2b3f8d 100644 --- a/unmaintained/systems/ceph-service-x86_64-generic.morph +++ b/unmaintained/systems/ceph-service-x86_64-generic.morph @@ -38,8 +38,8 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph +- name: buildstream-tools + morph: strata/buildstream-tools.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -50,8 +50,6 @@ strata: morph: strata/nodejs.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/unmaintained/systems/java-build-system-x86_64-generic.morph b/unmaintained/systems/java-build-system-x86_64-generic.morph index 2a26b7b1..2f7af1db 100644 --- a/unmaintained/systems/java-build-system-x86_64-generic.morph +++ b/unmaintained/systems/java-build-system-x86_64-generic.morph @@ -25,8 +25,8 @@ strata: morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph +- name: buildstream-tools + morph: strata/buildstream-tools.morph - name: openstack-common morph: strata/openstack-common.morph - name: openstack-clients @@ -39,8 +39,6 @@ strata: morph: strata/ruby.morph - name: lorry morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph - name: python2-core diff --git a/unmaintained/systems/xfce-system-x86_64.morph b/unmaintained/systems/xfce-system-x86_64.morph index 8525a28c..d2bd5098 100644 --- a/unmaintained/systems/xfce-system-x86_64.morph +++ b/unmaintained/systems/xfce-system-x86_64.morph @@ -67,8 +67,8 @@ strata: morph: strata/pcre-utils.morph - name: ostree-core morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph +- name: buildstream-tools + morph: strata/buildstream-tools.morph - name: xfce morph: unmaintained/strata/xfce.morph configuration-extensions: -- cgit v1.2.1