diff options
Diffstat (limited to 'systems')
42 files changed, 56 insertions, 246 deletions
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph new file mode 100644 index 00000000..e983ba7a --- /dev/null +++ b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph @@ -0,0 +1,18 @@ +name: armv7lhf-cross-toolchain-system-x86_32-generic +kind: system +description: A system that contains an ARM cross compiler, intended to be used as + a sysroot. +arch: x86_32 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: armv7lhf-cross-toolchain + morph: strata/armv7lhf-cross-toolchain.morph +- name: cross-tools + morph: strata/cross-tools.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph new file mode 100644 index 00000000..1a8c20bb --- /dev/null +++ b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph @@ -0,0 +1,18 @@ +name: armv7lhf-cross-toolchain-system-x86_64-generic +kind: system +description: A system that contains an ARM cross compiler, intended to be used as + a sysroot. +arch: x86_64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: armv7lhf-cross-toolchain + morph: strata/armv7lhf-cross-toolchain.morph +- name: cross-tools + morph: strata/cross-tools.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index c1f7f155..bd51f8d8 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-armv7-highbank morph: strata/bsp-armv7-highbank.morph - name: tools diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index c1179a36..4c474959 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-jetson morph: strata/bsp-jetson.morph - name: tools diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph deleted file mode 100644 index 15b0a52c..00000000 --- a/systems/build-system-armv8l64.morph +++ /dev/null @@ -1,39 +0,0 @@ -name: build-system-armv8l64 -kind: system -description: -- | - The system that should be used for building all other Baserock systems - for little endian 64-bit ARMv8 computers. -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8l64-generic - morph: strata/bsp-armv8l64-generic.morph -- name: tools - morph: strata/tools.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -configuration-extensions: -- set-hostname -- add-config-files -- nfsboot -- install-files -- distbuild -- fstab -- mason -- cloud-init diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 04bc34bf..174cd8ce 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-ppc64-generic morph: strata/bsp-ppc64-generic.morph - name: tools diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index a118705d..8636d510 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils @@ -26,8 +24,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 6f5af401..78d5b7ad 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-x86_32-generic morph: strata/bsp-x86_32-generic.morph - name: tools @@ -28,8 +26,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index e1b37185..1c8efb33 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils @@ -26,8 +24,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 18fbebc1..969ee125 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools @@ -28,8 +26,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index b03d1653..509bd383 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -36,8 +36,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph +- name: python-tools + morph: strata/python-tools.morph - name: chef morph: strata/chef.morph configuration-extensions: diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph deleted file mode 100644 index 30094e74..00000000 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ /dev/null @@ -1,11 +0,0 @@ -name: cross-bootstrap-system-armv8l64-generic -kind: system -description: A system that produces the minimum needed to build a devel system -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.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 de474c87..305f7a22 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -27,8 +27,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 2cce69d3..427dbb3f 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -30,8 +30,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 38806421..1529522c 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -30,8 +30,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index c47be836..0f6aef58 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -30,8 +30,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 64d75350..2b43bf65 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -21,8 +21,6 @@ strata: morph: strata/openstack-clients.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 3a84d178..2e342fc3 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -24,8 +24,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 2e4b83bd..c50468a9 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -27,8 +27,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 17f8bcbb..4bae3ac8 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -31,8 +31,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index c09caf96..e542f067 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -31,8 +31,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index ffa9edd4..cda52c36 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -31,8 +31,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph deleted file mode 100644 index 27080535..00000000 --- a/systems/devel-system-armv8l64.morph +++ /dev/null @@ -1,43 +0,0 @@ -name: devel-system-armv8l64 -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on 64-bit ARMv8 computers using little-endian word. -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8l64-generic - morph: strata/bsp-armv8l64-generic.morph -- name: tools - morph: strata/tools.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: cloudinit-support - morph: strata/cloudinit-support.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: python-tools - morph: strata/python-tools.morph -- name: devtools - morph: strata/devtools.morph -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- cloud-init diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 9e575d5d..c4918572 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -25,8 +25,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index d92da0fd..a53a6a56 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -28,8 +28,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 3578c221..83e55316 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -29,8 +29,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index b53d6d93..3ad441ca 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -32,8 +32,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index aa8d6a1c..569a00d8 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -29,8 +29,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index c071b3ea..95e27414 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -32,12 +32,12 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools morph: strata/devtools.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index c104b29b..7ffddc02 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -30,8 +30,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 50581561..5cbfddbe 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 16bed197..a5f07750 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index f4828688..f5fb571e 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 979b73b0..b4e20ec7 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -21,10 +21,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: tools diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index b8bfe41e..880d40dc 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -8,8 +8,6 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph - name: foundation morph: strata/foundation.morph - name: bsp-x86_64-generic diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 0a98f205..9a23bdeb 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -12,8 +12,6 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: multimedia-common - morph: strata/multimedia-common.morph - name: multimedia-gstreamer-0.10 morph: strata/multimedia-gstreamer-0.10.morph - name: bsp-x86_64-generic diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 0f768536..1a78ff4f 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -12,10 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/test.morph b/systems/test.morph deleted file mode 100644 index dee92b19..00000000 --- a/systems/test.morph +++ /dev/null @@ -1,47 +0,0 @@ -name: test-system -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on 64-bit Intel x86 computers. -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: tools - morph: strata/tools.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: cloudinit-support - morph: strata/cloudinit-support.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: python-core - morph: strata/python-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: devtools - morph: strata/devtools.morph -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- cloud-init diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 580f53f7..0d633f41 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -11,8 +11,6 @@ strata: morph: strata/foundation.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 722e85fd..27d56e78 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -20,10 +20,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common @@ -36,12 +34,6 @@ strata: morph: strata/mesa-common.morph - name: weston-common morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: tools - morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index dfa5c3df..b84eaeb5 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common @@ -39,8 +37,6 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: tools - morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 5aea4f7b..152bf16b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -7,8 +7,6 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph - name: foundation morph: strata/foundation.morph - name: bsp-x86_64-generic @@ -23,10 +21,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: gtk2 |