summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-11-19 16:09:07 +0000
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-11-19 16:09:07 +0000
commit53c7140bfe3317abeeaa85fc2f72cc8d9b052355 (patch)
tree7f02dd4c306b5619988b87b9a2a5cf28a5fcd02b
parente3e0baf91a5f0e1bcd1fad06345bbe4ec88fad1d (diff)
downloaddefinitions-baserock/ps/simple-defs.tar.gz
After morph-converter.shbaserock/ps/simple-defs
-rw-r--r--clusters/ci.def13
-rw-r--r--clusters/ci.morph14
-rw-r--r--clusters/example-distbuild-cluster.def36
-rw-r--r--clusters/example-distbuild-cluster.morph37
-rw-r--r--clusters/gerrit-openstack.def15
-rw-r--r--clusters/gerrit-openstack.morph16
-rw-r--r--clusters/gitlab-ci-runner-cluster.def15
-rw-r--r--clusters/gitlab-ci-runner-cluster.morph16
-rw-r--r--clusters/gitlab-cluster.def47
-rw-r--r--clusters/gitlab-cluster.morph48
-rw-r--r--clusters/gitlab-server-cluster.def21
-rw-r--r--clusters/gitlab-server-cluster.morph22
-rw-r--r--clusters/image-package-example.def11
-rw-r--r--clusters/image-package-example.morph12
-rw-r--r--clusters/initramfs-test.def15
-rw-r--r--clusters/initramfs-test.morph17
-rw-r--r--clusters/jetson-upgrade.def16
-rw-r--r--clusters/jetson-upgrade.morph17
-rw-r--r--clusters/mason-openstack.def38
-rw-r--r--clusters/mason-openstack.morph39
-rw-r--r--clusters/mason.def55
-rw-r--r--clusters/mason.morph56
-rw-r--r--clusters/minimal-system-deploy.def13
-rw-r--r--clusters/minimal-system-deploy.morph14
-rw-r--r--clusters/release.def59
-rw-r--r--clusters/release.morph60
-rw-r--r--clusters/sdk-example-cluster.def44
-rw-r--r--clusters/sdk-example-cluster.morph46
-rw-r--r--clusters/trove-example.def59
-rw-r--r--clusters/trove-example.morph60
-rw-r--r--clusters/trove.baserock.org-upgrade.def22
-rw-r--r--clusters/trove.baserock.org-upgrade.morph23
-rw-r--r--clusters/upgrade-devel.def38
-rw-r--r--clusters/upgrade-devel.morph39
-rw-r--r--strata/NetworkManager-common.def15
-rw-r--r--strata/NetworkManager-common.morph18
-rw-r--r--strata/NetworkManager-common/NetworkManager.def4
-rw-r--r--strata/NetworkManager-common/NetworkManager.morph5
-rw-r--r--strata/ansible.def26
-rw-r--r--strata/ansible.morph30
-rw-r--r--strata/ansible/ansible.def4
-rw-r--r--strata/ansible/ansible.morph5
-rw-r--r--strata/armv7lhf-cross-toolchain.def34
-rw-r--r--strata/armv7lhf-cross-toolchain.morph42
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.def23
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph24
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.def46
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph47
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.def53
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph54
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.def44
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph45
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.def9
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph10
-rw-r--r--strata/audio-bluetooth.def82
-rw-r--r--strata/audio-bluetooth.morph101
-rw-r--r--strata/audio-bluetooth/alsa-lib.def3
-rw-r--r--strata/audio-bluetooth/alsa-lib.morph4
-rw-r--r--strata/audio-bluetooth/alsa-utils.def6
-rw-r--r--strata/audio-bluetooth/alsa-utils.morph7
-rw-r--r--strata/audio-bluetooth/bluez-tools.def9
-rw-r--r--strata/audio-bluetooth/bluez-tools.morph10
-rw-r--r--strata/audio-bluetooth/bluez.def11
-rw-r--r--strata/audio-bluetooth/bluez.morph12
-rw-r--r--strata/audio-bluetooth/json-c.def6
-rw-r--r--strata/audio-bluetooth/json-c.morph7
-rw-r--r--strata/audio-bluetooth/libical.def5
-rw-r--r--strata/audio-bluetooth/libical.morph6
-rw-r--r--strata/audio-bluetooth/libsndfile.def4
-rw-r--r--strata/audio-bluetooth/libsndfile.morph5
-rw-r--r--strata/audio-bluetooth/nohands.def4
-rw-r--r--strata/audio-bluetooth/nohands.morph5
-rw-r--r--strata/audio-bluetooth/ofono.def10
-rw-r--r--strata/audio-bluetooth/ofono.morph11
-rw-r--r--strata/audio-bluetooth/pulseaudio.def12
-rw-r--r--strata/audio-bluetooth/pulseaudio.morph13
-rw-r--r--strata/bsp-armv7-highbank.def9
-rw-r--r--strata/bsp-armv7-highbank.morph12
-rw-r--r--strata/bsp-armv7-highbank/linux-armv7-highbank.def46
-rw-r--r--strata/bsp-armv7-highbank/linux-armv7-highbank.morph47
-rw-r--r--strata/bsp-armv7-versatile.def10
-rw-r--r--strata/bsp-armv7-versatile.morph13
-rw-r--r--strata/bsp-armv7-versatile/linux-armv7-versatile.def26
-rw-r--r--strata/bsp-armv7-versatile/linux-armv7-versatile.morph27
-rw-r--r--strata/bsp-armv7b-highbank.def9
-rw-r--r--strata/bsp-armv7b-highbank.morph12
-rw-r--r--strata/bsp-armv7b-highbank/linux-armv7b-highbank.def48
-rw-r--r--strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph49
-rw-r--r--strata/bsp-armv7b-vexpress-tc2.def9
-rw-r--r--strata/bsp-armv7b-vexpress-tc2.morph12
-rw-r--r--strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.def51
-rw-r--r--strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph52
-rw-r--r--strata/bsp-jetson.def43
-rw-r--r--strata/bsp-jetson.morph53
-rw-r--r--strata/bsp-jetson/bsp-support.def5
-rw-r--r--strata/bsp-jetson/bsp-support.morph6
-rw-r--r--strata/bsp-jetson/device-tree-compiler.def5
-rw-r--r--strata/bsp-jetson/device-tree-compiler.morph6
-rw-r--r--strata/bsp-jetson/linux-firmware-jetson.def5
-rw-r--r--strata/bsp-jetson/linux-firmware-jetson.morph6
-rw-r--r--strata/bsp-jetson/linux-jetson-tk1.def72
-rw-r--r--strata/bsp-jetson/linux-jetson-tk1.morph73
-rw-r--r--strata/bsp-jetson/nouveau-drm.def11
-rw-r--r--strata/bsp-jetson/nouveau-drm.morph12
-rw-r--r--strata/bsp-jetson/u-boot.def15
-rw-r--r--strata/bsp-jetson/u-boot.morph16
-rw-r--r--strata/bsp-ppc64-generic.def9
-rw-r--r--strata/bsp-ppc64-generic.morph12
-rw-r--r--strata/bsp-ppc64-generic/linux-ppc64.def55
-rw-r--r--strata/bsp-ppc64-generic/linux-ppc64.morph56
-rw-r--r--strata/bsp-wandboard.def15
-rw-r--r--strata/bsp-wandboard.morph19
-rw-r--r--strata/bsp-wandboard/linux-armv7-wandboard.def64
-rw-r--r--strata/bsp-wandboard/linux-armv7-wandboard.morph65
-rw-r--r--strata/bsp-wandboard/u-boot.def10
-rw-r--r--strata/bsp-wandboard/u-boot.morph11
-rw-r--r--strata/bsp-x86_32-generic.def20
-rw-r--r--strata/bsp-x86_32-generic.morph26
-rw-r--r--strata/bsp-x86_32-generic/linux-x86-32-generic.def102
-rw-r--r--strata/bsp-x86_32-generic/linux-x86-32-generic.morph103
-rw-r--r--strata/bsp-x86_32-generic/nasm.def4
-rw-r--r--strata/bsp-x86_32-generic/nasm.morph5
-rw-r--r--strata/bsp-x86_32-generic/syslinux.def7
-rw-r--r--strata/bsp-x86_32-generic/syslinux.morph8
-rw-r--r--strata/bsp-x86_64-generic.def20
-rw-r--r--strata/bsp-x86_64-generic.morph26
-rw-r--r--strata/bsp-x86_64-generic/linux-x86-64-generic.def102
-rw-r--r--strata/bsp-x86_64-generic/linux-x86-64-generic.morph103
-rw-r--r--strata/bsp-x86_64-generic/nasm.def4
-rw-r--r--strata/bsp-x86_64-generic/nasm.morph5
-rw-r--r--strata/bsp-x86_64-generic/syslinux.def7
-rw-r--r--strata/bsp-x86_64-generic/syslinux.morph8
-rw-r--r--strata/bsp-x86_both-tools.def16
-rw-r--r--strata/bsp-x86_both-tools.morph20
-rw-r--r--strata/bsp-x86_both-tools/nasm.def4
-rw-r--r--strata/bsp-x86_both-tools/nasm.morph5
-rw-r--r--strata/bsp-x86_both-tools/syslinux.def7
-rw-r--r--strata/bsp-x86_both-tools/syslinux.morph8
-rw-r--r--strata/build-essential.def318
-rw-r--r--strata/build-essential.morph344
-rw-r--r--strata/build-essential/binutils.def7
-rw-r--r--strata/build-essential/binutils.morph8
-rw-r--r--strata/build-essential/busybox.def123
-rw-r--r--strata/build-essential/busybox.morph124
-rw-r--r--strata/build-essential/ccache.def11
-rw-r--r--strata/build-essential/ccache.morph12
-rw-r--r--strata/build-essential/fhs-dirs.def49
-rw-r--r--strata/build-essential/fhs-dirs.morph50
-rw-r--r--strata/build-essential/gawk.def4
-rw-r--r--strata/build-essential/gawk.morph5
-rw-r--r--strata/build-essential/gcc.def41
-rw-r--r--strata/build-essential/gcc.morph42
-rw-r--r--strata/build-essential/glibc.def85
-rw-r--r--strata/build-essential/glibc.morph86
-rw-r--r--strata/build-essential/linux-api-headers.def5
-rw-r--r--strata/build-essential/linux-api-headers.morph6
-rw-r--r--strata/build-essential/make.def4
-rw-r--r--strata/build-essential/make.morph5
-rw-r--r--strata/build-essential/stage1-binutils.def16
-rw-r--r--strata/build-essential/stage1-binutils.morph17
-rw-r--r--strata/build-essential/stage1-gcc.def47
-rw-r--r--strata/build-essential/stage1-gcc.morph48
-rw-r--r--strata/build-essential/stage2-binutils.def23
-rw-r--r--strata/build-essential/stage2-binutils.morph24
-rw-r--r--strata/build-essential/stage2-busybox.def71
-rw-r--r--strata/build-essential/stage2-busybox.morph72
-rw-r--r--strata/build-essential/stage2-fake-bash.def3
-rw-r--r--strata/build-essential/stage2-fake-bash.morph4
-rw-r--r--strata/build-essential/stage2-fhs-dirs.def51
-rw-r--r--strata/build-essential/stage2-fhs-dirs.morph52
-rw-r--r--strata/build-essential/stage2-gawk.def8
-rw-r--r--strata/build-essential/stage2-gawk.morph9
-rw-r--r--strata/build-essential/stage2-gcc-fixed-headers.def18
-rw-r--r--strata/build-essential/stage2-gcc-fixed-headers.morph19
-rw-r--r--strata/build-essential/stage2-gcc.def67
-rw-r--r--strata/build-essential/stage2-gcc.morph68
-rw-r--r--strata/build-essential/stage2-glibc.def56
-rw-r--r--strata/build-essential/stage2-glibc.morph57
-rw-r--r--strata/build-essential/stage2-linux-api-headers.def7
-rw-r--r--strata/build-essential/stage2-linux-api-headers.morph8
-rw-r--r--strata/build-essential/stage2-make.def8
-rw-r--r--strata/build-essential/stage2-make.morph9
-rw-r--r--strata/build-essential/stage2-reset-specs.def20
-rw-r--r--strata/build-essential/stage2-reset-specs.morph21
-rw-r--r--strata/build-essential/zlib.def8
-rw-r--r--strata/build-essential/zlib.morph9
-rw-r--r--strata/ceph-service.def53
-rw-r--r--strata/ceph-service.morph65
-rw-r--r--strata/ceph-service/boost.def7
-rw-r--r--strata/ceph-service/boost.morph8
-rw-r--r--strata/ceph-service/ceph.def17
-rw-r--r--strata/ceph-service/ceph.morph18
-rw-r--r--strata/ceph-service/keyutils.def6
-rw-r--r--strata/ceph-service/keyutils.morph7
-rw-r--r--strata/ceph-service/leveldb.def5
-rw-r--r--strata/ceph-service/leveldb.morph6
-rw-r--r--strata/ceph-service/libaio.def6
-rw-r--r--strata/ceph-service/libaio.morph7
-rw-r--r--strata/cloudinit-support.def48
-rw-r--r--strata/cloudinit-support.morph57
-rw-r--r--strata/cloudinit-support/cloud-init.def5
-rw-r--r--strata/cloudinit-support/cloud-init.morph6
-rw-r--r--strata/cloudinit-support/python-prettytable.def5
-rw-r--r--strata/cloudinit-support/python-prettytable.morph6
-rw-r--r--strata/connectivity.def18
-rw-r--r--strata/connectivity.morph22
-rw-r--r--strata/connectivity/wpa_supplicant.def7
-rw-r--r--strata/connectivity/wpa_supplicant.morph8
-rw-r--r--strata/connman-common.def8
-rw-r--r--strata/connman-common.morph11
-rw-r--r--strata/connman-common/connman.def5
-rw-r--r--strata/connman-common/connman.morph6
-rw-r--r--strata/core.def269
-rw-r--r--strata/core.morph312
-rw-r--r--strata/core/autoconf.def4
-rw-r--r--strata/core/autoconf.morph5
-rw-r--r--strata/core/automake.def7
-rw-r--r--strata/core/automake.morph8
-rw-r--r--strata/core/bash.def7
-rw-r--r--strata/core/bash.morph8
-rw-r--r--strata/core/bison.def9
-rw-r--r--strata/core/bison.morph10
-rw-r--r--strata/core/bzip2.def9
-rw-r--r--strata/core/bzip2.morph10
-rw-r--r--strata/core/ca-certificates.def17
-rw-r--r--strata/core/ca-certificates.morph18
-rw-r--r--strata/core/cmake.def7
-rw-r--r--strata/core/cmake.morph8
-rw-r--r--strata/core/cpython.def6
-rw-r--r--strata/core/cpython.morph7
-rw-r--r--strata/core/curl.def8
-rw-r--r--strata/core/curl.morph9
-rw-r--r--strata/core/flex.def11
-rw-r--r--strata/core/flex.morph12
-rw-r--r--strata/core/gdbm.def7
-rw-r--r--strata/core/gdbm.morph8
-rw-r--r--strata/core/gettext.def8
-rw-r--r--strata/core/gettext.morph9
-rw-r--r--strata/core/git.def5
-rw-r--r--strata/core/git.morph6
-rw-r--r--strata/core/gperf.def2
-rw-r--r--strata/core/gperf.morph3
-rw-r--r--strata/core/help2man.def8
-rw-r--r--strata/core/help2man.morph9
-rw-r--r--strata/core/libexpat.def8
-rw-r--r--strata/core/libexpat.morph9
-rw-r--r--strata/core/libtool.def5
-rw-r--r--strata/core/libtool.morph6
-rw-r--r--strata/core/m4.def4
-rw-r--r--strata/core/m4.morph5
-rw-r--r--strata/core/mini-utils.def5
-rw-r--r--strata/core/mini-utils.morph6
-rw-r--r--strata/core/ncurses.def8
-rw-r--r--strata/core/ncurses.morph9
-rw-r--r--strata/core/openssl-new.def14
-rw-r--r--strata/core/openssl-new.morph15
-rw-r--r--strata/core/patch.def8
-rw-r--r--strata/core/patch.morph9
-rw-r--r--strata/core/perl.def15
-rw-r--r--strata/core/perl.morph16
-rw-r--r--strata/core/pkg-config.def4
-rw-r--r--strata/core/pkg-config.morph5
-rw-r--r--strata/core/python-setuptools.def5
-rw-r--r--strata/core/python-setuptools.morph6
-rw-r--r--strata/core/pyyaml.def5
-rw-r--r--strata/core/pyyaml.morph6
-rw-r--r--strata/core/shadow.def4
-rw-r--r--strata/core/shadow.morph5
-rw-r--r--strata/core/texinfo-tarball.def8
-rw-r--r--strata/core/texinfo-tarball.morph9
-rw-r--r--strata/core/util-linux.def5
-rw-r--r--strata/core/util-linux.morph6
-rw-r--r--strata/core/xz.def2
-rw-r--r--strata/core/xz.morph3
-rw-r--r--strata/coreutils-common.def12
-rw-r--r--strata/coreutils-common.morph15
-rw-r--r--strata/coreutils-common/coreutils.def8
-rw-r--r--strata/coreutils-common/coreutils.morph9
-rw-r--r--strata/cross-bootstrap.def74
-rw-r--r--strata/cross-bootstrap.morph89
-rw-r--r--strata/cross-bootstrap/cmdtest.def5
-rw-r--r--strata/cross-bootstrap/cmdtest.morph6
-rw-r--r--strata/cross-bootstrap/groff.def10
-rw-r--r--strata/cross-bootstrap/groff.morph11
-rw-r--r--strata/cross-bootstrap/openssh.def27
-rw-r--r--strata/cross-bootstrap/openssh.morph28
-rw-r--r--strata/cross-bootstrap/pyfilesystem.def5
-rw-r--r--strata/cross-bootstrap/pyfilesystem.morph6
-rw-r--r--strata/cross-bootstrap/python-coveragepy.def5
-rw-r--r--strata/cross-bootstrap/python-coveragepy.morph6
-rw-r--r--strata/cross-bootstrap/python-ttystatus.def5
-rw-r--r--strata/cross-bootstrap/python-ttystatus.morph6
-rw-r--r--strata/cross-bootstrap/rsync.def5
-rw-r--r--strata/cross-bootstrap/rsync.morph6
-rw-r--r--strata/cross-tools.def9
-rw-r--r--strata/cross-tools.morph11
-rw-r--r--strata/cxmanage.def30
-rw-r--r--strata/cxmanage.morph36
-rw-r--r--strata/cxmanage/pexpect.def9
-rw-r--r--strata/cxmanage/pexpect.morph10
-rw-r--r--strata/databases.def18
-rw-r--r--strata/databases.morph23
-rw-r--r--strata/databases/redis.def5
-rw-r--r--strata/databases/redis.morph6
-rw-r--r--strata/enlightenment.def60
-rw-r--r--strata/enlightenment.morph69
-rw-r--r--strata/enlightenment/efl.def9
-rw-r--r--strata/enlightenment/efl.morph10
-rw-r--r--strata/enlightenment/elementary.def7
-rw-r--r--strata/enlightenment/elementary.morph8
-rw-r--r--strata/enlightenment/enlightenment.def7
-rw-r--r--strata/enlightenment/enlightenment.morph8
-rw-r--r--strata/enlightenment/eterm.def7
-rw-r--r--strata/enlightenment/eterm.morph8
-rw-r--r--strata/enlightenment/evas_generic_loaders.def7
-rw-r--r--strata/enlightenment/evas_generic_loaders.morph8
-rw-r--r--strata/enlightenment/imlib2.def7
-rw-r--r--strata/enlightenment/imlib2.morph8
-rw-r--r--strata/enlightenment/libast.def7
-rw-r--r--strata/enlightenment/libast.morph8
-rw-r--r--strata/erlang.def9
-rw-r--r--strata/erlang.morph12
-rw-r--r--strata/erlang/erlang.def8
-rw-r--r--strata/erlang/erlang.morph9
-rw-r--r--strata/foundation.def113
-rw-r--r--strata/foundation.morph137
-rw-r--r--strata/foundation/attr.def13
-rw-r--r--strata/foundation/attr.morph14
-rw-r--r--strata/foundation/btrfs-progs.def5
-rw-r--r--strata/foundation/btrfs-progs.morph6
-rw-r--r--strata/foundation/dbus-pre.def9
-rw-r--r--strata/foundation/dbus-pre.morph10
-rw-r--r--strata/foundation/dbus.def9
-rw-r--r--strata/foundation/dbus.morph10
-rw-r--r--strata/foundation/fuse.def5
-rw-r--r--strata/foundation/fuse.morph6
-rw-r--r--strata/foundation/groff.def10
-rw-r--r--strata/foundation/groff.morph11
-rw-r--r--strata/foundation/kmod.def18
-rw-r--r--strata/foundation/kmod.morph19
-rw-r--r--strata/foundation/libcap2.def5
-rw-r--r--strata/foundation/libcap2.morph6
-rw-r--r--strata/foundation/libffi.def7
-rw-r--r--strata/foundation/libffi.morph8
-rw-r--r--strata/foundation/lzo.def4
-rw-r--r--strata/foundation/lzo.morph5
-rw-r--r--strata/foundation/openssh.def27
-rw-r--r--strata/foundation/openssh.morph28
-rw-r--r--strata/foundation/pciutils.def10
-rw-r--r--strata/foundation/pciutils.morph11
-rw-r--r--strata/foundation/systemd.def20
-rw-r--r--strata/foundation/systemd.morph21
-rw-r--r--strata/foundation/tbdiff.def2
-rw-r--r--strata/foundation/tbdiff.morph3
-rw-r--r--strata/genivi.def67
-rw-r--r--strata/genivi.morph78
-rw-r--r--strata/genivi/googlemock.def7
-rw-r--r--strata/genivi/googlemock.morph8
-rw-r--r--strata/genivi/googletest.def6
-rw-r--r--strata/genivi/googletest.morph7
-rw-r--r--strata/genivi/itzam-tarball.def9
-rw-r--r--strata/genivi/itzam-tarball.morph10
-rw-r--r--strata/genivi/linuxquota.def9
-rw-r--r--strata/genivi/linuxquota.morph10
-rw-r--r--strata/genivi/node-startup-controller.def8
-rw-r--r--strata/genivi/node-startup-controller.morph9
-rw-r--r--strata/gitlab.def17
-rw-r--r--strata/gitlab.morph24
-rw-r--r--strata/gitlab/gitlab-ce.def5
-rw-r--r--strata/gitlab/gitlab-ce.morph6
-rw-r--r--strata/gitlab/gitlab-ci.def5
-rw-r--r--strata/gitlab/gitlab-ci.morph6
-rw-r--r--strata/gitlab/gitlab-shell.def5
-rw-r--r--strata/gitlab/gitlab-shell.morph6
-rw-r--r--strata/graphics-common.def49
-rw-r--r--strata/graphics-common.morph58
-rw-r--r--strata/graphics-common/cairo.def4
-rw-r--r--strata/graphics-common/cairo.morph5
-rw-r--r--strata/graphics-common/freefont-otf.def4
-rw-r--r--strata/graphics-common/freefont-otf.morph5
-rw-r--r--strata/gtk-deps.def40
-rw-r--r--strata/gtk-deps.morph48
-rw-r--r--strata/gtk-deps/gdk-pixbuf.def5
-rw-r--r--strata/gtk-deps/gdk-pixbuf.morph6
-rw-r--r--strata/gtk-deps/shared-mime-info.def3
-rw-r--r--strata/gtk-deps/shared-mime-info.morph4
-rw-r--r--strata/gtk2.def9
-rw-r--r--strata/gtk2.morph12
-rw-r--r--strata/gtk2/gtk+.def10
-rw-r--r--strata/gtk2/gtk+.morph11
-rw-r--r--strata/gtk3.def16
-rw-r--r--strata/gtk3.morph19
-rw-r--r--strata/gtk3/gtk3.def10
-rw-r--r--strata/gtk3/gtk3.morph11
-rw-r--r--strata/initramfs-utils.def9
-rw-r--r--strata/initramfs-utils.morph12
-rw-r--r--strata/initramfs-utils/initramfs-scripts.def3
-rw-r--r--strata/initramfs-utils/initramfs-scripts.morph4
-rw-r--r--strata/input-common.def24
-rw-r--r--strata/input-common.morph29
-rw-r--r--strata/input-common/xkeyboard-config.def6
-rw-r--r--strata/input-common/xkeyboard-config.morph7
-rw-r--r--strata/libdrm-common.def14
-rw-r--r--strata/libdrm-common.morph17
-rw-r--r--strata/libdrm-common/drm.def9
-rw-r--r--strata/libdrm-common/drm.morph10
-rw-r--r--strata/lighttpd-server.def10
-rw-r--r--strata/lighttpd-server.morph13
-rw-r--r--strata/lighttpd-server/lighttpd.def5
-rw-r--r--strata/lighttpd-server/lighttpd.morph6
-rw-r--r--strata/llvm-common.def8
-rw-r--r--strata/llvm-common.morph11
-rw-r--r--strata/llvm-common/llvm.def7
-rw-r--r--strata/llvm-common/llvm.morph8
-rw-r--r--strata/lua.def9
-rw-r--r--strata/lua.morph12
-rw-r--r--strata/lua/lua.def10
-rw-r--r--strata/lua/lua.morph11
-rw-r--r--strata/mesa-common.def10
-rw-r--r--strata/mesa-common.morph13
-rw-r--r--strata/mesa-common/mesa.def22
-rw-r--r--strata/mesa-common/mesa.morph23
-rw-r--r--strata/morph-utils.def69
-rw-r--r--strata/morph-utils.morph82
-rw-r--r--strata/morph-utils/cmdtest.def5
-rw-r--r--strata/morph-utils/cmdtest.morph6
-rw-r--r--strata/morph-utils/pyfilesystem.def5
-rw-r--r--strata/morph-utils/pyfilesystem.morph6
-rw-r--r--strata/morph-utils/python-coveragepy.def5
-rw-r--r--strata/morph-utils/python-coveragepy.morph6
-rw-r--r--strata/morph-utils/python-ttystatus.def5
-rw-r--r--strata/morph-utils/python-ttystatus.morph6
-rw-r--r--strata/multimedia-gstreamer-0.10.def31
-rw-r--r--strata/multimedia-gstreamer-0.10.morph33
-rw-r--r--strata/multimedia.def37
-rw-r--r--strata/multimedia.morph39
-rw-r--r--strata/network-security.def15
-rw-r--r--strata/network-security.morph19
-rw-r--r--strata/network-security/nspr.def11
-rw-r--r--strata/network-security/nspr.morph12
-rw-r--r--strata/network-security/nss.def6
-rw-r--r--strata/network-security/nss.morph7
-rw-r--r--strata/nfs.def26
-rw-r--r--strata/nfs.morph32
-rw-r--r--strata/nfs/nfs-utils.def11
-rw-r--r--strata/nfs/nfs-utils.morph12
-rw-r--r--strata/nfs/rpcbind.def10
-rw-r--r--strata/nfs/rpcbind.morph11
-rw-r--r--strata/nfs/tcp-wrappers.def8
-rw-r--r--strata/nfs/tcp-wrappers.morph9
-rw-r--r--strata/nfs/ti-rpc.def5
-rw-r--r--strata/nfs/ti-rpc.morph6
-rw-r--r--strata/nodejs.def9
-rw-r--r--strata/nodejs.morph11
-rw-r--r--strata/openstack-clients.def102
-rw-r--r--strata/openstack-clients.morph117
-rw-r--r--strata/openstack-clients/python-prettytable.def5
-rw-r--r--strata/openstack-clients/python-prettytable.morph6
-rw-r--r--strata/openstack-clients/pytz.def5
-rw-r--r--strata/openstack-clients/pytz.morph6
-rw-r--r--strata/patch-manager-gerrit.def8
-rw-r--r--strata/patch-manager-gerrit.morph11
-rw-r--r--strata/patch-manager-gerrit/gerrit-installation-binaries.def27
-rw-r--r--strata/patch-manager-gerrit/gerrit-installation-binaries.morph28
-rw-r--r--strata/pcre-utils.def8
-rw-r--r--strata/pcre-utils.morph10
-rw-r--r--strata/qt4-sdk.def9
-rw-r--r--strata/qt4-sdk.morph12
-rw-r--r--strata/qt4-sdk/qt-creator.def8
-rw-r--r--strata/qt4-sdk/qt-creator.morph9
-rw-r--r--strata/qt4-tools.def28
-rw-r--r--strata/qt4-tools.morph35
-rw-r--r--strata/qt4-tools/icu.def7
-rw-r--r--strata/qt4-tools/icu.morph8
-rw-r--r--strata/qt4-tools/qt4-tools.def17
-rw-r--r--strata/qt4-tools/qt4-tools.morph18
-rw-r--r--strata/qt4-tools/ruby-1.8.def8
-rw-r--r--strata/qt4-tools/ruby-1.8.morph9
-rw-r--r--strata/qt4-tools/ruby-1.9.def8
-rw-r--r--strata/qt4-tools/ruby-1.9.morph9
-rw-r--r--strata/qt5-sdk.def13
-rw-r--r--strata/qt5-sdk.morph18
-rw-r--r--strata/qt5-sdk/qt-creator.def8
-rw-r--r--strata/qt5-sdk/qt-creator.morph9
-rw-r--r--strata/qt5-sdk/snowshoe.def7
-rw-r--r--strata/qt5-sdk/snowshoe.morph8
-rw-r--r--strata/qt5-tools.def164
-rw-r--r--strata/qt5-tools.morph190
-rw-r--r--strata/qt5-tools/icu.def7
-rw-r--r--strata/qt5-tools/icu.morph8
-rw-r--r--strata/qt5-tools/qt3d.def9
-rw-r--r--strata/qt5-tools/qt3d.morph10
-rw-r--r--strata/qt5-tools/qtbase.def14
-rw-r--r--strata/qt5-tools/qtbase.morph15
-rw-r--r--strata/qt5-tools/qtdeclarative.def9
-rw-r--r--strata/qt5-tools/qtdeclarative.morph10
-rw-r--r--strata/qt5-tools/qtdoc.def7
-rw-r--r--strata/qt5-tools/qtdoc.morph8
-rw-r--r--strata/qt5-tools/qtgraphicaleffects.def7
-rw-r--r--strata/qt5-tools/qtgraphicaleffects.morph8
-rw-r--r--strata/qt5-tools/qtimageformats.def9
-rw-r--r--strata/qt5-tools/qtimageformats.morph10
-rw-r--r--strata/qt5-tools/qtjsbackend.def9
-rw-r--r--strata/qt5-tools/qtjsbackend.morph10
-rw-r--r--strata/qt5-tools/qtmultimedia.def9
-rw-r--r--strata/qt5-tools/qtmultimedia.morph10
-rw-r--r--strata/qt5-tools/qtquick1.def9
-rw-r--r--strata/qt5-tools/qtquick1.morph10
-rw-r--r--strata/qt5-tools/qtquickcontrols.def9
-rw-r--r--strata/qt5-tools/qtquickcontrols.morph10
-rw-r--r--strata/qt5-tools/qtscript.def9
-rw-r--r--strata/qt5-tools/qtscript.morph10
-rw-r--r--strata/qt5-tools/qtsensors.def9
-rw-r--r--strata/qt5-tools/qtsensors.morph10
-rw-r--r--strata/qt5-tools/qtserialport.def9
-rw-r--r--strata/qt5-tools/qtserialport.morph10
-rw-r--r--strata/qt5-tools/qtsvg.def9
-rw-r--r--strata/qt5-tools/qtsvg.morph10
-rw-r--r--strata/qt5-tools/qttools.def9
-rw-r--r--strata/qt5-tools/qttools.morph10
-rw-r--r--strata/qt5-tools/qttranslations.def7
-rw-r--r--strata/qt5-tools/qttranslations.morph8
-rw-r--r--strata/qt5-tools/qtwebkit-examples.def7
-rw-r--r--strata/qt5-tools/qtwebkit-examples.morph8
-rw-r--r--strata/qt5-tools/qtwebkit.def10
-rw-r--r--strata/qt5-tools/qtwebkit.morph11
-rw-r--r--strata/qt5-tools/qtx11extras.def9
-rw-r--r--strata/qt5-tools/qtx11extras.morph10
-rw-r--r--strata/qt5-tools/qtxmlpatterns.def9
-rw-r--r--strata/qt5-tools/qtxmlpatterns.morph10
-rw-r--r--strata/qt5-tools/ruby-1.8.def8
-rw-r--r--strata/qt5-tools/ruby-1.8.morph9
-rw-r--r--strata/qt5-tools/ruby-1.9.def8
-rw-r--r--strata/qt5-tools/ruby-1.9.morph9
-rw-r--r--strata/ruby.def44
-rw-r--r--strata/ruby.morph52
-rw-r--r--strata/ruby/bundler.def5
-rw-r--r--strata/ruby/bundler.morph6
-rw-r--r--strata/ruby/hoe.def15
-rw-r--r--strata/ruby/hoe.morph16
-rw-r--r--strata/ruby/rake-compiler.def14
-rw-r--r--strata/ruby/rake-compiler.morph15
-rw-r--r--strata/ruby/ruby-1.8.def8
-rw-r--r--strata/ruby/ruby-1.8.morph9
-rw-r--r--strata/ruby/ruby.def8
-rw-r--r--strata/ruby/ruby.morph9
-rw-r--r--strata/tools.def78
-rw-r--r--strata/tools.morph107
-rw-r--r--strata/tools/device-tree-compiler.def5
-rw-r--r--strata/tools/device-tree-compiler.morph6
-rw-r--r--strata/tools/distcc.def5
-rw-r--r--strata/tools/distcc.morph6
-rw-r--r--strata/tools/e2fsprogs.def20
-rw-r--r--strata/tools/e2fsprogs.morph21
-rw-r--r--strata/tools/git-fat.def3
-rw-r--r--strata/tools/git-fat.morph4
-rw-r--r--strata/tools/kexec-tools.def5
-rw-r--r--strata/tools/kexec-tools.morph6
-rw-r--r--strata/tools/lsof.def11
-rw-r--r--strata/tools/lsof.morph12
-rw-r--r--strata/tools/rsync.def5
-rw-r--r--strata/tools/rsync.morph6
-rw-r--r--strata/tools/screen.def10
-rw-r--r--strata/tools/screen.morph11
-rw-r--r--strata/tools/u-boot.def10
-rw-r--r--strata/tools/u-boot.morph11
-rw-r--r--strata/tools/vala.def4
-rw-r--r--strata/tools/vala.morph5
-rw-r--r--strata/tools/vim.def9
-rw-r--r--strata/tools/vim.morph10
-rw-r--r--strata/trove.def166
-rw-r--r--strata/trove.morph202
-rw-r--r--strata/trove/cgit.def5
-rw-r--r--strata/trove/cgit.morph6
-rw-r--r--strata/trove/clod.def6
-rw-r--r--strata/trove/clod.morph7
-rw-r--r--strata/trove/cvs-tarball.def5
-rw-r--r--strata/trove/cvs-tarball.morph6
-rw-r--r--strata/trove/cvsps.def5
-rw-r--r--strata/trove/cvsps.morph6
-rw-r--r--strata/trove/gall.def6
-rw-r--r--strata/trove/gall.morph7
-rw-r--r--strata/trove/gitano.def4
-rw-r--r--strata/trove/gitano.morph5
-rw-r--r--strata/trove/hg-fast-export.def9
-rw-r--r--strata/trove/hg-fast-export.morph10
-rw-r--r--strata/trove/lace.def6
-rw-r--r--strata/trove/lace.morph7
-rw-r--r--strata/trove/libapr-util-tarball.def4
-rw-r--r--strata/trove/libapr-util-tarball.morph5
-rw-r--r--strata/trove/lorry-controller.def9
-rw-r--r--strata/trove/lorry-controller.morph10
-rw-r--r--strata/trove/lorry.def2
-rw-r--r--strata/trove/lorry.morph3
-rw-r--r--strata/trove/lrexlib-pcre.def8
-rw-r--r--strata/trove/lrexlib-pcre.morph9
-rw-r--r--strata/trove/lua-scrypt.def3
-rw-r--r--strata/trove/lua-scrypt.morph4
-rw-r--r--strata/trove/lua.def10
-rw-r--r--strata/trove/lua.morph11
-rw-r--r--strata/trove/luxio.def6
-rw-r--r--strata/trove/luxio.morph7
-rw-r--r--strata/trove/mercurial-tarball.def5
-rw-r--r--strata/trove/mercurial-tarball.morph6
-rw-r--r--strata/trove/neon.def7
-rw-r--r--strata/trove/neon.morph8
-rw-r--r--strata/trove/perl-dbi-tarball.def4
-rw-r--r--strata/trove/perl-dbi-tarball.morph5
-rw-r--r--strata/trove/subversion-tarball.def9
-rw-r--r--strata/trove/subversion-tarball.morph10
-rw-r--r--strata/trove/supple.def6
-rw-r--r--strata/trove/supple.morph7
-rw-r--r--strata/trove/swig-tarball.def4
-rw-r--r--strata/trove/swig-tarball.morph5
-rw-r--r--strata/trove/trove-setup.def3
-rw-r--r--strata/trove/trove-setup.morph4
-rw-r--r--strata/virtualbox-guest-x86_64.def19
-rw-r--r--strata/virtualbox-guest-x86_64.morph23
-rw-r--r--strata/virtualbox-guest-x86_64/vboxguest.def33
-rw-r--r--strata/virtualbox-guest-x86_64/vboxguest.morph34
-rw-r--r--strata/virtualbox-guest-x86_64/yasm.def3
-rw-r--r--strata/virtualbox-guest-x86_64/yasm.morph4
-rw-r--r--strata/virtualization.def105
-rw-r--r--strata/virtualization.morph123
-rw-r--r--strata/virtualization/dnsmasq.def5
-rw-r--r--strata/virtualization/dnsmasq.morph6
-rw-r--r--strata/virtualization/libosinfo.def5
-rw-r--r--strata/virtualization/libosinfo.morph6
-rw-r--r--strata/virtualization/libsoup.def5
-rw-r--r--strata/virtualization/libsoup.morph6
-rw-r--r--strata/virtualization/libvirt.def5
-rw-r--r--strata/virtualization/libvirt.morph6
-rw-r--r--strata/virtualization/lvm2.def5
-rw-r--r--strata/virtualization/lvm2.morph6
-rw-r--r--strata/virtualization/pygobject.def4
-rw-r--r--strata/virtualization/pygobject.morph5
-rw-r--r--strata/virtualization/qemu.def4
-rw-r--r--strata/virtualization/qemu.morph5
-rw-r--r--strata/virtualization/xml-catalog.def5
-rw-r--r--strata/virtualization/xml-catalog.morph6
-rw-r--r--strata/virtualization/yajl.def7
-rw-r--r--strata/virtualization/yajl.morph8
-rw-r--r--strata/wayland-generic.def15
-rw-r--r--strata/wayland-generic.morph18
-rw-r--r--strata/wayland-generic/wayland.def6
-rw-r--r--strata/wayland-generic/wayland.morph7
-rw-r--r--strata/webtools.def26
-rw-r--r--strata/webtools.morph35
-rw-r--r--strata/webtools/icu.def7
-rw-r--r--strata/webtools/icu.morph8
-rw-r--r--strata/webtools/nginx.def12
-rw-r--r--strata/webtools/nginx.morph13
-rw-r--r--strata/webtools/tar.def9
-rw-r--r--strata/webtools/tar.morph10
-rw-r--r--strata/weston-genivi.def24
-rw-r--r--strata/weston-genivi.morph28
-rw-r--r--strata/weston-genivi/wayland-ivi-extension.def7
-rw-r--r--strata/weston-genivi/wayland-ivi-extension.morph8
-rw-r--r--strata/weston-genivi/weston.def52
-rw-r--r--strata/weston-genivi/weston.morph53
-rw-r--r--strata/x-common.def282
-rw-r--r--strata/x-common.morph312
-rw-r--r--strata/x-common/drm.def9
-rw-r--r--strata/x-common/llvm.def7
-rw-r--r--strata/x-generic.def168
-rw-r--r--strata/x-generic.morph180
-rw-r--r--strata/x-generic/util-keysyms.def8
-rw-r--r--strata/x-generic/util-keysyms.morph9
-rw-r--r--strata/x-generic/xserver.def4
-rw-r--r--strata/x-generic/xserver.morph5
-rw-r--r--strata/xfce.def146
-rw-r--r--strata/xfce.morph171
-rw-r--r--strata/xfce/elementary-xfce.def9
-rw-r--r--strata/xfce/elementary-xfce.morph10
-rw-r--r--strata/xfce/exo.def7
-rw-r--r--strata/xfce/exo.morph8
-rw-r--r--strata/xfce/garcon.def7
-rw-r--r--strata/xfce/garcon.morph8
-rw-r--r--strata/xfce/gtk-xfce-engine-2.def7
-rw-r--r--strata/xfce/gtk-xfce-engine-2.morph8
-rw-r--r--strata/xfce/librsvg.def5
-rw-r--r--strata/xfce/librsvg.morph6
-rw-r--r--strata/xfce/libwnck.def10
-rw-r--r--strata/xfce/libwnck.morph11
-rw-r--r--strata/xfce/libxfce4ui.def7
-rw-r--r--strata/xfce/libxfce4ui.morph8
-rw-r--r--strata/xfce/libxfce4util.def7
-rw-r--r--strata/xfce/libxfce4util.morph8
-rw-r--r--strata/xfce/thunar.def8
-rw-r--r--strata/xfce/thunar.morph9
-rw-r--r--strata/xfce/tumbler.def7
-rw-r--r--strata/xfce/tumbler.morph8
-rw-r--r--strata/xfce/xfce4-appfinder.def7
-rw-r--r--strata/xfce/xfce4-appfinder.morph8
-rw-r--r--strata/xfce/xfce4-panel.def7
-rw-r--r--strata/xfce/xfce4-panel.morph8
-rw-r--r--strata/xfce/xfce4-session.def8
-rw-r--r--strata/xfce/xfce4-session.morph9
-rw-r--r--strata/xfce/xfce4-settings.def7
-rw-r--r--strata/xfce/xfce4-settings.morph8
-rw-r--r--strata/xfce/xfconf.def7
-rw-r--r--strata/xfce/xfconf.morph8
-rw-r--r--strata/xfce/xfdesktop.def7
-rw-r--r--strata/xfce/xfdesktop.morph8
-rw-r--r--strata/xfce/xfwm4.def10
-rw-r--r--strata/xfce/xfwm4.morph11
-rw-r--r--strata/xorg-util-macros-common.def14
-rw-r--r--strata/xorg-util-macros-common.morph16
-rw-r--r--systems/armv7lhf-cross-toolchain-system-x86_32-generic.def14
-rw-r--r--systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph18
-rw-r--r--systems/armv7lhf-cross-toolchain-system-x86_64-generic.def14
-rw-r--r--systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph18
-rw-r--r--systems/base-system-armv7-highbank.def15
-rw-r--r--systems/base-system-armv7-highbank.morph20
-rw-r--r--systems/base-system-armv7-versatile.def15
-rw-r--r--systems/base-system-armv7-versatile.morph20
-rw-r--r--systems/base-system-armv7b-highbank.def15
-rw-r--r--systems/base-system-armv7b-highbank.morph20
-rw-r--r--systems/base-system-armv7b-vexpress-tc2.def14
-rw-r--r--systems/base-system-armv7b-vexpress-tc2.morph19
-rw-r--r--systems/base-system-armv7lhf-highbank.def15
-rw-r--r--systems/base-system-armv7lhf-highbank.morph20
-rw-r--r--systems/base-system-ppc64-generic.def15
-rw-r--r--systems/base-system-ppc64-generic.morph20
-rw-r--r--systems/base-system-x86_32-generic.def16
-rw-r--r--systems/base-system-x86_32-generic.morph22
-rw-r--r--systems/base-system-x86_64-generic.def17
-rw-r--r--systems/base-system-x86_64-generic.morph23
-rw-r--r--systems/build-system-armv7lhf-highbank.def23
-rw-r--r--systems/build-system-armv7lhf-highbank.morph33
-rw-r--r--systems/build-system-armv7lhf-jetson.def23
-rw-r--r--systems/build-system-armv7lhf-jetson.morph33
-rw-r--r--systems/build-system-ppc64.def23
-rw-r--r--systems/build-system-ppc64.morph33
-rw-r--r--systems/build-system-x86_32-chroot.def22
-rw-r--r--systems/build-system-x86_32-chroot.morph31
-rw-r--r--systems/build-system-x86_32.def23
-rw-r--r--systems/build-system-x86_32.morph33
-rw-r--r--systems/build-system-x86_64-chroot.def22
-rw-r--r--systems/build-system-x86_64-chroot.morph31
-rw-r--r--systems/build-system-x86_64.def23
-rw-r--r--systems/build-system-x86_64.morph33
-rw-r--r--systems/ceph-service-x86_64-generic.def18
-rw-r--r--systems/ceph-service-x86_64-generic.morph25
-rw-r--r--systems/cross-bootstrap-system-armv7lhf-generic.def7
-rw-r--r--systems/cross-bootstrap-system-armv7lhf-generic.morph11
-rw-r--r--systems/cross-bootstrap-system-ppc64-generic.def7
-rw-r--r--systems/cross-bootstrap-system-ppc64-generic.morph11
-rw-r--r--systems/cross-bootstrap-system-x86_64-generic.def7
-rw-r--r--systems/cross-bootstrap-system-x86_64-generic.morph11
-rw-r--r--systems/cxmanage-system-x86_64-generic.def17
-rw-r--r--systems/cxmanage-system-x86_64-generic.morph24
-rw-r--r--systems/devel-system-armv7-chroot.def22
-rw-r--r--systems/devel-system-armv7-chroot.morph31
-rw-r--r--systems/devel-system-armv7-highbank.def23
-rw-r--r--systems/devel-system-armv7-highbank.morph34
-rw-r--r--systems/devel-system-armv7-versatile.def23
-rw-r--r--systems/devel-system-armv7-versatile.morph34
-rw-r--r--systems/devel-system-armv7-wandboard.def23
-rw-r--r--systems/devel-system-armv7-wandboard.morph34
-rw-r--r--systems/devel-system-armv7b-chroot.def20
-rw-r--r--systems/devel-system-armv7b-chroot.morph27
-rw-r--r--systems/devel-system-armv7b-highbank.def21
-rw-r--r--systems/devel-system-armv7b-highbank.morph30
-rw-r--r--systems/devel-system-armv7lhf-chroot.def22
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph31
-rw-r--r--systems/devel-system-armv7lhf-highbank.def24
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph35
-rw-r--r--systems/devel-system-armv7lhf-jetson.def24
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph35
-rw-r--r--systems/devel-system-armv7lhf-wandboard.def24
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph35
-rw-r--r--systems/devel-system-ppc64-chroot.def21
-rw-r--r--systems/devel-system-ppc64-chroot.morph29
-rw-r--r--systems/devel-system-ppc64-generic.def22
-rw-r--r--systems/devel-system-ppc64-generic.morph32
-rw-r--r--systems/devel-system-x86_32-chroot.def23
-rw-r--r--systems/devel-system-x86_32-chroot.morph33
-rw-r--r--systems/devel-system-x86_32-generic.def25
-rw-r--r--systems/devel-system-x86_32-generic.morph37
-rw-r--r--systems/devel-system-x86_64-chroot.def23
-rw-r--r--systems/devel-system-x86_64-chroot.morph33
-rw-r--r--systems/devel-system-x86_64-generic.def25
-rw-r--r--systems/devel-system-x86_64-generic.morph37
-rw-r--r--systems/devel-system-x86_64-vagrant.def24
-rw-r--r--systems/devel-system-x86_64-vagrant.morph35
-rw-r--r--systems/distbuild-system-x86_64-openstack.def24
-rw-r--r--systems/distbuild-system-x86_64-openstack.morph35
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.def27
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph43
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.def26
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph41
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.def27
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph44
-rw-r--r--systems/gerrit-x86_64.def22
-rw-r--r--systems/gerrit-x86_64.morph33
-rw-r--r--systems/gitlab-ci-runner.def29
-rw-r--r--systems/gitlab-ci-runner.morph49
-rw-r--r--systems/gitlab-server.def23
-rw-r--r--systems/gitlab-server.morph35
-rw-r--r--systems/initramfs-x86_64.def8
-rw-r--r--systems/initramfs-x86_64.morph11
-rw-r--r--systems/minimal-system-x86_32-generic.def17
-rw-r--r--systems/minimal-system-x86_32-generic.morph20
-rw-r--r--systems/minimal-system-x86_64-generic.def17
-rw-r--r--systems/minimal-system-x86_64-generic.morph20
-rw-r--r--systems/nodejs-system-x86_64.def16
-rw-r--r--systems/nodejs-system-x86_64.morph22
-rw-r--r--systems/qt4-devel-system-x86_64-generic.def26
-rw-r--r--systems/qt4-devel-system-x86_64-generic.morph42
-rw-r--r--systems/qt5-devel-system-x86_64-generic.def26
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph42
-rw-r--r--systems/trove-system-x86_64.def24
-rw-r--r--systems/trove-system-x86_64.morph37
-rw-r--r--systems/web-system-x86_64-generic.def23
-rw-r--r--systems/web-system-x86_64-generic.morph37
-rw-r--r--systems/xfce-system.def25
-rw-r--r--systems/xfce-system.morph41
818 files changed, 8191 insertions, 9550 deletions
diff --git a/clusters/ci.def b/clusters/ci.def
new file mode 100644
index 00000000..a2d8d599
--- /dev/null
+++ b/clusters/ci.def
@@ -0,0 +1,13 @@
+name: ci
+description: |
+ Deploy all the systems for CD.
+
+ This cluster morph is for use by the Mason Continuous Delivery pipeline
+ during development.
+systems:
+- name: devel-system-x86_64-generic
+ deploy:
+ devel-system-x86_64-generic:
+ type: rawdisk
+ location: devel-system-x86_64-generic.img
+ DISK_SIZE: 4G
diff --git a/clusters/ci.morph b/clusters/ci.morph
deleted file mode 100644
index f860a4ba..00000000
--- a/clusters/ci.morph
+++ /dev/null
@@ -1,14 +0,0 @@
-name: ci
-kind: cluster
-description: |
- Deploy all the systems for CD.
-
- This cluster morph is for use by the Mason Continuous Delivery pipeline
- during development.
-systems:
-- morph: systems/devel-system-x86_64-generic.morph
- deploy:
- devel-system-x86_64-generic:
- type: rawdisk
- location: devel-system-x86_64-generic.img
- DISK_SIZE: 4G
diff --git a/clusters/example-distbuild-cluster.def b/clusters/example-distbuild-cluster.def
new file mode 100644
index 00000000..d999e683
--- /dev/null
+++ b/clusters/example-distbuild-cluster.def
@@ -0,0 +1,36 @@
+name: example-distbuild-cluster
+description: |
+ This is an example cluster morph that can be adapted to set up a
+ Baserock distributed build network.
+
+ You will need to deploy a Trove for the distributed build network
+ to use before deploying this cluster. The worker SSH key file should
+ be generated as part of the Trove deployment. It is the key used by
+ workers to authenticate with the Trove to give them read access to
+ all source repositories.
+systems:
+- name: build-system-x86_64
+ deploy-defaults:
+ CONTROLLERHOST: build-controller
+ DISTBUILD_CONTROLLER: false
+ DISTBUILD_WORKER: true
+ FSTAB_SRC: LABEL=src /srv/distbuild auto defaults,rw,noatime 0 2
+ INSTALL_FILES: distbuild/manifest
+ NFSBOOT_CONFIGURE: true
+ TROVE_ID: $MY_TROVE
+ WORKER_SSH_KEY: ssh-keys/worker.key
+ deploy:
+ build-controller:
+ type: nfsboot
+ location: $MY_TROVE
+ DISTBUILD_CONTROLLER: true
+ HOSTNAME: build-controller
+ WORKERS: build-node-1, build-node-2
+ build-node-1:
+ type: nfsboot
+ location: $MY_TROVE
+ HOSTNAME: build-node-1
+ build-node-2:
+ type: nfsboot
+ location: $MY_TROVE
+ HOSTNAME: build-node-2
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph
deleted file mode 100644
index 513c16c5..00000000
--- a/clusters/example-distbuild-cluster.morph
+++ /dev/null
@@ -1,37 +0,0 @@
-name: example-distbuild-cluster
-kind: cluster
-description: |
- This is an example cluster morph that can be adapted to set up a
- Baserock distributed build network.
-
- You will need to deploy a Trove for the distributed build network
- to use before deploying this cluster. The worker SSH key file should
- be generated as part of the Trove deployment. It is the key used by
- workers to authenticate with the Trove to give them read access to
- all source repositories.
-systems:
-- morph: systems/build-system-x86_64.morph
- deploy-defaults:
- CONTROLLERHOST: build-controller
- DISTBUILD_CONTROLLER: false
- DISTBUILD_WORKER: true
- FSTAB_SRC: LABEL=src /srv/distbuild auto defaults,rw,noatime 0 2
- INSTALL_FILES: distbuild/manifest
- NFSBOOT_CONFIGURE: true
- TROVE_ID: $MY_TROVE
- WORKER_SSH_KEY: ssh-keys/worker.key
- deploy:
- build-controller:
- type: nfsboot
- location: $MY_TROVE
- DISTBUILD_CONTROLLER: true
- HOSTNAME: build-controller
- WORKERS: build-node-1, build-node-2
- build-node-1:
- type: nfsboot
- location: $MY_TROVE
- HOSTNAME: build-node-1
- build-node-2:
- type: nfsboot
- location: $MY_TROVE
- HOSTNAME: build-node-2
diff --git a/clusters/gerrit-openstack.def b/clusters/gerrit-openstack.def
new file mode 100644
index 00000000..ebddf213
--- /dev/null
+++ b/clusters/gerrit-openstack.def
@@ -0,0 +1,15 @@
+name: open-stack-gerrit
+description: |
+ Deploy gerrit morphology into openstack
+systems:
+- name: gerrit-x86_64
+ deploy:
+ openstack-image:
+ type: openstack
+ location: http://openstack-host:5000/v2.0/
+ DISK_SIZE: 4G
+ OPENSTACK_USER: openstack-user
+ OPENSTACK_TENANT: openstack-tenant
+ OPENSTACK_IMAGENAME: Gerrit
+ CLOUD_INIT: yes
+ KERNEL_ARGS: console=ttyS0 console=tty0
diff --git a/clusters/gerrit-openstack.morph b/clusters/gerrit-openstack.morph
deleted file mode 100644
index bdfb128c..00000000
--- a/clusters/gerrit-openstack.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: open-stack-gerrit
-kind: cluster
-description: |
- Deploy gerrit morphology into openstack
-systems:
-- morph: systems/gerrit-x86_64.morph
- deploy:
- openstack-image:
- type: openstack
- location: http://openstack-host:5000/v2.0/
- DISK_SIZE: 4G
- OPENSTACK_USER: openstack-user
- OPENSTACK_TENANT: openstack-tenant
- OPENSTACK_IMAGENAME: Gerrit
- CLOUD_INIT: yes
- KERNEL_ARGS: console=ttyS0 console=tty0
diff --git a/clusters/gitlab-ci-runner-cluster.def b/clusters/gitlab-ci-runner-cluster.def
new file mode 100644
index 00000000..a0d1cae4
--- /dev/null
+++ b/clusters/gitlab-ci-runner-cluster.def
@@ -0,0 +1,15 @@
+name: gitlab-ci-runner-cluster
+systems:
+- name: gitlab-ci-runner
+ deploy-defaults:
+ AUTOSTART: false
+ DISK_SIZE: 6G
+ RAM_SIZE: 3G
+ VCPUS: 2
+ VERSION_LABEL: factory
+ deploy:
+ gitlab-ci-runner:
+ type: kvm
+ location: kvm+ssh://USER@HOST/gitlab-ci-runner/home/USER/gitlab-ci-runner.img
+ HOSTNAME: gitlab-ci-runner
+ INSTALL_FILES: gitlab-ci-runner/manifest
diff --git a/clusters/gitlab-ci-runner-cluster.morph b/clusters/gitlab-ci-runner-cluster.morph
deleted file mode 100644
index 97da4a8d..00000000
--- a/clusters/gitlab-ci-runner-cluster.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: gitlab-ci-runner-cluster
-kind: cluster
-systems:
-- morph: systems/gitlab-ci-runner.morph
- deploy-defaults:
- AUTOSTART: false
- DISK_SIZE: 6G
- RAM_SIZE: 3G
- VCPUS: 2
- VERSION_LABEL: factory
- deploy:
- gitlab-ci-runner:
- type: kvm
- location: kvm+ssh://USER@HOST/gitlab-ci-runner/home/USER/gitlab-ci-runner.img
- HOSTNAME: gitlab-ci-runner
- INSTALL_FILES: gitlab-ci-runner/manifest
diff --git a/clusters/gitlab-cluster.def b/clusters/gitlab-cluster.def
new file mode 100644
index 00000000..5675c440
--- /dev/null
+++ b/clusters/gitlab-cluster.def
@@ -0,0 +1,47 @@
+name: gitlab-cluster
+description: |
+ This is an example cluster morphology that can be adapted to set up a GitLab
+ server with GitLab CI running alongside it, along with one or more CI
+ runners to actually run the CI tests/builds.
+
+ For the server, you will need to specify the GITLAB_HOSTNAME. This is the
+ domain name or IP by which your deployed GitLab instance will be able to be
+ reached by. You will also need a GITLAB_PORT, CI_PORT, UNICORN PORT and
+ UNICORN_CI_PORT. These are the port to use for GitLab, the port to use for
+ GitLab CI, the port for GitLab's Unicorn process to listen on, and the port
+ for GitLab CI's Unicorn process to listen on respectively. Finally, you will
+ need to define a GITLAB_EMAIL, that is the email that mail from your GitLab
+ instance will appear to be from.
+systems:
+- name: gitlab-server
+ deploy-defaults:
+ AUTOSTART: false
+ DISK_SIZE: 10G
+ RAM_SIZE: 2G
+ VCPUS: 2
+ VERSION_LABEL: factory
+ deploy:
+ gitlab:
+ type: kvm
+ location: kvm+ssh://USER@HOST/gitlab/home/USER/gitlab.img
+ CI_PORT: 81
+ GITLAB_EMAIL: gitlab@gitlab.example.com
+ GITLAB_HOSTNAME: gitlab.example.com
+ GITLAB_PORT: 80
+ HOSTNAME: gitlab
+ INSTALL_FILES: gitlab-server/manifest
+ UNICORN_CI_PORT: 8081
+ UNICORN_PORT: 8080
+- name: gitlab-ci-runner
+ deploy-defaults:
+ AUTOSTART: false
+ DISK_SIZE: 10G
+ RAM_SIZE: 3G
+ VCPUS: 2
+ VERSION_LABEL: factory
+ deploy:
+ gitlab-ci-runner:
+ type: kvm
+ location: kvm+ssh://USER@HOST/gitlab-ci-runner/home/USER/gitlab-ci-runner.img
+ HOSTNAME: gitlab-ci-runner
+ INSTALL_FILES: gitlab-ci-runner/manifest
diff --git a/clusters/gitlab-cluster.morph b/clusters/gitlab-cluster.morph
deleted file mode 100644
index 5f3177ca..00000000
--- a/clusters/gitlab-cluster.morph
+++ /dev/null
@@ -1,48 +0,0 @@
-name: gitlab-cluster
-kind: cluster
-description: |
- This is an example cluster morphology that can be adapted to set up a GitLab
- server with GitLab CI running alongside it, along with one or more CI
- runners to actually run the CI tests/builds.
-
- For the server, you will need to specify the GITLAB_HOSTNAME. This is the
- domain name or IP by which your deployed GitLab instance will be able to be
- reached by. You will also need a GITLAB_PORT, CI_PORT, UNICORN PORT and
- UNICORN_CI_PORT. These are the port to use for GitLab, the port to use for
- GitLab CI, the port for GitLab's Unicorn process to listen on, and the port
- for GitLab CI's Unicorn process to listen on respectively. Finally, you will
- need to define a GITLAB_EMAIL, that is the email that mail from your GitLab
- instance will appear to be from.
-systems:
-- morph: systems/gitlab-server.morph
- deploy-defaults:
- AUTOSTART: false
- DISK_SIZE: 10G
- RAM_SIZE: 2G
- VCPUS: 2
- VERSION_LABEL: factory
- deploy:
- gitlab:
- type: kvm
- location: kvm+ssh://USER@HOST/gitlab/home/USER/gitlab.img
- CI_PORT: 81
- GITLAB_EMAIL: gitlab@gitlab.example.com
- GITLAB_HOSTNAME: gitlab.example.com
- GITLAB_PORT: 80
- HOSTNAME: gitlab
- INSTALL_FILES: gitlab-server/manifest
- UNICORN_CI_PORT: 8081
- UNICORN_PORT: 8080
-- morph: systems/gitlab-ci-runner.morph
- deploy-defaults:
- AUTOSTART: false
- DISK_SIZE: 10G
- RAM_SIZE: 3G
- VCPUS: 2
- VERSION_LABEL: factory
- deploy:
- gitlab-ci-runner:
- type: kvm
- location: kvm+ssh://USER@HOST/gitlab-ci-runner/home/USER/gitlab-ci-runner.img
- HOSTNAME: gitlab-ci-runner
- INSTALL_FILES: gitlab-ci-runner/manifest
diff --git a/clusters/gitlab-server-cluster.def b/clusters/gitlab-server-cluster.def
new file mode 100644
index 00000000..089e7fae
--- /dev/null
+++ b/clusters/gitlab-server-cluster.def
@@ -0,0 +1,21 @@
+name: gitlab-server-cluster
+systems:
+- name: gitlab-server
+ deploy-defaults:
+ AUTOSTART: false
+ DISK_SIZE: 6G
+ RAM_SIZE: 2G
+ VCPUS: 2
+ VERSION_LABEL: factory
+ deploy:
+ gitlab:
+ type: kvm
+ location: kvm+ssh://USER@HOST/gitlab/home/USER/gitlab.img
+ CI_PORT: 81
+ GITLAB_EMAIL: gitlab@gitlab.example.com
+ GITLAB_HOSTNAME: gitlab.example.com
+ GITLAB_PORT: 80
+ HOSTNAME: gitlab
+ INSTALL_FILES: gitlab-server/manifest
+ UNICORN_CI_PORT: 8081
+ UNICORN_PORT: 8080
diff --git a/clusters/gitlab-server-cluster.morph b/clusters/gitlab-server-cluster.morph
deleted file mode 100644
index fcb7c1d2..00000000
--- a/clusters/gitlab-server-cluster.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-name: gitlab-server-cluster
-kind: cluster
-systems:
-- morph: systems/gitlab-server.morph
- deploy-defaults:
- AUTOSTART: false
- DISK_SIZE: 6G
- RAM_SIZE: 2G
- VCPUS: 2
- VERSION_LABEL: factory
- deploy:
- gitlab:
- type: kvm
- location: kvm+ssh://USER@HOST/gitlab/home/USER/gitlab.img
- CI_PORT: 81
- GITLAB_EMAIL: gitlab@gitlab.example.com
- GITLAB_HOSTNAME: gitlab.example.com
- GITLAB_PORT: 80
- HOSTNAME: gitlab
- INSTALL_FILES: gitlab-server/manifest
- UNICORN_CI_PORT: 8081
- UNICORN_PORT: 8080
diff --git a/clusters/image-package-example.def b/clusters/image-package-example.def
new file mode 100644
index 00000000..fd056bbb
--- /dev/null
+++ b/clusters/image-package-example.def
@@ -0,0 +1,11 @@
+name: image-package-example
+description: |
+ Packaged system and script for installing it, for deferred instantiation.
+systems:
+- name: base-system-x86_32-generic
+ deploy:
+ imgpkg:
+ type: image-package
+ location: image-package-example.tar
+ BOOTLOADER_BLOBS: /usr/share/syslinux/mbr.bin
+ INCLUDE_SCRIPTS: image-package-example/make-disk-image.sh.in:image-package-example/disk-install.sh.in:image-package-example/common.sh.in
diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.morph
deleted file mode 100644
index fd8487e2..00000000
--- a/clusters/image-package-example.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: image-package-example
-kind: cluster
-description: |
- Packaged system and script for installing it, for deferred instantiation.
-systems:
-- morph: systems/base-system-x86_32-generic.morph
- deploy:
- imgpkg:
- type: image-package
- location: image-package-example.tar
- BOOTLOADER_BLOBS: /usr/share/syslinux/mbr.bin
- INCLUDE_SCRIPTS: image-package-example/make-disk-image.sh.in:image-package-example/disk-install.sh.in:image-package-example/common.sh.in
diff --git a/clusters/initramfs-test.def b/clusters/initramfs-test.def
new file mode 100644
index 00000000..81265f13
--- /dev/null
+++ b/clusters/initramfs-test.def
@@ -0,0 +1,15 @@
+name: initramfs-test
+systems:
+- name: base-system-x86_64-generic
+ deploy:
+ system:
+ type: rawdisk
+ location: initramfs-system-x86_64.img
+ DISK_SIZE: 1G
+ HOSTNAME: initramfs-system
+ INITRAMFS_PATH: boot/initramfs.gz
+ subsystems:
+ deploy:
+ initramfs:
+ type: initramfs
+ location: boot/initramfs.gz
diff --git a/clusters/initramfs-test.morph b/clusters/initramfs-test.morph
deleted file mode 100644
index afc94961..00000000
--- a/clusters/initramfs-test.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-name: initramfs-test
-kind: cluster
-systems:
-- morph: systems/base-system-x86_64-generic.morph
- deploy:
- system:
- type: rawdisk
- location: initramfs-system-x86_64.img
- DISK_SIZE: 1G
- HOSTNAME: initramfs-system
- INITRAMFS_PATH: boot/initramfs.gz
- subsystems:
- - morph: systems/initramfs-x86_64.morph
- deploy:
- initramfs:
- type: initramfs
- location: boot/initramfs.gz
diff --git a/clusters/jetson-upgrade.def b/clusters/jetson-upgrade.def
new file mode 100644
index 00000000..16c6d791
--- /dev/null
+++ b/clusters/jetson-upgrade.def
@@ -0,0 +1,16 @@
+name: jetson-upgrade
+systems:
+- name: devel-system-armv7lhf-jetson
+ deploy-defaults:
+ TROVE_HOST: TROVE_HOST
+ TROVE_ID: TROVE_ID
+ ROOT_DEVICE: "/dev/mmcblk0p1"
+ DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
+ BOOTLOADER_CONFIG_FORMAT: "extlinux"
+ BOOTLOADER_INSTALL: "none"
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
+ deploy:
+ self:
+ type: ssh-rsync
+ location: root@127.0.0.1
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
deleted file mode 100644
index a73507aa..00000000
--- a/clusters/jetson-upgrade.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-name: jetson-upgrade
-kind: cluster
-systems:
-- morph: systems/devel-system-armv7lhf-jetson.morph
- deploy-defaults:
- TROVE_HOST: TROVE_HOST
- TROVE_ID: TROVE_ID
- ROOT_DEVICE: "/dev/mmcblk0p1"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
- FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
- deploy:
- self:
- type: ssh-rsync
- location: root@127.0.0.1
diff --git a/clusters/mason-openstack.def b/clusters/mason-openstack.def
new file mode 100644
index 00000000..90fe10a0
--- /dev/null
+++ b/clusters/mason-openstack.def
@@ -0,0 +1,38 @@
+name: openstack-mason
+description: |
+ This is a template cluster morphology that can be adapted to set up a
+ Mason. Masons are composed of a trove and a distbuild system.
+systems:
+- name: distbuild-system-x86_64-openstack
+ deploy-defaults:
+ ARTIFACT_CACHE_SERVER: example-cache-server
+ CONTROLLERHOST: controller-hostname
+ DISTBUILD_CONTROLLER: true
+ DISTBUILD_WORKER: true
+ INSTALL_FILES: distbuild/manifest
+ RAM_SIZE: 8G
+ TROVE_HOST: your-upstream-trove
+ TROVE_ID: your-upstream-trove-prefix
+ VCPUS: 2
+ WORKER_SSH_KEY: ssh-keys/worker.key
+ deploy:
+ mason-openstack:
+ type: openstack
+ location: openstack-auth-url (eg example.com:5000/v2.0)
+ DISK_SIZE: 6G
+ DISTBUILD_CONTROLLER: true
+ HOSTNAME: controller-hostname
+ MASON_CLUSTER_MORPHOLOGY: clusters/ci
+ MASON_DEFINITIONS_REF: master
+ MASON_DISTBUILD_ARCH: x86_64
+ MASON_TEST_HOST: user@openstack-auth-url
+ WORKERS: controller-hostname
+ OPENSTACK_AUTH_URL: openstack-auth-url
+ OPENSTACK_USER: baserock
+ OPENSTACK_TENANT: baserock
+ OPENSTACK_TENANT_ID: 7d7ebfe23367490b973a10fa426c3aec
+ OPENSTACK_IMAGENAME: mason-openstack
+ OPENSTACK_NETWORK_ID: 71f5151a-b7c3-405d-a841-d1b07e5db099
+ CLOUD_INIT: yes
+ KERNEL_ARGS: console=ttyS0 console=tty0
+ TEST_INFRASTRUCTURE_TYPE: openstack
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
deleted file mode 100644
index bea73dda..00000000
--- a/clusters/mason-openstack.morph
+++ /dev/null
@@ -1,39 +0,0 @@
-name: openstack-mason
-kind: cluster
-description: |
- This is a template cluster morphology that can be adapted to set up a
- Mason. Masons are composed of a trove and a distbuild system.
-systems:
-- morph: systems/distbuild-system-x86_64-openstack.morph
- deploy-defaults:
- ARTIFACT_CACHE_SERVER: example-cache-server
- CONTROLLERHOST: controller-hostname
- DISTBUILD_CONTROLLER: true
- DISTBUILD_WORKER: true
- INSTALL_FILES: distbuild/manifest
- RAM_SIZE: 8G
- TROVE_HOST: your-upstream-trove
- TROVE_ID: your-upstream-trove-prefix
- VCPUS: 2
- WORKER_SSH_KEY: ssh-keys/worker.key
- deploy:
- mason-openstack:
- type: openstack
- location: openstack-auth-url (eg example.com:5000/v2.0)
- DISK_SIZE: 6G
- DISTBUILD_CONTROLLER: true
- HOSTNAME: controller-hostname
- MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph
- MASON_DEFINITIONS_REF: master
- MASON_DISTBUILD_ARCH: x86_64
- MASON_TEST_HOST: user@openstack-auth-url
- WORKERS: controller-hostname
- OPENSTACK_AUTH_URL: openstack-auth-url
- OPENSTACK_USER: baserock
- OPENSTACK_TENANT: baserock
- OPENSTACK_TENANT_ID: 7d7ebfe23367490b973a10fa426c3aec
- OPENSTACK_IMAGENAME: mason-openstack
- OPENSTACK_NETWORK_ID: 71f5151a-b7c3-405d-a841-d1b07e5db099
- CLOUD_INIT: yes
- KERNEL_ARGS: console=ttyS0 console=tty0
- TEST_INFRASTRUCTURE_TYPE: openstack
diff --git a/clusters/mason.def b/clusters/mason.def
new file mode 100644
index 00000000..34b0f6b0
--- /dev/null
+++ b/clusters/mason.def
@@ -0,0 +1,55 @@
+name: example-mason-cluster
+description: |
+ This is a template cluster morphology that can be adapted to set up a
+ Mason. Masons are composed of a trove and a distbuild system.
+
+ It is suggested that you use mason/mason-generator.sh to adapt this
+ template to suit your needs. It also handles the generation of
+ keys to let the systems communicate.
+systems:
+- name: trove-system-x86_64
+ deploy:
+ red-box-v1-trove:
+ type: kvm
+ location: kvm+ssh://vm-user@vm-host/red-box-v1-trove/vm-path/red-box-v1-trove.img
+ AUTOSTART: true
+ DISK_SIZE: 20G
+ HOSTNAME: red-box-v1-trove
+ LORRY_SSH_KEY: ssh_keys/lorry.key
+ MASON_SSH_PUBKEY: ssh_keys/mason.key.pub
+ RAM_SIZE: 8G
+ TROVE_ADMIN_EMAIL: adminuser@example.com
+ TROVE_ADMIN_NAME: Nobody
+ TROVE_ADMIN_SSH_PUBKEY: ssh_keys/id_rsa.pub
+ TROVE_ADMIN_USER: adminuser
+ TROVE_COMPANY: Company name goes here
+ TROVE_HOST: red-box-v1
+ TROVE_ID: red-box-v1-trove
+ UPSTREAM_TROVE: upstream-trove
+ VCPUS: 2
+ VERSION_LABEL: 45
+ WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub
+- name: build-system-x86_64
+ deploy-defaults:
+ ARTIFACT_CACHE_SERVER: red-box-v1-trove.example.com
+ CONTROLLERHOST: red-box-v1-controller.example.com
+ DISTBUILD_CONTROLLER: false
+ DISTBUILD_WORKER: true
+ INSTALL_FILES: distbuild/manifest
+ RAM_SIZE: 8G
+ TROVE_HOST: upstream-trove
+ TROVE_ID: upstream-trove
+ VCPUS: 2
+ WORKER_SSH_KEY: ssh_keys/worker.key
+ deploy:
+ red-box-v1-controller:
+ type: kvm
+ location: kvm+ssh://vm-user@vm-host/red-box-v1-controller/vm-path/red-box-v1-controller.img
+ DISK_SIZE: 60G
+ DISTBUILD_CONTROLLER: true
+ HOSTNAME: red-box-v1-controller
+ MASON_CLUSTER_MORPHOLOGY: clusters/ci
+ MASON_DEFINITIONS_REF: master
+ MASON_DISTBUILD_ARCH: x86_64
+ MASON_TEST_HOST: vm-user@vm-host:/vm-path/
+ WORKERS: red-box-v1-controller
diff --git a/clusters/mason.morph b/clusters/mason.morph
deleted file mode 100644
index 9717239d..00000000
--- a/clusters/mason.morph
+++ /dev/null
@@ -1,56 +0,0 @@
-name: example-mason-cluster
-kind: cluster
-description: |
- This is a template cluster morphology that can be adapted to set up a
- Mason. Masons are composed of a trove and a distbuild system.
-
- It is suggested that you use mason/mason-generator.sh to adapt this
- template to suit your needs. It also handles the generation of
- keys to let the systems communicate.
-systems:
-- morph: systems/trove-system-x86_64.morph
- deploy:
- red-box-v1-trove:
- type: kvm
- location: kvm+ssh://vm-user@vm-host/red-box-v1-trove/vm-path/red-box-v1-trove.img
- AUTOSTART: true
- DISK_SIZE: 20G
- HOSTNAME: red-box-v1-trove
- LORRY_SSH_KEY: ssh_keys/lorry.key
- MASON_SSH_PUBKEY: ssh_keys/mason.key.pub
- RAM_SIZE: 8G
- TROVE_ADMIN_EMAIL: adminuser@example.com
- TROVE_ADMIN_NAME: Nobody
- TROVE_ADMIN_SSH_PUBKEY: ssh_keys/id_rsa.pub
- TROVE_ADMIN_USER: adminuser
- TROVE_COMPANY: Company name goes here
- TROVE_HOST: red-box-v1
- TROVE_ID: red-box-v1-trove
- UPSTREAM_TROVE: upstream-trove
- VCPUS: 2
- VERSION_LABEL: 45
- WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub
-- morph: systems/build-system-x86_64.morph
- deploy-defaults:
- ARTIFACT_CACHE_SERVER: red-box-v1-trove.example.com
- CONTROLLERHOST: red-box-v1-controller.example.com
- DISTBUILD_CONTROLLER: false
- DISTBUILD_WORKER: true
- INSTALL_FILES: distbuild/manifest
- RAM_SIZE: 8G
- TROVE_HOST: upstream-trove
- TROVE_ID: upstream-trove
- VCPUS: 2
- WORKER_SSH_KEY: ssh_keys/worker.key
- deploy:
- red-box-v1-controller:
- type: kvm
- location: kvm+ssh://vm-user@vm-host/red-box-v1-controller/vm-path/red-box-v1-controller.img
- DISK_SIZE: 60G
- DISTBUILD_CONTROLLER: true
- HOSTNAME: red-box-v1-controller
- MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph
- MASON_DEFINITIONS_REF: master
- MASON_DISTBUILD_ARCH: x86_64
- MASON_TEST_HOST: vm-user@vm-host:/vm-path/
- WORKERS: red-box-v1-controller
diff --git a/clusters/minimal-system-deploy.def b/clusters/minimal-system-deploy.def
new file mode 100644
index 00000000..da5261f2
--- /dev/null
+++ b/clusters/minimal-system-deploy.def
@@ -0,0 +1,13 @@
+name: minimal-system-deploy
+description: |
+ Deploy a minimal system to a system running KVM
+systems:
+- name: minimal-system-x86_32-generic
+ deploy:
+ vm:
+ type: kvm
+ location: kvm+ssh://192.168.122.1/tiny-x86_32/srv/VMs/tiny-x86_32.img
+ DISK_SIZE: 512M
+ HOSTNAME: tiny-x86_32
+ INIT_SYSTEM: busybox
+ RAM_SIZE: 512M
diff --git a/clusters/minimal-system-deploy.morph b/clusters/minimal-system-deploy.morph
deleted file mode 100644
index 06629ffc..00000000
--- a/clusters/minimal-system-deploy.morph
+++ /dev/null
@@ -1,14 +0,0 @@
-name: minimal-system-deploy
-kind: cluster
-description: |
- Deploy a minimal system to a system running KVM
-systems:
-- morph: systems/minimal-system-x86_32-generic.morph
- deploy:
- vm:
- type: kvm
- location: kvm+ssh://192.168.122.1/tiny-x86_32/srv/VMs/tiny-x86_32.img
- DISK_SIZE: 512M
- HOSTNAME: tiny-x86_32
- INIT_SYSTEM: busybox
- RAM_SIZE: 512M
diff --git a/clusters/release.def b/clusters/release.def
new file mode 100644
index 00000000..174541ec
--- /dev/null
+++ b/clusters/release.def
@@ -0,0 +1,59 @@
+name: release
+description: |
+ Deploy all the systems for we support in a release.
+
+ This cluster morph is used by the tool 'scripts/do-release'. While
+ you can deploy the systems yourself, if you are making a Baserock release
+ then the script should be used.
+systems:
+- name: build-system-x86_32-chroot
+ deploy:
+ build-system-x86_32-chroot:
+ type: tar
+ location: build-system-x86_32-chroot.tar
+- name: build-system-x86_32
+ deploy:
+ build-system-x86_32:
+ type: rawdisk
+ location: build-system-x86_32.img
+ DISK_SIZE: 6G
+- name: build-system-x86_64-chroot
+ deploy:
+ build-system-x86_64-chroot:
+ type: tar
+ location: build-system-x86_64-chroot.tar
+- name: build-system-x86_64
+ deploy:
+ build-system-x86_64:
+ type: rawdisk
+ location: build-system-x86_64.img
+ DISK_SIZE: 6G
+- name: build-system-armv7lhf-jetson
+ deploy:
+ devel-system-armv7lhf-jetson:
+ type: rawdisk
+ location: build-system-armv7lhf-jetson.img
+ DISK_SIZE: 2G
+ ROOT_DEVICE: "/dev/mmcblk0p1"
+ DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
+ BOOTLOADER_CONFIG_FORMAT: "extlinux"
+ BOOTLOADER_INSTALL: "none"
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+- name: genivi-baseline-system-x86_64-generic
+ deploy:
+ genivi-baseline-system-x86_64-generic:
+ type: rawdisk
+ location: genivi-baseline-system-x86_64-generic.img
+ DISK_SIZE: 4G
+ KERNEL_ARGS: vga=788
+- name: genivi-baseline-system-armv7lhf-jetson
+ deploy:
+ genivi-baseline-system-armv7lhf-jetson:
+ type: rawdisk
+ location: genivi-baseline-system-armv7lhf-jetson.img
+ DISK_SIZE: 4G
+ ROOT_DEVICE: "/dev/mmcblk0p1"
+ DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
+ BOOTLOADER_CONFIG_FORMAT: "extlinux"
+ BOOTLOADER_INSTALL: "none"
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
diff --git a/clusters/release.morph b/clusters/release.morph
deleted file mode 100644
index f161d0df..00000000
--- a/clusters/release.morph
+++ /dev/null
@@ -1,60 +0,0 @@
-name: release
-kind: cluster
-description: |
- Deploy all the systems for we support in a release.
-
- This cluster morph is used by the tool 'scripts/do-release'. While
- you can deploy the systems yourself, if you are making a Baserock release
- then the script should be used.
-systems:
-- morph: systems/build-system-x86_32-chroot.morph
- deploy:
- build-system-x86_32-chroot:
- type: tar
- location: build-system-x86_32-chroot.tar
-- morph: systems/build-system-x86_32.morph
- deploy:
- build-system-x86_32:
- type: rawdisk
- location: build-system-x86_32.img
- DISK_SIZE: 6G
-- morph: systems/build-system-x86_64-chroot.morph
- deploy:
- build-system-x86_64-chroot:
- type: tar
- location: build-system-x86_64-chroot.tar
-- morph: systems/build-system-x86_64.morph
- deploy:
- build-system-x86_64:
- type: rawdisk
- location: build-system-x86_64.img
- DISK_SIZE: 6G
-- morph: systems/build-system-armv7lhf-jetson.morph
- deploy:
- devel-system-armv7lhf-jetson:
- type: rawdisk
- location: build-system-armv7lhf-jetson.img
- DISK_SIZE: 2G
- ROOT_DEVICE: "/dev/mmcblk0p1"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
-- morph: systems/genivi-baseline-system-x86_64-generic.morph
- deploy:
- genivi-baseline-system-x86_64-generic:
- type: rawdisk
- location: genivi-baseline-system-x86_64-generic.img
- DISK_SIZE: 4G
- KERNEL_ARGS: vga=788
-- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph
- deploy:
- genivi-baseline-system-armv7lhf-jetson:
- type: rawdisk
- location: genivi-baseline-system-armv7lhf-jetson.img
- DISK_SIZE: 4G
- ROOT_DEVICE: "/dev/mmcblk0p1"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
diff --git a/clusters/sdk-example-cluster.def b/clusters/sdk-example-cluster.def
new file mode 100644
index 00000000..5a2d512e
--- /dev/null
+++ b/clusters/sdk-example-cluster.def
@@ -0,0 +1,44 @@
+name: sdk
+description: |
+ An example of creating a cross-compile SDK for an embedded Baserock system.
+
+ This cluster demonstrates how you can use the 'sdk' write extension to
+ produce a cross-compile SDK tarball for an Baserock applicance. In this
+ example the system is assumed to run on ARMv7, and the SDK is built to
+ run on any x86_32 GNU/Linux system.
+
+ The SDK is a Baserock system itself, containing just 'build-essential' and a
+ 'cross-toolchain' stratum. The SDK system also includes the target
+ appliance's system, as a 'subsystem', so that the libraries and headers are
+ available when building.
+
+ This cluster deploys the SDK system using the 'sdk' write extension, which
+ produces a tarball with a small shell header. When the shell header is
+ executed, and passed a directory name on the commandline, it extracts the SDK
+ to that path and patches the binaries so that they execute correctly from
+ that directory.
+
+ Deploying the applicate system artifact to the target device should be
+ done with a separate cluster morphology, because you will often want to
+ do this without rebuilding the SDK.
+
+ You must build each system with `morph build` before deploying. We recommend
+ doing this all from your Baserock development machine, using a Baserock
+ ARM distributed build network to produce the system artifact. Once both
+ system artifacts are cached locally, the `morph deploy` command will produce
+ a self-extracting shell script/tarball following the 'location' field.
+
+ See the documentation of the sdk.write extension for more information.
+systems:
+- name: armv7lhf-cross-toolchain-system-x86_32-generic
+ deploy:
+ sdk:
+ type: sdk
+ location: armv7lhf-cross-toolchain-system-x86_32-generic.sh
+ PREFIX: /usr
+ TARGET: armv7lhf-baserock-linux-gnueabi
+ subsystems:
+ deploy:
+ sysroot:
+ type: sysroot
+ location: usr/armv7lhf-baserock-linux-gnueabi/sys-root
diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph
deleted file mode 100644
index f71d093d..00000000
--- a/clusters/sdk-example-cluster.morph
+++ /dev/null
@@ -1,46 +0,0 @@
-name: sdk
-kind: cluster
-description: |
- An example of creating a cross-compile SDK for an embedded Baserock system.
-
- This cluster demonstrates how you can use the 'sdk' write extension to
- produce a cross-compile SDK tarball for an Baserock applicance. In this
- example the system is assumed to run on ARMv7, and the SDK is built to
- run on any x86_32 GNU/Linux system.
-
- The SDK is a Baserock system itself, containing just 'build-essential' and a
- 'cross-toolchain' stratum. The SDK system also includes the target
- appliance's system, as a 'subsystem', so that the libraries and headers are
- available when building.
-
- This cluster deploys the SDK system using the 'sdk' write extension, which
- produces a tarball with a small shell header. When the shell header is
- executed, and passed a directory name on the commandline, it extracts the SDK
- to that path and patches the binaries so that they execute correctly from
- that directory.
-
- Deploying the applicate system artifact to the target device should be
- done with a separate cluster morphology, because you will often want to
- do this without rebuilding the SDK.
-
- You must build each system with `morph build` before deploying. We recommend
- doing this all from your Baserock development machine, using a Baserock
- ARM distributed build network to produce the system artifact. Once both
- system artifacts are cached locally, the `morph deploy` command will produce
- a self-extracting shell script/tarball following the 'location' field.
-
- See the documentation of the sdk.write extension for more information.
-systems:
-- morph: systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
- deploy:
- sdk:
- type: sdk
- location: armv7lhf-cross-toolchain-system-x86_32-generic.sh
- PREFIX: /usr
- TARGET: armv7lhf-baserock-linux-gnueabi
- subsystems:
- - morph: systems/devel-system-armv7lhf-highbank.morph
- deploy:
- sysroot:
- type: sysroot
- location: usr/armv7lhf-baserock-linux-gnueabi/sys-root
diff --git a/clusters/trove-example.def b/clusters/trove-example.def
new file mode 100644
index 00000000..5913c152
--- /dev/null
+++ b/clusters/trove-example.def
@@ -0,0 +1,59 @@
+name: trove-example
+description: |
+ This is an example cluster morphology for deploying a Trove,
+ both the initial deployment and an upgrade.
+
+ You need some ssh keys, which you can create like this:
+
+ mkdir ssh_keys
+ ssh-keygen -N '' -f ssh_keys/lorry.key
+ ssh-keygen -N '' -f ssh_keys/mason.key
+ ssh-keygen -N '' -f ssh_keys/worker.key
+ ssh-keygen -N '' -f ssh_keys/trove-admin.key
+
+ You may also put in your own keys instead of creating new ones.
+
+ To do the initial deployment:
+
+ morph deploy --upgrade clusters/trove-example \
+ initial \
+ initial.location=kvm+ssh://liw@192.168.122.1/test-trove/tmp/test-trove.img
+
+ To do an upgrade:
+
+ morph deploy clusters/trove-example \
+ upgrade upgrade.VERSION_LABEL=123
+
+ where `VERSION_LABEL` gets a new unique value each time.
+
+ Remember to always specify either initial or upgrade as the
+ deployment name to use, otherwise morph will attempt to deploy both.
+
+ You can find documentation for Trove at the following web address:
+ http://wiki.baserock.org/Trove/
+systems:
+- name: trove-system-x86_64
+ deploy-defaults:
+ HOSTNAME: test-trove
+ VCPUS: 2
+ RAM_SIZE: 2G
+ DISK_SIZE: 8G
+ LORRY_SSH_KEY: ssh_keys/lorry.key
+ MASON_SSH_PUBKEY: ssh_keys/mason.key.pub
+ WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub
+ TROVE_ADMIN_EMAIL: adminuser@example.com
+ TROVE_ADMIN_NAME: Nobody
+ TROVE_ADMIN_SSH_PUBKEY: ssh_keys/trove-admin.key.pub
+ TROVE_ADMIN_USER: adminuser
+ TROVE_COMPANY: Company name goes here
+ TROVE_HOST: test-trove
+ TROVE_ID: test-trove
+ UPSTREAM_TROVE: ''
+ deploy:
+ initial:
+ type: kvm
+ location: kvm+ssh://vm-user@vm-host/test-trove/vm-path/test-trove.img
+ VERSION_LABEL: 1
+ upgrade:
+ type: ssh-rsync
+ location: test-trove
diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph
deleted file mode 100644
index 25ee579d..00000000
--- a/clusters/trove-example.morph
+++ /dev/null
@@ -1,60 +0,0 @@
-name: trove-example
-kind: cluster
-description: |
- This is an example cluster morphology for deploying a Trove,
- both the initial deployment and an upgrade.
-
- You need some ssh keys, which you can create like this:
-
- mkdir ssh_keys
- ssh-keygen -N '' -f ssh_keys/lorry.key
- ssh-keygen -N '' -f ssh_keys/mason.key
- ssh-keygen -N '' -f ssh_keys/worker.key
- ssh-keygen -N '' -f ssh_keys/trove-admin.key
-
- You may also put in your own keys instead of creating new ones.
-
- To do the initial deployment:
-
- morph deploy --upgrade clusters/trove-example.morph \
- initial \
- initial.location=kvm+ssh://liw@192.168.122.1/test-trove/tmp/test-trove.img
-
- To do an upgrade:
-
- morph deploy clusters/trove-example.morph \
- upgrade upgrade.VERSION_LABEL=123
-
- where `VERSION_LABEL` gets a new unique value each time.
-
- Remember to always specify either initial or upgrade as the
- deployment name to use, otherwise morph will attempt to deploy both.
-
- You can find documentation for Trove at the following web address:
- http://wiki.baserock.org/Trove/
-systems:
-- morph: systems/trove-system-x86_64.morph
- deploy-defaults:
- HOSTNAME: test-trove
- VCPUS: 2
- RAM_SIZE: 2G
- DISK_SIZE: 8G
- LORRY_SSH_KEY: ssh_keys/lorry.key
- MASON_SSH_PUBKEY: ssh_keys/mason.key.pub
- WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub
- TROVE_ADMIN_EMAIL: adminuser@example.com
- TROVE_ADMIN_NAME: Nobody
- TROVE_ADMIN_SSH_PUBKEY: ssh_keys/trove-admin.key.pub
- TROVE_ADMIN_USER: adminuser
- TROVE_COMPANY: Company name goes here
- TROVE_HOST: test-trove
- TROVE_ID: test-trove
- UPSTREAM_TROVE: ''
- deploy:
- initial:
- type: kvm
- location: kvm+ssh://vm-user@vm-host/test-trove/vm-path/test-trove.img
- VERSION_LABEL: 1
- upgrade:
- type: ssh-rsync
- location: test-trove
diff --git a/clusters/trove.baserock.org-upgrade.def b/clusters/trove.baserock.org-upgrade.def
new file mode 100644
index 00000000..3b0671be
--- /dev/null
+++ b/clusters/trove.baserock.org-upgrade.def
@@ -0,0 +1,22 @@
+name: trove.baserock.org-upgrade
+description: |
+ This is a cluster morphology for deploying an UPGRADE to
+ git.baserock.org. It doesn't work for the initial deployment. The
+ deployer MUST have ssh access to root@git.baserock.org. To use:
+
+ morph deploy --upgrade trove.baserock.org-upgrade gbo.VERSION_LABEL=2014-05-29
+
+ Replace the value of gbo.VERSION_LABEL above with the current date.
+ You can add letters if you need to upgrade multiple times in a day.
+systems:
+- name: trove-system-x86_64
+ deploy:
+ gbo:
+ type: ssh-rsync
+ location: root@git.baserock.org
+ FSTAB_HOME: LABEL=homes /home auto defaults,noatime,rw 0 2
+ HOSTNAME: firehose1
+ LORRY_CONTROLLER_MINIONS: 4
+ TROVE_COMPANY: Baserock
+ TROVE_HOSTNAME: git.baserock.org
+ TROVE_ID: baserock
diff --git a/clusters/trove.baserock.org-upgrade.morph b/clusters/trove.baserock.org-upgrade.morph
deleted file mode 100644
index eaf939e1..00000000
--- a/clusters/trove.baserock.org-upgrade.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-name: trove.baserock.org-upgrade
-kind: cluster
-description: |
- This is a cluster morphology for deploying an UPGRADE to
- git.baserock.org. It doesn't work for the initial deployment. The
- deployer MUST have ssh access to root@git.baserock.org. To use:
-
- morph deploy --upgrade trove.baserock.org-upgrade gbo.VERSION_LABEL=2014-05-29
-
- Replace the value of gbo.VERSION_LABEL above with the current date.
- You can add letters if you need to upgrade multiple times in a day.
-systems:
-- morph: systems/trove-system-x86_64.morph
- deploy:
- gbo:
- type: ssh-rsync
- location: root@git.baserock.org
- FSTAB_HOME: LABEL=homes /home auto defaults,noatime,rw 0 2
- HOSTNAME: firehose1
- LORRY_CONTROLLER_MINIONS: 4
- TROVE_COMPANY: Baserock
- TROVE_HOSTNAME: git.baserock.org
- TROVE_ID: baserock
diff --git a/clusters/upgrade-devel.def b/clusters/upgrade-devel.def
new file mode 100644
index 00000000..b4685ba1
--- /dev/null
+++ b/clusters/upgrade-devel.def
@@ -0,0 +1,38 @@
+name: upgrade-devel
+description: |
+ This is a cluster morphology that can be used to deploy systems to a
+ an existing Baserock devel system, as an upgrade of the running system.
+
+ This method is for users who deployed a system manually from one of the
+ images provided on http://download.baserock.org. IT IS ONLY POSSIBLE TO
+ UPGRADE BASEROCK 14 RELEASES OR NEWER.
+
+ If you deployed your system using `morph deploy` then you should reuse the
+ cluster morphology you did the initial deployment with, instead of this one,
+ so that the configuration is preserved in the new system.
+
+ Ensure that your root user has passwordless SSH access to localhost with
+ `ssh root@localhost whoami`. If not, run `ssh-copy-id root@localhost`.
+ Make sure the 'morph' field below matches the system you are upgrading.
+
+ To upgrade, select a sensible a value for VERSION_LABEL and run:
+
+ morph deploy --upgrade upgrade-devel self.HOSTNAME=$(hostname) self.VERSION_LABEL=$VERSION_LABEL
+
+ Your configuration in /etc should be propagated to the new system, but there
+ may be merge conflicts. Check /etc for files named '.rej' and '.orig' in the
+ new system, which will indicate that there are changes from the old system
+ that must be merged manually. You can get a nice diff from the old /etc as
+ follows:
+
+ mount /dev/sda /mnt
+ git diff --no-index /mnt/systems/factory/run/etc /mnt/systems/$VERSION_LABEL/run/etc
+
+ On a base system, use 'diff -r' instead of 'git diff --no-index'. It will
+ not be as colourful.
+systems:
+- name: devel-system-x86_64-generic
+ deploy:
+ self:
+ type: ssh-rsync
+ location: root@127.0.0.1
diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph
deleted file mode 100644
index b7ce9bc0..00000000
--- a/clusters/upgrade-devel.morph
+++ /dev/null
@@ -1,39 +0,0 @@
-name: upgrade-devel
-kind: cluster
-description: |
- This is a cluster morphology that can be used to deploy systems to a
- an existing Baserock devel system, as an upgrade of the running system.
-
- This method is for users who deployed a system manually from one of the
- images provided on http://download.baserock.org. IT IS ONLY POSSIBLE TO
- UPGRADE BASEROCK 14 RELEASES OR NEWER.
-
- If you deployed your system using `morph deploy` then you should reuse the
- cluster morphology you did the initial deployment with, instead of this one,
- so that the configuration is preserved in the new system.
-
- Ensure that your root user has passwordless SSH access to localhost with
- `ssh root@localhost whoami`. If not, run `ssh-copy-id root@localhost`.
- Make sure the 'morph' field below matches the system you are upgrading.
-
- To upgrade, select a sensible a value for VERSION_LABEL and run:
-
- morph deploy --upgrade upgrade-devel.morph self.HOSTNAME=$(hostname) self.VERSION_LABEL=$VERSION_LABEL
-
- Your configuration in /etc should be propagated to the new system, but there
- may be merge conflicts. Check /etc for files named '.rej' and '.orig' in the
- new system, which will indicate that there are changes from the old system
- that must be merged manually. You can get a nice diff from the old /etc as
- follows:
-
- mount /dev/sda /mnt
- git diff --no-index /mnt/systems/factory/run/etc /mnt/systems/$VERSION_LABEL/run/etc
-
- On a base system, use 'diff -r' instead of 'git diff --no-index'. It will
- not be as colourful.
-systems:
-- morph: systems/devel-system-x86_64-generic.morph
- deploy:
- self:
- type: ssh-rsync
- location: root@127.0.0.1
diff --git a/strata/NetworkManager-common.def b/strata/NetworkManager-common.def
new file mode 100644
index 00000000..73fd5408
--- /dev/null
+++ b/strata/NetworkManager-common.def
@@ -0,0 +1,15 @@
+name: NetworkManager-common
+build-depends:
+- name: audio-bluetooth
+- name: network-security
+- name: connectivity
+contents:
+- name: libndp
+ repo: upstream:libndp
+ ref: master
+- name: NetworkManager
+ repo: upstream:NetworkManager
+ ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2
+ unpetrify-ref: 0.9.10
+ build-depends:
+ - libndp
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
deleted file mode 100644
index 7233d84f..00000000
--- a/strata/NetworkManager-common.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: NetworkManager-common
-kind: stratum
-build-depends:
-- morph: strata/audio-bluetooth.morph
-- morph: strata/network-security.morph
-- morph: strata/connectivity.morph
-chunks:
-- name: libndp
- repo: upstream:libndp
- ref: master
- build-depends: []
-- name: NetworkManager
- morph: strata/NetworkManager-common/NetworkManager.morph
- repo: upstream:NetworkManager
- ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2
- unpetrify-ref: 0.9.10
- build-depends:
- - libndp
diff --git a/strata/NetworkManager-common/NetworkManager.def b/strata/NetworkManager-common/NetworkManager.def
new file mode 100644
index 00000000..40b05207
--- /dev/null
+++ b/strata/NetworkManager-common/NetworkManager.def
@@ -0,0 +1,4 @@
+name: NetworkManager
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp
diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph
deleted file mode 100644
index 9840dfa4..00000000
--- a/strata/NetworkManager-common/NetworkManager.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: NetworkManager
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp
diff --git a/strata/ansible.def b/strata/ansible.def
new file mode 100644
index 00000000..12491249
--- /dev/null
+++ b/strata/ansible.def
@@ -0,0 +1,26 @@
+name: ansible
+description: A stratum with ansible and its dependencies
+build-depends:
+- name: core
+contents:
+- name: paramiko
+ repo: upstream:paramiko
+ ref: 951faed80b017e553a27c4cb98f210df44341f8f
+ unpetrify-ref: baserock/morph
+- name: markupsafe
+ repo: upstream:markupsafe
+ ref: 58cde05bdcb0a53d87213b4a5bb605937f178171
+ unpetrify-ref: baserock/morph
+- name: jinja2
+ repo: upstream:jinja2
+ ref: 91fa138077d9ed5cf73a7903479077498e695492
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - markupsafe
+- name: ansible
+ repo: upstream:ansible
+ ref: aa56db7e28d4fe256471043b05120c2f41a840e5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - paramiko
+ - jinja2
diff --git a/strata/ansible.morph b/strata/ansible.morph
deleted file mode 100644
index e0cb8581..00000000
--- a/strata/ansible.morph
+++ /dev/null
@@ -1,30 +0,0 @@
-name: ansible
-kind: stratum
-description: A stratum with ansible and its dependencies
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: paramiko
- repo: upstream:paramiko
- ref: 951faed80b017e553a27c4cb98f210df44341f8f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: markupsafe
- repo: upstream:markupsafe
- ref: 58cde05bdcb0a53d87213b4a5bb605937f178171
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: jinja2
- repo: upstream:jinja2
- ref: 91fa138077d9ed5cf73a7903479077498e695492
- unpetrify-ref: baserock/morph
- build-depends:
- - markupsafe
-- name: ansible
- morph: strata/ansible/ansible.morph
- repo: upstream:ansible
- ref: aa56db7e28d4fe256471043b05120c2f41a840e5
- unpetrify-ref: baserock/morph
- build-depends:
- - paramiko
- - jinja2
diff --git a/strata/ansible/ansible.def b/strata/ansible/ansible.def
new file mode 100644
index 00000000..27396bd7
--- /dev/null
+++ b/strata/ansible/ansible.def
@@ -0,0 +1,4 @@
+name: ansible
+build-system: python-distutils
+post-install-commands:
+- install -D -m644 ansible.cfg "$DESTDIR/etc/ansible/ansible.cfg"
diff --git a/strata/ansible/ansible.morph b/strata/ansible/ansible.morph
deleted file mode 100644
index da434f03..00000000
--- a/strata/ansible/ansible.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: ansible
-kind: chunk
-build-system: python-distutils
-post-install-commands:
-- install -D -m644 ansible.cfg "$DESTDIR/etc/ansible/ansible.cfg"
diff --git a/strata/armv7lhf-cross-toolchain.def b/strata/armv7lhf-cross-toolchain.def
new file mode 100644
index 00000000..3061d8bc
--- /dev/null
+++ b/strata/armv7lhf-cross-toolchain.def
@@ -0,0 +1,34 @@
+name: armv7lhf-cross-toolchain
+description: Stratum for building an armv7lhf cross compiler for your native system.
+build-depends:
+- name: build-essential
+contents:
+- name: armv7lhf-cross-binutils
+ repo: upstream:binutils-redhat
+ ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
+ unpetrify-ref: baserock/build-essential
+- name: armv7lhf-cross-linux-api-headers
+ repo: upstream:linux
+ ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+ unpetrify-ref: baserock/v3.8
+- name: armv7lhf-cross-gcc-nolibc
+ repo: upstream:gcc-tarball
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - armv7lhf-cross-binutils
+- name: armv7lhf-cross-eglibc
+ repo: upstream:eglibc2
+ ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
+ unpetrify-ref: baserock/2.15-build-essential
+ build-depends:
+ - armv7lhf-cross-binutils
+ - armv7lhf-cross-gcc-nolibc
+ - armv7lhf-cross-linux-api-headers
+- name: armv7lhf-cross-gcc
+ repo: upstream:gcc-tarball
+ ref: b0254026149b13782eae26d38435a4c62a002cf0
+ unpetrify-ref: baserock/build-essential-4.7
+ build-depends:
+ - armv7lhf-cross-binutils
+ - armv7lhf-cross-eglibc
diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
deleted file mode 100644
index c76ae537..00000000
--- a/strata/armv7lhf-cross-toolchain.morph
+++ /dev/null
@@ -1,42 +0,0 @@
-name: armv7lhf-cross-toolchain
-kind: stratum
-description: Stratum for building an armv7lhf cross compiler for your native system.
-build-depends:
-- morph: strata/build-essential.morph
-chunks:
-- name: armv7lhf-cross-binutils
- morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph
- repo: upstream:binutils-redhat
- ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
- unpetrify-ref: baserock/build-essential
- build-depends: []
-- name: armv7lhf-cross-linux-api-headers
- morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
- repo: upstream:linux
- ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
- unpetrify-ref: baserock/v3.8
- build-depends: []
-- name: armv7lhf-cross-gcc-nolibc
- morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
- repo: upstream:gcc-tarball
- ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
- unpetrify-ref: baserock/build-essential
- build-depends:
- - armv7lhf-cross-binutils
-- name: armv7lhf-cross-eglibc
- morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph
- repo: upstream:eglibc2
- ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
- unpetrify-ref: baserock/2.15-build-essential
- build-depends:
- - armv7lhf-cross-binutils
- - armv7lhf-cross-gcc-nolibc
- - armv7lhf-cross-linux-api-headers
-- name: armv7lhf-cross-gcc
- morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
- repo: upstream:gcc-tarball
- ref: b0254026149b13782eae26d38435a4c62a002cf0
- unpetrify-ref: baserock/build-essential-4.7
- build-depends:
- - armv7lhf-cross-binutils
- - armv7lhf-cross-eglibc
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.def b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.def
new file mode 100644
index 00000000..07c75279
--- /dev/null
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.def
@@ -0,0 +1,23 @@
+name: armv7lhf-cross-binutils
+build-system: autotools
+
+configure-commands:
+- |
+ # The TARGET used is the final triplet we expect, rather than that
+ # of the libc-less GCC we build, since the binutils only needs to
+ # be built once.
+ # This requires extra effort to get the stage 1 GCC to use these
+ # tools, but saves having an extra binutils build.
+ export TARGET=armv7lhf-baserock-linux-gnueabi
+
+ # 1. Binutils gets installed in the default sysroot path of
+ # $PREFIX/$TARGET/{bin,lib}, with the actual sysroot at
+ # $PREFIX/$TARGET/sys-root and its tools also available as
+ # $PREFIX/bin/$TARGET-$tool
+ # 2. The '=' makes the path we give relative to the sysroot.
+ ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
+ --build=$(sh config.guess) \
+ --host=$(sh config.guess) \
+ --target="$TARGET" \
+ `# [1]` --with-sysroot \
+ `# [2]` --with-lib-path="=$PREFIX/lib"
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph
deleted file mode 100644
index 8e842e41..00000000
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph
+++ /dev/null
@@ -1,24 +0,0 @@
-name: armv7lhf-cross-binutils
-kind: chunk
-build-system: autotools
-
-configure-commands:
-- |
- # The TARGET used is the final triplet we expect, rather than that
- # of the libc-less GCC we build, since the binutils only needs to
- # be built once.
- # This requires extra effort to get the stage 1 GCC to use these
- # tools, but saves having an extra binutils build.
- export TARGET=armv7lhf-baserock-linux-gnueabi
-
- # 1. Binutils gets installed in the default sysroot path of
- # $PREFIX/$TARGET/{bin,lib}, with the actual sysroot at
- # $PREFIX/$TARGET/sys-root and its tools also available as
- # $PREFIX/bin/$TARGET-$tool
- # 2. The '=' makes the path we give relative to the sysroot.
- ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
- --build=$(sh config.guess) \
- --host=$(sh config.guess) \
- --target="$TARGET" \
- `# [1]` --with-sysroot \
- `# [2]` --with-lib-path="=$PREFIX/lib"
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.def b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.def
new file mode 100644
index 00000000..9dcd48c8
--- /dev/null
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.def
@@ -0,0 +1,46 @@
+name: armv7lhf-cross-eglibc
+
+configure-commands:
+- mkdir o
+
+# Necessary for ARM port
+- cd libc && ln -s ../ports ports
+
+# Configure flag notes:
+# 1. Location of linux-api-headers, needed since eglibc doesn't
+# support being given a sysroot.
+# 2. Location of binutils, since we build binutils for the final
+# target triplet, but our gcc of our stage 1 target triplet.
+# 3. Normal flags. See eglibc.
+# 4. Force configuration values of certain things that can't be detected
+# in a cross-compile.
+- |
+ export MORPH_ARCH=armv7lhf
+ export TARGET=armv7lhf-baserock-linux-gnueabi
+ export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
+ export CFLAGS="-O2 $CFLAGS"
+ # eglibc looks for $TARGET-gcc, but not $TARGET_STAGE1-gcc even
+ # though --build is specified, so we have to override what gcc to
+ # use here.
+ export CC="$TARGET_STAGE1-gcc"
+ cd o && ../libc/configure \
+ $(../morph-arch-config) \
+ --build=$TARGET_STAGE1 --host=$TARGET \
+ --prefix="$PREFIX" \
+ `# [1]` --with-headers="$PREFIX/$TARGET/sys-root/$PREFIX/include" \
+ `# [2]` --with-binutils="$PREFIX/$TARGET/bin" \
+ `# [3]` --disable-profile --enable-kernel=2.6.25 \
+ --enable-add-ons=nptl,ports --without-cvs --without-selinux \
+ `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \
+ libc_cv_forced_unwind=yes libc_cv_ssp=no
+
+build-commands:
+- cd o && make localtime=UTC
+
+install-commands:
+- |
+ # eglibc doesn't help with sysroots, so we need to spell out the
+ # full path ourselves.
+ export TARGET=armv7lhf-baserock-linux-gnueabi
+ cd o && make install_root="$DESTDIR/$PREFIX/$TARGET/sys-root/" \
+ localtime=UTC install
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph
deleted file mode 100644
index ee28c9dd..00000000
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph
+++ /dev/null
@@ -1,47 +0,0 @@
-name: armv7lhf-cross-eglibc
-kind: chunk
-
-configure-commands:
-- mkdir o
-
-# Necessary for ARM port
-- cd libc && ln -s ../ports ports
-
-# Configure flag notes:
-# 1. Location of linux-api-headers, needed since eglibc doesn't
-# support being given a sysroot.
-# 2. Location of binutils, since we build binutils for the final
-# target triplet, but our gcc of our stage 1 target triplet.
-# 3. Normal flags. See eglibc.morph.
-# 4. Force configuration values of certain things that can't be detected
-# in a cross-compile.
-- |
- export MORPH_ARCH=armv7lhf
- export TARGET=armv7lhf-baserock-linux-gnueabi
- export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
- export CFLAGS="-O2 $CFLAGS"
- # eglibc looks for $TARGET-gcc, but not $TARGET_STAGE1-gcc even
- # though --build is specified, so we have to override what gcc to
- # use here.
- export CC="$TARGET_STAGE1-gcc"
- cd o && ../libc/configure \
- $(../morph-arch-config) \
- --build=$TARGET_STAGE1 --host=$TARGET \
- --prefix="$PREFIX" \
- `# [1]` --with-headers="$PREFIX/$TARGET/sys-root/$PREFIX/include" \
- `# [2]` --with-binutils="$PREFIX/$TARGET/bin" \
- `# [3]` --disable-profile --enable-kernel=2.6.25 \
- --enable-add-ons=nptl,ports --without-cvs --without-selinux \
- `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \
- libc_cv_forced_unwind=yes libc_cv_ssp=no
-
-build-commands:
-- cd o && make localtime=UTC
-
-install-commands:
-- |
- # eglibc doesn't help with sysroots, so we need to spell out the
- # full path ourselves.
- export TARGET=armv7lhf-baserock-linux-gnueabi
- cd o && make install_root="$DESTDIR/$PREFIX/$TARGET/sys-root/" \
- localtime=UTC install
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.def b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.def
new file mode 100644
index 00000000..a125af3d
--- /dev/null
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.def
@@ -0,0 +1,53 @@
+name: armv7lhf-cross-gcc-nolibc
+
+configure-commands:
+- mkdir o
+
+# Configure flag notes:
+# 1. Standard flags. See gcc.
+# 2. Our binutils is for the final $TARGET, rather than the intermediate
+# target our GCC is being built for, so we need to set
+# with-build-time-tools to get it to find our binutils at
+# build-time and with-as and with-ld so our temporary GCC uses
+# the appropriate tools when it compiles our libc, rather than
+# trying to use $TARGET_STAGE1-as when producing binaries.
+# 3. Disable stuff that doesn't work when building a cross compiler
+# without an existing libc, and generally try to keep this build as
+# simple as possible.
+- |
+ export MORPH_ARCH=armv7lhf
+ export TARGET=armv7lhf-baserock-linux-gnueabi
+ export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
+ cd o &&
+ ../configure \
+ $(../morph-arch-config) \
+ --build=$(sh ../config.guess) --host=$(sh ../config.guess) \
+ --target="$TARGET_STAGE1" \
+ --prefix="$PREFIX" \
+ --disable-bootstrap --disable-nls \
+ `# [1]` --libdir="$PREFIX/lib" --disable-multilib --disable-libgomp \
+ --without-cloog --without-ppl \
+ --with-mpfr-include="$(pwd)/../mpfr/src" \
+ --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
+ `# [2]` --with-build-time-tools="$PREFIX/$TARGET/bin" \
+ --with-as="$PREFIX/$TARGET/bin/as" \
+ --with-ld="$PREFIX/$TARGET/bin/ld" \
+ `# [3]` --enable-languages=c --disable-decimal-float \
+ --disable-libmudflap --disable-libquadmath --disable-libssp \
+ --disable-shared --disable-threads --disable-target-libiberty \
+ --disable-target-zlib --without-headers --with-newlib \
+ --with-system-zlib
+
+build-commands:
+- cd o && make
+
+install-commands:
+- cd o && make DESTDIR="$DESTDIR" install
+
+# The file libgcc_eh is required during eglibc's build, but is not created
+# because we built GCC with --disable-shared. This is a workaround for
+# eglibc's build system being slightly broken.
+- |
+ export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
+ libgcc_filename="$("$DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc" -print-libgcc-file-name)"
+ ln -sv libgcc.a "$(echo "$libgcc_filename" | sed 's/libgcc/&_eh/')"
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
deleted file mode 100644
index d164a60b..00000000
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
+++ /dev/null
@@ -1,54 +0,0 @@
-name: armv7lhf-cross-gcc-nolibc
-kind: chunk
-
-configure-commands:
-- mkdir o
-
-# Configure flag notes:
-# 1. Standard flags. See gcc.morph.
-# 2. Our binutils is for the final $TARGET, rather than the intermediate
-# target our GCC is being built for, so we need to set
-# with-build-time-tools to get it to find our binutils at
-# build-time and with-as and with-ld so our temporary GCC uses
-# the appropriate tools when it compiles our libc, rather than
-# trying to use $TARGET_STAGE1-as when producing binaries.
-# 3. Disable stuff that doesn't work when building a cross compiler
-# without an existing libc, and generally try to keep this build as
-# simple as possible.
-- |
- export MORPH_ARCH=armv7lhf
- export TARGET=armv7lhf-baserock-linux-gnueabi
- export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
- cd o &&
- ../configure \
- $(../morph-arch-config) \
- --build=$(sh ../config.guess) --host=$(sh ../config.guess) \
- --target="$TARGET_STAGE1" \
- --prefix="$PREFIX" \
- --disable-bootstrap --disable-nls \
- `# [1]` --libdir="$PREFIX/lib" --disable-multilib --disable-libgomp \
- --without-cloog --without-ppl \
- --with-mpfr-include="$(pwd)/../mpfr/src" \
- --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
- `# [2]` --with-build-time-tools="$PREFIX/$TARGET/bin" \
- --with-as="$PREFIX/$TARGET/bin/as" \
- --with-ld="$PREFIX/$TARGET/bin/ld" \
- `# [3]` --enable-languages=c --disable-decimal-float \
- --disable-libmudflap --disable-libquadmath --disable-libssp \
- --disable-shared --disable-threads --disable-target-libiberty \
- --disable-target-zlib --without-headers --with-newlib \
- --with-system-zlib
-
-build-commands:
-- cd o && make
-
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
-
-# The file libgcc_eh is required during eglibc's build, but is not created
-# because we built GCC with --disable-shared. This is a workaround for
-# eglibc's build system being slightly broken.
-- |
- export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
- libgcc_filename="$("$DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc" -print-libgcc-file-name)"
- ln -sv libgcc.a "$(echo "$libgcc_filename" | sed 's/libgcc/&_eh/')"
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.def b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.def
new file mode 100644
index 00000000..49bd7222
--- /dev/null
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.def
@@ -0,0 +1,44 @@
+name: armv7lhf-cross-gcc
+
+configure-commands:
+- mkdir o
+
+# Configure flag notes:
+# 1. Use the default sysroot path to install to and locate headers
+# 2. Recommended by Linux From Scratch; required for C++ ABI
+# compatibility with other Linux distributions.
+# 3. Standard flags. See gcc.
+# 4. Avoid having more than one copy of ZLib in use on the system
+- |
+ export MORPH_ARCH=armv7lhf
+ export TARGET=armv7lhf-baserock-linux-gnueabi
+ export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
+ cd o && ../configure \
+ $(../morph-arch-config) \
+ --build=$(sh ../config.guess) \
+ --host=$(sh ../config.guess) \
+ --target="$TARGET" \
+ `# [1]` --with-sysroot \
+ --prefix="$PREFIX" \
+ --disable-bootstrap \
+ --enable-shared --enable-threads=posix \
+ `# [2]` --enable-__cxa_atexit \
+ --enable-languages=c,c++,fortran \
+ `# [3]` --libdir="$PREFIX/lib" \
+ --disable-libgomp --disable-multilib \
+ --without-cloog --without-ppl \
+ --with-mpfr-include="$(pwd)/../mpfr/src" \
+ --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
+ `# [4]` --with-system-zlib
+
+build-commands:
+- cd o && make
+
+install-commands:
+- cd o && make DESTDIR="$DESTDIR" install
+- |
+ export TARGET=armv7lhf-baserock-linux-gnueabi
+ for fortran_alias in f77 f90 f95; do
+ ln -s "$TARGET-gfortran" \
+ "$DESTDIR/$PREFIX/bin/$TARGET-$fortran_alias"
+ done
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
deleted file mode 100644
index 50c338e5..00000000
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
+++ /dev/null
@@ -1,45 +0,0 @@
-name: armv7lhf-cross-gcc
-kind: chunk
-
-configure-commands:
-- mkdir o
-
-# Configure flag notes:
-# 1. Use the default sysroot path to install to and locate headers
-# 2. Recommended by Linux From Scratch; required for C++ ABI
-# compatibility with other Linux distributions.
-# 3. Standard flags. See gcc.morph.
-# 4. Avoid having more than one copy of ZLib in use on the system
-- |
- export MORPH_ARCH=armv7lhf
- export TARGET=armv7lhf-baserock-linux-gnueabi
- export TARGET_STAGE1=armv7lhf-none-linux-gnueabi
- cd o && ../configure \
- $(../morph-arch-config) \
- --build=$(sh ../config.guess) \
- --host=$(sh ../config.guess) \
- --target="$TARGET" \
- `# [1]` --with-sysroot \
- --prefix="$PREFIX" \
- --disable-bootstrap \
- --enable-shared --enable-threads=posix \
- `# [2]` --enable-__cxa_atexit \
- --enable-languages=c,c++,fortran \
- `# [3]` --libdir="$PREFIX/lib" \
- --disable-libgomp --disable-multilib \
- --without-cloog --without-ppl \
- --with-mpfr-include="$(pwd)/../mpfr/src" \
- --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
- `# [4]` --with-system-zlib
-
-build-commands:
-- cd o && make
-
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
-- |
- export TARGET=armv7lhf-baserock-linux-gnueabi
- for fortran_alias in f77 f90 f95; do
- ln -s "$TARGET-gfortran" \
- "$DESTDIR/$PREFIX/bin/$TARGET-$fortran_alias"
- done
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.def b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.def
new file mode 100644
index 00000000..d8288851
--- /dev/null
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.def
@@ -0,0 +1,9 @@
+name: armv7lhf-cross-linux-api-headers
+install-commands:
+- ARCH=arm make INSTALL_HDR_PATH=dest headers_install
+- |
+ # Copy headers to the sysroot where the eglibc build will find them,
+ # and install its own headers and libraries.
+ export TARGET=armv7lhf-baserock-linux-gnueabi
+ install -d "$DESTDIR$PREFIX/$TARGET/sys-root/$PREFIX/include"
+ cp -r dest/include/* "$DESTDIR/$PREFIX/$TARGET/sys-root/$PREFIX/include"
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
deleted file mode 100644
index c2654419..00000000
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: armv7lhf-cross-linux-api-headers
-kind: chunk
-install-commands:
-- ARCH=arm make INSTALL_HDR_PATH=dest headers_install
-- |
- # Copy headers to the sysroot where the eglibc build will find them,
- # and install its own headers and libraries.
- export TARGET=armv7lhf-baserock-linux-gnueabi
- install -d "$DESTDIR$PREFIX/$TARGET/sys-root/$PREFIX/include"
- cp -r dest/include/* "$DESTDIR/$PREFIX/$TARGET/sys-root/$PREFIX/include"
diff --git a/strata/audio-bluetooth.def b/strata/audio-bluetooth.def
new file mode 100644
index 00000000..65512bd3
--- /dev/null
+++ b/strata/audio-bluetooth.def
@@ -0,0 +1,82 @@
+name: audio-bluetooth
+description: Components required for audio and bluetooth.
+build-depends:
+- name: foundation
+contents:
+- name: libatomic_ops
+ repo: upstream:libatomic_ops
+ ref: 0a58f5d63969c10d2141af89cb7a53df786909ab
+ unpetrify-ref: baserock/morph
+- name: alsa-lib
+ repo: upstream:alsa-lib
+ ref: ab715503853be8d8f365fd157c3cb97ef7a89f7b
+ unpetrify-ref: baserock/morph
+- name: alsa-utils
+ repo: upstream:alsa-utils
+ ref: f12208425051a7abf5ffc87ac2b9d2bd9e096fe1
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - alsa-lib
+- name: libical
+ repo: upstream:libical
+ ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3
+ unpetrify-ref: baserock/morph
+- name: bluez
+ repo: upstream:bluez
+ ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6
+ unpetrify-ref: baserock/v5.17-patched
+ build-depends:
+ - libical
+ - alsa-lib
+- name: bluez-tools
+ repo: upstream:bluez-tools
+ ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461
+ unpetrify-ref: baserock/morph
+- name: obexd
+ repo: upstream:obexd
+ ref: 4225280022c206762c91beee47c62d05e1baeacc
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - bluez
+ - libical
+- name: speex
+ repo: upstream:speex
+ ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa
+ unpetrify-ref: baserock/morph
+- name: nohands
+ repo: upstream:nohands
+ ref: 20ec5cc245fd5e74d9a0fc21497d1ba4164f2a3a
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - bluez
+ - speex
+- name: mobile-broadband-provider-info
+ repo: upstream:mobile-broadband-provider-info
+ ref: 4ed19e11c2975105b71b956440acdb25d46a347d
+ unpetrify-ref: baserock/morph
+- name: ofono
+ repo: upstream:ofono
+ ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
+ unpetrify-ref: "1.15"
+ build-depends:
+ - mobile-broadband-provider-info
+ - bluez
+- name: json-c
+ repo: upstream:json-c
+ ref: 60a5f3dedc879db3e5dacdd3b7e3e543c2e1bae7
+ unpetrify-ref: baserock/morph
+- name: libsndfile
+ repo: upstream:libsndfile
+ ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244
+ unpetrify-ref: baserock/morph
+- name: pulseaudio
+ repo: upstream:pulseaudio
+ ref: e1b44688c0db505f70761fe76b4fed2ca6924a09
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libsndfile
+ - libatomic_ops
+ - speex
+ - json-c
+ - alsa-lib
+ - bluez
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
deleted file mode 100644
index 003d451a..00000000
--- a/strata/audio-bluetooth.morph
+++ /dev/null
@@ -1,101 +0,0 @@
-name: audio-bluetooth
-kind: stratum
-description: Components required for audio and bluetooth.
-build-depends:
-- morph: strata/foundation.morph
-chunks:
-- name: libatomic_ops
- repo: upstream:libatomic_ops
- ref: 0a58f5d63969c10d2141af89cb7a53df786909ab
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: alsa-lib
- morph: strata/audio-bluetooth/alsa-lib.morph
- repo: upstream:alsa-lib
- ref: ab715503853be8d8f365fd157c3cb97ef7a89f7b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: alsa-utils
- morph: strata/audio-bluetooth/alsa-utils.morph
- repo: upstream:alsa-utils
- ref: f12208425051a7abf5ffc87ac2b9d2bd9e096fe1
- unpetrify-ref: baserock/morph
- build-depends:
- - alsa-lib
-- name: libical
- morph: strata/audio-bluetooth/libical.morph
- repo: upstream:libical
- ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: bluez
- morph: strata/audio-bluetooth/bluez.morph
- repo: upstream:bluez
- ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6
- unpetrify-ref: baserock/v5.17-patched
- build-depends:
- - libical
- - alsa-lib
-- name: bluez-tools
- morph: strata/audio-bluetooth/bluez-tools.morph
- repo: upstream:bluez-tools
- ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: obexd
- repo: upstream:obexd
- ref: 4225280022c206762c91beee47c62d05e1baeacc
- unpetrify-ref: baserock/morph
- build-depends:
- - bluez
- - libical
-- name: speex
- repo: upstream:speex
- ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: nohands
- morph: strata/audio-bluetooth/nohands.morph
- repo: upstream:nohands
- ref: 20ec5cc245fd5e74d9a0fc21497d1ba4164f2a3a
- unpetrify-ref: baserock/morph
- build-depends:
- - bluez
- - speex
-- name: mobile-broadband-provider-info
- repo: upstream:mobile-broadband-provider-info
- ref: 4ed19e11c2975105b71b956440acdb25d46a347d
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: ofono
- morph: strata/audio-bluetooth/ofono.morph
- repo: upstream:ofono
- ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
- unpetrify-ref: "1.15"
- build-depends:
- - mobile-broadband-provider-info
- - bluez
-- name: json-c
- morph: strata/audio-bluetooth/json-c.morph
- repo: upstream:json-c
- ref: 60a5f3dedc879db3e5dacdd3b7e3e543c2e1bae7
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libsndfile
- morph: strata/audio-bluetooth/libsndfile.morph
- repo: upstream:libsndfile
- ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pulseaudio
- morph: strata/audio-bluetooth/pulseaudio.morph
- repo: upstream:pulseaudio
- ref: e1b44688c0db505f70761fe76b4fed2ca6924a09
- unpetrify-ref: baserock/morph
- build-depends:
- - libsndfile
- - libatomic_ops
- - speex
- - json-c
- - alsa-lib
- - bluez
diff --git a/strata/audio-bluetooth/alsa-lib.def b/strata/audio-bluetooth/alsa-lib.def
new file mode 100644
index 00000000..6a2ead36
--- /dev/null
+++ b/strata/audio-bluetooth/alsa-lib.def
@@ -0,0 +1,3 @@
+name: alsa-lib
+description: ALSA library
+build-system: autotools
diff --git a/strata/audio-bluetooth/alsa-lib.morph b/strata/audio-bluetooth/alsa-lib.morph
deleted file mode 100644
index 1e3015ca..00000000
--- a/strata/audio-bluetooth/alsa-lib.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: alsa-lib
-kind: chunk
-description: ALSA library
-build-system: autotools
diff --git a/strata/audio-bluetooth/alsa-utils.def b/strata/audio-bluetooth/alsa-utils.def
new file mode 100644
index 00000000..cd789c48
--- /dev/null
+++ b/strata/audio-bluetooth/alsa-utils.def
@@ -0,0 +1,6 @@
+name: alsa-utils
+description: ALSA utilities
+build-system: autotools
+configure-commands:
+- autoreconf -ifv
+- ./configure --prefix="$PREFIX" --disable-xmlto
diff --git a/strata/audio-bluetooth/alsa-utils.morph b/strata/audio-bluetooth/alsa-utils.morph
deleted file mode 100644
index a6a1e041..00000000
--- a/strata/audio-bluetooth/alsa-utils.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: alsa-utils
-kind: chunk
-description: ALSA utilities
-build-system: autotools
-configure-commands:
-- autoreconf -ifv
-- ./configure --prefix="$PREFIX" --disable-xmlto
diff --git a/strata/audio-bluetooth/bluez-tools.def b/strata/audio-bluetooth/bluez-tools.def
new file mode 100644
index 00000000..1470edc3
--- /dev/null
+++ b/strata/audio-bluetooth/bluez-tools.def
@@ -0,0 +1,9 @@
+name: bluez-tools
+description: A set of tools to manage Bluetooth devices for Linux
+build-system: autotools
+configure-commands:
+- sed -i -e 's/-lreadline/-lreadline -lncurses/g' configure.ac
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-obex
+build-commands:
+- LDFLAGS="$LDFLAGS -lncurses" make
diff --git a/strata/audio-bluetooth/bluez-tools.morph b/strata/audio-bluetooth/bluez-tools.morph
deleted file mode 100644
index 80e47ef5..00000000
--- a/strata/audio-bluetooth/bluez-tools.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: bluez-tools
-kind: chunk
-description: A set of tools to manage Bluetooth devices for Linux
-build-system: autotools
-configure-commands:
-- sed -i -e 's/-lreadline/-lreadline -lncurses/g' configure.ac
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-obex
-build-commands:
-- LDFLAGS="$LDFLAGS -lncurses" make
diff --git a/strata/audio-bluetooth/bluez.def b/strata/audio-bluetooth/bluez.def
new file mode 100644
index 00000000..d4a4c9a0
--- /dev/null
+++ b/strata/audio-bluetooth/bluez.def
@@ -0,0 +1,11 @@
+name: bluez
+description: Bluetooth protocol stack for Linux
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX" --enable-tools --enable-test --enable-alsa --enable-library
+ --with-telephony=ofono --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
+install-commands:
+- make install
+- mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants"
+- ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/bluetooth.target.wants/bluetooth.service"
diff --git a/strata/audio-bluetooth/bluez.morph b/strata/audio-bluetooth/bluez.morph
deleted file mode 100644
index 1395b98d..00000000
--- a/strata/audio-bluetooth/bluez.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: bluez
-kind: chunk
-description: Bluetooth protocol stack for Linux
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --enable-tools --enable-test --enable-alsa --enable-library
- --with-telephony=ofono --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
-install-commands:
-- make install
-- mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants"
-- ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/bluetooth.target.wants/bluetooth.service"
diff --git a/strata/audio-bluetooth/json-c.def b/strata/audio-bluetooth/json-c.def
new file mode 100644
index 00000000..b13322a9
--- /dev/null
+++ b/strata/audio-bluetooth/json-c.def
@@ -0,0 +1,6 @@
+name: json-c
+description: JSON C Library
+build-system: autotools
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- install -m755 json_object_iterator.h "$DESTDIR/usr/include/json"
diff --git a/strata/audio-bluetooth/json-c.morph b/strata/audio-bluetooth/json-c.morph
deleted file mode 100644
index c3d9243c..00000000
--- a/strata/audio-bluetooth/json-c.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: json-c
-kind: chunk
-description: JSON C Library
-build-system: autotools
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- install -m755 json_object_iterator.h "$DESTDIR/usr/include/json"
diff --git a/strata/audio-bluetooth/libical.def b/strata/audio-bluetooth/libical.def
new file mode 100644
index 00000000..27e91bd7
--- /dev/null
+++ b/strata/audio-bluetooth/libical.def
@@ -0,0 +1,5 @@
+name: libical
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX"
diff --git a/strata/audio-bluetooth/libical.morph b/strata/audio-bluetooth/libical.morph
deleted file mode 100644
index 1f772fd9..00000000
--- a/strata/audio-bluetooth/libical.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libical
-kind: chunk
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX"
diff --git a/strata/audio-bluetooth/libsndfile.def b/strata/audio-bluetooth/libsndfile.def
new file mode 100644
index 00000000..8618b85a
--- /dev/null
+++ b/strata/audio-bluetooth/libsndfile.def
@@ -0,0 +1,4 @@
+name: libsndfile
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-external-libs
diff --git a/strata/audio-bluetooth/libsndfile.morph b/strata/audio-bluetooth/libsndfile.morph
deleted file mode 100644
index 8d6c2fe0..00000000
--- a/strata/audio-bluetooth/libsndfile.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: libsndfile
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --disable-external-libs
diff --git a/strata/audio-bluetooth/nohands.def b/strata/audio-bluetooth/nohands.def
new file mode 100644
index 00000000..e74d2464
--- /dev/null
+++ b/strata/audio-bluetooth/nohands.def
@@ -0,0 +1,4 @@
+name: nohands
+build-system: autotools
+build-commands:
+- make CXXFLAGS="-fpermissive -lpthread"
diff --git a/strata/audio-bluetooth/nohands.morph b/strata/audio-bluetooth/nohands.morph
deleted file mode 100644
index ebe249c0..00000000
--- a/strata/audio-bluetooth/nohands.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: nohands
-kind: chunk
-build-system: autotools
-build-commands:
-- make CXXFLAGS="-fpermissive -lpthread"
diff --git a/strata/audio-bluetooth/ofono.def b/strata/audio-bluetooth/ofono.def
new file mode 100644
index 00000000..c3f8b81f
--- /dev/null
+++ b/strata/audio-bluetooth/ofono.def
@@ -0,0 +1,10 @@
+name: ofono
+description: ofono Open Source Telephony
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
+install-commands:
+- make install
+- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
+- ln -s /lib/systemd/system/ofono.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/ofono.service"
diff --git a/strata/audio-bluetooth/ofono.morph b/strata/audio-bluetooth/ofono.morph
deleted file mode 100644
index a775b0c1..00000000
--- a/strata/audio-bluetooth/ofono.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: ofono
-kind: chunk
-description: ofono Open Source Telephony
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
-install-commands:
-- make install
-- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
-- ln -s /lib/systemd/system/ofono.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/ofono.service"
diff --git a/strata/audio-bluetooth/pulseaudio.def b/strata/audio-bluetooth/pulseaudio.def
new file mode 100644
index 00000000..bcaeb67e
--- /dev/null
+++ b/strata/audio-bluetooth/pulseaudio.def
@@ -0,0 +1,12 @@
+name: pulseaudio
+description: PulseAudio System
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR/lib/systemd/system"
+- install -m755 pulseaudio.service "$DESTDIR/lib/systemd/system"
+- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
+- ln -s /lib/systemd/system/pulseaudio.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/pulseaudio.service"
diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph
deleted file mode 100644
index 117f3396..00000000
--- a/strata/audio-bluetooth/pulseaudio.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: pulseaudio
-kind: chunk
-description: PulseAudio System
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR/lib/systemd/system"
-- install -m755 pulseaudio.service "$DESTDIR/lib/systemd/system"
-- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
-- ln -s /lib/systemd/system/pulseaudio.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/pulseaudio.service"
diff --git a/strata/bsp-armv7-highbank.def b/strata/bsp-armv7-highbank.def
new file mode 100644
index 00000000..a6953e05
--- /dev/null
+++ b/strata/bsp-armv7-highbank.def
@@ -0,0 +1,9 @@
+name: bsp-armv7-highbank
+description: The platform dependent components required to boot an ARM highbank board.
+build-depends:
+- name: core
+contents:
+- name: linux-armv7-highbank
+ repo: upstream:linux
+ ref: d67a0e110187abd560a1de63fa172894a52839d5
+ unpetrify-ref: baserock/morph
diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph
deleted file mode 100644
index d17d9c66..00000000
--- a/strata/bsp-armv7-highbank.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: bsp-armv7-highbank
-kind: stratum
-description: The platform dependent components required to boot an ARM highbank board.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: linux-armv7-highbank
- morph: strata/bsp-armv7-highbank/linux-armv7-highbank.morph
- repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.def b/strata/bsp-armv7-highbank/linux-armv7-highbank.def
new file mode 100644
index 00000000..48245222
--- /dev/null
+++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.def
@@ -0,0 +1,46 @@
+name: linux-armv7-highbank
+configure-commands:
+- make multi_v7_defconfig
+- scripts/config -e AUTOFS4_FS
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -e CGROUPS
+- scripts/config -e CONFIG_POSIX_MQUEUE
+- scripts/config -e CPU_IDLE
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_USE_FOR_EXT23
+- scripts/config -e PACKET
+- scripts/config -e UNIX
+- scripts/config -e INET
+- scripts/config -e IP_MULTICAST
+- scripts/config -e IP_PNP
+- scripts/config -e IP_PNP_DHCP
+- scripts/config -e IP_PNP_BOOTP
+- scripts/config -e MSDOS_FS
+- scripts/config -e NETWORK_FILESYSTEMS
+- scripts/config -e NET_KEY
+- scripts/config -e NFS_FS
+- scripts/config -e NFS_V3
+- scripts/config -e ROOT_NFS
+- scripts/config -e LOCKD
+- scripts/config -e LOCKD_V4
+- scripts/config -e NFS_COMMON
+- scripts/config -e SUNRPC
+- scripts/config -e SYSVIPC
+- scripts/config -e BTRFS_FS
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e TMPFS
+- scripts/config -e TMPFS_POSIX_ACL
+- scripts/config -e VFAT_FS
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make oldconfig
+build-commands:
+- make zImage $MAKEFLAGS
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
deleted file mode 100644
index dfebf69c..00000000
--- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
+++ /dev/null
@@ -1,47 +0,0 @@
-name: linux-armv7-highbank
-kind: chunk
-configure-commands:
-- make multi_v7_defconfig
-- scripts/config -e AUTOFS4_FS
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -e CGROUPS
-- scripts/config -e CONFIG_POSIX_MQUEUE
-- scripts/config -e CPU_IDLE
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_USE_FOR_EXT23
-- scripts/config -e PACKET
-- scripts/config -e UNIX
-- scripts/config -e INET
-- scripts/config -e IP_MULTICAST
-- scripts/config -e IP_PNP
-- scripts/config -e IP_PNP_DHCP
-- scripts/config -e IP_PNP_BOOTP
-- scripts/config -e MSDOS_FS
-- scripts/config -e NETWORK_FILESYSTEMS
-- scripts/config -e NET_KEY
-- scripts/config -e NFS_FS
-- scripts/config -e NFS_V3
-- scripts/config -e ROOT_NFS
-- scripts/config -e LOCKD
-- scripts/config -e LOCKD_V4
-- scripts/config -e NFS_COMMON
-- scripts/config -e SUNRPC
-- scripts/config -e SYSVIPC
-- scripts/config -e BTRFS_FS
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e TMPFS
-- scripts/config -e TMPFS_POSIX_ACL
-- scripts/config -e VFAT_FS
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make oldconfig
-build-commands:
-- make zImage $MAKEFLAGS
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-armv7-versatile.def b/strata/bsp-armv7-versatile.def
new file mode 100644
index 00000000..92cd024a
--- /dev/null
+++ b/strata/bsp-armv7-versatile.def
@@ -0,0 +1,10 @@
+name: bsp-armv7-versatile
+description: The platform dependent components required to boot an ARM versatile development
+ board.
+build-depends:
+- name: core
+contents:
+- name: linux-armv7-versatile
+ repo: upstream:linux
+ ref: d67a0e110187abd560a1de63fa172894a52839d5
+ unpetrify-ref: baserock/morph
diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph
deleted file mode 100644
index 801f5287..00000000
--- a/strata/bsp-armv7-versatile.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: bsp-armv7-versatile
-kind: stratum
-description: The platform dependent components required to boot an ARM versatile development
- board.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: linux-armv7-versatile
- morph: strata/bsp-armv7-versatile/linux-armv7-versatile.morph
- repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.def b/strata/bsp-armv7-versatile/linux-armv7-versatile.def
new file mode 100644
index 00000000..9c2ac915
--- /dev/null
+++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.def
@@ -0,0 +1,26 @@
+name: linux-armv7-versatile
+configure-commands:
+- make ARCH=arm vexpress_defconfig
+- scripts/config -e BTRFS_FS
+- scripts/config -e BTRFS_FS_POSIX_ACL
+- scripts/config -d BTRFS_FS_CHECK_INTEGRITY
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e CGROUPS
+- scripts/config -e AUTOFS4_FS
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e SECCOMP
+- scripts/config -d DEBUG_STACK_TRACE
+- scripts/config -e FB_VESA
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make oldconfig
+build-commands:
+- make ARCH=arm zImage $MAKEFLAGS
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
deleted file mode 100644
index 1da640e7..00000000
--- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
+++ /dev/null
@@ -1,27 +0,0 @@
-name: linux-armv7-versatile
-kind: chunk
-configure-commands:
-- make ARCH=arm vexpress_defconfig
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -d BTRFS_FS_CHECK_INTEGRITY
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e FB_VESA
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make oldconfig
-build-commands:
-- make ARCH=arm zImage $MAKEFLAGS
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-armv7b-highbank.def b/strata/bsp-armv7b-highbank.def
new file mode 100644
index 00000000..5822d10b
--- /dev/null
+++ b/strata/bsp-armv7b-highbank.def
@@ -0,0 +1,9 @@
+name: bsp-armv7b-highbank
+description: The platform dependent components required to boot an ARM highbank board.
+build-depends:
+- name: core
+contents:
+- name: linux-armv7b-highbank
+ repo: upstream:linux
+ ref: d67a0e110187abd560a1de63fa172894a52839d5
+ unpetrify-ref: baserock/morph
diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph
deleted file mode 100644
index fe8c30e1..00000000
--- a/strata/bsp-armv7b-highbank.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: bsp-armv7b-highbank
-kind: stratum
-description: The platform dependent components required to boot an ARM highbank board.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: linux-armv7b-highbank
- morph: strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
- repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.def b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.def
new file mode 100644
index 00000000..4fc55c7b
--- /dev/null
+++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.def
@@ -0,0 +1,48 @@
+name: linux-armv7b-highbank
+configure-commands:
+- make multi_v7_defconfig
+- scripts/config -e CPU_BIG_ENDIAN
+- scripts/config -e CPU_ENDIAN_BE8
+- scripts/config -e CPU_BE8_BOOT_LE
+- scripts/config -e PACKET
+- scripts/config -e UNIX
+- scripts/config -e NET_KEY
+- scripts/config -e INET
+- scripts/config -e IP_MULTICAST
+- scripts/config -e IP_PNP
+- scripts/config -e IP_PNP_DHCP
+- scripts/config -e IP_PNP_BOOTP
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -e BTRFS_FS
+- scripts/config -e TMPFS
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e CGROUPS
+- scripts/config -e AUTOFS4_FS
+- scripts/config -e NETWORK_FILESYSTEMS
+- scripts/config -e NFS_FS
+- scripts/config -e NFS_V3
+- scripts/config -e ROOT_NFS
+- scripts/config -e LOCKD
+- scripts/config -e LOCKD_V4
+- scripts/config -e NFS_COMMON
+- scripts/config -e SUNRPC
+- scripts/config -e SYSVIPC
+- scripts/config -e CONFIG_POSIX_MQUEUE
+- scripts/config -e CPU_IDLE
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_USE_FOR_EXT23
+- scripts/config -e MSDOS_FS
+- scripts/config -e VFAT_FS
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make oldconfig
+build-commands:
+- make zImage $MAKEFLAGS
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
deleted file mode 100644
index ea1a2d5f..00000000
--- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
+++ /dev/null
@@ -1,49 +0,0 @@
-name: linux-armv7b-highbank
-kind: chunk
-configure-commands:
-- make multi_v7_defconfig
-- scripts/config -e CPU_BIG_ENDIAN
-- scripts/config -e CPU_ENDIAN_BE8
-- scripts/config -e CPU_BE8_BOOT_LE
-- scripts/config -e PACKET
-- scripts/config -e UNIX
-- scripts/config -e NET_KEY
-- scripts/config -e INET
-- scripts/config -e IP_MULTICAST
-- scripts/config -e IP_PNP
-- scripts/config -e IP_PNP_DHCP
-- scripts/config -e IP_PNP_BOOTP
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -e BTRFS_FS
-- scripts/config -e TMPFS
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config -e NETWORK_FILESYSTEMS
-- scripts/config -e NFS_FS
-- scripts/config -e NFS_V3
-- scripts/config -e ROOT_NFS
-- scripts/config -e LOCKD
-- scripts/config -e LOCKD_V4
-- scripts/config -e NFS_COMMON
-- scripts/config -e SUNRPC
-- scripts/config -e SYSVIPC
-- scripts/config -e CONFIG_POSIX_MQUEUE
-- scripts/config -e CPU_IDLE
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_USE_FOR_EXT23
-- scripts/config -e MSDOS_FS
-- scripts/config -e VFAT_FS
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make oldconfig
-build-commands:
-- make zImage $MAKEFLAGS
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-armv7b-vexpress-tc2.def b/strata/bsp-armv7b-vexpress-tc2.def
new file mode 100644
index 00000000..4dd9bcbc
--- /dev/null
+++ b/strata/bsp-armv7b-vexpress-tc2.def
@@ -0,0 +1,9 @@
+name: bsp-armv7b-vexpress-tc2
+description: The platform dependent components required to boot Versatile TC2 board
+build-depends:
+- name: core
+contents:
+- name: linux-armv7b-vexpress-tc2
+ repo: upstream:linux
+ ref: d67a0e110187abd560a1de63fa172894a52839d5
+ unpetrify-ref: baserock/morph
diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph
deleted file mode 100644
index 81d6fe48..00000000
--- a/strata/bsp-armv7b-vexpress-tc2.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: bsp-armv7b-vexpress-tc2
-kind: stratum
-description: The platform dependent components required to boot Versatile TC2 board
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: linux-armv7b-vexpress-tc2
- morph: strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
- repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.def b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.def
new file mode 100644
index 00000000..c9e9ad46
--- /dev/null
+++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.def
@@ -0,0 +1,51 @@
+name: linux-armv7b-vexpress-tc2
+configure-commands:
+- make vexpress_defconfig
+- scripts/config -e CPU_BIG_ENDIAN
+- scripts/config -e CPU_ENDIAN_BE8
+- scripts/config -e CPU_BE8_BOOT_LE
+- scripts/config -e PACKET
+- scripts/config -e UNIX
+- scripts/config -e NET_KEY
+- scripts/config -e INET
+- scripts/config -e IP_MULTICAST
+- scripts/config -e IP_PNP
+- scripts/config -e IP_PNP_DHCP
+- scripts/config -e IP_PNP_BOOTP
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -e BTRFS_FS
+- scripts/config -e TMPFS
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e CGROUPS
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e AUTOFS4_FS
+- scripts/config -e NETWORK_FILESYSTEMS
+- scripts/config -e NFS_FS
+- scripts/config -e NFS_V3
+- scripts/config -e ROOT_NFS
+- scripts/config -e LOCKD
+- scripts/config -e LOCKD_V4
+- scripts/config -e NFS_COMMON
+- scripts/config -e SUNRPC
+- scripts/config -e SYSVIPC
+- scripts/config -e CONFIG_POSIX_MQUEUE
+- scripts/config -e CPU_IDLE
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_USE_FOR_EXT23
+- scripts/config -e MSDOS_FS
+- scripts/config -e VFAT_FS
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make oldconfig
+build-commands:
+- make zImage vexpress-v2p-ca15_a7.dtb
+- |
+ cat arch/arm/boot/zImage arch/arm/boot/dts/vexpress-v2p-ca15_a7.dtb |
+ dd conv=sync bs=4 of=kernel.bin
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp kernel.bin "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
deleted file mode 100644
index ecf6b9bc..00000000
--- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
+++ /dev/null
@@ -1,52 +0,0 @@
-name: linux-armv7b-vexpress-tc2
-kind: chunk
-configure-commands:
-- make vexpress_defconfig
-- scripts/config -e CPU_BIG_ENDIAN
-- scripts/config -e CPU_ENDIAN_BE8
-- scripts/config -e CPU_BE8_BOOT_LE
-- scripts/config -e PACKET
-- scripts/config -e UNIX
-- scripts/config -e NET_KEY
-- scripts/config -e INET
-- scripts/config -e IP_MULTICAST
-- scripts/config -e IP_PNP
-- scripts/config -e IP_PNP_DHCP
-- scripts/config -e IP_PNP_BOOTP
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -e BTRFS_FS
-- scripts/config -e TMPFS
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e CGROUPS
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e AUTOFS4_FS
-- scripts/config -e NETWORK_FILESYSTEMS
-- scripts/config -e NFS_FS
-- scripts/config -e NFS_V3
-- scripts/config -e ROOT_NFS
-- scripts/config -e LOCKD
-- scripts/config -e LOCKD_V4
-- scripts/config -e NFS_COMMON
-- scripts/config -e SUNRPC
-- scripts/config -e SYSVIPC
-- scripts/config -e CONFIG_POSIX_MQUEUE
-- scripts/config -e CPU_IDLE
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_USE_FOR_EXT23
-- scripts/config -e MSDOS_FS
-- scripts/config -e VFAT_FS
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make oldconfig
-build-commands:
-- make zImage vexpress-v2p-ca15_a7.dtb
-- |
- cat arch/arm/boot/zImage arch/arm/boot/dts/vexpress-v2p-ca15_a7.dtb |
- dd conv=sync bs=4 of=kernel.bin
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp kernel.bin "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-jetson.def b/strata/bsp-jetson.def
new file mode 100644
index 00000000..7deecf1d
--- /dev/null
+++ b/strata/bsp-jetson.def
@@ -0,0 +1,43 @@
+name: bsp-jetson
+description: |
+ Platform-specific chunks for NVIDIA Jetson TK1
+
+ Support for the Tegra platform is still being developed. A very recent
+ kernel with some patches is currently required to get a fully
+ accelerated graphics stack on this platform. Note that the SATA and
+ networking will not work unless you have flashed the bootloader on
+ your board to the version of U-Boot built in this stratum. Also, the
+ CPUs on the Jetson run at a slow speed with this version of Linux.
+build-depends:
+- name: core
+contents:
+- name: device-tree-compiler
+ repo: upstream:device-tree-compiler
+ ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
+ unpetrify-ref: baserock/morph
+- name: u-boot
+ repo: upstream:u-boot
+ ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
+ unpetrify-ref: baserock/jetson/u-boot-tegra-next
+ build-depends:
+ - device-tree-compiler
+- name: linux-jetson-tk1
+ repo: upstream:linux
+ ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69
+ unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3
+ build-depends:
+ - u-boot
+- name: bsp-support
+ repo: baserock:baserock/bsp-support
+ ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
+ unpetrify-ref: baserock/arm/tegra-3.10
+- name: nouveau-drm
+ repo: upstream:nouveau
+ ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501
+ unpetrify-ref: baserock/jetson/gk20a
+ build-depends:
+ - linux-jetson-tk1
+- name: linux-firmware-jetson
+ repo: upstream:linux-firmware
+ ref: 9322ef5b14c78ec28163baa41bff240a0e098810
+ unpetrify-ref: baserock/jetson
diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph
deleted file mode 100644
index eda1d99b..00000000
--- a/strata/bsp-jetson.morph
+++ /dev/null
@@ -1,53 +0,0 @@
-name: bsp-jetson
-kind: stratum
-description: |
- Platform-specific chunks for NVIDIA Jetson TK1
-
- Support for the Tegra platform is still being developed. A very recent
- kernel with some patches is currently required to get a fully
- accelerated graphics stack on this platform. Note that the SATA and
- networking will not work unless you have flashed the bootloader on
- your board to the version of U-Boot built in this stratum. Also, the
- CPUs on the Jetson run at a slow speed with this version of Linux.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: device-tree-compiler
- morph: strata/bsp-jetson/device-tree-compiler.morph
- repo: upstream:device-tree-compiler
- ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: u-boot
- morph: strata/bsp-jetson/u-boot.morph
- repo: upstream:u-boot
- ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
- unpetrify-ref: baserock/jetson/u-boot-tegra-next
- build-depends:
- - device-tree-compiler
-- name: linux-jetson-tk1
- morph: strata/bsp-jetson/linux-jetson-tk1.morph
- repo: upstream:linux
- ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69
- unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3
- build-depends:
- - u-boot
-- name: bsp-support
- morph: strata/bsp-jetson/bsp-support.morph
- repo: baserock:baserock/bsp-support
- ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
- unpetrify-ref: baserock/arm/tegra-3.10
- build-depends: []
-- name: nouveau-drm
- morph: strata/bsp-jetson/nouveau-drm.morph
- repo: upstream:nouveau
- ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501
- unpetrify-ref: baserock/jetson/gk20a
- build-depends:
- - linux-jetson-tk1
-- name: linux-firmware-jetson
- morph: strata/bsp-jetson/linux-firmware-jetson.morph
- repo: upstream:linux-firmware
- ref: 9322ef5b14c78ec28163baa41bff240a0e098810
- unpetrify-ref: baserock/jetson
- build-depends: []
diff --git a/strata/bsp-jetson/bsp-support.def b/strata/bsp-jetson/bsp-support.def
new file mode 100644
index 00000000..cd88a463
--- /dev/null
+++ b/strata/bsp-jetson/bsp-support.def
@@ -0,0 +1,5 @@
+name: bsp-support
+install-commands:
+- install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
+- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants"
+- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service"
diff --git a/strata/bsp-jetson/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph
deleted file mode 100644
index 23524ac7..00000000
--- a/strata/bsp-jetson/bsp-support.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: bsp-support
-kind: chunk
-install-commands:
-- install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
-- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants"
-- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service"
diff --git a/strata/bsp-jetson/device-tree-compiler.def b/strata/bsp-jetson/device-tree-compiler.def
new file mode 100644
index 00000000..c5e4bc6f
--- /dev/null
+++ b/strata/bsp-jetson/device-tree-compiler.def
@@ -0,0 +1,5 @@
+name: device-tree-compiler
+build-commands:
+- make all
+install-commands:
+- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX"
diff --git a/strata/bsp-jetson/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler.morph
deleted file mode 100644
index 8abfafc8..00000000
--- a/strata/bsp-jetson/device-tree-compiler.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: device-tree-compiler
-kind: chunk
-build-commands:
-- make all
-install-commands:
-- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX"
diff --git a/strata/bsp-jetson/linux-firmware-jetson.def b/strata/bsp-jetson/linux-firmware-jetson.def
new file mode 100644
index 00000000..29491f17
--- /dev/null
+++ b/strata/bsp-jetson/linux-firmware-jetson.def
@@ -0,0 +1,5 @@
+name: linux-firmware-jetson
+install-commands:
+- install -d "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -m644 nvidia/tegra124/gk20a_ctxsw.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.morph
deleted file mode 100644
index c803eab2..00000000
--- a/strata/bsp-jetson/linux-firmware-jetson.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: linux-firmware-jetson
-kind: chunk
-install-commands:
-- install -d "$DESTDIR/lib/firmware/nvidia/tegra124"
-- install -m644 nvidia/tegra124/gk20a_ctxsw.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
-- install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
diff --git a/strata/bsp-jetson/linux-jetson-tk1.def b/strata/bsp-jetson/linux-jetson-tk1.def
new file mode 100644
index 00000000..9859b2a5
--- /dev/null
+++ b/strata/bsp-jetson/linux-jetson-tk1.def
@@ -0,0 +1,72 @@
+name: linux-jetson-tk1
+configure-commands:
+- make ARCH=arm tegra_defconfig
+- scripts/config -d KERNEL_LZO
+- scripts/config -e KERNEL_GZIP
+- scripts/config -e NAMESPACES
+- scripts/config -e PACKET
+- scripts/config -e SATA_AHCI
+- scripts/config -e ATA_GENERIC
+- scripts/config -e HAVE_IDE
+- scripts/config -d BLK_DEV_IDE_SATA
+- scripts/config -e BTRFS_FS
+- scripts/config -e BTRFS_FS_POSIX_ACL
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e CGROUPS
+- scripts/config -e AUTOFS4_FS
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e EXT2_FS
+- scripts/config -e EXT2_FS_XATTR
+- scripts/config -e EXT2_FS_POSIX_ACL
+- scripts/config -e EXT2_FS_SECURITY
+- scripts/config -e EXT2_FS_XIP
+- scripts/config -e EXT3_FS
+- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
+- scripts/config -e EXT3_FS_XATTR
+- scripts/config -e EXT3_FS_POSIX_ACL
+- scripts/config -e EXT3_FS_SECURITY
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_FS_XATTR
+- scripts/config -e EXT4_FS_POSIX_ACL
+- scripts/config -e EXT4_FS_SECURITY
+- scripts/config -d EXT4_DEBUG
+- scripts/config -d JBD_DEBUG
+- scripts/config -d JBD2_DEBUG
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -d BLK_DEV_CRYPTOLOOP
+- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e SECCOMP
+- scripts/config -d DEBUG_STACK_TRACE
+- scripts/config -e NFSD
+- scripts/config -e NFSD_V3
+- scripts/config -e DRM_TEGRA_STAGING
+- scripts/config -m DRM_NOUVEAU
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make ARCH=arm oldconfig
+build-commands:
+- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
+- cp arch/arm/boot/dts/tegra124-jetson-tk1.dtb "$DESTDIR"/boot/.
+- make modules
+- make INSTALL_MOD_PATH="$DESTDIR" modules_install
+- install -d "$DESTDIR$PREFIX/src/linux"
+- |
+ (
+ printf 'Makefile\0'
+ printf 'Module.symvers\0'
+ find arch/arm -maxdepth 1 -name 'Makefile*' -print0
+ find arch/arm \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
+ find arch/arm \( -type d -a \( -name include -o -name scripts \) \) -o \
+ \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
+ find include -name 'asm*' -prune -o -print0
+ find include/asm-generic -print0
+ find include/uapi -print0
+ find scripts -print0
+ ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph
deleted file mode 100644
index 42c16f01..00000000
--- a/strata/bsp-jetson/linux-jetson-tk1.morph
+++ /dev/null
@@ -1,73 +0,0 @@
-name: linux-jetson-tk1
-kind: chunk
-configure-commands:
-- make ARCH=arm tegra_defconfig
-- scripts/config -d KERNEL_LZO
-- scripts/config -e KERNEL_GZIP
-- scripts/config -e NAMESPACES
-- scripts/config -e PACKET
-- scripts/config -e SATA_AHCI
-- scripts/config -e ATA_GENERIC
-- scripts/config -e HAVE_IDE
-- scripts/config -d BLK_DEV_IDE_SATA
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e EXT2_FS
-- scripts/config -e EXT2_FS_XATTR
-- scripts/config -e EXT2_FS_POSIX_ACL
-- scripts/config -e EXT2_FS_SECURITY
-- scripts/config -e EXT2_FS_XIP
-- scripts/config -e EXT3_FS
-- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
-- scripts/config -e EXT3_FS_XATTR
-- scripts/config -e EXT3_FS_POSIX_ACL
-- scripts/config -e EXT3_FS_SECURITY
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_FS_XATTR
-- scripts/config -e EXT4_FS_POSIX_ACL
-- scripts/config -e EXT4_FS_SECURITY
-- scripts/config -d EXT4_DEBUG
-- scripts/config -d JBD_DEBUG
-- scripts/config -d JBD2_DEBUG
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -d BLK_DEV_CRYPTOLOOP
-- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e NFSD
-- scripts/config -e NFSD_V3
-- scripts/config -e DRM_TEGRA_STAGING
-- scripts/config -m DRM_NOUVEAU
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make ARCH=arm oldconfig
-build-commands:
-- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
-- cp arch/arm/boot/dts/tegra124-jetson-tk1.dtb "$DESTDIR"/boot/.
-- make modules
-- make INSTALL_MOD_PATH="$DESTDIR" modules_install
-- install -d "$DESTDIR$PREFIX/src/linux"
-- |
- (
- printf 'Makefile\0'
- printf 'Module.symvers\0'
- find arch/arm -maxdepth 1 -name 'Makefile*' -print0
- find arch/arm \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
- find arch/arm \( -type d -a \( -name include -o -name scripts \) \) -o \
- \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
- find include -name 'asm*' -prune -o -print0
- find include/asm-generic -print0
- find include/uapi -print0
- find scripts -print0
- ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-jetson/nouveau-drm.def b/strata/bsp-jetson/nouveau-drm.def
new file mode 100644
index 00000000..30a66418
--- /dev/null
+++ b/strata/bsp-jetson/nouveau-drm.def
@@ -0,0 +1,11 @@
+name: nouveau-drm
+build-commands:
+ - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
+install-commands:
+ - cd drm && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install
+system-integration:
+ nouveau-drm-misc:
+ 00-earlyconf:
+ - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done)
+ - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; done)
+ - (cd /lib/modules && for version in *; do depmod -a "$version"; done)
diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph
deleted file mode 100644
index e297a069..00000000
--- a/strata/bsp-jetson/nouveau-drm.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: nouveau-drm
-kind: chunk
-build-commands:
- - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
-install-commands:
- - cd drm && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install
-system-integration:
- nouveau-drm-misc:
- 00-earlyconf:
- - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done)
- - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; done)
- - (cd /lib/modules && for version in *; do depmod -a "$version"; done)
diff --git a/strata/bsp-jetson/u-boot.def b/strata/bsp-jetson/u-boot.def
new file mode 100644
index 00000000..776bc948
--- /dev/null
+++ b/strata/bsp-jetson/u-boot.def
@@ -0,0 +1,15 @@
+name: u-boot
+configure-commands:
+- make ARCH=arm jetson-tk1_config
+build-commands:
+- make ARCH=arm CROSS_COMPILE=/usr/bin/
+- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- mkdir -p "$DESTDIR/boot"
+- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin"
+- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/bsp-jetson/u-boot.morph b/strata/bsp-jetson/u-boot.morph
deleted file mode 100644
index 705b3851..00000000
--- a/strata/bsp-jetson/u-boot.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: u-boot
-kind: chunk
-configure-commands:
-- make ARCH=arm jetson-tk1_config
-build-commands:
-- make ARCH=arm CROSS_COMPILE=/usr/bin/
-- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX/bin"
-- mkdir -p "$DESTDIR/boot"
-- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin"
-- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/bsp-ppc64-generic.def b/strata/bsp-ppc64-generic.def
new file mode 100644
index 00000000..dd122258
--- /dev/null
+++ b/strata/bsp-ppc64-generic.def
@@ -0,0 +1,9 @@
+name: bsp-ppc64-generic
+description: The platform dependent components required to boot a ppc64 board.
+build-depends:
+- name: core
+contents:
+- name: linux-ppc64
+ repo: upstream:linux
+ ref: d67a0e110187abd560a1de63fa172894a52839d5
+ unpetrify-ref: baserock/morph
diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph
deleted file mode 100644
index cbb0b201..00000000
--- a/strata/bsp-ppc64-generic.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: bsp-ppc64-generic
-kind: stratum
-description: The platform dependent components required to boot a ppc64 board.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: linux-ppc64
- morph: strata/bsp-ppc64-generic/linux-ppc64.morph
- repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/bsp-ppc64-generic/linux-ppc64.def b/strata/bsp-ppc64-generic/linux-ppc64.def
new file mode 100644
index 00000000..6826d7a2
--- /dev/null
+++ b/strata/bsp-ppc64-generic/linux-ppc64.def
@@ -0,0 +1,55 @@
+name: linux-ppc64
+configure-commands:
+- make ARCH=powerpc ppc64_defconfig
+- scripts/config -e NAMESPACES
+- scripts/config -e PACKET
+- scripts/config -e SATA_AHCI
+- scripts/config -e ATA_GENERIC
+- scripts/config -e HAVE_IDE
+- scripts/config -d BLK_DEV_IDE_SATA
+- scripts/config -e BTRFS_FS
+- scripts/config -e BTRFS_FS_POSIX_ACL
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e CGROUPS
+- scripts/config -e AUTOFS4_FS
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e EXT2_FS
+- scripts/config -e EXT2_FS_XATTR
+- scripts/config -e EXT2_FS_POSIX_ACL
+- scripts/config -e EXT2_FS_SECURITY
+- scripts/config -e EXT2_FS_XIP
+- scripts/config -e EXT3_FS
+- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
+- scripts/config -e EXT3_FS_XATTR
+- scripts/config -e EXT3_FS_POSIX_ACL
+- scripts/config -e EXT3_FS_SECURITY
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_FS_XATTR
+- scripts/config -e EXT4_FS_POSIX_ACL
+- scripts/config -e EXT4_FS_SECURITY
+- scripts/config -d EXT4_DEBUG
+- scripts/config -d JBD_DEBUG
+- scripts/config -d JBD2_DEBUG
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -d BLK_DEV_CRYPTOLOOP
+- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e SECCOMP
+- scripts/config -d DEBUG_STACK_TRACE
+- scripts/config -e NFSD
+- scripts/config -e NFSD_V3
+- scripts/config -e IP_PNP
+- scripts/config -e IP_PNP_DHCP
+- scripts/config -e NFS_FS
+- scripts/config -e ROOT_NFS
+- scripts/config -e PCI
+- scripts/config -e TIGON3
+- yes '' | make oldconfig
+build-commands:
+- make $MAKEFLAGS ARCH=powerpc zImage
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp arch/powerpc/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-ppc64-generic/linux-ppc64.morph b/strata/bsp-ppc64-generic/linux-ppc64.morph
deleted file mode 100644
index 1740a144..00000000
--- a/strata/bsp-ppc64-generic/linux-ppc64.morph
+++ /dev/null
@@ -1,56 +0,0 @@
-name: linux-ppc64
-kind: chunk
-configure-commands:
-- make ARCH=powerpc ppc64_defconfig
-- scripts/config -e NAMESPACES
-- scripts/config -e PACKET
-- scripts/config -e SATA_AHCI
-- scripts/config -e ATA_GENERIC
-- scripts/config -e HAVE_IDE
-- scripts/config -d BLK_DEV_IDE_SATA
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e EXT2_FS
-- scripts/config -e EXT2_FS_XATTR
-- scripts/config -e EXT2_FS_POSIX_ACL
-- scripts/config -e EXT2_FS_SECURITY
-- scripts/config -e EXT2_FS_XIP
-- scripts/config -e EXT3_FS
-- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
-- scripts/config -e EXT3_FS_XATTR
-- scripts/config -e EXT3_FS_POSIX_ACL
-- scripts/config -e EXT3_FS_SECURITY
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_FS_XATTR
-- scripts/config -e EXT4_FS_POSIX_ACL
-- scripts/config -e EXT4_FS_SECURITY
-- scripts/config -d EXT4_DEBUG
-- scripts/config -d JBD_DEBUG
-- scripts/config -d JBD2_DEBUG
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -d BLK_DEV_CRYPTOLOOP
-- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e NFSD
-- scripts/config -e NFSD_V3
-- scripts/config -e IP_PNP
-- scripts/config -e IP_PNP_DHCP
-- scripts/config -e NFS_FS
-- scripts/config -e ROOT_NFS
-- scripts/config -e PCI
-- scripts/config -e TIGON3
-- yes '' | make oldconfig
-build-commands:
-- make $MAKEFLAGS ARCH=powerpc zImage
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/powerpc/boot/zImage "$DESTDIR"/boot/zImage
diff --git a/strata/bsp-wandboard.def b/strata/bsp-wandboard.def
new file mode 100644
index 00000000..82be4388
--- /dev/null
+++ b/strata/bsp-wandboard.def
@@ -0,0 +1,15 @@
+name: bsp-wandboard
+description: The platform dependent components required to boot an wandboard ARM board.
+build-depends:
+- name: core
+contents:
+- name: u-boot
+ repo: upstream:u-boot
+ ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
+ unpetrify-ref: baserock/morph
+- name: linux-armv7-wandboard
+ repo: upstream:linux
+ ref: 9573986cf27ff44814f3efb1f1e95638406db456
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - u-boot
diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph
deleted file mode 100644
index 4b07b150..00000000
--- a/strata/bsp-wandboard.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-name: bsp-wandboard
-kind: stratum
-description: The platform dependent components required to boot an wandboard ARM board.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: u-boot
- morph: strata/bsp-wandboard/u-boot.morph
- repo: upstream:u-boot
- ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: linux-armv7-wandboard
- morph: strata/bsp-wandboard/linux-armv7-wandboard.morph
- repo: upstream:linux
- ref: 9573986cf27ff44814f3efb1f1e95638406db456
- unpetrify-ref: baserock/morph
- build-depends:
- - u-boot
diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.def b/strata/bsp-wandboard/linux-armv7-wandboard.def
new file mode 100644
index 00000000..2ae70047
--- /dev/null
+++ b/strata/bsp-wandboard/linux-armv7-wandboard.def
@@ -0,0 +1,64 @@
+name: linux-armv7-wandboard
+configure-commands:
+- make ARCH=arm imx_v6_v7_defconfig
+- scripts/config -d KERNEL_LZO
+- scripts/config -e KERNEL_GZIP
+- scripts/config -e NAMESPACES
+- scripts/config -e PACKET
+- scripts/config -e SATA_AHCI
+- scripts/config -e ATA_GENERIC
+- scripts/config -e HAVE_IDE
+- scripts/config -d BLK_DEV_IDE_SATA
+- scripts/config -e BTRFS_FS
+- scripts/config -e BTRFS_FS_POSIX_ACL
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e CGROUPS
+- scripts/config -e AUTOFS4_FS
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e EXT2_FS
+- scripts/config -e EXT2_FS_XATTR
+- scripts/config -e EXT2_FS_POSIX_ACL
+- scripts/config -e EXT2_FS_SECURITY
+- scripts/config -e EXT2_FS_XIP
+- scripts/config -e EXT3_FS
+- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
+- scripts/config -e EXT3_FS_XATTR
+- scripts/config -e EXT3_FS_POSIX_ACL
+- scripts/config -e EXT3_FS_SECURITY
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_FS_XATTR
+- scripts/config -e EXT4_FS_POSIX_ACL
+- scripts/config -e EXT4_FS_SECURITY
+- scripts/config -d EXT4_DEBUG
+- scripts/config -d JBD_DEBUG
+- scripts/config -d JBD2_DEBUG
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -d BLK_DEV_CRYPTOLOOP
+- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e SECCOMP
+- scripts/config -d DEBUG_STACK_TRACE
+- scripts/config -e NFSD
+- scripts/config -e NFSD_V3
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make oldconfig
+build-commands:
+- make $MAKEFLAGS ARCH=arm LOADADDR=0x10800000 uImage dtbs
+- |
+ cat >boot.script <<'EOF'
+ setenv image_addr "0x12000000"
+ setenv bootargs "console=ttymxc0,115200 root=/dev/nfs rw ip=dhcp nfsroot=${fileserver}:${nfsroot},v3,tcp"
+ dhcp ${image_addr} ${fileserver}:${tfpboot}/uImage
+ bootm ${image_addr}
+ EOF
+- mkimage -A arm -T script -C none -n "Wandboard TFTP Boot Script" -d boot.script
+ boot.scr
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp arch/arm/boot/uImage "$DESTDIR"/boot/uImage
+- cp boot.scr "$DESTDIR"/boot/boot.scr
+- cp arch/arm/boot/dts/imx6*-wandboard.dtb "$DESTDIR"/boot/.
diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph
deleted file mode 100644
index 15317978..00000000
--- a/strata/bsp-wandboard/linux-armv7-wandboard.morph
+++ /dev/null
@@ -1,65 +0,0 @@
-name: linux-armv7-wandboard
-kind: chunk
-configure-commands:
-- make ARCH=arm imx_v6_v7_defconfig
-- scripts/config -d KERNEL_LZO
-- scripts/config -e KERNEL_GZIP
-- scripts/config -e NAMESPACES
-- scripts/config -e PACKET
-- scripts/config -e SATA_AHCI
-- scripts/config -e ATA_GENERIC
-- scripts/config -e HAVE_IDE
-- scripts/config -d BLK_DEV_IDE_SATA
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e EXT2_FS
-- scripts/config -e EXT2_FS_XATTR
-- scripts/config -e EXT2_FS_POSIX_ACL
-- scripts/config -e EXT2_FS_SECURITY
-- scripts/config -e EXT2_FS_XIP
-- scripts/config -e EXT3_FS
-- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
-- scripts/config -e EXT3_FS_XATTR
-- scripts/config -e EXT3_FS_POSIX_ACL
-- scripts/config -e EXT3_FS_SECURITY
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_FS_XATTR
-- scripts/config -e EXT4_FS_POSIX_ACL
-- scripts/config -e EXT4_FS_SECURITY
-- scripts/config -d EXT4_DEBUG
-- scripts/config -d JBD_DEBUG
-- scripts/config -d JBD2_DEBUG
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -d BLK_DEV_CRYPTOLOOP
-- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e NFSD
-- scripts/config -e NFSD_V3
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make oldconfig
-build-commands:
-- make $MAKEFLAGS ARCH=arm LOADADDR=0x10800000 uImage dtbs
-- |
- cat >boot.script <<'EOF'
- setenv image_addr "0x12000000"
- setenv bootargs "console=ttymxc0,115200 root=/dev/nfs rw ip=dhcp nfsroot=${fileserver}:${nfsroot},v3,tcp"
- dhcp ${image_addr} ${fileserver}:${tfpboot}/uImage
- bootm ${image_addr}
- EOF
-- mkimage -A arm -T script -C none -n "Wandboard TFTP Boot Script" -d boot.script
- boot.scr
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/arm/boot/uImage "$DESTDIR"/boot/uImage
-- cp boot.scr "$DESTDIR"/boot/boot.scr
-- cp arch/arm/boot/dts/imx6*-wandboard.dtb "$DESTDIR"/boot/.
diff --git a/strata/bsp-wandboard/u-boot.def b/strata/bsp-wandboard/u-boot.def
new file mode 100644
index 00000000..3b6f5453
--- /dev/null
+++ b/strata/bsp-wandboard/u-boot.def
@@ -0,0 +1,10 @@
+name: u-boot
+build-commands:
+- make tools
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/bsp-wandboard/u-boot.morph b/strata/bsp-wandboard/u-boot.morph
deleted file mode 100644
index 9be30bc7..00000000
--- a/strata/bsp-wandboard/u-boot.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: u-boot
-kind: chunk
-build-commands:
-- make tools
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX/bin"
-- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/bsp-x86_32-generic.def b/strata/bsp-x86_32-generic.def
new file mode 100644
index 00000000..63cfe9ff
--- /dev/null
+++ b/strata/bsp-x86_32-generic.def
@@ -0,0 +1,20 @@
+name: bsp-x86_32-generic
+description: The set of platform specific components required for booting a 32-bit
+ x86 based system.
+build-depends:
+- name: core
+contents:
+- name: linux-x86-32-generic
+ repo: upstream:linux
+ ref: d67a0e110187abd560a1de63fa172894a52839d5
+ unpetrify-ref: baserock/morph
+- name: nasm
+ repo: upstream:nasm
+ ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
+ unpetrify-ref: baserock/morph
+- name: syslinux
+ repo: upstream:syslinux
+ ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - nasm
diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph
deleted file mode 100644
index fa9dbf75..00000000
--- a/strata/bsp-x86_32-generic.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-name: bsp-x86_32-generic
-kind: stratum
-description: The set of platform specific components required for booting a 32-bit
- x86 based system.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: linux-x86-32-generic
- morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph
- repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: nasm
- morph: strata/bsp-x86_32-generic/nasm.morph
- repo: upstream:nasm
- ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: syslinux
- morph: strata/bsp-x86_32-generic/syslinux.morph
- repo: upstream:syslinux
- ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
- unpetrify-ref: baserock/morph
- build-depends:
- - nasm
diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.def b/strata/bsp-x86_32-generic/linux-x86-32-generic.def
new file mode 100644
index 00000000..4aedecb2
--- /dev/null
+++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.def
@@ -0,0 +1,102 @@
+name: linux-x86-32-generic
+products:
+- artifact: linux-x86-32-generic-devel
+ include:
+ - (usr/)?src/linux/.*
+- artifact: linux-x86-32-generic-bins
+ include:
+ - boot/.*
+- artifact: linux-x86-32-generic-libs
+ include:
+ - lib/.*
+configure-commands:
+- make defconfig
+- scripts/config -e PACKET
+- scripts/config -e SATA_AHCI
+- scripts/config -e ATA_GENERIC
+- scripts/config -e HAVE_IDE
+- scripts/config -d BLK_DEV_IDE_SATA
+- scripts/config -e BTRFS_FS
+- scripts/config -e BTRFS_FS_POSIX_ACL
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e CGROUPS
+- scripts/config -e AUTOFS4_FS
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e EXT2_FS
+- scripts/config -e EXT2_FS_XATTR
+- scripts/config -e EXT2_FS_POSIX_ACL
+- scripts/config -e EXT2_FS_SECURITY
+- scripts/config -e EXT2_FS_XIP
+- scripts/config -e EXT3_FS
+- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
+- scripts/config -e EXT3_FS_XATTR
+- scripts/config -e EXT3_FS_POSIX_ACL
+- scripts/config -e EXT3_FS_SECURITY
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_FS_XATTR
+- scripts/config -e EXT4_FS_POSIX_ACL
+- scripts/config -e EXT4_FS_SECURITY
+- scripts/config -d EXT4_DEBUG
+- scripts/config -d JBD_DEBUG
+- scripts/config -d JBD2_DEBUG
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -d BLK_DEV_CRYPTOLOOP
+- scripts/config -e CEPH_FS
+- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
+- scripts/config -e VIRTIO
+- scripts/config -e VIRTIO_RING
+- scripts/config -e VIRTIO_PCI
+- scripts/config -e VIRTIO_BALLOON
+- scripts/config -e VIRTIO_BLK
+- scripts/config -e VIRTIO_NET
+- scripts/config -e VIRTIO_CONSOLE
+- scripts/config -e HW_RANDOM_VIRTIO
+- scripts/config -e 9P_FS
+- scripts/config -e 9P_FSCACHE
+- scripts/config -e 9P_FS_POSIX_ACL
+- scripts/config -e NET_9P
+- scripts/config -e NET_9P_VIRTIO
+- scripts/config -e R8169
+- scripts/config -e 8139TOO
+- scripts/config -e 8139CP
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e SECCOMP
+- scripts/config -d DEBUG_STACK_TRACE
+- scripts/config -e NFSD
+- scripts/config -e NFSD_V3
+- scripts/config -e KVM
+- scripts/config -e TUN
+- scripts/config -e BRIDGE
+- scripts/config -e VHOST_NET
+- scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_IPV4
+- scripts/config -e IP_NF_TARGET_MASQUERADE
+- scripts/config -e FB_VESA
+- scripts/config -e HOTPLUG_PCI
+- scripts/config -e HOTPLUG_PCI_ACPI
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make oldconfig
+build-commands:
+- make $MAKEFLAGS
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- make INSTALL_PATH="$DESTDIR"/boot install
+- make INSTALL_MOD_PATH="$DESTDIR" modules_install
+- install -d "$DESTDIR$PREFIX/src/linux"
+- |
+ (
+ printf 'Makefile\0'
+ printf 'Module.symvers\0'
+ find arch/x86 -maxdepth 1 -name 'Makefile*' -print0
+ find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
+ find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \
+ \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
+ find include -name 'asm*' -prune -o -print0
+ find include/asm-generic -print0
+ find include/uapi -print0
+ find scripts -print0
+ ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
deleted file mode 100644
index 593d9a65..00000000
--- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
+++ /dev/null
@@ -1,103 +0,0 @@
-name: linux-x86-32-generic
-kind: chunk
-products:
-- artifact: linux-x86-32-generic-devel
- include:
- - (usr/)?src/linux/.*
-- artifact: linux-x86-32-generic-bins
- include:
- - boot/.*
-- artifact: linux-x86-32-generic-libs
- include:
- - lib/.*
-configure-commands:
-- make defconfig
-- scripts/config -e PACKET
-- scripts/config -e SATA_AHCI
-- scripts/config -e ATA_GENERIC
-- scripts/config -e HAVE_IDE
-- scripts/config -d BLK_DEV_IDE_SATA
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e EXT2_FS
-- scripts/config -e EXT2_FS_XATTR
-- scripts/config -e EXT2_FS_POSIX_ACL
-- scripts/config -e EXT2_FS_SECURITY
-- scripts/config -e EXT2_FS_XIP
-- scripts/config -e EXT3_FS
-- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
-- scripts/config -e EXT3_FS_XATTR
-- scripts/config -e EXT3_FS_POSIX_ACL
-- scripts/config -e EXT3_FS_SECURITY
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_FS_XATTR
-- scripts/config -e EXT4_FS_POSIX_ACL
-- scripts/config -e EXT4_FS_SECURITY
-- scripts/config -d EXT4_DEBUG
-- scripts/config -d JBD_DEBUG
-- scripts/config -d JBD2_DEBUG
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -d BLK_DEV_CRYPTOLOOP
-- scripts/config -e CEPH_FS
-- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
-- scripts/config -e VIRTIO
-- scripts/config -e VIRTIO_RING
-- scripts/config -e VIRTIO_PCI
-- scripts/config -e VIRTIO_BALLOON
-- scripts/config -e VIRTIO_BLK
-- scripts/config -e VIRTIO_NET
-- scripts/config -e VIRTIO_CONSOLE
-- scripts/config -e HW_RANDOM_VIRTIO
-- scripts/config -e 9P_FS
-- scripts/config -e 9P_FSCACHE
-- scripts/config -e 9P_FS_POSIX_ACL
-- scripts/config -e NET_9P
-- scripts/config -e NET_9P_VIRTIO
-- scripts/config -e R8169
-- scripts/config -e 8139TOO
-- scripts/config -e 8139CP
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e NFSD
-- scripts/config -e NFSD_V3
-- scripts/config -e KVM
-- scripts/config -e TUN
-- scripts/config -e BRIDGE
-- scripts/config -e VHOST_NET
-- scripts/config -e NF_NAT
-- scripts/config -e NF_NAT_IPV4
-- scripts/config -e IP_NF_TARGET_MASQUERADE
-- scripts/config -e FB_VESA
-- scripts/config -e HOTPLUG_PCI
-- scripts/config -e HOTPLUG_PCI_ACPI
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make oldconfig
-build-commands:
-- make $MAKEFLAGS
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- make INSTALL_PATH="$DESTDIR"/boot install
-- make INSTALL_MOD_PATH="$DESTDIR" modules_install
-- install -d "$DESTDIR$PREFIX/src/linux"
-- |
- (
- printf 'Makefile\0'
- printf 'Module.symvers\0'
- find arch/x86 -maxdepth 1 -name 'Makefile*' -print0
- find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
- find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \
- \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
- find include -name 'asm*' -prune -o -print0
- find include/asm-generic -print0
- find include/uapi -print0
- find scripts -print0
- ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-x86_32-generic/nasm.def b/strata/bsp-x86_32-generic/nasm.def
new file mode 100644
index 00000000..00bc26fe
--- /dev/null
+++ b/strata/bsp-x86_32-generic/nasm.def
@@ -0,0 +1,4 @@
+name: nasm
+build-system: autotools
+install-commands:
+- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_32-generic/nasm.morph b/strata/bsp-x86_32-generic/nasm.morph
deleted file mode 100644
index 0ab1a629..00000000
--- a/strata/bsp-x86_32-generic/nasm.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: nasm
-kind: chunk
-build-system: autotools
-install-commands:
-- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_32-generic/syslinux.def b/strata/bsp-x86_32-generic/syslinux.def
new file mode 100644
index 00000000..810663c5
--- /dev/null
+++ b/strata/bsp-x86_32-generic/syslinux.def
@@ -0,0 +1,7 @@
+name: syslinux
+build-commands:
+- make clean
+- make
+- make installer
+install-commands:
+- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_32-generic/syslinux.morph b/strata/bsp-x86_32-generic/syslinux.morph
deleted file mode 100644
index c0f15807..00000000
--- a/strata/bsp-x86_32-generic/syslinux.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: syslinux
-kind: chunk
-build-commands:
-- make clean
-- make
-- make installer
-install-commands:
-- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_64-generic.def b/strata/bsp-x86_64-generic.def
new file mode 100644
index 00000000..b10d0bf6
--- /dev/null
+++ b/strata/bsp-x86_64-generic.def
@@ -0,0 +1,20 @@
+name: bsp-x86_64-generic
+description: The set of platform specific components required for booting a 64-bit
+ x86 based system.
+build-depends:
+- name: core
+contents:
+- name: linux-x86-64-generic
+ repo: upstream:linux
+ ref: d67a0e110187abd560a1de63fa172894a52839d5
+ unpetrify-ref: baserock/morph
+- name: nasm
+ repo: upstream:nasm
+ ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
+ unpetrify-ref: baserock/morph
+- name: syslinux
+ repo: upstream:syslinux
+ ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - nasm
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
deleted file mode 100644
index 8a7b9c9b..00000000
--- a/strata/bsp-x86_64-generic.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-name: bsp-x86_64-generic
-kind: stratum
-description: The set of platform specific components required for booting a 64-bit
- x86 based system.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: linux-x86-64-generic
- morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
- repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: nasm
- morph: strata/bsp-x86_64-generic/nasm.morph
- repo: upstream:nasm
- ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: syslinux
- morph: strata/bsp-x86_64-generic/syslinux.morph
- repo: upstream:syslinux
- ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
- unpetrify-ref: baserock/morph
- build-depends:
- - nasm
diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.def b/strata/bsp-x86_64-generic/linux-x86-64-generic.def
new file mode 100644
index 00000000..1d2101a7
--- /dev/null
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.def
@@ -0,0 +1,102 @@
+name: linux-x86-64-generic
+products:
+- artifact: linux-x86-64-generic-devel
+ include:
+ - (usr/)?src/linux/.*
+- artifact: linux-x86-64-generic-bins
+ include:
+ - boot/.*
+- artifact: linux-x86-64-generic-libs
+ include:
+ - lib/.*
+configure-commands:
+- make defconfig
+- scripts/config -e PACKET
+- scripts/config -e SATA_AHCI
+- scripts/config -e ATA_GENERIC
+- scripts/config -e HAVE_IDE
+- scripts/config -d BLK_DEV_IDE_SATA
+- scripts/config -e BTRFS_FS
+- scripts/config -e BTRFS_FS_POSIX_ACL
+- scripts/config -e DEVTMPFS
+- scripts/config -e DEVTMPFS_MOUNT
+- scripts/config -e CONFIG_FHANDLE
+- scripts/config -e CGROUPS
+- scripts/config -e AUTOFS4_FS
+- scripts/config --set-str UEVENT_HELPER_PATH ''
+- scripts/config -e EXT2_FS
+- scripts/config -e EXT2_FS_XATTR
+- scripts/config -e EXT2_FS_POSIX_ACL
+- scripts/config -e EXT2_FS_SECURITY
+- scripts/config -e EXT2_FS_XIP
+- scripts/config -e EXT3_FS
+- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
+- scripts/config -e EXT3_FS_XATTR
+- scripts/config -e EXT3_FS_POSIX_ACL
+- scripts/config -e EXT3_FS_SECURITY
+- scripts/config -e EXT4_FS
+- scripts/config -e EXT4_FS_XATTR
+- scripts/config -e EXT4_FS_POSIX_ACL
+- scripts/config -e EXT4_FS_SECURITY
+- scripts/config -d EXT4_DEBUG
+- scripts/config -d JBD_DEBUG
+- scripts/config -d JBD2_DEBUG
+- scripts/config -e BLK_DEV_LOOP
+- scripts/config -d BLK_DEV_CRYPTOLOOP
+- scripts/config -e CEPH_FS
+- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
+- scripts/config -e VIRTIO
+- scripts/config -e VIRTIO_RING
+- scripts/config -e VIRTIO_PCI
+- scripts/config -e VIRTIO_BALLOON
+- scripts/config -e VIRTIO_BLK
+- scripts/config -e VIRTIO_NET
+- scripts/config -e VIRTIO_CONSOLE
+- scripts/config -e HW_RANDOM_VIRTIO
+- scripts/config -e 9P_FS
+- scripts/config -e 9P_FSCACHE
+- scripts/config -e 9P_FS_POSIX_ACL
+- scripts/config -e NET_9P
+- scripts/config -e NET_9P_VIRTIO
+- scripts/config -e R8169
+- scripts/config -e 8139TOO
+- scripts/config -e 8139CP
+- scripts/config -e IKCONFIG
+- scripts/config -e IKCONFIG_PROC
+- scripts/config -e SECCOMP
+- scripts/config -d DEBUG_STACK_TRACE
+- scripts/config -e NFSD
+- scripts/config -e NFSD_V3
+- scripts/config -e KVM
+- scripts/config -e TUN
+- scripts/config -e BRIDGE
+- scripts/config -e VHOST_NET
+- scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_IPV4
+- scripts/config -e IP_NF_TARGET_MASQUERADE
+- scripts/config -e FB_VESA
+- scripts/config -e HOTPLUG_PCI
+- scripts/config -e HOTPLUG_PCI_ACPI
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
+- yes '' | make oldconfig
+build-commands:
+- make $MAKEFLAGS
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- make INSTALL_PATH="$DESTDIR"/boot install
+- make INSTALL_MOD_PATH="$DESTDIR" modules_install
+- install -d "$DESTDIR$PREFIX/src/linux"
+- |
+ (
+ printf 'Makefile\0'
+ printf 'Module.symvers\0'
+ find arch/x86 -maxdepth 1 -name 'Makefile*' -print0
+ find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
+ find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \
+ \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
+ find include -name 'asm*' -prune -o -print0
+ find include/asm-generic -print0
+ find include/uapi -print0
+ find scripts -print0
+ ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
deleted file mode 100644
index fe0721cc..00000000
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ /dev/null
@@ -1,103 +0,0 @@
-name: linux-x86-64-generic
-kind: chunk
-products:
-- artifact: linux-x86-64-generic-devel
- include:
- - (usr/)?src/linux/.*
-- artifact: linux-x86-64-generic-bins
- include:
- - boot/.*
-- artifact: linux-x86-64-generic-libs
- include:
- - lib/.*
-configure-commands:
-- make defconfig
-- scripts/config -e PACKET
-- scripts/config -e SATA_AHCI
-- scripts/config -e ATA_GENERIC
-- scripts/config -e HAVE_IDE
-- scripts/config -d BLK_DEV_IDE_SATA
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e EXT2_FS
-- scripts/config -e EXT2_FS_XATTR
-- scripts/config -e EXT2_FS_POSIX_ACL
-- scripts/config -e EXT2_FS_SECURITY
-- scripts/config -e EXT2_FS_XIP
-- scripts/config -e EXT3_FS
-- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
-- scripts/config -e EXT3_FS_XATTR
-- scripts/config -e EXT3_FS_POSIX_ACL
-- scripts/config -e EXT3_FS_SECURITY
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_FS_XATTR
-- scripts/config -e EXT4_FS_POSIX_ACL
-- scripts/config -e EXT4_FS_SECURITY
-- scripts/config -d EXT4_DEBUG
-- scripts/config -d JBD_DEBUG
-- scripts/config -d JBD2_DEBUG
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -d BLK_DEV_CRYPTOLOOP
-- scripts/config -e CEPH_FS
-- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
-- scripts/config -e VIRTIO
-- scripts/config -e VIRTIO_RING
-- scripts/config -e VIRTIO_PCI
-- scripts/config -e VIRTIO_BALLOON
-- scripts/config -e VIRTIO_BLK
-- scripts/config -e VIRTIO_NET
-- scripts/config -e VIRTIO_CONSOLE
-- scripts/config -e HW_RANDOM_VIRTIO
-- scripts/config -e 9P_FS
-- scripts/config -e 9P_FSCACHE
-- scripts/config -e 9P_FS_POSIX_ACL
-- scripts/config -e NET_9P
-- scripts/config -e NET_9P_VIRTIO
-- scripts/config -e R8169
-- scripts/config -e 8139TOO
-- scripts/config -e 8139CP
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e NFSD
-- scripts/config -e NFSD_V3
-- scripts/config -e KVM
-- scripts/config -e TUN
-- scripts/config -e BRIDGE
-- scripts/config -e VHOST_NET
-- scripts/config -e NF_NAT
-- scripts/config -e NF_NAT_IPV4
-- scripts/config -e IP_NF_TARGET_MASQUERADE
-- scripts/config -e FB_VESA
-- scripts/config -e HOTPLUG_PCI
-- scripts/config -e HOTPLUG_PCI_ACPI
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make oldconfig
-build-commands:
-- make $MAKEFLAGS
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- make INSTALL_PATH="$DESTDIR"/boot install
-- make INSTALL_MOD_PATH="$DESTDIR" modules_install
-- install -d "$DESTDIR$PREFIX/src/linux"
-- |
- (
- printf 'Makefile\0'
- printf 'Module.symvers\0'
- find arch/x86 -maxdepth 1 -name 'Makefile*' -print0
- find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
- find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \
- \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
- find include -name 'asm*' -prune -o -print0
- find include/asm-generic -print0
- find include/uapi -print0
- find scripts -print0
- ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-x86_64-generic/nasm.def b/strata/bsp-x86_64-generic/nasm.def
new file mode 100644
index 00000000..00bc26fe
--- /dev/null
+++ b/strata/bsp-x86_64-generic/nasm.def
@@ -0,0 +1,4 @@
+name: nasm
+build-system: autotools
+install-commands:
+- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_64-generic/nasm.morph b/strata/bsp-x86_64-generic/nasm.morph
deleted file mode 100644
index 0ab1a629..00000000
--- a/strata/bsp-x86_64-generic/nasm.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: nasm
-kind: chunk
-build-system: autotools
-install-commands:
-- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_64-generic/syslinux.def b/strata/bsp-x86_64-generic/syslinux.def
new file mode 100644
index 00000000..810663c5
--- /dev/null
+++ b/strata/bsp-x86_64-generic/syslinux.def
@@ -0,0 +1,7 @@
+name: syslinux
+build-commands:
+- make clean
+- make
+- make installer
+install-commands:
+- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_64-generic/syslinux.morph b/strata/bsp-x86_64-generic/syslinux.morph
deleted file mode 100644
index c0f15807..00000000
--- a/strata/bsp-x86_64-generic/syslinux.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: syslinux
-kind: chunk
-build-commands:
-- make clean
-- make
-- make installer
-install-commands:
-- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_both-tools.def b/strata/bsp-x86_both-tools.def
new file mode 100644
index 00000000..ffa6819c
--- /dev/null
+++ b/strata/bsp-x86_both-tools.def
@@ -0,0 +1,16 @@
+name: bsp-x86_both-tools
+description: The set of platform specific components required for configuring a bootable
+ x86 based system.
+build-depends:
+- name: core
+contents:
+- name: nasm
+ repo: upstream:nasm
+ ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
+ unpetrify-ref: baserock/morph
+- name: syslinux
+ repo: upstream:syslinux
+ ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - nasm
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
deleted file mode 100644
index c1ba501c..00000000
--- a/strata/bsp-x86_both-tools.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: bsp-x86_both-tools
-kind: stratum
-description: The set of platform specific components required for configuring a bootable
- x86 based system.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: nasm
- morph: strata/bsp-x86_both-tools/nasm.morph
- repo: upstream:nasm
- ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: syslinux
- morph: strata/bsp-x86_both-tools/syslinux.morph
- repo: upstream:syslinux
- ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
- unpetrify-ref: baserock/morph
- build-depends:
- - nasm
diff --git a/strata/bsp-x86_both-tools/nasm.def b/strata/bsp-x86_both-tools/nasm.def
new file mode 100644
index 00000000..00bc26fe
--- /dev/null
+++ b/strata/bsp-x86_both-tools/nasm.def
@@ -0,0 +1,4 @@
+name: nasm
+build-system: autotools
+install-commands:
+- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_both-tools/nasm.morph b/strata/bsp-x86_both-tools/nasm.morph
deleted file mode 100644
index 0ab1a629..00000000
--- a/strata/bsp-x86_both-tools/nasm.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: nasm
-kind: chunk
-build-system: autotools
-install-commands:
-- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_both-tools/syslinux.def b/strata/bsp-x86_both-tools/syslinux.def
new file mode 100644
index 00000000..810663c5
--- /dev/null
+++ b/strata/bsp-x86_both-tools/syslinux.def
@@ -0,0 +1,7 @@
+name: syslinux
+build-commands:
+- make clean
+- make
+- make installer
+install-commands:
+- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/bsp-x86_both-tools/syslinux.morph
deleted file mode 100644
index c0f15807..00000000
--- a/strata/bsp-x86_both-tools/syslinux.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: syslinux
-kind: chunk
-build-commands:
-- make clean
-- make
-- make installer
-install-commands:
-- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/build-essential.def b/strata/build-essential.def
new file mode 100644
index 00000000..3c0a3755
--- /dev/null
+++ b/strata/build-essential.def
@@ -0,0 +1,318 @@
+name: build-essential
+description: |
+ Toolchain stratum
+
+ Stage 1: build a minimal cross compiler with the host's tools.
+
+ Starting with a cross compiler ensures that (a) nothing from the host
+ can leak into the build-essential artifacts, and (b) cross-compiling
+ build-essential is fully tested and supported, since we always use the
+ cross code paths.
+
+ Stage 2: cross-build the whole of build-essential, using the host's tools
+ but the cross-compiler toolchain.
+
+ Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC,
+ but because stage 2 GCC is also built to *run* on the bootstrap machine
+ it can only execute inside the stage 3 chroot (due to being built against
+ a libc with a non-standard prefix).
+
+ Stage 3: build the whole of build-essential again, this time using a
+ staging area containing only the output of stage 2. The result of this
+ build is fully reproducible.
+
+ We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built
+ to run on a host *-bootstrap-* while stage 3 chunks are native-built for
+ a *-baserock-* machine. This works, because the cross build was all for
+ show (and cleanliness) and the binaries actually still run on the host.
+
+ After build-essential is built we do another trick. See
+ stage2-fhs-dirs for details. Basically, /bin is a symlink to
+ /tools/bin during stage 2 but in stage 3 it becomes a real directory
+ again.
+products:
+- artifact: build-essential-minimal
+ include:
+ - fhs-dirs-.*
+ - busybox-.*
+ - glibc-nss
+contents:
+- name: stage1-binutils
+ repo: upstream:binutils-redhat
+ ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
+ unpetrify-ref: baserock/build-essential
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage1-gcc
+ repo: upstream:gcc-tarball
+ ref: 999c918a7ad32ad436395666def22ab90b3447fe
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage1-binutils
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-linux-api-headers
+ repo: upstream:linux
+ ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+ unpetrify-ref: baserock/v3.8
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-glibc
+ repo: upstream:glibc
+ ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
+ unpetrify-ref: baserock/glibc-2.20
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-linux-api-headers
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-binutils
+ repo: upstream:binutils-redhat
+ ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-glibc
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-gcc-fixed-headers
+ repo: upstream:gcc-tarball
+ ref: 999c918a7ad32ad436395666def22ab90b3447fe
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-glibc
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-gcc
+ repo: upstream:gcc-tarball
+ ref: 999c918a7ad32ad436395666def22ab90b3447fe
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-glibc
+ - stage2-gcc-fixed-headers
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-busybox
+ repo: upstream:busybox
+ ref: 8a801e0f024f1385d8e989b80b90443546bceae7
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-glibc
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-fake-bash
+ repo: upstream:bash
+ ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
+ unpetrify-ref: baserock/bash-4.3-patch-27
+ build-depends:
+ - stage2-busybox
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-fhs-dirs
+ repo: baserock:baserock/fhs-dirs
+ ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
+ unpetrify-ref: master
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-gawk
+ repo: upstream:gawk
+ ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-glibc
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-make
+ repo: upstream:make
+ ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-glibc
+ build-mode: bootstrap
+ prefix: /tools
+- name: stage2-reset-specs
+ repo: upstream:glibc
+ ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
+ unpetrify-ref: baserock/glibc-2.20
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-linux-api-headers
+ - stage2-glibc
+ build-mode: bootstrap
+ prefix: /tools
+- name: fhs-dirs
+ repo: baserock:baserock/fhs-dirs
+ ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
+ unpetrify-ref: master
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+- name: linux-api-headers
+ repo: upstream:linux
+ ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+ unpetrify-ref: baserock/v3.8
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+- name: glibc
+ repo: upstream:glibc
+ ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
+ unpetrify-ref: baserock/glibc-2.20
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-fake-bash
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - linux-api-headers
+ artifacts:
+ glibc-gconv: build-essential-runtime
+ glibc-libs: build-essential-minimal
+ glibc-nss: build-essential-runtime
+- name: zlib
+ repo: upstream:zlib
+ ref: db333af7e9b90a23fd7f9cd8dc128123b34bf698
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - glibc
+ artifacts:
+ zlib-libs: build-essential-minimal
+- name: binutils
+ repo: upstream:binutils-redhat
+ ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - glibc
+ - zlib
+- name: busybox
+ repo: upstream:busybox
+ ref: 8a801e0f024f1385d8e989b80b90443546bceae7
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - glibc
+- name: gawk
+ repo: upstream:gawk
+ ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - glibc
+- name: gcc
+ repo: upstream:gcc-tarball
+ ref: 5c08cea34d5562dc828b85c7c02519246823aaf0
+ unpetrify-ref: baserock/build-essential-4.7
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - glibc
+ - zlib
+ artifacts:
+ gcc-libs: build-essential-minimal
+- name: make
+ repo: upstream:make
+ ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - glibc
+- name: ccache
+ repo: upstream:ccache
+ ref: 567631456f0899cdf0c382f898d38aadc8901d32
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - stage2-binutils
+ - stage2-busybox
+ - stage2-glibc
+ - stage2-fhs-dirs
+ - stage2-gawk
+ - stage2-gcc
+ - stage2-linux-api-headers
+ - stage2-make
+ - stage2-reset-specs
+ - glibc
+ - zlib
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
deleted file mode 100644
index 38bd60d8..00000000
--- a/strata/build-essential.morph
+++ /dev/null
@@ -1,344 +0,0 @@
-name: build-essential
-kind: stratum
-description: |
- Toolchain stratum
-
- Stage 1: build a minimal cross compiler with the host's tools.
-
- Starting with a cross compiler ensures that (a) nothing from the host
- can leak into the build-essential artifacts, and (b) cross-compiling
- build-essential is fully tested and supported, since we always use the
- cross code paths.
-
- Stage 2: cross-build the whole of build-essential, using the host's tools
- but the cross-compiler toolchain.
-
- Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC,
- but because stage 2 GCC is also built to *run* on the bootstrap machine
- it can only execute inside the stage 3 chroot (due to being built against
- a libc with a non-standard prefix).
-
- Stage 3: build the whole of build-essential again, this time using a
- staging area containing only the output of stage 2. The result of this
- build is fully reproducible.
-
- We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built
- to run on a host *-bootstrap-* while stage 3 chunks are native-built for
- a *-baserock-* machine. This works, because the cross build was all for
- show (and cleanliness) and the binaries actually still run on the host.
-
- After build-essential is built we do another trick. See
- stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to
- /tools/bin during stage 2 but in stage 3 it becomes a real directory
- again.
-products:
-- artifact: build-essential-minimal
- include:
- - fhs-dirs-.*
- - busybox-.*
- - glibc-nss
-chunks:
-- name: stage1-binutils
- morph: strata/build-essential/stage1-binutils.morph
- repo: upstream:binutils-redhat
- ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
- unpetrify-ref: baserock/build-essential
- build-depends: []
- build-mode: bootstrap
- prefix: /tools
-- name: stage1-gcc
- morph: strata/build-essential/stage1-gcc.morph
- repo: upstream:gcc-tarball
- ref: 999c918a7ad32ad436395666def22ab90b3447fe
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage1-binutils
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-linux-api-headers
- morph: strata/build-essential/stage2-linux-api-headers.morph
- repo: upstream:linux
- ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
- unpetrify-ref: baserock/v3.8
- build-depends:
- - stage1-binutils
- - stage1-gcc
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-glibc
- morph: strata/build-essential/stage2-glibc.morph
- repo: upstream:glibc
- ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
- unpetrify-ref: baserock/glibc-2.20
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-linux-api-headers
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-binutils
- morph: strata/build-essential/stage2-binutils.morph
- repo: upstream:binutils-redhat
- ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-glibc
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-gcc-fixed-headers
- morph: strata/build-essential/stage2-gcc-fixed-headers.morph
- repo: upstream:gcc-tarball
- ref: 999c918a7ad32ad436395666def22ab90b3447fe
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-glibc
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-gcc
- morph: strata/build-essential/stage2-gcc.morph
- repo: upstream:gcc-tarball
- ref: 999c918a7ad32ad436395666def22ab90b3447fe
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-glibc
- - stage2-gcc-fixed-headers
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-busybox
- morph: strata/build-essential/stage2-busybox.morph
- repo: upstream:busybox
- ref: 8a801e0f024f1385d8e989b80b90443546bceae7
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-glibc
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-fake-bash
- morph: strata/build-essential/stage2-fake-bash.morph
- repo: upstream:bash
- ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
- unpetrify-ref: baserock/bash-4.3-patch-27
- build-depends:
- - stage2-busybox
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-fhs-dirs
- morph: strata/build-essential/stage2-fhs-dirs.morph
- repo: baserock:baserock/fhs-dirs
- ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
- unpetrify-ref: master
- build-depends: []
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-gawk
- morph: strata/build-essential/stage2-gawk.morph
- repo: upstream:gawk
- ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-glibc
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-make
- morph: strata/build-essential/stage2-make.morph
- repo: upstream:make
- ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-glibc
- build-mode: bootstrap
- prefix: /tools
-- name: stage2-reset-specs
- morph: strata/build-essential/stage2-reset-specs.morph
- repo: upstream:glibc
- ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
- unpetrify-ref: baserock/glibc-2.20
- build-depends:
- - stage1-binutils
- - stage1-gcc
- - stage2-linux-api-headers
- - stage2-glibc
- build-mode: bootstrap
- prefix: /tools
-- name: fhs-dirs
- morph: strata/build-essential/fhs-dirs.morph
- repo: baserock:baserock/fhs-dirs
- ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
- unpetrify-ref: master
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
-- name: linux-api-headers
- morph: strata/build-essential/linux-api-headers.morph
- repo: upstream:linux
- ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
- unpetrify-ref: baserock/v3.8
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
-- name: glibc
- morph: strata/build-essential/glibc.morph
- repo: upstream:glibc
- ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
- unpetrify-ref: baserock/glibc-2.20
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-fake-bash
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - linux-api-headers
- artifacts:
- glibc-gconv: build-essential-runtime
- glibc-libs: build-essential-minimal
- glibc-nss: build-essential-runtime
-- name: zlib
- morph: strata/build-essential/zlib.morph
- repo: upstream:zlib
- ref: db333af7e9b90a23fd7f9cd8dc128123b34bf698
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - glibc
- artifacts:
- zlib-libs: build-essential-minimal
-- name: binutils
- morph: strata/build-essential/binutils.morph
- repo: upstream:binutils-redhat
- ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - glibc
- - zlib
-- name: busybox
- morph: strata/build-essential/busybox.morph
- repo: upstream:busybox
- ref: 8a801e0f024f1385d8e989b80b90443546bceae7
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - glibc
-- name: gawk
- morph: strata/build-essential/gawk.morph
- repo: upstream:gawk
- ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - glibc
-- name: gcc
- morph: strata/build-essential/gcc.morph
- repo: upstream:gcc-tarball
- ref: 5c08cea34d5562dc828b85c7c02519246823aaf0
- unpetrify-ref: baserock/build-essential-4.7
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - glibc
- - zlib
- artifacts:
- gcc-libs: build-essential-minimal
-- name: make
- morph: strata/build-essential/make.morph
- repo: upstream:make
- ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - glibc
-- name: ccache
- morph: strata/build-essential/ccache.morph
- repo: upstream:ccache
- ref: 567631456f0899cdf0c382f898d38aadc8901d32
- unpetrify-ref: baserock/build-essential
- build-depends:
- - stage2-binutils
- - stage2-busybox
- - stage2-glibc
- - stage2-fhs-dirs
- - stage2-gawk
- - stage2-gcc
- - stage2-linux-api-headers
- - stage2-make
- - stage2-reset-specs
- - glibc
- - zlib
diff --git a/strata/build-essential/binutils.def b/strata/build-essential/binutils.def
new file mode 100644
index 00000000..c332c84a
--- /dev/null
+++ b/strata/build-essential/binutils.def
@@ -0,0 +1,7 @@
+name: binutils
+build-system: autotools
+
+configure-commands:
+- |
+ ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
+ --with-system-zlib
diff --git a/strata/build-essential/binutils.morph b/strata/build-essential/binutils.morph
deleted file mode 100644
index bab52672..00000000
--- a/strata/build-essential/binutils.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: binutils
-kind: chunk
-build-system: autotools
-
-configure-commands:
-- |
- ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
- --with-system-zlib
diff --git a/strata/build-essential/busybox.def b/strata/build-essential/busybox.def
new file mode 100644
index 00000000..265e5e31
--- /dev/null
+++ b/strata/build-essential/busybox.def
@@ -0,0 +1,123 @@
+name: busybox
+
+configure-commands:
+# Busybox's default config has everything enabled.
+- make defconfig
+
+- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config
+- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config
+
+# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
+
+# We have GAWK, but in GENIVI baseline we want to get rid of it
+# - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
+
+# Depends on stuff that was removed since eglibc 2.14.
+- sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config
+
+# Busybox Patch is incompatible enough with GNU Patch that it can't be
+# used for GNULib projects built from Git.
+- sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config
+
+# None of this is needed because we have kmod; and it actually breaks the
+# Linux build because depmod isn't compatible enough with util-linux's.
+- sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config
+- sed -e 's/CONFIG_INSMOD=y.*/# CONFIG_INSMOD is not set/' -i .config
+- sed -e 's/CONFIG_MODPROBE=y.*/# CONFIG_MODPROBE is not set/' -i .config
+- sed -e 's/CONFIG_MODPROBE_SMALL=y.*/# CONFIG_MODPROBE_SMALL is not set/' -i .config
+- sed -e 's/CONFIG_LSMOD=y.*/# CONFIG_LSMOD is not set/' -i .config
+- sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
+
+# General features that we don't need.
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
+- sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
+- sed -e 's/CONFIG_LOSETUP=y.*/# CONFIG_LOSETUP is not set/' -i .config
+- sed -e 's/CONFIG_LSUSB=y.*/# CONFIG_LSUSB is not set/' -i .config
+- sed -e 's/CONFIG_LZMA=y.*/# CONFIG_LZMA is not set/' -i .config
+- sed -e 's/CONFIG_MKFS_EXT2=y.*/# CONFIG_MKFS_EXT2 is not set/' -i .config
+- sed -e 's/CONFIG_MKFS_MINIX=y.*/# CONFIG_MKFS_MINIX is not set/' -i .config
+- sed -e 's/CONFIG_STRINGS=y.*/# CONFIG_STRINGS is not set/' -i .config
+- sed -e 's/CONFIG_UNLZMA=y.*/# CONFIG_UNLZMA is not set/' -i .config
+- sed -e 's/CONFIG_UNXZ=y.*/# CONFIG_UNXZ is not set/' -i .config
+- sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config
+
+# Now turn on some little bits we do need
+- sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config
+- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config
+- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config
+
+
+build-commands:
+- make
+- |
+ for fin in systemd-units/*.in
+ do
+ f=$(echo "$fin" | sed 's/\.in$//')
+ sed -e 's|@rootprefix@||g' "$fin" >"$f";
+ done
+
+install-commands:
+- |
+ if [ "$PREFIX" = /usr ]; then PREFIX=; fi &&
+ make CONFIG_PREFIX="$DESTDIR$PREFIX" install &&
+ chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
+
+- mkdir -p "$DESTDIR/var/spool/cron/crontabs"
+
+# Install systemd units
+- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
+- |
+ for f in systemd-units/*.service; do
+ install -m 644 "$f" "$DESTDIR/lib/systemd/system";
+ done
+- |
+ for f in $(cd systemd-units; ls *.service | grep -v -F "@"); do
+ ln -s "../$f" "$DESTDIR/lib/systemd/system/multi-user.target.wants/";
+ done
+
+# Install custom udev rule to run ifup for every network device detected
+- mkdir -p "$DESTDIR/lib/udev/rules.d"
+- for f in udev-rules/100-baserock.rules; do
+ install -m 644 "$f" "$DESTDIR/lib/udev/rules.d";
+ done
+
+# Set up DHCP
+- mkdir -p "$DESTDIR$PREFIX"/share/udhcpc
+- cp examples/udhcp/simple.script "$DESTDIR$PREFIX"/share/udhcpc/default.script
+
+# Set up NTP
+- install scripts/run-ntpd-with-config "$DESTDIR$PREFIX"/sbin/.
+- install -d "$DESTDIR/etc"
+- |
+ cat << EOF > "$DESTDIR/etc/ntpd.conf"
+ server 0.pool.ntp.org
+ server 1.pool.ntp.org
+ server 2.pool.ntp.org
+ server 3.pool.ntp.org
+ EOF
+
+# Set up man environment variables
+- |
+ cat << EOF > "$DESTDIR/etc/profile"
+ # Set default pager to less
+ export MANPAGER='less -R'
+ EOF
+- |
+ cat << EOF > "$DESTDIR/etc/man.conf"
+ # This file is used by man to provide a manpath for those without one by
+ # examining their PATH environment variable.
+ #
+ # Lines beginning with `#' are comments and are ignored. Any combination of
+ # tabs or spaces may be used as `whitespace' separators.
+
+ MANDATORY_MANPATH /usr/man
+ MANDATORY_MANPATH /usr/share/man
+ MANDATORY_MANPATH /usr/local/share/man
+ EOF
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
deleted file mode 100644
index b0bb46f5..00000000
--- a/strata/build-essential/busybox.morph
+++ /dev/null
@@ -1,124 +0,0 @@
-name: busybox
-kind: chunk
-
-configure-commands:
-# Busybox's default config has everything enabled.
-- make defconfig
-
-- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config
-- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config
-
-# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
-# We have GAWK, but in GENIVI baseline we want to get rid of it
-# - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
-
-# Depends on stuff that was removed since eglibc 2.14.
-- sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config
-
-# Busybox Patch is incompatible enough with GNU Patch that it can't be
-# used for GNULib projects built from Git.
-- sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config
-
-# None of this is needed because we have kmod; and it actually breaks the
-# Linux build because depmod isn't compatible enough with util-linux's.
-- sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config
-- sed -e 's/CONFIG_INSMOD=y.*/# CONFIG_INSMOD is not set/' -i .config
-- sed -e 's/CONFIG_MODPROBE=y.*/# CONFIG_MODPROBE is not set/' -i .config
-- sed -e 's/CONFIG_MODPROBE_SMALL=y.*/# CONFIG_MODPROBE_SMALL is not set/' -i .config
-- sed -e 's/CONFIG_LSMOD=y.*/# CONFIG_LSMOD is not set/' -i .config
-- sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
-
-# General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
-- sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
-- sed -e 's/CONFIG_LOSETUP=y.*/# CONFIG_LOSETUP is not set/' -i .config
-- sed -e 's/CONFIG_LSUSB=y.*/# CONFIG_LSUSB is not set/' -i .config
-- sed -e 's/CONFIG_LZMA=y.*/# CONFIG_LZMA is not set/' -i .config
-- sed -e 's/CONFIG_MKFS_EXT2=y.*/# CONFIG_MKFS_EXT2 is not set/' -i .config
-- sed -e 's/CONFIG_MKFS_MINIX=y.*/# CONFIG_MKFS_MINIX is not set/' -i .config
-- sed -e 's/CONFIG_STRINGS=y.*/# CONFIG_STRINGS is not set/' -i .config
-- sed -e 's/CONFIG_UNLZMA=y.*/# CONFIG_UNLZMA is not set/' -i .config
-- sed -e 's/CONFIG_UNXZ=y.*/# CONFIG_UNXZ is not set/' -i .config
-- sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config
-
-# Now turn on some little bits we do need
-- sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config
-
-
-build-commands:
-- make
-- |
- for fin in systemd-units/*.in
- do
- f=$(echo "$fin" | sed 's/\.in$//')
- sed -e 's|@rootprefix@||g' "$fin" >"$f";
- done
-
-install-commands:
-- |
- if [ "$PREFIX" = /usr ]; then PREFIX=; fi &&
- make CONFIG_PREFIX="$DESTDIR$PREFIX" install &&
- chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
-
-- mkdir -p "$DESTDIR/var/spool/cron/crontabs"
-
-# Install systemd units
-- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
-- |
- for f in systemd-units/*.service; do
- install -m 644 "$f" "$DESTDIR/lib/systemd/system";
- done
-- |
- for f in $(cd systemd-units; ls *.service | grep -v -F "@"); do
- ln -s "../$f" "$DESTDIR/lib/systemd/system/multi-user.target.wants/";
- done
-
-# Install custom udev rule to run ifup for every network device detected
-- mkdir -p "$DESTDIR/lib/udev/rules.d"
-- for f in udev-rules/100-baserock.rules; do
- install -m 644 "$f" "$DESTDIR/lib/udev/rules.d";
- done
-
-# Set up DHCP
-- mkdir -p "$DESTDIR$PREFIX"/share/udhcpc
-- cp examples/udhcp/simple.script "$DESTDIR$PREFIX"/share/udhcpc/default.script
-
-# Set up NTP
-- install scripts/run-ntpd-with-config "$DESTDIR$PREFIX"/sbin/.
-- install -d "$DESTDIR/etc"
-- |
- cat << EOF > "$DESTDIR/etc/ntpd.conf"
- server 0.pool.ntp.org
- server 1.pool.ntp.org
- server 2.pool.ntp.org
- server 3.pool.ntp.org
- EOF
-
-# Set up man environment variables
-- |
- cat << EOF > "$DESTDIR/etc/profile"
- # Set default pager to less
- export MANPAGER='less -R'
- EOF
-- |
- cat << EOF > "$DESTDIR/etc/man.conf"
- # This file is used by man to provide a manpath for those without one by
- # examining their PATH environment variable.
- #
- # Lines beginning with `#' are comments and are ignored. Any combination of
- # tabs or spaces may be used as `whitespace' separators.
-
- MANDATORY_MANPATH /usr/man
- MANDATORY_MANPATH /usr/share/man
- MANDATORY_MANPATH /usr/local/share/man
- EOF
diff --git a/strata/build-essential/ccache.def b/strata/build-essential/ccache.def
new file mode 100644
index 00000000..f2d5bc0d
--- /dev/null
+++ b/strata/build-essential/ccache.def
@@ -0,0 +1,11 @@
+name: ccache
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR/$PREFIX/lib/ccache"
+- for cc in gcc cc g++ c++; do ln -sf "$PREFIX/bin/ccache" "$DESTDIR/$PREFIX/lib/ccache/$cc";
+ done
+- for cc in gcc cc g++ c++; do ln -sf "$PREFIX/bin/ccache" "$DESTDIR/$PREFIX/lib/ccache/$TARGET-$cc";
+ done
diff --git a/strata/build-essential/ccache.morph b/strata/build-essential/ccache.morph
deleted file mode 100644
index 383eee8a..00000000
--- a/strata/build-essential/ccache.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: ccache
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX"
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR/$PREFIX/lib/ccache"
-- for cc in gcc cc g++ c++; do ln -sf "$PREFIX/bin/ccache" "$DESTDIR/$PREFIX/lib/ccache/$cc";
- done
-- for cc in gcc cc g++ c++; do ln -sf "$PREFIX/bin/ccache" "$DESTDIR/$PREFIX/lib/ccache/$TARGET-$cc";
- done
diff --git a/strata/build-essential/fhs-dirs.def b/strata/build-essential/fhs-dirs.def
new file mode 100644
index 00000000..9f5a0a88
--- /dev/null
+++ b/strata/build-essential/fhs-dirs.def
@@ -0,0 +1,49 @@
+name: fhs-dirs
+description: create the FHS 2.3 directory hierarchy and the usual files
+install-commands:
+- sh ./create-fhs-dirs "$DESTDIR"
+- install -m 644 passwd "$DESTDIR/etc/passwd"
+- install -m 600 shadow "$DESTDIR/etc/shadow"
+- install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
+- install -m 644 group "$DESTDIR/etc/group"
+- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
+- install -m 644 issue "$DESTDIR/etc/issue"
+- install -m 644 services "$DESTDIR/etc/services"
+- install -m 644 protocols "$DESTDIR/etc/protocols"
+- echo baserock > "$DESTDIR"/etc/hostname
+devices:
+- type: c
+ filename: /dev/console
+ gid: 0
+ major: 5
+ minor: 1
+ permissions: '0600'
+ uid: 0
+- type: c
+ filename: /dev/full
+ gid: 0
+ major: 1
+ minor: 7
+ permissions: '0666'
+ uid: 0
+- type: c
+ filename: /dev/null
+ gid: 0
+ major: 1
+ minor: 3
+ permissions: '0666'
+ uid: 0
+- type: c
+ filename: /dev/urandom
+ gid: 0
+ major: 1
+ minor: 9
+ permissions: '0666'
+ uid: 0
+- type: c
+ filename: /dev/zero
+ gid: 0
+ major: 1
+ minor: 5
+ permissions: '0666'
+ uid: 0
diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph
deleted file mode 100644
index 64474872..00000000
--- a/strata/build-essential/fhs-dirs.morph
+++ /dev/null
@@ -1,50 +0,0 @@
-name: fhs-dirs
-kind: chunk
-description: create the FHS 2.3 directory hierarchy and the usual files
-install-commands:
-- sh ./create-fhs-dirs "$DESTDIR"
-- install -m 644 passwd "$DESTDIR/etc/passwd"
-- install -m 600 shadow "$DESTDIR/etc/shadow"
-- install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
-- install -m 644 group "$DESTDIR/etc/group"
-- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
-- install -m 644 issue "$DESTDIR/etc/issue"
-- install -m 644 services "$DESTDIR/etc/services"
-- install -m 644 protocols "$DESTDIR/etc/protocols"
-- echo baserock > "$DESTDIR"/etc/hostname
-devices:
-- type: c
- filename: /dev/console
- gid: 0
- major: 5
- minor: 1
- permissions: '0600'
- uid: 0
-- type: c
- filename: /dev/full
- gid: 0
- major: 1
- minor: 7
- permissions: '0666'
- uid: 0
-- type: c
- filename: /dev/null
- gid: 0
- major: 1
- minor: 3
- permissions: '0666'
- uid: 0
-- type: c
- filename: /dev/urandom
- gid: 0
- major: 1
- minor: 9
- permissions: '0666'
- uid: 0
-- type: c
- filename: /dev/zero
- gid: 0
- major: 1
- minor: 5
- permissions: '0666'
- uid: 0
diff --git a/strata/build-essential/gawk.def b/strata/build-essential/gawk.def
new file mode 100644
index 00000000..f21c81d3
--- /dev/null
+++ b/strata/build-essential/gawk.def
@@ -0,0 +1,4 @@
+name: gawk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/gawk.morph b/strata/build-essential/gawk.morph
deleted file mode 100644
index 1ad871c6..00000000
--- a/strata/build-essential/gawk.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: gawk
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/gcc.def b/strata/build-essential/gcc.def
new file mode 100644
index 00000000..592a39b7
--- /dev/null
+++ b/strata/build-essential/gcc.def
@@ -0,0 +1,41 @@
+name: gcc
+
+configure-commands:
+- mkdir o
+
+# Configure flag notes:
+# 1. An attempt to stop anything going in $PREFIX/lib64 (which doesn't
+# fully work; we will need to hobble the multilib configuration in
+# config/i386/t-linux64 if we really want to kill /lib64).
+# 2. Multilib does not make sense in Baserock.
+# 3. Optimisation libraries which for now we do without.
+# 4. Recommended by Linux From Scratch; required for C++ ABI
+# compatibility with other Linux distributions.
+# 5. MPFR is built in the GCC tree, we need to locate it.
+# 6. Avoid having more than one copy of ZLib in use on the system
+- |
+ cd o && \
+ ../configure \
+ $(../morph-arch-config) \
+ --prefix="$PREFIX" \
+ `# [1]` --libdir=$PREFIX/lib \
+ --disable-nls \
+ --enable-languages=c,c++,fortran \
+ --enable-shared --enable-threads=posix \
+ `# [2]` --disable-multilib \
+ `# [3]` --disable-libgomp --without-cloog --without-ppl \
+ `# [4]` --enable-__cxa_atexit \
+ `# [5]` --with-mpfr-include="$(pwd)/../mpfr/src" \
+ --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
+ `# [6]` --with-system-zlib
+
+build-commands:
+- cd o && make
+
+install-commands:
+- cd o && make DESTDIR="$DESTDIR" install
+- ln -s gcc "$DESTDIR/$PREFIX/bin/cc"
+- >
+ for fortran_alias in f77 f90 f95; do
+ ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias"
+ done
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph
deleted file mode 100644
index 50e2918c..00000000
--- a/strata/build-essential/gcc.morph
+++ /dev/null
@@ -1,42 +0,0 @@
-name: gcc
-kind: chunk
-
-configure-commands:
-- mkdir o
-
-# Configure flag notes:
-# 1. An attempt to stop anything going in $PREFIX/lib64 (which doesn't
-# fully work; we will need to hobble the multilib configuration in
-# config/i386/t-linux64 if we really want to kill /lib64).
-# 2. Multilib does not make sense in Baserock.
-# 3. Optimisation libraries which for now we do without.
-# 4. Recommended by Linux From Scratch; required for C++ ABI
-# compatibility with other Linux distributions.
-# 5. MPFR is built in the GCC tree, we need to locate it.
-# 6. Avoid having more than one copy of ZLib in use on the system
-- |
- cd o && \
- ../configure \
- $(../morph-arch-config) \
- --prefix="$PREFIX" \
- `# [1]` --libdir=$PREFIX/lib \
- --disable-nls \
- --enable-languages=c,c++,fortran \
- --enable-shared --enable-threads=posix \
- `# [2]` --disable-multilib \
- `# [3]` --disable-libgomp --without-cloog --without-ppl \
- `# [4]` --enable-__cxa_atexit \
- `# [5]` --with-mpfr-include="$(pwd)/../mpfr/src" \
- --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
- `# [6]` --with-system-zlib
-
-build-commands:
-- cd o && make
-
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
-- ln -s gcc "$DESTDIR/$PREFIX/bin/cc"
-- >
- for fortran_alias in f77 f90 f95; do
- ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias"
- done
diff --git a/strata/build-essential/glibc.def b/strata/build-essential/glibc.def
new file mode 100644
index 00000000..949e6d5e
--- /dev/null
+++ b/strata/build-essential/glibc.def
@@ -0,0 +1,85 @@
+name: glibc
+products:
+- artifact: glibc-nss
+ include:
+ - etc/nsswitch.conf
+ - (usr/)?lib/libnss.*
+- artifact: glibc-gconv
+ include:
+ - (usr/)?lib/gconv/.*
+- artifact: glibc-libs
+ include:
+ - sbin/ldconfig
+ - lib(32|64)?/ld-.*
+ - (usr/)?lib(exec)?/pt_chown
+- artifact: glibc-bins
+ include:
+ - (usr/)?s?bin/.*
+ - (usr/)?libexec/getconf/.*
+ - (usr/)?lib/libSegFault\.so(\.\d+)*$
+- artifact: glibc-libs
+ include:
+ - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*$
+- artifact: glibc-devel
+ include:
+ - (usr/)?include/.*
+ - (usr/)?lib(32|64)?/lib.*\.a
+ - (usr/)?lib(32|64)?/lib.*\.la
+ - (usr/)?(lib(32|64)?|share)/pkgconfig/.*\.pc
+ - (usr/)?lib(32|64)?/.*\.o
+- artifact: glibc-locale
+ include:
+ - (usr/)?share/locale/.*
+ - (usr/)?share/i18n/.*
+ - (usr/)?share/zoneinfo/.*
+- artifact: glibc-misc
+ include:
+ - .*
+configure-commands:
+- mkdir o
+
+- |
+ case "$MORPH_ARCH" in
+ armv7*)
+ ARCH_FLAGS="--without-fp" ;;
+ esac
+
+ # We override the PATH here to remove /tools/bin from it.
+ # Thanks to this glibc finds bash in /bin/bash through the /bin
+ # symlink. This is important because glibc changes the path to bash
+ # of the shebang in some scripts and these scripts will be broken if
+ # they point to bash in /tools/bin/bash.
+ export PATH="/usr/bin:/sbin:/bin";
+ export CFLAGS="-O2 $CFLAGS";
+ cd o && ../configure \
+ $ARCH_FLAGS \
+ --prefix="$PREFIX" \
+ --disable-profile \
+ --enable-kernel=2.6.25 \
+ --without-cvs \
+ --without-selinux \
+ --enable-obsolete-rpc
+
+build-commands:
+- cd o && make localtime=UTC
+
+install-commands:
+- cd o && make install_root="$DESTDIR" localtime=UTC install
+- mkdir -p "$DESTDIR/etc"
+- |
+ cat <<EOF > nsswitch.conf
+ passwd: compat
+ group: compat
+ shadow: compat
+
+ hosts: files myhostname mdns4_minimal [NOTFOUND=return] dns mdns4
+ networks: files
+
+ protocols: db files
+ services: db files
+ ethers: db files
+ rpc: db files
+
+ netgroup: nis
+ EOF
+- install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf"
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
deleted file mode 100644
index 789283eb..00000000
--- a/strata/build-essential/glibc.morph
+++ /dev/null
@@ -1,86 +0,0 @@
-name: glibc
-kind: chunk
-products:
-- artifact: glibc-nss
- include:
- - etc/nsswitch.conf
- - (usr/)?lib/libnss.*
-- artifact: glibc-gconv
- include:
- - (usr/)?lib/gconv/.*
-- artifact: glibc-libs
- include:
- - sbin/ldconfig
- - lib(32|64)?/ld-.*
- - (usr/)?lib(exec)?/pt_chown
-- artifact: glibc-bins
- include:
- - (usr/)?s?bin/.*
- - (usr/)?libexec/getconf/.*
- - (usr/)?lib/libSegFault\.so(\.\d+)*$
-- artifact: glibc-libs
- include:
- - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*$
-- artifact: glibc-devel
- include:
- - (usr/)?include/.*
- - (usr/)?lib(32|64)?/lib.*\.a
- - (usr/)?lib(32|64)?/lib.*\.la
- - (usr/)?(lib(32|64)?|share)/pkgconfig/.*\.pc
- - (usr/)?lib(32|64)?/.*\.o
-- artifact: glibc-locale
- include:
- - (usr/)?share/locale/.*
- - (usr/)?share/i18n/.*
- - (usr/)?share/zoneinfo/.*
-- artifact: glibc-misc
- include:
- - .*
-configure-commands:
-- mkdir o
-
-- |
- case "$MORPH_ARCH" in
- armv7*)
- ARCH_FLAGS="--without-fp" ;;
- esac
-
- # We override the PATH here to remove /tools/bin from it.
- # Thanks to this glibc finds bash in /bin/bash through the /bin
- # symlink. This is important because glibc changes the path to bash
- # of the shebang in some scripts and these scripts will be broken if
- # they point to bash in /tools/bin/bash.
- export PATH="/usr/bin:/sbin:/bin";
- export CFLAGS="-O2 $CFLAGS";
- cd o && ../configure \
- $ARCH_FLAGS \
- --prefix="$PREFIX" \
- --disable-profile \
- --enable-kernel=2.6.25 \
- --without-cvs \
- --without-selinux \
- --enable-obsolete-rpc
-
-build-commands:
-- cd o && make localtime=UTC
-
-install-commands:
-- cd o && make install_root="$DESTDIR" localtime=UTC install
-- mkdir -p "$DESTDIR/etc"
-- |
- cat <<EOF > nsswitch.conf
- passwd: compat
- group: compat
- shadow: compat
-
- hosts: files myhostname mdns4_minimal [NOTFOUND=return] dns mdns4
- networks: files
-
- protocols: db files
- services: db files
- ethers: db files
- rpc: db files
-
- netgroup: nis
- EOF
-- install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf"
diff --git a/strata/build-essential/linux-api-headers.def b/strata/build-essential/linux-api-headers.def
new file mode 100644
index 00000000..a852e6b4
--- /dev/null
+++ b/strata/build-essential/linux-api-headers.def
@@ -0,0 +1,5 @@
+name: linux-api-headers
+install-commands:
+- ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
+- install -d "$DESTDIR${PREFIX-/usr}/include"
+- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph
deleted file mode 100644
index e1ff2638..00000000
--- a/strata/build-essential/linux-api-headers.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: linux-api-headers
-kind: chunk
-install-commands:
-- ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/make.def b/strata/build-essential/make.def
new file mode 100644
index 00000000..fdb98974
--- /dev/null
+++ b/strata/build-essential/make.def
@@ -0,0 +1,4 @@
+name: make
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/make.morph b/strata/build-essential/make.morph
deleted file mode 100644
index 1259b342..00000000
--- a/strata/build-essential/make.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: make
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/stage1-binutils.def b/strata/build-essential/stage1-binutils.def
new file mode 100644
index 00000000..55417a9a
--- /dev/null
+++ b/strata/build-essential/stage1-binutils.def
@@ -0,0 +1,16 @@
+name: stage1-binutils
+build-system: autotools
+
+configure-commands:
+# We set the sysroot location dynamically at runtime by passing -B to GCC,
+# so we configure with sysroot=/. Setting the lib path is vital to avoid
+# the tools we build linking to the libraries on the host system; the '='
+# makes the path we give relative to the sysroot, which we can then set
+# at runtime by passing -Wl,--sysroot to GCC.
+
+- |
+ ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
+ --build=$(sh config.guess) \
+ --host=$(sh config.guess) \
+ --target=$TARGET_STAGE1 \
+ --with-sysroot="/" --with-lib-path="=$PREFIX/lib"
diff --git a/strata/build-essential/stage1-binutils.morph b/strata/build-essential/stage1-binutils.morph
deleted file mode 100644
index b6670d5c..00000000
--- a/strata/build-essential/stage1-binutils.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-name: stage1-binutils
-kind: chunk
-build-system: autotools
-
-configure-commands:
-# We set the sysroot location dynamically at runtime by passing -B to GCC,
-# so we configure with sysroot=/. Setting the lib path is vital to avoid
-# the tools we build linking to the libraries on the host system; the '='
-# makes the path we give relative to the sysroot, which we can then set
-# at runtime by passing -Wl,--sysroot to GCC.
-
-- |
- ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
- --build=$(sh config.guess) \
- --host=$(sh config.guess) \
- --target=$TARGET_STAGE1 \
- --with-sysroot="/" --with-lib-path="=$PREFIX/lib"
diff --git a/strata/build-essential/stage1-gcc.def b/strata/build-essential/stage1-gcc.def
new file mode 100644
index 00000000..63a61b81
--- /dev/null
+++ b/strata/build-essential/stage1-gcc.def
@@ -0,0 +1,47 @@
+name: stage1-gcc
+
+configure-commands:
+- mkdir o
+
+# Configure flag notes:
+# 1. Standard flags. See gcc.
+# 2. Disable searching /usr/local/include for headers
+# 3. The pass 1 compiler needs to find the libraries we build in pass 2.
+# Include path must be set explicility, because it defaults to
+# $SYSROOT/usr/include rather than $SYSROOT/include.
+# FIXME: this flag is not present until GCC 4.6.3!
+# 4. Disable stuff that doesn't work when building a cross compiler
+# without an existing libc, and generally try to keep this build as
+# simple as possible.
+- |
+ cd o &&
+ ../configure \
+ $(../morph-arch-config) \
+ --build=$(sh ../config.guess) --host=$(sh ../config.guess) \
+ --target=$TARGET_STAGE1 \
+ --prefix="$PREFIX" \
+ --disable-bootstrap --disable-nls \
+ `# [1]` --libdir="$PREFIX/lib" --disable-multilib --disable-libgomp \
+ --without-cloog --without-ppl \
+ --with-mpfr-include="$(pwd)/../mpfr/src" \
+ --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
+ `# [2]` --with-local-prefix="$PREFIX" \
+ `# [3]` --with-native-system-header-dir="$PREFIX/include" \
+ `# [4]` --enable-languages=c --disable-decimal-float \
+ --disable-libmudflap --disable-libquadmath --disable-libssp \
+ --disable-shared --disable-threads --disable-target-libiberty \
+ --disable-target-zlib --without-headers --with-newlib \
+ --with-system-zlib
+
+build-commands:
+- cd o && make
+
+install-commands:
+- cd o && make DESTDIR="$DESTDIR" install
+
+# The file libgcc_eh is required during eglibc's build, but is not created
+# because we built GCC with --disable-shared. This is a workaround for
+# eglibc's build system being slightly broken.
+- |
+ libgcc_filename=$($DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc -print-libgcc-file-name)
+ ln -sv libgcc.a $(echo $libgcc_filename | sed 's/libgcc/&_eh/')
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph
deleted file mode 100644
index 0cb03568..00000000
--- a/strata/build-essential/stage1-gcc.morph
+++ /dev/null
@@ -1,48 +0,0 @@
-name: stage1-gcc
-kind: chunk
-
-configure-commands:
-- mkdir o
-
-# Configure flag notes:
-# 1. Standard flags. See gcc.morph.
-# 2. Disable searching /usr/local/include for headers
-# 3. The pass 1 compiler needs to find the libraries we build in pass 2.
-# Include path must be set explicility, because it defaults to
-# $SYSROOT/usr/include rather than $SYSROOT/include.
-# FIXME: this flag is not present until GCC 4.6.3!
-# 4. Disable stuff that doesn't work when building a cross compiler
-# without an existing libc, and generally try to keep this build as
-# simple as possible.
-- |
- cd o &&
- ../configure \
- $(../morph-arch-config) \
- --build=$(sh ../config.guess) --host=$(sh ../config.guess) \
- --target=$TARGET_STAGE1 \
- --prefix="$PREFIX" \
- --disable-bootstrap --disable-nls \
- `# [1]` --libdir="$PREFIX/lib" --disable-multilib --disable-libgomp \
- --without-cloog --without-ppl \
- --with-mpfr-include="$(pwd)/../mpfr/src" \
- --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
- `# [2]` --with-local-prefix="$PREFIX" \
- `# [3]` --with-native-system-header-dir="$PREFIX/include" \
- `# [4]` --enable-languages=c --disable-decimal-float \
- --disable-libmudflap --disable-libquadmath --disable-libssp \
- --disable-shared --disable-threads --disable-target-libiberty \
- --disable-target-zlib --without-headers --with-newlib \
- --with-system-zlib
-
-build-commands:
-- cd o && make
-
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
-
-# The file libgcc_eh is required during eglibc's build, but is not created
-# because we built GCC with --disable-shared. This is a workaround for
-# eglibc's build system being slightly broken.
-- |
- libgcc_filename=$($DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc -print-libgcc-file-name)
- ln -sv libgcc.a $(echo $libgcc_filename | sed 's/libgcc/&_eh/')
diff --git a/strata/build-essential/stage2-binutils.def b/strata/build-essential/stage2-binutils.def
new file mode 100644
index 00000000..56f5056d
--- /dev/null
+++ b/strata/build-essential/stage2-binutils.def
@@ -0,0 +1,23 @@
+name: stage2-binutils
+build-system: autotools
+
+configure-commands:
+- |
+ export STAGE2_SYSROOT="$(dirname $(pwd))"
+ export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
+ export CXX=false
+ export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+ ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
+ --build=$(sh config.guess) \
+ --host=$TARGET_STAGE1 \
+ --target=$TARGET_STAGE1
+
+build-commands:
+# Nested configure scripts require that we set CPPFLAGS here as well
+# (I don't think we should have to .. . at least in GCC, I think
+# TARGET_CPPFLAGS may be the answer)
+- |
+ export STAGE2_SYSROOT="$(dirname $(pwd))"
+ export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
+ export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+ make
diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.morph
deleted file mode 100644
index bc0b18ac..00000000
--- a/strata/build-essential/stage2-binutils.morph
+++ /dev/null
@@ -1,24 +0,0 @@
-name: stage2-binutils
-kind: chunk
-build-system: autotools
-
-configure-commands:
-- |
- export STAGE2_SYSROOT="$(dirname $(pwd))"
- export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
- export CXX=false
- export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
- ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
- --build=$(sh config.guess) \
- --host=$TARGET_STAGE1 \
- --target=$TARGET_STAGE1
-
-build-commands:
-# Nested configure scripts require that we set CPPFLAGS here as well
-# (I don't think we should have to .. . at least in GCC, I think
-# TARGET_CPPFLAGS may be the answer)
-- |
- export STAGE2_SYSROOT="$(dirname $(pwd))"
- export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
- export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
- make
diff --git a/strata/build-essential/stage2-busybox.def b/strata/build-essential/stage2-busybox.def
new file mode 100644
index 00000000..da5e0a40
--- /dev/null
+++ b/strata/build-essential/stage2-busybox.def
@@ -0,0 +1,71 @@
+name: stage2-busybox
+
+configure-commands:
+# Explicitly setting HOSTCC is required because we have a 'gcc' earlier in
+# the PATH supplied by the stage2-gcc chunk, which can't execute outside of
+# the stage 3 staging area.
+- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- defconfig
+
+# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
+
+# We have GAWK.
+- sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
+
+# Depends on stuff that was removed since eglibc 2.14.
+- sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config
+
+# Busybox Patch is incompatible enough with GNU Patch that it can't be
+# used for GNULib projects built from Git.
+- sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config
+
+# None of this is needed because we have kmod; and it actually breaks the
+# Linux build because depmod isn't compatible enough with util-linux's.
+- sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config
+- sed -e 's/CONFIG_INSMOD=y.*/# CONFIG_INSMOD is not set/' -i .config
+- sed -e 's/CONFIG_MODPROBE=y.*/# CONFIG_MODPROBE is not set/' -i .config
+- sed -e 's/CONFIG_MODPROBE_SMALL=y.*/# CONFIG_MODPROBE_SMALL is not set/' -i .config
+- sed -e 's/CONFIG_LSMOD=y.*/# CONFIG_LSMOD is not set/' -i .config
+- sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
+
+# General features that we don't need.
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
+- sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
+- sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config
+- sed -e 's/CONFIG_INIT=y.*/# CONFIG_INIT is not set/' -i .config
+- sed -e 's/CONFIG_INIT_TERMINAL_TYPE=y.*/CONFIG_INIT_TERMINAL_TYPE=""/' -i .config
+- sed -e 's/CONFIG_LOSETUP=y.*/# CONFIG_LOSETUP is not set/' -i .config
+- sed -e 's/CONFIG_LSUSB=y.*/# CONFIG_LSUSB is not set/' -i .config
+- sed -e 's/CONFIG_LZMA=y.*/# CONFIG_LZMA is not set/' -i .config
+- sed -e 's/CONFIG_MKFS_EXT2=y.*/# CONFIG_MKFS_EXT2 is not set/' -i .config
+- sed -e 's/CONFIG_MKFS_MINIX=y.*/# CONFIG_MKFS_MINIX is not set/' -i .config
+- sed -e 's/CONFIG_RUNLEVEL=y.*/# CONFIG_RUNLEVEL is not set/' -i .config
+- sed -e 's/CONFIG_STRINGS=y.*/# CONFIG_STRINGS is not set/' -i .config
+- sed -e 's/CONFIG_UNLZMA=y.*/# CONFIG_UNLZMA is not set/' -i .config
+- sed -e 's/CONFIG_UNXZ=y.*/# CONFIG_UNXZ is not set/' -i .config
+- sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config
+
+build-commands:
+- |
+ export STAGE2_SYSROOT="$(dirname $(pwd))"
+ export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
+ export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+ make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1-
+
+install-commands:
+# We expect to be built with a non-standard prefix in stage 2 (i.e. not
+# /usr). The install will break if prefix is set to /usr.
+- |
+ export STAGE2_SYSROOT="$(dirname $(pwd))"
+ export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
+ export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+ make CONFIG_PREFIX="$DESTDIR$PREFIX" \
+ HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- install &&
+ chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph
deleted file mode 100644
index dc23d09b..00000000
--- a/strata/build-essential/stage2-busybox.morph
+++ /dev/null
@@ -1,72 +0,0 @@
-name: stage2-busybox
-kind: chunk
-
-configure-commands:
-# Explicitly setting HOSTCC is required because we have a 'gcc' earlier in
-# the PATH supplied by the stage2-gcc chunk, which can't execute outside of
-# the stage 3 staging area.
-- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- defconfig
-
-# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
-# We have GAWK.
-- sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
-
-# Depends on stuff that was removed since eglibc 2.14.
-- sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config
-
-# Busybox Patch is incompatible enough with GNU Patch that it can't be
-# used for GNULib projects built from Git.
-- sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config
-
-# None of this is needed because we have kmod; and it actually breaks the
-# Linux build because depmod isn't compatible enough with util-linux's.
-- sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config
-- sed -e 's/CONFIG_INSMOD=y.*/# CONFIG_INSMOD is not set/' -i .config
-- sed -e 's/CONFIG_MODPROBE=y.*/# CONFIG_MODPROBE is not set/' -i .config
-- sed -e 's/CONFIG_MODPROBE_SMALL=y.*/# CONFIG_MODPROBE_SMALL is not set/' -i .config
-- sed -e 's/CONFIG_LSMOD=y.*/# CONFIG_LSMOD is not set/' -i .config
-- sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
-
-# General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
-- sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
-- sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config
-- sed -e 's/CONFIG_INIT=y.*/# CONFIG_INIT is not set/' -i .config
-- sed -e 's/CONFIG_INIT_TERMINAL_TYPE=y.*/CONFIG_INIT_TERMINAL_TYPE=""/' -i .config
-- sed -e 's/CONFIG_LOSETUP=y.*/# CONFIG_LOSETUP is not set/' -i .config
-- sed -e 's/CONFIG_LSUSB=y.*/# CONFIG_LSUSB is not set/' -i .config
-- sed -e 's/CONFIG_LZMA=y.*/# CONFIG_LZMA is not set/' -i .config
-- sed -e 's/CONFIG_MKFS_EXT2=y.*/# CONFIG_MKFS_EXT2 is not set/' -i .config
-- sed -e 's/CONFIG_MKFS_MINIX=y.*/# CONFIG_MKFS_MINIX is not set/' -i .config
-- sed -e 's/CONFIG_RUNLEVEL=y.*/# CONFIG_RUNLEVEL is not set/' -i .config
-- sed -e 's/CONFIG_STRINGS=y.*/# CONFIG_STRINGS is not set/' -i .config
-- sed -e 's/CONFIG_UNLZMA=y.*/# CONFIG_UNLZMA is not set/' -i .config
-- sed -e 's/CONFIG_UNXZ=y.*/# CONFIG_UNXZ is not set/' -i .config
-- sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config
-
-build-commands:
-- |
- export STAGE2_SYSROOT="$(dirname $(pwd))"
- export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
- export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1-
-
-install-commands:
-# We expect to be built with a non-standard prefix in stage 2 (i.e. not
-# /usr). The install will break if prefix is set to /usr.
-- |
- export STAGE2_SYSROOT="$(dirname $(pwd))"
- export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
- export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
- make CONFIG_PREFIX="$DESTDIR$PREFIX" \
- HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- install &&
- chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
diff --git a/strata/build-essential/stage2-fake-bash.def b/strata/build-essential/stage2-fake-bash.def
new file mode 100644
index 00000000..7deb793b
--- /dev/null
+++ b/strata/build-essential/stage2-fake-bash.def
@@ -0,0 +1,3 @@
+name: stage2-fake-bash
+install-commands:
+- printf '#!/bin/sh\nexec /bin/sh "$@"\n' | install -D /proc/self/fd/0 -m 755 "$DESTDIR$PREFIX/bin/bash"
diff --git a/strata/build-essential/stage2-fake-bash.morph b/strata/build-essential/stage2-fake-bash.morph
deleted file mode 100644
index 021fd366..00000000
--- a/strata/build-essential/stage2-fake-bash.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: stage2-fake-bash
-kind: chunk
-install-commands:
-- printf '#!/bin/sh\nexec /bin/sh "$@"\n' | install -D /proc/self/fd/0 -m 755 "$DESTDIR$PREFIX/bin/bash"
diff --git a/strata/build-essential/stage2-fhs-dirs.def b/strata/build-essential/stage2-fhs-dirs.def
new file mode 100644
index 00000000..23f08826
--- /dev/null
+++ b/strata/build-essential/stage2-fhs-dirs.def
@@ -0,0 +1,51 @@
+name: stage2-fhs-dirs
+description: create the FHS 2.3 directory hierarchy and the usual files
+install-commands:
+- sh ./create-fhs-dirs "$DESTDIR"
+- rmdir "$DESTDIR/bin"
+- ln -s "$PREFIX/bin" "$DESTDIR/bin"
+- install -m 644 passwd "$DESTDIR/etc/passwd"
+- install -m 600 shadow "$DESTDIR/etc/shadow"
+- install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
+- install -m 644 group "$DESTDIR/etc/group"
+- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
+- install -m 644 issue "$DESTDIR/etc/issue"
+- install -m 644 services "$DESTDIR/etc/services"
+- install -m 644 protocols "$DESTDIR/etc/protocols"
+- echo baserock > "$DESTDIR"/etc/hostname
+devices:
+- type: c
+ filename: /dev/console
+ gid: 0
+ major: 5
+ minor: 1
+ permissions: '0600'
+ uid: 0
+- type: c
+ filename: /dev/full
+ gid: 0
+ major: 1
+ minor: 7
+ permissions: '0666'
+ uid: 0
+- type: c
+ filename: /dev/null
+ gid: 0
+ major: 1
+ minor: 3
+ permissions: '0666'
+ uid: 0
+- type: c
+ filename: /dev/urandom
+ gid: 0
+ major: 1
+ minor: 9
+ permissions: '0666'
+ uid: 0
+- type: c
+ filename: /dev/zero
+ gid: 0
+ major: 1
+ minor: 5
+ permissions: '0666'
+ uid: 0
diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph
deleted file mode 100644
index 14a6e253..00000000
--- a/strata/build-essential/stage2-fhs-dirs.morph
+++ /dev/null
@@ -1,52 +0,0 @@
-name: stage2-fhs-dirs
-kind: chunk
-description: create the FHS 2.3 directory hierarchy and the usual files
-install-commands:
-- sh ./create-fhs-dirs "$DESTDIR"
-- rmdir "$DESTDIR/bin"
-- ln -s "$PREFIX/bin" "$DESTDIR/bin"
-- install -m 644 passwd "$DESTDIR/etc/passwd"
-- install -m 600 shadow "$DESTDIR/etc/shadow"
-- install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
-- install -m 644 group "$DESTDIR/etc/group"
-- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
-- install -m 644 issue "$DESTDIR/etc/issue"
-- install -m 644 services "$DESTDIR/etc/services"
-- install -m 644 protocols "$DESTDIR/etc/protocols"
-- echo baserock > "$DESTDIR"/etc/hostname
-devices:
-- type: c
- filename: /dev/console
- gid: 0
- major: 5
- minor: 1
- permissions: '0600'
- uid: 0
-- type: c
- filename: /dev/full
- gid: 0
- major: 1
- minor: 7
- permissions: '0666'
- uid: 0
-- type: c
- filename: /dev/null
- gid: 0
- major: 1
- minor: 3
- permissions: '0666'
- uid: 0
-- type: c
- filename: /dev/urandom
- gid: 0
- major: 1
- minor: 9
- permissions: '0666'
- uid: 0
-- type: c
- filename: /dev/zero
- gid: 0
- major: 1
- minor: 5
- permissions: '0666'
- uid: 0
diff --git a/strata/build-essential/stage2-gawk.def b/strata/build-essential/stage2-gawk.def
new file mode 100644
index 00000000..5e21b421
--- /dev/null
+++ b/strata/build-essential/stage2-gawk.def
@@ -0,0 +1,8 @@
+name: stage2-gawk
+build-system: autotools
+configure-commands:
+- STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
+ LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
+ --build=$(sh config.guess) --host=$TARGET_STAGE1
+build-commands:
+- STAGE2_SYSROOT="$(dirname $(pwd))" make
diff --git a/strata/build-essential/stage2-gawk.morph b/strata/build-essential/stage2-gawk.morph
deleted file mode 100644
index f644d72b..00000000
--- a/strata/build-essential/stage2-gawk.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: stage2-gawk
-kind: chunk
-build-system: autotools
-configure-commands:
-- STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
- LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
- --build=$(sh config.guess) --host=$TARGET_STAGE1
-build-commands:
-- STAGE2_SYSROOT="$(dirname $(pwd))" make
diff --git a/strata/build-essential/stage2-gcc-fixed-headers.def b/strata/build-essential/stage2-gcc-fixed-headers.def
new file mode 100644
index 00000000..1c9e70e1
--- /dev/null
+++ b/strata/build-essential/stage2-gcc-fixed-headers.def
@@ -0,0 +1,18 @@
+name: stage2-gcc-fixed-headers
+install-commands:
+# Stage 1 GCC's fixincludes process created a limits.h before there was
+# a real limits.h available for the target. This step (taken from Linux
+# Linux From Scratch) creates a better one so that stage 2 GCC can compile.
+#
+# THIS IS A FRAGILE HACK! We need to replace the headers. The only way to
+# overwrite files in a staging area is to install a new chunk.
+# This is undesired behaviour in the long term, as we want to never
+# have overlaps, so this functionality may go away.
+- |
+ libgcc_dir=$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name))
+ sysroot="$(dirname "$(pwd)")"
+ target_libgcc_dir="${libgcc_dir#$sysroot}"
+ mkdir -p "$DESTDIR/$target_libgcc_dir/include-fixed"
+ cat "gcc/limitx.h" "gcc/glimits.h" "gcc/limity.h" \
+ >"$DESTDIR/$target_libgcc_dir/include-fixed/limits.h"
+
diff --git a/strata/build-essential/stage2-gcc-fixed-headers.morph b/strata/build-essential/stage2-gcc-fixed-headers.morph
deleted file mode 100644
index 10794872..00000000
--- a/strata/build-essential/stage2-gcc-fixed-headers.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-name: stage2-gcc-fixed-headers
-kind: chunk
-install-commands:
-# Stage 1 GCC's fixincludes process created a limits.h before there was
-# a real limits.h available for the target. This step (taken from Linux
-# Linux From Scratch) creates a better one so that stage 2 GCC can compile.
-#
-# THIS IS A FRAGILE HACK! We need to replace the headers. The only way to
-# overwrite files in a staging area is to install a new chunk.
-# This is undesired behaviour in the long term, as we want to never
-# have overlaps, so this functionality may go away.
-- |
- libgcc_dir=$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name))
- sysroot="$(dirname "$(pwd)")"
- target_libgcc_dir="${libgcc_dir#$sysroot}"
- mkdir -p "$DESTDIR/$target_libgcc_dir/include-fixed"
- cat "gcc/limitx.h" "gcc/glimits.h" "gcc/limity.h" \
- >"$DESTDIR/$target_libgcc_dir/include-fixed/limits.h"
-
diff --git a/strata/build-essential/stage2-gcc.def b/strata/build-essential/stage2-gcc.def
new file mode 100644
index 00000000..5c9b729a
--- /dev/null
+++ b/strata/build-essential/stage2-gcc.def
@@ -0,0 +1,67 @@
+name: stage2-gcc
+
+configure-commands:
+- mkdir o
+
+# In other projects we specify the sysroot location using CPPFLAGS. Here,
+# that breaks because GCC compiles stuff for the *build* machine, too ...
+# and this requires using the host's compiler, which cannot use the same
+# set of CPPFLAGS as the target. If we specify the sysroot using CC instead
+# then we don't interfere, because we are only specifying the *host* C
+# compiler.
+#
+# Configure flag notes:
+# 1. It's vital that this compiler targets the bootstrap machine
+# (TARGET_STAGE1) so that the stage 1 GCC is used instead of the
+# compiler of the build machine.
+# 2. Disable searching /usr/local/include for headers
+# 3. This flag causes the correct --sysroot flag to be passed when calling
+# stage 1 GCC.
+# 4. C++ is built in stage 3.
+# 5. Standard flags. See gcc.
+- |
+ export STAGE2_SYSROOT="$(dirname $(pwd))"
+ export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
+ export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+ cd o && ../configure \
+ $(../morph-arch-config) \
+ `# [1]` --build=$(sh ../config.guess) \
+ --host=$TARGET_STAGE1 \
+ --target=$TARGET_STAGE1 \
+ --prefix="$PREFIX" \
+ `# [2]` --with-local-prefix=$PREFIX \
+ `# [3]` --with-build-sysroot="$STAGE2_SYSROOT" \
+ --disable-bootstrap \
+ --enable-clocale=gnu --enable-shared --enable-threads=posix \
+ `# [4]` --enable-languages=c \
+ `# [5]` --libdir=$PREFIX/lib \
+ --disable-libgomp --disable-multilib --disable-nls \
+ --without-cloog --without-ppl \
+ --with-mpfr-include="$(pwd)/../mpfr/src" \
+ --with-mpfr-lib="$(pwd)/mpfr/src/.libs"
+
+build-commands:
+- |
+ export STAGE2_SYSROOT="$(dirname $(pwd))"
+ cd o && make
+
+install-commands:
+- cd o && make DESTDIR="$DESTDIR" install
+
+# Stage 3 builds need to link against this file in the location that
+# it will be in the final system, so we make a temporary link now.
+#
+# On x86_64 GCC resolutely installs its libraries into lib64. To fix this
+# would require hobbling the MULTILIB_OSDIRNAMES field in
+# gcc/config/i386/t-linux64 and this might break things, so for now we
+# tolerate the inconsistency.
+- |
+ if [ "$(echo $TARGET | cut -c -6)" = "x86_64" ]; then
+ libdir=lib64
+ else
+ libdir=lib
+ fi
+
+ install -d "$DESTDIR/lib"
+ ln -s "$PREFIX/$libdir/libgcc_s.so" "$DESTDIR/lib/"
+ ln -s "$PREFIX/$libdir/libgcc_s.so.1" "$DESTDIR/lib/"
diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.morph
deleted file mode 100644
index bf6378c1..00000000
--- a/strata/build-essential/stage2-gcc.morph
+++ /dev/null
@@ -1,68 +0,0 @@
-name: stage2-gcc
-kind: chunk
-
-configure-commands:
-- mkdir o
-
-# In other projects we specify the sysroot location using CPPFLAGS. Here,
-# that breaks because GCC compiles stuff for the *build* machine, too ...
-# and this requires using the host's compiler, which cannot use the same
-# set of CPPFLAGS as the target. If we specify the sysroot using CC instead
-# then we don't interfere, because we are only specifying the *host* C
-# compiler.
-#
-# Configure flag notes:
-# 1. It's vital that this compiler targets the bootstrap machine
-# (TARGET_STAGE1) so that the stage 1 GCC is used instead of the
-# compiler of the build machine.
-# 2. Disable searching /usr/local/include for headers
-# 3. This flag causes the correct --sysroot flag to be passed when calling
-# stage 1 GCC.
-# 4. C++ is built in stage 3.
-# 5. Standard flags. See gcc.morph.
-- |
- export STAGE2_SYSROOT="$(dirname $(pwd))"
- export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
- export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
- cd o && ../configure \
- $(../morph-arch-config) \
- `# [1]` --build=$(sh ../config.guess) \
- --host=$TARGET_STAGE1 \
- --target=$TARGET_STAGE1 \
- --prefix="$PREFIX" \
- `# [2]` --with-local-prefix=$PREFIX \
- `# [3]` --with-build-sysroot="$STAGE2_SYSROOT" \
- --disable-bootstrap \
- --enable-clocale=gnu --enable-shared --enable-threads=posix \
- `# [4]` --enable-languages=c \
- `# [5]` --libdir=$PREFIX/lib \
- --disable-libgomp --disable-multilib --disable-nls \
- --without-cloog --without-ppl \
- --with-mpfr-include="$(pwd)/../mpfr/src" \
- --with-mpfr-lib="$(pwd)/mpfr/src/.libs"
-
-build-commands:
-- |
- export STAGE2_SYSROOT="$(dirname $(pwd))"
- cd o && make
-
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
-
-# Stage 3 builds need to link against this file in the location that
-# it will be in the final system, so we make a temporary link now.
-#
-# On x86_64 GCC resolutely installs its libraries into lib64. To fix this
-# would require hobbling the MULTILIB_OSDIRNAMES field in
-# gcc/config/i386/t-linux64 and this might break things, so for now we
-# tolerate the inconsistency.
-- |
- if [ "$(echo $TARGET | cut -c -6)" = "x86_64" ]; then
- libdir=lib64
- else
- libdir=lib
- fi
-
- install -d "$DESTDIR/lib"
- ln -s "$PREFIX/$libdir/libgcc_s.so" "$DESTDIR/lib/"
- ln -s "$PREFIX/$libdir/libgcc_s.so.1" "$DESTDIR/lib/"
diff --git a/strata/build-essential/stage2-glibc.def b/strata/build-essential/stage2-glibc.def
new file mode 100644
index 00000000..5ba67410
--- /dev/null
+++ b/strata/build-essential/stage2-glibc.def
@@ -0,0 +1,56 @@
+name: stage2-glibc
+
+configure-commands:
+- mkdir o
+
+# Configure flag notes:
+# 1. Avoid installing to PREFIX/lib64 on x86_64.
+# 2. Location of linux-api-headers.
+# 3. Normal flags. See glibc.
+# 4. Force configuration values of certain things that can't be detected
+# in a cross-compile.
+- |
+ case "$MORPH_ARCH" in
+ armv7*)
+ ARCH_FLAGS="--without-fp" ;;
+ esac
+
+ export CFLAGS="-O2 $CFLAGS"; export CXX=false; \
+ cd o && ../configure \
+ $ARCH_FLAGS \
+ --build=$(../scripts/config.guess) --host=$TARGET_STAGE1 \
+ --prefix="$PREFIX" \
+ `# [1]` --libdir="$PREFIX/lib" \
+ `# [2]` --with-headers="$(pwd)/../../$PREFIX/include" \
+ `# [3]` --disable-profile --enable-kernel=2.6.25 \
+ `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \
+ libc_cv_forced_unwind=yes libc_cv_ssp=no
+
+build-commands:
+- cd o && make localtime=UTC
+
+install-commands:
+- cd o && make install_root="$DESTDIR" localtime=UTC install
+- sh stage2-glibc-fix-specs
+
+# Install a symlink for the program interpreter (ld.so) so that binaries
+# built in stage 3 before the stage 3 glibc is built can use it.
+# FIXME: get a better way of finding the name of the loader. The lib64
+# path is hardcoded into glibc in the file
+# sysdeps/unix/sysv/linux/configure.
+- install -d $DESTDIR/lib
+- |
+ cpu=$(echo $TARGET | cut -d '-' -f 1)
+ case "$cpu" in
+ x86_64)
+ install -d "$DESTDIR/lib64"
+ ln -s "$PREFIX/lib/ld-linux-x86-64.so.2" \
+ "$DESTDIR/lib64/ld-linux-x86-64.so.2" ;;
+ ppc64)
+ install -d "$DESTDIR/lib64"
+ ln -s "$PREFIX/lib/ld64.so.1" \
+ "$DESTDIR/lib64/ld64.so.1" ;;
+ *)
+ loader=$(basename $(ls "$DESTDIR$PREFIX"/lib/ld-linux*))
+ ln -s "$PREFIX/lib/$loader" "$DESTDIR/lib/$loader"
+ esac
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
deleted file mode 100644
index ffa0970b..00000000
--- a/strata/build-essential/stage2-glibc.morph
+++ /dev/null
@@ -1,57 +0,0 @@
-name: stage2-glibc
-kind: chunk
-
-configure-commands:
-- mkdir o
-
-# Configure flag notes:
-# 1. Avoid installing to PREFIX/lib64 on x86_64.
-# 2. Location of linux-api-headers.
-# 3. Normal flags. See glibc.morph.
-# 4. Force configuration values of certain things that can't be detected
-# in a cross-compile.
-- |
- case "$MORPH_ARCH" in
- armv7*)
- ARCH_FLAGS="--without-fp" ;;
- esac
-
- export CFLAGS="-O2 $CFLAGS"; export CXX=false; \
- cd o && ../configure \
- $ARCH_FLAGS \
- --build=$(../scripts/config.guess) --host=$TARGET_STAGE1 \
- --prefix="$PREFIX" \
- `# [1]` --libdir="$PREFIX/lib" \
- `# [2]` --with-headers="$(pwd)/../../$PREFIX/include" \
- `# [3]` --disable-profile --enable-kernel=2.6.25 \
- `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \
- libc_cv_forced_unwind=yes libc_cv_ssp=no
-
-build-commands:
-- cd o && make localtime=UTC
-
-install-commands:
-- cd o && make install_root="$DESTDIR" localtime=UTC install
-- sh stage2-glibc-fix-specs
-
-# Install a symlink for the program interpreter (ld.so) so that binaries
-# built in stage 3 before the stage 3 glibc is built can use it.
-# FIXME: get a better way of finding the name of the loader. The lib64
-# path is hardcoded into glibc in the file
-# sysdeps/unix/sysv/linux/configure.
-- install -d $DESTDIR/lib
-- |
- cpu=$(echo $TARGET | cut -d '-' -f 1)
- case "$cpu" in
- x86_64)
- install -d "$DESTDIR/lib64"
- ln -s "$PREFIX/lib/ld-linux-x86-64.so.2" \
- "$DESTDIR/lib64/ld-linux-x86-64.so.2" ;;
- ppc64)
- install -d "$DESTDIR/lib64"
- ln -s "$PREFIX/lib/ld64.so.1" \
- "$DESTDIR/lib64/ld64.so.1" ;;
- *)
- loader=$(basename $(ls "$DESTDIR$PREFIX"/lib/ld-linux*))
- ln -s "$PREFIX/lib/$loader" "$DESTDIR/lib/$loader"
- esac
diff --git a/strata/build-essential/stage2-linux-api-headers.def b/strata/build-essential/stage2-linux-api-headers.def
new file mode 100644
index 00000000..0742c930
--- /dev/null
+++ b/strata/build-essential/stage2-linux-api-headers.def
@@ -0,0 +1,7 @@
+name: stage2-linux-api-headers
+install-commands:
+- |
+ export ARCH=$(./morph-arch)
+ make INSTALL_HDR_PATH=dest headers_install
+- install -d "$DESTDIR${PREFIX-/usr}/include"
+- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph
deleted file mode 100644
index 5cbf2f05..00000000
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: stage2-linux-api-headers
-kind: chunk
-install-commands:
-- |
- export ARCH=$(./morph-arch)
- make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/stage2-make.def b/strata/build-essential/stage2-make.def
new file mode 100644
index 00000000..4eaf86ae
--- /dev/null
+++ b/strata/build-essential/stage2-make.def
@@ -0,0 +1,8 @@
+name: stage2-make
+build-system: autotools
+configure-commands:
+- STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
+ LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
+ --build=$(sh config/config.guess) --host=$TARGET_STAGE1
+build-commands:
+- STAGE2_SYSROOT="$(dirname $(pwd))" make
diff --git a/strata/build-essential/stage2-make.morph b/strata/build-essential/stage2-make.morph
deleted file mode 100644
index d3c8bf22..00000000
--- a/strata/build-essential/stage2-make.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: stage2-make
-kind: chunk
-build-system: autotools
-configure-commands:
-- STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
- LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
- --build=$(sh config/config.guess) --host=$TARGET_STAGE1
-build-commands:
-- STAGE2_SYSROOT="$(dirname $(pwd))" make
diff --git a/strata/build-essential/stage2-reset-specs.def b/strata/build-essential/stage2-reset-specs.def
new file mode 100644
index 00000000..ab933f60
--- /dev/null
+++ b/strata/build-essential/stage2-reset-specs.def
@@ -0,0 +1,20 @@
+name: stage2-reset-specs
+
+# Nasty hack to get around being unable to reliably add configuration to gcc,
+# hence the gcc specs are modified, combined with Baserock's rootfs protection
+# preventing specs being modified before builds.
+# The limitation is overcome by installing files as part of a chunk, which
+# overwrites previous files.
+# New specs were added for the bootstrap builds, but after stage2 we start
+# having chrooted builds, so the old specs need to be replaced.
+# Unfortunately we can't just replace the specs with the ones gcc produces,
+# since gcc behaves differently without specs to with specs it produces!
+# So we use a **NASTY HACK** to replace the specs symlink with one that
+# points to a file that doesn't exist.
+install-commands:
+- |
+ STAGE2_SYSROOT="$(dirname "$(pwd)")"
+ specs_dir="$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name))"
+ target_specs_dir="$DESTDIR/${specs_dir#$STAGE2_SYSROOT}"
+ mkdir -p "$target_specs_dir"
+ ln -s "temporary specs removed by baserock bootstrap" "$target_specs_dir/specs"
diff --git a/strata/build-essential/stage2-reset-specs.morph b/strata/build-essential/stage2-reset-specs.morph
deleted file mode 100644
index 8892f67c..00000000
--- a/strata/build-essential/stage2-reset-specs.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: stage2-reset-specs
-kind: chunk
-
-# Nasty hack to get around being unable to reliably add configuration to gcc,
-# hence the gcc specs are modified, combined with Baserock's rootfs protection
-# preventing specs being modified before builds.
-# The limitation is overcome by installing files as part of a chunk, which
-# overwrites previous files.
-# New specs were added for the bootstrap builds, but after stage2 we start
-# having chrooted builds, so the old specs need to be replaced.
-# Unfortunately we can't just replace the specs with the ones gcc produces,
-# since gcc behaves differently without specs to with specs it produces!
-# So we use a **NASTY HACK** to replace the specs symlink with one that
-# points to a file that doesn't exist.
-install-commands:
-- |
- STAGE2_SYSROOT="$(dirname "$(pwd)")"
- specs_dir="$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name))"
- target_specs_dir="$DESTDIR/${specs_dir#$STAGE2_SYSROOT}"
- mkdir -p "$target_specs_dir"
- ln -s "temporary specs removed by baserock bootstrap" "$target_specs_dir/specs"
diff --git a/strata/build-essential/zlib.def b/strata/build-essential/zlib.def
new file mode 100644
index 00000000..730688b1
--- /dev/null
+++ b/strata/build-essential/zlib.def
@@ -0,0 +1,8 @@
+name: zlib
+max-jobs: 1
+configure-commands:
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/build-essential/zlib.morph b/strata/build-essential/zlib.morph
deleted file mode 100644
index a69eebf3..00000000
--- a/strata/build-essential/zlib.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: zlib
-kind: chunk
-max-jobs: 1
-configure-commands:
-- ./configure --prefix="$PREFIX"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/ceph-service.def b/strata/ceph-service.def
new file mode 100644
index 00000000..2e4f80e7
--- /dev/null
+++ b/strata/ceph-service.def
@@ -0,0 +1,53 @@
+name: ceph-service
+build-depends:
+- name: foundation
+- name: network-security
+contents:
+- name: libaio
+ repo: upstream:libaio
+ ref: 262e589ea4ac3d1ff809648c8f2caa3836e69b25
+ unpetrify-ref: baserock/morph
+- name: keyutils
+ repo: upstream:keyutils
+ ref: 116417bce1e1df06a918de5e9e63f6ba88e2f4f5
+ unpetrify-ref: baserock/morph
+- name: libunwind
+ repo: upstream:libunwind
+ ref: 4b8404d153c58b95cb4420fc7603fdae62489a31
+ unpetrify-ref: v0.99
+- name: gperftools
+ repo: upstream:gperftools
+ ref: 2a2d6596f8c3d62b7ec444761f4edf0c85d10d92
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libunwind
+- name: snappy
+ repo: upstream:snappy
+ ref: 760c6ffc67836027c5f1d307e5c6cb012dfbdf72
+ unpetrify-ref: baserock/morph
+- name: leveldb
+ repo: upstream:leveldb
+ ref: 0f0ed46e70967365c851243663689e156fe1b7b5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - snappy
+ - gperftools
+- name: libeditline
+ repo: upstream:libeditline-tarball
+ ref: 7503ff5f8610734521f40e276b59b3b6291830e7
+ unpetrify-ref: baserock/morph
+- name: boost
+ repo: upstream:boost-tarball
+ ref: 026fc3d84a27e84a61d0f4c26f011a68271a0d6e
+ unpetrify-ref: baserock/markdoffman/morph
+- name: ceph
+ repo: upstream:ceph
+ ref: 8fdf1df512b73bad0eb695cdf9cbf2d09f0327d4
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libaio
+ - gperftools
+ - leveldb
+ - libeditline
+ - keyutils
+ - boost
diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph
deleted file mode 100644
index 25d6712d..00000000
--- a/strata/ceph-service.morph
+++ /dev/null
@@ -1,65 +0,0 @@
-name: ceph-service
-kind: stratum
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/network-security.morph
-chunks:
-- name: libaio
- morph: strata/ceph-service/libaio.morph
- repo: upstream:libaio
- ref: 262e589ea4ac3d1ff809648c8f2caa3836e69b25
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: keyutils
- morph: strata/ceph-service/keyutils.morph
- repo: upstream:keyutils
- ref: 116417bce1e1df06a918de5e9e63f6ba88e2f4f5
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libunwind
- repo: upstream:libunwind
- ref: 4b8404d153c58b95cb4420fc7603fdae62489a31
- unpetrify-ref: v0.99
- build-depends: []
-- name: gperftools
- repo: upstream:gperftools
- ref: 2a2d6596f8c3d62b7ec444761f4edf0c85d10d92
- unpetrify-ref: baserock/morph
- build-depends:
- - libunwind
-- name: snappy
- repo: upstream:snappy
- ref: 760c6ffc67836027c5f1d307e5c6cb012dfbdf72
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: leveldb
- morph: strata/ceph-service/leveldb.morph
- repo: upstream:leveldb
- ref: 0f0ed46e70967365c851243663689e156fe1b7b5
- unpetrify-ref: baserock/morph
- build-depends:
- - snappy
- - gperftools
-- name: libeditline
- repo: upstream:libeditline-tarball
- ref: 7503ff5f8610734521f40e276b59b3b6291830e7
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: boost
- morph: strata/ceph-service/boost.morph
- repo: upstream:boost-tarball
- ref: 026fc3d84a27e84a61d0f4c26f011a68271a0d6e
- unpetrify-ref: baserock/markdoffman/morph
- build-depends: []
-- name: ceph
- morph: strata/ceph-service/ceph.morph
- repo: upstream:ceph
- ref: 8fdf1df512b73bad0eb695cdf9cbf2d09f0327d4
- unpetrify-ref: baserock/morph
- build-depends:
- - libaio
- - gperftools
- - leveldb
- - libeditline
- - keyutils
- - boost
diff --git a/strata/ceph-service/boost.def b/strata/ceph-service/boost.def
new file mode 100644
index 00000000..0410ded1
--- /dev/null
+++ b/strata/ceph-service/boost.def
@@ -0,0 +1,7 @@
+name: boost
+configure-commands:
+- ./bootstrap.sh
+build-commands:
+- ./b2 || true
+install-commands:
+- ./b2 install --prefix=$DESTDIR$PREFIX || true
diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph
deleted file mode 100644
index 7c3e6cff..00000000
--- a/strata/ceph-service/boost.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: boost
-kind: chunk
-configure-commands:
-- ./bootstrap.sh
-build-commands:
-- ./b2 || true
-install-commands:
-- ./b2 install --prefix=$DESTDIR$PREFIX || true
diff --git a/strata/ceph-service/ceph.def b/strata/ceph-service/ceph.def
new file mode 100644
index 00000000..1e05042a
--- /dev/null
+++ b/strata/ceph-service/ceph.def
@@ -0,0 +1,17 @@
+name: ceph
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops
+install-commands:
+- make install
+- install -D -m 755 src/init-ceph $DESTDIR/etc/init.d/ceph
+- install -d $DESTDIR/etc/ceph
+- install -D -d $DESTDIR/var/lib/ceph
+- install -d $DESTDIR/var/lib/ceph/mon
+- install -d $DESTDIR/var/lib/ceph/osd
+- install -d $DESTDIR/var/lib/ceph/mds
+- install -d $DESTDIR/var/lib/ceph/tmp
+- install -d $DESTDIR/var/lib/ceph/bootstrap-mds
+- install -d $DESTDIR/var/lib/ceph/bootstrap-osd
+- install -D -d $DESTDIR/var/log/ceph
diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph
deleted file mode 100644
index 5ad0d812..00000000
--- a/strata/ceph-service/ceph.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: ceph
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops
-install-commands:
-- make install
-- install -D -m 755 src/init-ceph $DESTDIR/etc/init.d/ceph
-- install -d $DESTDIR/etc/ceph
-- install -D -d $DESTDIR/var/lib/ceph
-- install -d $DESTDIR/var/lib/ceph/mon
-- install -d $DESTDIR/var/lib/ceph/osd
-- install -d $DESTDIR/var/lib/ceph/mds
-- install -d $DESTDIR/var/lib/ceph/tmp
-- install -d $DESTDIR/var/lib/ceph/bootstrap-mds
-- install -d $DESTDIR/var/lib/ceph/bootstrap-osd
-- install -D -d $DESTDIR/var/log/ceph
diff --git a/strata/ceph-service/keyutils.def b/strata/ceph-service/keyutils.def
new file mode 100644
index 00000000..c185b1a4
--- /dev/null
+++ b/strata/ceph-service/keyutils.def
@@ -0,0 +1,6 @@
+name: keyutils
+build-commands:
+- make clean
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" LIBDIR="$PREFIX/lib" USRLIBDIR="$PREFIX/lib" install
diff --git a/strata/ceph-service/keyutils.morph b/strata/ceph-service/keyutils.morph
deleted file mode 100644
index 4d47e265..00000000
--- a/strata/ceph-service/keyutils.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: keyutils
-kind: chunk
-build-commands:
-- make clean
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" LIBDIR="$PREFIX/lib" USRLIBDIR="$PREFIX/lib" install
diff --git a/strata/ceph-service/leveldb.def b/strata/ceph-service/leveldb.def
new file mode 100644
index 00000000..eae045a6
--- /dev/null
+++ b/strata/ceph-service/leveldb.def
@@ -0,0 +1,5 @@
+name: leveldb
+build-commands:
+- make
+install-commands:
+- ./install.sh
diff --git a/strata/ceph-service/leveldb.morph b/strata/ceph-service/leveldb.morph
deleted file mode 100644
index 1385897c..00000000
--- a/strata/ceph-service/leveldb.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: leveldb
-kind: chunk
-build-commands:
-- make
-install-commands:
-- ./install.sh
diff --git a/strata/ceph-service/libaio.def b/strata/ceph-service/libaio.def
new file mode 100644
index 00000000..b51f8480
--- /dev/null
+++ b/strata/ceph-service/libaio.def
@@ -0,0 +1,6 @@
+name: libaio
+build-commands:
+- make clean
+- make
+install-commands:
+- make prefix="$DESTDIR$PREFIX" install
diff --git a/strata/ceph-service/libaio.morph b/strata/ceph-service/libaio.morph
deleted file mode 100644
index 62c24d37..00000000
--- a/strata/ceph-service/libaio.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: libaio
-kind: chunk
-build-commands:
-- make clean
-- make
-install-commands:
-- make prefix="$DESTDIR$PREFIX" install
diff --git a/strata/cloudinit-support.def b/strata/cloudinit-support.def
new file mode 100644
index 00000000..ef80f98a
--- /dev/null
+++ b/strata/cloudinit-support.def
@@ -0,0 +1,48 @@
+name: cloudinit-support
+description: A stratum with cloudinit to fit a system in the OpenStack cloud.
+build-depends:
+- name: build-essential
+- name: core
+- name: foundation
+contents:
+- name: configobj
+ repo: upstream:configobj
+ ref: 935a78736e4eb43b9fafae87f5e9902328673f63
+ unpetrify-ref: baserock/morph
+- name: python-requests
+ repo: upstream:python-requests
+ ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
+ unpetrify-ref: baserock/morph
+- name: python-prettytable
+ repo: upstream:python-prettytable
+ ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
+ unpetrify-ref: baserock/morph
+- name: python-json-patch
+ repo: upstream:python-json-patch
+ ref: 27c7032de25923593fa17cc14f535fb7abd52448
+ unpetrify-ref: baserock/morph
+- name: python-json-pointer
+ repo: upstream:python-json-pointer
+ ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-json-patch
+- name: python-cheetah
+ repo: upstream:python-cheetah
+ ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed
+ unpetrify-ref: baserock/morph
+- name: boto
+ repo: upstream:boto
+ ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf
+ unpetrify-ref: baserock/morph
+- name: cloud-init
+ repo: upstream:cloud-init
+ ref: 130d51acc5b0becd64e7007f9dfe41a6e022eaec
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - boto
+ - configobj
+ - python-requests
+ - python-prettytable
+ - python-json-pointer
+ - python-cheetah
diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph
deleted file mode 100644
index 399df685..00000000
--- a/strata/cloudinit-support.morph
+++ /dev/null
@@ -1,57 +0,0 @@
-name: cloudinit-support
-kind: stratum
-description: A stratum with cloudinit to fit a system in the OpenStack cloud.
-build-depends:
-- morph: strata/build-essential.morph
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-chunks:
-- name: configobj
- repo: upstream:configobj
- ref: 935a78736e4eb43b9fafae87f5e9902328673f63
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-requests
- repo: upstream:python-requests
- ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-prettytable
- morph: strata/cloudinit-support/python-prettytable.morph
- repo: upstream:python-prettytable
- ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-json-patch
- repo: upstream:python-json-patch
- ref: 27c7032de25923593fa17cc14f535fb7abd52448
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-json-pointer
- repo: upstream:python-json-pointer
- ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53
- unpetrify-ref: baserock/morph
- build-depends:
- - python-json-patch
-- name: python-cheetah
- repo: upstream:python-cheetah
- ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: boto
- repo: upstream:boto
- ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cloud-init
- morph: strata/cloudinit-support/cloud-init.morph
- repo: upstream:cloud-init
- ref: 130d51acc5b0becd64e7007f9dfe41a6e022eaec
- unpetrify-ref: baserock/morph
- build-depends:
- - boto
- - configobj
- - python-requests
- - python-prettytable
- - python-json-pointer
- - python-cheetah
diff --git a/strata/cloudinit-support/cloud-init.def b/strata/cloudinit-support/cloud-init.def
new file mode 100644
index 00000000..d131f6d1
--- /dev/null
+++ b/strata/cloudinit-support/cloud-init.def
@@ -0,0 +1,5 @@
+name: cloud-init
+build-system: python-distutils
+post-install-commands:
+- mkdir -p "$DESTDIR"/lib/systemd/system
+- cp systemd/* "$DESTDIR"/lib/systemd/system/
diff --git a/strata/cloudinit-support/cloud-init.morph b/strata/cloudinit-support/cloud-init.morph
deleted file mode 100644
index 5933dbf8..00000000
--- a/strata/cloudinit-support/cloud-init.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: cloud-init
-kind: chunk
-build-system: python-distutils
-post-install-commands:
-- mkdir -p "$DESTDIR"/lib/systemd/system
-- cp systemd/* "$DESTDIR"/lib/systemd/system/
diff --git a/strata/cloudinit-support/python-prettytable.def b/strata/cloudinit-support/python-prettytable.def
new file mode 100644
index 00000000..35620ff0
--- /dev/null
+++ b/strata/cloudinit-support/python-prettytable.def
@@ -0,0 +1,5 @@
+name: python-prettytable
+build-commands:
+- cd src && python setup.py build
+install-commands:
+- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/cloudinit-support/python-prettytable.morph b/strata/cloudinit-support/python-prettytable.morph
deleted file mode 100644
index cf1ac6e1..00000000
--- a/strata/cloudinit-support/python-prettytable.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-prettytable
-kind: chunk
-build-commands:
-- cd src && python setup.py build
-install-commands:
-- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/connectivity.def b/strata/connectivity.def
new file mode 100644
index 00000000..aaf53421
--- /dev/null
+++ b/strata/connectivity.def
@@ -0,0 +1,18 @@
+name: connectivity
+build-depends:
+- name: foundation
+contents:
+- name: libnl
+ repo: upstream:libnl
+ ref: a2c4bd8f094a7247903578860a9c42049991860b
+ unpetrify-ref: baserock/morph
+- name: wpa_supplicant
+ repo: upstream:hostap
+ ref: 1cdfb99c3a04235697dc6979b9eb5418861e42f8
+ unpetrify-ref: baserock/genivi/morph
+ build-depends:
+ - libnl
+- name: iptables
+ repo: upstream:iptables
+ ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
+ unpetrify-ref: baserock/morph
diff --git a/strata/connectivity.morph b/strata/connectivity.morph
deleted file mode 100644
index a8697f3a..00000000
--- a/strata/connectivity.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-name: connectivity
-kind: stratum
-build-depends:
-- morph: strata/foundation.morph
-chunks:
-- name: libnl
- repo: upstream:libnl
- ref: a2c4bd8f094a7247903578860a9c42049991860b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: wpa_supplicant
- morph: strata/connectivity/wpa_supplicant.morph
- repo: upstream:hostap
- ref: 1cdfb99c3a04235697dc6979b9eb5418861e42f8
- unpetrify-ref: baserock/genivi/morph
- build-depends:
- - libnl
-- name: iptables
- repo: upstream:iptables
- ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/connectivity/wpa_supplicant.def b/strata/connectivity/wpa_supplicant.def
new file mode 100644
index 00000000..74ebea78
--- /dev/null
+++ b/strata/connectivity/wpa_supplicant.def
@@ -0,0 +1,7 @@
+name: wpa_supplicant
+configure-commands:
+- sed -i 's/^CONFIG_READLINE=y$//' wpa_supplicant/.config
+build-commands:
+- make -C wpa_supplicant
+install-commands:
+- make -C wpa_supplicant DESTDIR="$DESTDIR" install
diff --git a/strata/connectivity/wpa_supplicant.morph b/strata/connectivity/wpa_supplicant.morph
deleted file mode 100644
index 86a51608..00000000
--- a/strata/connectivity/wpa_supplicant.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: wpa_supplicant
-kind: chunk
-configure-commands:
-- sed -i 's/^CONFIG_READLINE=y$//' wpa_supplicant/.config
-build-commands:
-- make -C wpa_supplicant
-install-commands:
-- make -C wpa_supplicant DESTDIR="$DESTDIR" install
diff --git a/strata/connman-common.def b/strata/connman-common.def
new file mode 100644
index 00000000..a5f8e51e
--- /dev/null
+++ b/strata/connman-common.def
@@ -0,0 +1,8 @@
+name: connman-common
+build-depends:
+- name: connectivity
+contents:
+- name: connman
+ repo: upstream:connman
+ ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
+ unpetrify-ref: baserock/1.24
diff --git a/strata/connman-common.morph b/strata/connman-common.morph
deleted file mode 100644
index f6f7ddb0..00000000
--- a/strata/connman-common.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: connman-common
-kind: stratum
-build-depends:
-- morph: strata/connectivity.morph
-chunks:
-- name: connman
- morph: strata/connman-common/connman.morph
- repo: upstream:connman
- ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
- unpetrify-ref: baserock/1.24
- build-depends: []
diff --git a/strata/connman-common/connman.def b/strata/connman-common/connman.def
new file mode 100644
index 00000000..867659b8
--- /dev/null
+++ b/strata/connman-common/connman.def
@@ -0,0 +1,5 @@
+name: connman
+build-system: autotools
+configure-commands:
+- ./bootstrap
+- ./configure --prefix="$PREFIX" --disable-wispr --disable-client LIBS=-lncurses
diff --git a/strata/connman-common/connman.morph b/strata/connman-common/connman.morph
deleted file mode 100644
index e468bc49..00000000
--- a/strata/connman-common/connman.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: connman
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./bootstrap
-- ./configure --prefix="$PREFIX" --disable-wispr --disable-client LIBS=-lncurses
diff --git a/strata/core.def b/strata/core.def
new file mode 100644
index 00000000..016b96fe
--- /dev/null
+++ b/strata/core.def
@@ -0,0 +1,269 @@
+name: core
+description: Core components of a Baserock base system that are build tools required
+ for the BSP and Foundation strata, but a step above build-essential
+build-depends:
+- name: build-essential
+contents:
+- name: sqlite3
+ repo: upstream:sqlite3
+ ref: f6c2a9fe49d20654c2c41844d056033692a223b7
+ unpetrify-ref: baserock/morph
+- name: cmake
+ repo: upstream:cmake
+ ref: 0b3781e4c497566acaa504d4106d11c02a642501
+ unpetrify-ref: v2.8.12.2
+- name: gdbm
+ repo: upstream:gdbm
+ ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c
+ unpetrify-ref: baserock/build-essential
+- name: gettext
+ repo: upstream:gettext
+ ref: 3898e324f07c05404b63d71f0e519f352fb1e072
+ unpetrify-ref: baserock/build-essential
+- name: m4
+ repo: upstream:m4
+ ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db
+ unpetrify-ref: baserock/build-essential
+- name: mini-utils
+ repo: baserock:baserock/mini-utils
+ ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8
+ unpetrify-ref: master
+- name: ncurses
+ repo: upstream:ncurses
+ ref: 0fe89dc66ec061b839bea3ab451207e2dee757b9
+ unpetrify-ref: baserock/morph
+- name: perl
+ repo: upstream:perl
+ ref: 78f9a3c880f11578fb9ff9c7d5f7e34b602d2ad1
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - gdbm
+- name: pkg-config
+ repo: upstream:pkg-config
+ ref: 67a702a15cf88e270539484929ffa1f42b90c728
+ unpetrify-ref: baserock/build-essential
+- name: texinfo-tarball
+ repo: upstream:texinfo-tarball
+ ref: 4843a7f5ff14ac802a56f1cdd49960b25c15702b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - ncurses
+- name: autoconf
+ repo: upstream:autoconf
+ ref: cffdb90be331111ce3fbe4a32320181ec2b92652
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - m4
+ - perl
+- name: automake
+ repo: upstream:automake
+ ref: ba4b42faff673e3e5265416dff09e59affc688fb
+ unpetrify-ref: v1.14.1
+ build-depends:
+ - autoconf
+ - perl
+ - texinfo-tarball
+- name: bash
+ repo: upstream:bash
+ ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
+ unpetrify-ref: baserock/bash-4.3-patch-27
+- name: error-perl-tarball
+ repo: upstream:error-perl-tarball
+ ref: 661707e7bd4282aeab5a2f6a8f02ca5731fd813f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - perl
+- name: flex
+ repo: upstream:flex
+ ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - m4
+- name: openssl-new
+ repo: upstream:openssl-new
+ ref: 872e681c00a713e840ebed77a4e05fa0e181f16f
+ unpetrify-ref: OpenSSL_1_0_1j
+ build-depends:
+ - perl
+- name: bzip2
+ repo: upstream:bzip2
+ ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5
+ unpetrify-ref: baserock/morph
+- name: readline
+ repo: upstream:readline
+ ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6
+ unpetrify-ref: baserock/genivi/baseline
+- name: cpython
+ repo: upstream:cpython
+ ref: 0b92c75574adef1e1ccf1b635a3724a86b567cd2
+ unpetrify-ref: v2.7.8
+ build-depends:
+ - openssl-new
+ - bzip2
+ - sqlite3
+ - ncurses
+ - readline
+- name: libtool
+ repo: upstream:libtool
+ ref: d388b7f2dc628b22006025d01179bc09b8aabe81
+ unpetrify-ref: baserock/build-essential
+ build-depends:
+ - bash
+- name: gtk-doc-stub
+ repo: upstream:gtk-doc-stub
+ ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
+ - libtool
+- name: xz
+ repo: upstream:xz
+ ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
+ - gettext
+ - libtool
+- name: libxml2
+ repo: upstream:libxml2
+ ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
+ - cpython
+ - libtool
+ - xz
+- name: ca-certificates
+ repo: upstream:ca-certificates
+ ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6
+ unpetrify-ref: baserock/debian/20140325
+ build-depends:
+ - automake
+ - cpython
+- name: curl
+ repo: upstream:curl
+ ref: 202aa9f7758636730299b86715d924f54468a908
+ unpetrify-ref: curl-7_38_0
+ build-depends:
+ - autoconf
+ - automake
+ - libtool
+ - openssl-new
+ - ca-certificates
+- name: libexpat
+ repo: upstream:libexpat
+ ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
+ - libtool
+- name: XML-Parser
+ repo: upstream:XML-Parser
+ ref: e1a3ec157140a699e3020836475a0df622f70f1b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libexpat
+ - libxml2
+ - perl
+- name: git
+ repo: upstream:git
+ ref: 43efcf42382e87de4aa423e5e1607958ad1717d0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - cpython
+ - curl
+ - error-perl-tarball
+ - gettext
+ - libexpat
+ - openssl-new
+- name: help2man
+ repo: upstream:help2man
+ ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
+- name: bison
+ repo: upstream:bison
+ ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308
+ unpetrify-ref: baserock/v3.0.2
+ build-depends:
+ - autoconf
+ - automake
+ - bash
+ - flex
+ - gettext
+ - git
+ - help2man
+ - mini-utils
+- name: gperf
+ repo: upstream:gperf
+ ref: 5094e4a539adf845111013f82c2c4fcaec637983
+ unpetrify-ref: baserock/morph
+- name: intltool
+ repo: upstream:intltool
+ ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - XML-Parser
+ - autoconf
+ - automake
+ - perl
+- name: util-linux
+ repo: upstream:util-linux
+ ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
+ - gettext
+ - git
+ - libtool
+ - pkg-config
+- name: nano
+ repo: upstream:nano-tarball
+ ref: 8b74abeb02c01ddc768c465a826360cf33cec063
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - ncurses
+- name: bc
+ repo: upstream:bc-tarball
+ ref: 0956d119432ff6a2e85bae1fa336df799cad70b0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - flex
+ - texinfo-tarball
+- name: python-setuptools
+ repo: upstream:python-setuptools
+ ref: 05b07a427a1eae2a51d527f7ac5135a8fd215d77
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - cpython
+- name: pyyaml
+ repo: upstream:pyyaml
+ ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-setuptools
+- name: shadow
+ repo: upstream:shadow
+ ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2
+ unpetrify-ref: baserock/4.2
+ build-depends:
+ - autoconf
+ - automake
+ - gettext
+ - libtool
+ - bison
+- name: patch
+ repo: upstream:patch
+ ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
+ unpetrify-ref: baserock/v2.7.1
+ build-depends:
+ - bash
+ - shadow
diff --git a/strata/core.morph b/strata/core.morph
deleted file mode 100644
index 140674f1..00000000
--- a/strata/core.morph
+++ /dev/null
@@ -1,312 +0,0 @@
-name: core
-kind: stratum
-description: Core components of a Baserock base system that are build tools required
- for the BSP and Foundation strata, but a step above build-essential
-build-depends:
-- morph: strata/build-essential.morph
-chunks:
-- name: sqlite3
- repo: upstream:sqlite3
- ref: f6c2a9fe49d20654c2c41844d056033692a223b7
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cmake
- morph: strata/core/cmake.morph
- repo: upstream:cmake
- ref: 0b3781e4c497566acaa504d4106d11c02a642501
- unpetrify-ref: v2.8.12.2
- build-depends: []
-- name: gdbm
- morph: strata/core/gdbm.morph
- repo: upstream:gdbm
- ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c
- unpetrify-ref: baserock/build-essential
- build-depends: []
-- name: gettext
- morph: strata/core/gettext.morph
- repo: upstream:gettext
- ref: 3898e324f07c05404b63d71f0e519f352fb1e072
- unpetrify-ref: baserock/build-essential
- build-depends: []
-- name: m4
- morph: strata/core/m4.morph
- repo: upstream:m4
- ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db
- unpetrify-ref: baserock/build-essential
- build-depends: []
-- name: mini-utils
- morph: strata/core/mini-utils.morph
- repo: baserock:baserock/mini-utils
- ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8
- unpetrify-ref: master
- build-depends: []
-- name: ncurses
- morph: strata/core/ncurses.morph
- repo: upstream:ncurses
- ref: 0fe89dc66ec061b839bea3ab451207e2dee757b9
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: perl
- morph: strata/core/perl.morph
- repo: upstream:perl
- ref: 78f9a3c880f11578fb9ff9c7d5f7e34b602d2ad1
- unpetrify-ref: baserock/morph
- build-depends:
- - gdbm
-- name: pkg-config
- morph: strata/core/pkg-config.morph
- repo: upstream:pkg-config
- ref: 67a702a15cf88e270539484929ffa1f42b90c728
- unpetrify-ref: baserock/build-essential
- build-depends: []
-- name: texinfo-tarball
- morph: strata/core/texinfo-tarball.morph
- repo: upstream:texinfo-tarball
- ref: 4843a7f5ff14ac802a56f1cdd49960b25c15702b
- unpetrify-ref: baserock/morph
- build-depends:
- - ncurses
-- name: autoconf
- morph: strata/core/autoconf.morph
- repo: upstream:autoconf
- ref: cffdb90be331111ce3fbe4a32320181ec2b92652
- unpetrify-ref: baserock/build-essential
- build-depends:
- - m4
- - perl
-- name: automake
- morph: strata/core/automake.morph
- repo: upstream:automake
- ref: ba4b42faff673e3e5265416dff09e59affc688fb
- unpetrify-ref: v1.14.1
- build-depends:
- - autoconf
- - perl
- - texinfo-tarball
-- name: bash
- morph: strata/core/bash.morph
- repo: upstream:bash
- ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
- unpetrify-ref: baserock/bash-4.3-patch-27
- build-depends: []
-- name: error-perl-tarball
- repo: upstream:error-perl-tarball
- ref: 661707e7bd4282aeab5a2f6a8f02ca5731fd813f
- unpetrify-ref: baserock/morph
- build-depends:
- - perl
-- name: flex
- morph: strata/core/flex.morph
- repo: upstream:flex
- ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
- unpetrify-ref: baserock/build-essential
- build-depends:
- - m4
-- name: openssl-new
- morph: strata/core/openssl-new.morph
- repo: upstream:openssl-new
- ref: 872e681c00a713e840ebed77a4e05fa0e181f16f
- unpetrify-ref: OpenSSL_1_0_1j
- build-depends:
- - perl
-- name: bzip2
- morph: strata/core/bzip2.morph
- repo: upstream:bzip2
- ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: readline
- repo: upstream:readline
- ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: cpython
- morph: strata/core/cpython.morph
- repo: upstream:cpython
- ref: 0b92c75574adef1e1ccf1b635a3724a86b567cd2
- unpetrify-ref: v2.7.8
- build-depends:
- - openssl-new
- - bzip2
- - sqlite3
- - ncurses
- - readline
-- name: libtool
- morph: strata/core/libtool.morph
- repo: upstream:libtool
- ref: d388b7f2dc628b22006025d01179bc09b8aabe81
- unpetrify-ref: baserock/build-essential
- build-depends:
- - bash
-- name: gtk-doc-stub
- repo: upstream:gtk-doc-stub
- ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - automake
- - libtool
-- name: xz
- morph: strata/core/xz.morph
- repo: upstream:xz
- ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - automake
- - gettext
- - libtool
-- name: libxml2
- repo: upstream:libxml2
- ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - automake
- - cpython
- - libtool
- - xz
-- name: ca-certificates
- morph: strata/core/ca-certificates.morph
- repo: upstream:ca-certificates
- ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6
- unpetrify-ref: baserock/debian/20140325
- build-depends:
- - automake
- - cpython
-- name: curl
- morph: strata/core/curl.morph
- repo: upstream:curl
- ref: 202aa9f7758636730299b86715d924f54468a908
- unpetrify-ref: curl-7_38_0
- build-depends:
- - autoconf
- - automake
- - libtool
- - openssl-new
- - ca-certificates
-- name: libexpat
- morph: strata/core/libexpat.morph
- repo: upstream:libexpat
- ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - automake
- - libtool
-- name: XML-Parser
- repo: upstream:XML-Parser
- ref: e1a3ec157140a699e3020836475a0df622f70f1b
- unpetrify-ref: baserock/morph
- build-depends:
- - libexpat
- - libxml2
- - perl
-- name: git
- morph: strata/core/git.morph
- repo: upstream:git
- ref: 43efcf42382e87de4aa423e5e1607958ad1717d0
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - cpython
- - curl
- - error-perl-tarball
- - gettext
- - libexpat
- - openssl-new
-- name: help2man
- morph: strata/core/help2man.morph
- repo: upstream:help2man
- ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - automake
-- name: bison
- morph: strata/core/bison.morph
- repo: upstream:bison
- ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308
- unpetrify-ref: baserock/v3.0.2
- build-depends:
- - autoconf
- - automake
- - bash
- - flex
- - gettext
- - git
- - help2man
- - mini-utils
-- name: gperf
- morph: strata/core/gperf.morph
- repo: upstream:gperf
- ref: 5094e4a539adf845111013f82c2c4fcaec637983
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: intltool
- repo: upstream:intltool
- ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4
- unpetrify-ref: baserock/morph
- build-depends:
- - XML-Parser
- - autoconf
- - automake
- - perl
-- name: util-linux
- morph: strata/core/util-linux.morph
- repo: upstream:util-linux
- ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - automake
- - gettext
- - git
- - libtool
- - pkg-config
-- name: nano
- repo: upstream:nano-tarball
- ref: 8b74abeb02c01ddc768c465a826360cf33cec063
- unpetrify-ref: baserock/morph
- build-depends:
- - ncurses
-- name: bc
- repo: upstream:bc-tarball
- ref: 0956d119432ff6a2e85bae1fa336df799cad70b0
- unpetrify-ref: baserock/morph
- build-depends:
- - flex
- - texinfo-tarball
-- name: python-setuptools
- morph: strata/core/python-setuptools.morph
- repo: upstream:python-setuptools
- ref: 05b07a427a1eae2a51d527f7ac5135a8fd215d77
- unpetrify-ref: baserock/morph
- build-depends:
- - cpython
-- name: pyyaml
- morph: strata/core/pyyaml.morph
- repo: upstream:pyyaml
- ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
- unpetrify-ref: baserock/morph
- build-depends:
- - python-setuptools
-- name: shadow
- morph: strata/core/shadow.morph
- repo: upstream:shadow
- ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2
- unpetrify-ref: baserock/4.2
- build-depends:
- - autoconf
- - automake
- - gettext
- - libtool
- - bison
-- name: patch
- morph: strata/core/patch.morph
- repo: upstream:patch
- ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
- unpetrify-ref: baserock/v2.7.1
- build-depends:
- - bash
- - shadow
diff --git a/strata/core/autoconf.def b/strata/core/autoconf.def
new file mode 100644
index 00000000..1abd23d2
--- /dev/null
+++ b/strata/core/autoconf.def
@@ -0,0 +1,4 @@
+name: autoconf
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/autoconf.morph b/strata/core/autoconf.morph
deleted file mode 100644
index 046bfc40..00000000
--- a/strata/core/autoconf.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: autoconf
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX"
diff --git a/strata/core/automake.def b/strata/core/automake.def
new file mode 100644
index 00000000..01bc862e
--- /dev/null
+++ b/strata/core/automake.def
@@ -0,0 +1,7 @@
+name: automake
+build-system: autotools
+configure-commands:
+- ./bootstrap.sh
+- ./configure --prefix="$PREFIX"
+build-commands:
+- unset DESTDIR; make
diff --git a/strata/core/automake.morph b/strata/core/automake.morph
deleted file mode 100644
index 282535d6..00000000
--- a/strata/core/automake.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: automake
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./bootstrap.sh
-- ./configure --prefix="$PREFIX"
-build-commands:
-- unset DESTDIR; make
diff --git a/strata/core/bash.def b/strata/core/bash.def
new file mode 100644
index 00000000..3326fad4
--- /dev/null
+++ b/strata/core/bash.def
@@ -0,0 +1,7 @@
+name: bash
+configure-commands:
+- ./configure --prefix=/usr --bindir=/bin --without-bash-malloc --with-installed-readline
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/bash.morph b/strata/core/bash.morph
deleted file mode 100644
index 9639593b..00000000
--- a/strata/core/bash.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: bash
-kind: chunk
-configure-commands:
-- ./configure --prefix=/usr --bindir=/bin --without-bash-malloc --with-installed-readline
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/bison.def b/strata/core/bison.def
new file mode 100644
index 00000000..d8abd277
--- /dev/null
+++ b/strata/core/bison.def
@@ -0,0 +1,9 @@
+name: bison
+configure-commands:
+- echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version
+- bash bootstrap --skip-po
+- ./configure --prefix=/usr --disable-nls
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
deleted file mode 100644
index a9497d4e..00000000
--- a/strata/core/bison.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: bison
-kind: chunk
-configure-commands:
-- echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version
-- bash bootstrap --skip-po
-- ./configure --prefix=/usr --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/bzip2.def b/strata/core/bzip2.def
new file mode 100644
index 00000000..bee616ca
--- /dev/null
+++ b/strata/core/bzip2.def
@@ -0,0 +1,9 @@
+name: bzip2
+configure-commands:
+- sed -i -rf bzip2-makefix.sed Makefile
+build-commands:
+- make -f Makefile-libbz2_so
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" PREFIX="$PREFIX" install
+- install libbz2.so* "$DESTDIR$PREFIX/lib"
diff --git a/strata/core/bzip2.morph b/strata/core/bzip2.morph
deleted file mode 100644
index f4bdb794..00000000
--- a/strata/core/bzip2.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: bzip2
-kind: chunk
-configure-commands:
-- sed -i -rf bzip2.morph-makefix.sed Makefile
-build-commands:
-- make -f Makefile-libbz2_so
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" PREFIX="$PREFIX" install
-- install libbz2.so* "$DESTDIR$PREFIX/lib"
diff --git a/strata/core/ca-certificates.def b/strata/core/ca-certificates.def
new file mode 100644
index 00000000..14a67d9c
--- /dev/null
+++ b/strata/core/ca-certificates.def
@@ -0,0 +1,17 @@
+name: ca-certificates
+build-system: autotools
+configure-commands: []
+pre-install-commands:
+- mkdir -p "$DESTDIR"/usr/share/ca-certificates
+- mkdir -p "$DESTDIR"/usr/sbin
+post-install-commands:
+- mkdir "$DESTDIR"/etc
+- |
+ cd "$DESTDIR"/usr/share/ca-certificates
+ find * -type f > "$DESTDIR"/etc/ca-certificates.conf
+- |
+ export CERTSCONF="$DESTDIR/etc/ca-certificates.conf"
+ export CERTSDIR="$DESTDIR/usr/share/ca-certificates"
+ export ETCCERTSDIR="$DESTDIR/etc/ssl/certs"
+ mkdir -p "$ETCCERTSDIR"
+ ./sbin/update-ca-certificates
diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph
deleted file mode 100644
index 3072e4f3..00000000
--- a/strata/core/ca-certificates.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: ca-certificates
-kind: chunk
-build-system: autotools
-configure-commands: []
-pre-install-commands:
-- mkdir -p "$DESTDIR"/usr/share/ca-certificates
-- mkdir -p "$DESTDIR"/usr/sbin
-post-install-commands:
-- mkdir "$DESTDIR"/etc
-- |
- cd "$DESTDIR"/usr/share/ca-certificates
- find * -type f > "$DESTDIR"/etc/ca-certificates.conf
-- |
- export CERTSCONF="$DESTDIR/etc/ca-certificates.conf"
- export CERTSDIR="$DESTDIR/usr/share/ca-certificates"
- export ETCCERTSDIR="$DESTDIR/etc/ssl/certs"
- mkdir -p "$ETCCERTSDIR"
- ./sbin/update-ca-certificates
diff --git a/strata/core/cmake.def b/strata/core/cmake.def
new file mode 100644
index 00000000..db287b52
--- /dev/null
+++ b/strata/core/cmake.def
@@ -0,0 +1,7 @@
+name: cmake
+configure-commands:
+- ./bootstrap --prefix="$PREFIX" --docdir=/share/doc/cmake --mandir=/share/man
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/cmake.morph b/strata/core/cmake.morph
deleted file mode 100644
index 1d310ef4..00000000
--- a/strata/core/cmake.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: cmake
-kind: chunk
-configure-commands:
-- ./bootstrap --prefix="$PREFIX" --docdir=/share/doc/cmake --mandir=/share/man
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/cpython.def b/strata/core/cpython.def
new file mode 100644
index 00000000..0e244b5e
--- /dev/null
+++ b/strata/core/cpython.def
@@ -0,0 +1,6 @@
+name: cpython
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --enable-shared
+post-install-commands:
+- test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2
diff --git a/strata/core/cpython.morph b/strata/core/cpython.morph
deleted file mode 100644
index 6c9e4b3d..00000000
--- a/strata/core/cpython.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: cpython
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --enable-shared
-post-install-commands:
-- test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2
diff --git a/strata/core/curl.def b/strata/core/curl.def
new file mode 100644
index 00000000..81439a0f
--- /dev/null
+++ b/strata/core/curl.def
@@ -0,0 +1,8 @@
+name: curl
+configure-commands:
+- ./buildconf
+- ./configure --disable-manual --prefix="$PREFIX"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/curl.morph b/strata/core/curl.morph
deleted file mode 100644
index e245688c..00000000
--- a/strata/core/curl.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: curl
-kind: chunk
-configure-commands:
-- ./buildconf
-- ./configure --disable-manual --prefix="$PREFIX"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/flex.def b/strata/core/flex.def
new file mode 100644
index 00000000..59c1436a
--- /dev/null
+++ b/strata/core/flex.def
@@ -0,0 +1,11 @@
+name: flex
+configure-commands:
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make dist_doc_DATA=
+install-commands:
+- make dist_doc_DATA= DESTDIR="$DESTDIR" install
+- ln -s libfl.a "$DESTDIR$PREFIX/lib/libl.a"
+- echo "#!$PREFIX/bin/sh" >"$DESTDIR$PREFIX/bin/lex"
+- echo 'exec '"$PREFIX"'/bin/flex -l "$@"' >>"$DESTDIR$PREFIX/bin/lex"
+- chmod 755 "$DESTDIR$PREFIX/bin/lex"
diff --git a/strata/core/flex.morph b/strata/core/flex.morph
deleted file mode 100644
index 7ca8f538..00000000
--- a/strata/core/flex.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: flex
-kind: chunk
-configure-commands:
-- ./configure --prefix="$PREFIX"
-build-commands:
-- make dist_doc_DATA=
-install-commands:
-- make dist_doc_DATA= DESTDIR="$DESTDIR" install
-- ln -s libfl.a "$DESTDIR$PREFIX/lib/libl.a"
-- echo "#!$PREFIX/bin/sh" >"$DESTDIR$PREFIX/bin/lex"
-- echo 'exec '"$PREFIX"'/bin/flex -l "$@"' >>"$DESTDIR$PREFIX/bin/lex"
-- chmod 755 "$DESTDIR$PREFIX/bin/lex"
diff --git a/strata/core/gdbm.def b/strata/core/gdbm.def
new file mode 100644
index 00000000..194f0402
--- /dev/null
+++ b/strata/core/gdbm.def
@@ -0,0 +1,7 @@
+name: gdbm
+configure-commands:
+- ./configure --prefix="$PREFIX" --enable-libgdbm-compat --disable-nls
+build-commands:
+- make MANS= INFO_DEPS=
+install-commands:
+- make MANS= INFO_DEPS= DESTDIR="$DESTDIR" install
diff --git a/strata/core/gdbm.morph b/strata/core/gdbm.morph
deleted file mode 100644
index 6bec33e0..00000000
--- a/strata/core/gdbm.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: gdbm
-kind: chunk
-configure-commands:
-- ./configure --prefix="$PREFIX" --enable-libgdbm-compat --disable-nls
-build-commands:
-- make MANS= INFO_DEPS=
-install-commands:
-- make MANS= INFO_DEPS= DESTDIR="$DESTDIR" install
diff --git a/strata/core/gettext.def b/strata/core/gettext.def
new file mode 100644
index 00000000..7460d351
--- /dev/null
+++ b/strata/core/gettext.def
@@ -0,0 +1,8 @@
+name: gettext
+max-jobs: 1
+configure-commands:
+- ./configure --prefix=/usr
+build-commands:
+- make EXAMPLESPOFILES=
+install-commands:
+- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install
diff --git a/strata/core/gettext.morph b/strata/core/gettext.morph
deleted file mode 100644
index 3e2c56b5..00000000
--- a/strata/core/gettext.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: gettext
-kind: chunk
-max-jobs: 1
-configure-commands:
-- ./configure --prefix=/usr
-build-commands:
-- make EXAMPLESPOFILES=
-install-commands:
-- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install
diff --git a/strata/core/git.def b/strata/core/git.def
new file mode 100644
index 00000000..a0e4e4c1
--- /dev/null
+++ b/strata/core/git.def
@@ -0,0 +1,5 @@
+name: git
+build-commands:
+- make prefix=${PREFIX-/usr} all PYTHON_PATH=${PREFIX-/usr}/bin/python NO_TCLTK=YesPlease
+install-commands:
+- make prefix=${PREFIX-/usr} install
diff --git a/strata/core/git.morph b/strata/core/git.morph
deleted file mode 100644
index 62932b0d..00000000
--- a/strata/core/git.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: git
-kind: chunk
-build-commands:
-- make prefix=${PREFIX-/usr} all PYTHON_PATH=${PREFIX-/usr}/bin/python NO_TCLTK=YesPlease
-install-commands:
-- make prefix=${PREFIX-/usr} install
diff --git a/strata/core/gperf.def b/strata/core/gperf.def
new file mode 100644
index 00000000..fa714ee2
--- /dev/null
+++ b/strata/core/gperf.def
@@ -0,0 +1,2 @@
+name: gperf
+build-system: autotools
diff --git a/strata/core/gperf.morph b/strata/core/gperf.morph
deleted file mode 100644
index e4f598c5..00000000
--- a/strata/core/gperf.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: gperf
-kind: chunk
-build-system: autotools
diff --git a/strata/core/help2man.def b/strata/core/help2man.def
new file mode 100644
index 00000000..34d2d298
--- /dev/null
+++ b/strata/core/help2man.def
@@ -0,0 +1,8 @@
+name: help2man
+configure-commands:
+- autoreconf -i
+- ./configure --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/help2man.morph b/strata/core/help2man.morph
deleted file mode 100644
index e25a8d8e..00000000
--- a/strata/core/help2man.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: help2man
-kind: chunk
-configure-commands:
-- autoreconf -i
-- ./configure --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/libexpat.def b/strata/core/libexpat.def
new file mode 100644
index 00000000..7894051e
--- /dev/null
+++ b/strata/core/libexpat.def
@@ -0,0 +1,8 @@
+name: libexpat
+configure-commands:
+- autoreconf -i
+- ./configure --prefix="${PREFIX-/usr}"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph
deleted file mode 100644
index 1e0fe696..00000000
--- a/strata/core/libexpat.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: libexpat
-kind: chunk
-configure-commands:
-- autoreconf -i
-- ./configure --prefix="${PREFIX-/usr}"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/libtool.def b/strata/core/libtool.def
new file mode 100644
index 00000000..87361d6e
--- /dev/null
+++ b/strata/core/libtool.def
@@ -0,0 +1,5 @@
+name: libtool
+max-jobs: 1
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/libtool.morph b/strata/core/libtool.morph
deleted file mode 100644
index f311281d..00000000
--- a/strata/core/libtool.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libtool
-kind: chunk
-max-jobs: 1
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX"
diff --git a/strata/core/m4.def b/strata/core/m4.def
new file mode 100644
index 00000000..5c845587
--- /dev/null
+++ b/strata/core/m4.def
@@ -0,0 +1,4 @@
+name: m4
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/core/m4.morph b/strata/core/m4.morph
deleted file mode 100644
index b76afbe4..00000000
--- a/strata/core/m4.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: m4
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/core/mini-utils.def b/strata/core/mini-utils.def
new file mode 100644
index 00000000..e38137a5
--- /dev/null
+++ b/strata/core/mini-utils.def
@@ -0,0 +1,5 @@
+name: mini-utils
+build-system: autotools
+configure-commands: []
+install-commands:
+- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/core/mini-utils.morph b/strata/core/mini-utils.morph
deleted file mode 100644
index dc915b30..00000000
--- a/strata/core/mini-utils.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: mini-utils
-kind: chunk
-build-system: autotools
-configure-commands: []
-install-commands:
-- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/core/ncurses.def b/strata/core/ncurses.def
new file mode 100644
index 00000000..ca8d3f6e
--- /dev/null
+++ b/strata/core/ncurses.def
@@ -0,0 +1,8 @@
+name: ncurses
+configure-commands:
+- LDCONFIG=true ./configure --with-shared --without-debug --enable-widec
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- sh ncurses-morph-postinstall.sh
diff --git a/strata/core/ncurses.morph b/strata/core/ncurses.morph
deleted file mode 100644
index c75495bc..00000000
--- a/strata/core/ncurses.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ncurses
-kind: chunk
-configure-commands:
-- LDCONFIG=true ./configure --with-shared --without-debug --enable-widec
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- sh ncurses-morph-postinstall.sh
diff --git a/strata/core/openssl-new.def b/strata/core/openssl-new.def
new file mode 100644
index 00000000..349e2f60
--- /dev/null
+++ b/strata/core/openssl-new.def
@@ -0,0 +1,14 @@
+name: openssl-new
+max-jobs: 1
+configure-commands:
+- sed -i -e 's,^LIBNAMES=\\(.*\\) padlock \\(.*\\),LIBNAMES=\\1 \\2,g' engines/Makefile
+- |
+ if [ "$(uname -m)" = "ppc64" ]; then
+ sh ./Configure linux-ppc64 --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared
+ else
+ ./config --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared
+ fi
+build-commands:
+- make
+install-commands:
+- make INSTALL_PREFIX="$DESTDIR" install_sw
diff --git a/strata/core/openssl-new.morph b/strata/core/openssl-new.morph
deleted file mode 100644
index 2ed14ff2..00000000
--- a/strata/core/openssl-new.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: openssl-new
-kind: chunk
-max-jobs: 1
-configure-commands:
-- sed -i -e 's,^LIBNAMES=\\(.*\\) padlock \\(.*\\),LIBNAMES=\\1 \\2,g' engines/Makefile
-- |
- if [ "$(uname -m)" = "ppc64" ]; then
- sh ./Configure linux-ppc64 --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared
- else
- ./config --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared
- fi
-build-commands:
-- make
-install-commands:
-- make INSTALL_PREFIX="$DESTDIR" install_sw
diff --git a/strata/core/patch.def b/strata/core/patch.def
new file mode 100644
index 00000000..9056fa0e
--- /dev/null
+++ b/strata/core/patch.def
@@ -0,0 +1,8 @@
+name: patch
+configure-commands:
+- bash bootstrap --skip-po
+- ./configure --prefix="$PREFIX" --disable-nls
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/patch.morph b/strata/core/patch.morph
deleted file mode 100644
index 01d977c4..00000000
--- a/strata/core/patch.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: patch
-kind: chunk
-configure-commands:
-- bash bootstrap --skip-po
-- ./configure --prefix="$PREFIX" --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/perl.def b/strata/core/perl.def
new file mode 100644
index 00000000..d4fdfe31
--- /dev/null
+++ b/strata/core/perl.def
@@ -0,0 +1,15 @@
+name: perl
+max-jobs: 1
+configure-commands:
+- sh Configure -des -Dprefix="$PREFIX" -Darchlib="$PREFIX/lib/perl" -Dprivlib="$PREFIX/share/perl"
+ -Dbin="$PREFIX/bin" -Dscriptdir="$PREFIX/bin" -Dman1dir="$PREFIX/share/man/man1"
+ -Dman3dir="$PREFIX/share/man/man3" -Dsiteprefix="$PREFIX" -Dsitearch="$PREFIX/lib/perl"
+ -Dsitelib="$PREFIX/share/perl" -Dsitebin="$PREFIX/bin" -Dsitescript="$PREFIX/bin"
+ -Dsiteman1dir="$PREFIX/share/man/man1" -Dsiteman3dir="$PREFIX/share/man/man3" -Dvendorprefix="$PREFIX"
+ -Dvendorarch="$PREFIX/lib/perl" -Dvendorlib="$PREFIX/share/perl" -Dvendorbin="$PREFIX/bin"
+ -Dvendorscript="$PREFIX/bin" -Dvendorman1dir="$PREFIX/share/man/man1" -Dvendorman3dir="$PREFIX/share/man/man3"
+ -Dpager="$PREFIX/bin/less -isR" -Duseshrplib
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/perl.morph b/strata/core/perl.morph
deleted file mode 100644
index ce086aa7..00000000
--- a/strata/core/perl.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: perl
-kind: chunk
-max-jobs: 1
-configure-commands:
-- sh Configure -des -Dprefix="$PREFIX" -Darchlib="$PREFIX/lib/perl" -Dprivlib="$PREFIX/share/perl"
- -Dbin="$PREFIX/bin" -Dscriptdir="$PREFIX/bin" -Dman1dir="$PREFIX/share/man/man1"
- -Dman3dir="$PREFIX/share/man/man3" -Dsiteprefix="$PREFIX" -Dsitearch="$PREFIX/lib/perl"
- -Dsitelib="$PREFIX/share/perl" -Dsitebin="$PREFIX/bin" -Dsitescript="$PREFIX/bin"
- -Dsiteman1dir="$PREFIX/share/man/man1" -Dsiteman3dir="$PREFIX/share/man/man3" -Dvendorprefix="$PREFIX"
- -Dvendorarch="$PREFIX/lib/perl" -Dvendorlib="$PREFIX/share/perl" -Dvendorbin="$PREFIX/bin"
- -Dvendorscript="$PREFIX/bin" -Dvendorman1dir="$PREFIX/share/man/man1" -Dvendorman3dir="$PREFIX/share/man/man3"
- -Dpager="$PREFIX/bin/less -isR" -Duseshrplib
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/pkg-config.def b/strata/core/pkg-config.def
new file mode 100644
index 00000000..8af53cbb
--- /dev/null
+++ b/strata/core/pkg-config.def
@@ -0,0 +1,4 @@
+name: pkg-config
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --with-internal-glib
diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.morph
deleted file mode 100644
index 090a65e5..00000000
--- a/strata/core/pkg-config.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: pkg-config
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --with-internal-glib
diff --git a/strata/core/python-setuptools.def b/strata/core/python-setuptools.def
new file mode 100644
index 00000000..8db444ab
--- /dev/null
+++ b/strata/core/python-setuptools.def
@@ -0,0 +1,5 @@
+name: python-setuptools
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/core/python-setuptools.morph b/strata/core/python-setuptools.morph
deleted file mode 100644
index fa436c60..00000000
--- a/strata/core/python-setuptools.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-setuptools
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/core/pyyaml.def b/strata/core/pyyaml.def
new file mode 100644
index 00000000..518b6b3d
--- /dev/null
+++ b/strata/core/pyyaml.def
@@ -0,0 +1,5 @@
+name: pyyaml
+build-commands:
+- python setup.py --without-libyaml build
+install-commands:
+- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/core/pyyaml.morph b/strata/core/pyyaml.morph
deleted file mode 100644
index 8ebd7b57..00000000
--- a/strata/core/pyyaml.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: pyyaml
-kind: chunk
-build-commands:
-- python setup.py --without-libyaml build
-install-commands:
-- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/core/shadow.def b/strata/core/shadow.def
new file mode 100644
index 00000000..11b19df0
--- /dev/null
+++ b/strata/core/shadow.def
@@ -0,0 +1,4 @@
+name: shadow
+build-system: autotools
+configure-commands:
+- ./autogen.sh --with-selinux=no --sysconfdir=/etc
diff --git a/strata/core/shadow.morph b/strata/core/shadow.morph
deleted file mode 100644
index 6887a6b3..00000000
--- a/strata/core/shadow.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: shadow
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --with-selinux=no --sysconfdir=/etc
diff --git a/strata/core/texinfo-tarball.def b/strata/core/texinfo-tarball.def
new file mode 100644
index 00000000..14516294
--- /dev/null
+++ b/strata/core/texinfo-tarball.def
@@ -0,0 +1,8 @@
+name: texinfo-tarball
+configure-commands:
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- make DESTDIR="$DESTDIR" TEXMF="$PREFIX/share/texmf" install-tex
diff --git a/strata/core/texinfo-tarball.morph b/strata/core/texinfo-tarball.morph
deleted file mode 100644
index 5f784ba2..00000000
--- a/strata/core/texinfo-tarball.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: texinfo-tarball
-kind: chunk
-configure-commands:
-- ./configure --prefix="$PREFIX"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- make DESTDIR="$DESTDIR" TEXMF="$PREFIX/share/texmf" install-tex
diff --git a/strata/core/util-linux.def b/strata/core/util-linux.def
new file mode 100644
index 00000000..b94372c3
--- /dev/null
+++ b/strata/core/util-linux.def
@@ -0,0 +1,5 @@
+name: util-linux
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-use-tty-group
diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.morph
deleted file mode 100644
index 22f19529..00000000
--- a/strata/core/util-linux.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: util-linux
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-use-tty-group
diff --git a/strata/core/xz.def b/strata/core/xz.def
new file mode 100644
index 00000000..7e3b2689
--- /dev/null
+++ b/strata/core/xz.def
@@ -0,0 +1,2 @@
+name: xz
+build-system: autotools
diff --git a/strata/core/xz.morph b/strata/core/xz.morph
deleted file mode 100644
index 8165abdc..00000000
--- a/strata/core/xz.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: xz
-kind: chunk
-build-system: autotools
diff --git a/strata/coreutils-common.def b/strata/coreutils-common.def
new file mode 100644
index 00000000..3bba9842
--- /dev/null
+++ b/strata/coreutils-common.def
@@ -0,0 +1,12 @@
+name: coreutils-common
+description: |
+ We need to split this so we can build stuff using coreutils but we can not
+ having it in the final systems (for example in genivi ones that do not
+ accept GPLv3 code)
+build-depends:
+- name: core
+contents:
+- name: coreutils
+ repo: upstream:coreutils
+ ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
+ unpetrify-ref: baserock/8.23
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph
deleted file mode 100644
index 9c5c38fe..00000000
--- a/strata/coreutils-common.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: coreutils-common
-kind: stratum
-description: |
- We need to split this so we can build stuff using coreutils but we can not
- having it in the final systems (for example in genivi ones that do not
- accept GPLv3 code)
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: coreutils
- morph: strata/coreutils-common/coreutils.morph
- repo: upstream:coreutils
- ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
- unpetrify-ref: baserock/8.23
- build-depends: []
diff --git a/strata/coreutils-common/coreutils.def b/strata/coreutils-common/coreutils.def
new file mode 100644
index 00000000..c8b7aeab
--- /dev/null
+++ b/strata/coreutils-common/coreutils.def
@@ -0,0 +1,8 @@
+name: coreutils
+build-system: autotools
+configure-commands:
+- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
+- bash bootstrap --skip-po
+- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls
+install-commands:
+- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
deleted file mode 100644
index 479e9925..00000000
--- a/strata/coreutils-common/coreutils.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: coreutils
-kind: chunk
-build-system: autotools
-configure-commands:
-- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- bash bootstrap --skip-po
-- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls
-install-commands:
-- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
diff --git a/strata/cross-bootstrap.def b/strata/cross-bootstrap.def
new file mode 100644
index 00000000..467c9fe2
--- /dev/null
+++ b/strata/cross-bootstrap.def
@@ -0,0 +1,74 @@
+name: cross-bootstrap
+description: The minimal development tools to build a baserock devel system
+build-depends:
+- name: core
+contents:
+- name: six
+ repo: upstream:six
+ ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
+ unpetrify-ref: baserock/morph
+- name: groff
+ repo: upstream:groff
+ ref: c7017a099f954bb6de60e79c876935b1bf438b9a
+ unpetrify-ref: baserock/morph
+- name: openssh
+ repo: upstream:openssh
+ ref: 233514106dcde5ac61a70f1043de563122e2f1c9
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - groff
+- name: python-ttystatus
+ repo: upstream:python-ttystatus
+ ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
+ unpetrify-ref: baserock/morph
+- name: python-coveragepy
+ repo: upstream:python-coveragepy
+ ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
+ unpetrify-ref: baserock/morph
+- name: python-coverage-test-runner
+ repo: upstream:python-coverage-test-runner
+ ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coveragepy
+- name: cliapp
+ repo: upstream:cliapp
+ ref: cec20cedd062a3aef1b04f997e77b45090c07806
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coverage-test-runner
+- name: python-markdown
+ repo: upstream:python-markdown
+ ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
+ unpetrify-ref: baserock/morph
+- name: cmdtest
+ repo: upstream:cmdtest
+ ref: ac91791842c6e7e6eda3213916af413255999c7b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - cliapp
+ - python-ttystatus
+ - python-markdown
+- name: linux-user-chroot
+ repo: upstream:linux-user-chroot
+ ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
+ unpetrify-ref: baserock/morph
+- name: pyfilesystem
+ repo: upstream:pyfilesystem
+ ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - six
+- name: morph
+ repo: baserock:baserock/morph
+ ref: 67afd098cd297b769b1341a460d160a2902ba4e4
+ unpetrify-ref: master
+ build-depends:
+ - cliapp
+ - cmdtest
+ - python-coverage-test-runner
+ - pyfilesystem
+- name: rsync
+ repo: upstream:rsync
+ ref: 9faf8e0ccff2755cd019ff64d8322226a214b013
+ unpetrify-ref: baserock/morph
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
deleted file mode 100644
index 9687ac7e..00000000
--- a/strata/cross-bootstrap.morph
+++ /dev/null
@@ -1,89 +0,0 @@
-name: cross-bootstrap
-kind: stratum
-description: The minimal development tools to build a baserock devel system
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: six
- repo: upstream:six
- ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: groff
- morph: strata/cross-bootstrap/groff.morph
- repo: upstream:groff
- ref: c7017a099f954bb6de60e79c876935b1bf438b9a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: openssh
- morph: strata/cross-bootstrap/openssh.morph
- repo: upstream:openssh
- ref: 233514106dcde5ac61a70f1043de563122e2f1c9
- unpetrify-ref: baserock/morph
- build-depends:
- - groff
-- name: python-ttystatus
- morph: strata/cross-bootstrap/python-ttystatus.morph
- repo: upstream:python-ttystatus
- ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-coveragepy
- morph: strata/cross-bootstrap/python-coveragepy.morph
- repo: upstream:python-coveragepy
- ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-coverage-test-runner
- repo: upstream:python-coverage-test-runner
- ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coveragepy
-- name: cliapp
- repo: upstream:cliapp
- ref: cec20cedd062a3aef1b04f997e77b45090c07806
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coverage-test-runner
-- name: python-markdown
- repo: upstream:python-markdown
- ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cmdtest
- morph: strata/cross-bootstrap/cmdtest.morph
- repo: upstream:cmdtest
- ref: ac91791842c6e7e6eda3213916af413255999c7b
- unpetrify-ref: baserock/morph
- build-depends:
- - cliapp
- - python-ttystatus
- - python-markdown
-- name: linux-user-chroot
- repo: upstream:linux-user-chroot
- ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pyfilesystem
- morph: strata/cross-bootstrap/pyfilesystem.morph
- repo: upstream:pyfilesystem
- ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
- unpetrify-ref: baserock/morph
- build-depends:
- - six
-- name: morph
- repo: baserock:baserock/morph
- ref: 67afd098cd297b769b1341a460d160a2902ba4e4
- unpetrify-ref: master
- build-depends:
- - cliapp
- - cmdtest
- - python-coverage-test-runner
- - pyfilesystem
-- name: rsync
- morph: strata/cross-bootstrap/rsync.morph
- repo: upstream:rsync
- ref: 9faf8e0ccff2755cd019ff64d8322226a214b013
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/cross-bootstrap/cmdtest.def b/strata/cross-bootstrap/cmdtest.def
new file mode 100644
index 00000000..34010c41
--- /dev/null
+++ b/strata/cross-bootstrap/cmdtest.def
@@ -0,0 +1,5 @@
+name: cmdtest
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/cmdtest.morph b/strata/cross-bootstrap/cmdtest.morph
deleted file mode 100644
index 3e1c71c6..00000000
--- a/strata/cross-bootstrap/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/cross-bootstrap/groff.def b/strata/cross-bootstrap/groff.def
new file mode 100644
index 00000000..f1fd3c6e
--- /dev/null
+++ b/strata/cross-bootstrap/groff.def
@@ -0,0 +1,10 @@
+name: groff
+max-jobs: 1
+configure-commands:
+- PAGE=A4 ./configure --prefix="$PREFIX"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- ln -s eqn "$DESTDIR$PREFIX/bin/geqn"
+- ln -s tbl "$DESTDIR$PREFIX/bin/gtbl"
diff --git a/strata/cross-bootstrap/groff.morph b/strata/cross-bootstrap/groff.morph
deleted file mode 100644
index fed35b7d..00000000
--- a/strata/cross-bootstrap/groff.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: groff
-kind: chunk
-max-jobs: 1
-configure-commands:
-- PAGE=A4 ./configure --prefix="$PREFIX"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- ln -s eqn "$DESTDIR$PREFIX/bin/geqn"
-- ln -s tbl "$DESTDIR$PREFIX/bin/gtbl"
diff --git a/strata/cross-bootstrap/openssh.def b/strata/cross-bootstrap/openssh.def
new file mode 100644
index 00000000..8d44993e
--- /dev/null
+++ b/strata/cross-bootstrap/openssh.def
@@ -0,0 +1,27 @@
+name: openssh
+configure-commands:
+- autoreconf -if
+- |
+ OPENSSL_SEEDS_ITSELF=yes ./configure \
+ --prefix="$PREFIX" --sysconfdir=/etc/ssh \
+ --datadir="$PREFIX/share/sshd" \
+ --libexecdir="$PREFIX/lib/openssh" \
+ --with-privsep-path=/var/lib/sshd
+build-commands:
+- make
+- |
+ sed -e "s|@prefix@|$PREFIX|g" \
+ -e 's|@STARTUP_SCRIPT_SHELL@|/bin/sh|g' \
+ -e 's|@sysconfdir@|/etc/ssh|g' \
+ -e 's|@COMMENT_OUT_ECC@||g' \
+ sshd-keygen.in >sshd-keygen
+- sed -e "s|@prefix@|$PREFIX|g" opensshd.service.in >opensshd.service
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR/$PREFIX/sbin"
+- chmod go= "$DESTDIR"/var/lib/sshd
+- install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen"
+- install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id"
+- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
+- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service"
+- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service"
diff --git a/strata/cross-bootstrap/openssh.morph b/strata/cross-bootstrap/openssh.morph
deleted file mode 100644
index 6c759cb0..00000000
--- a/strata/cross-bootstrap/openssh.morph
+++ /dev/null
@@ -1,28 +0,0 @@
-name: openssh
-kind: chunk
-configure-commands:
-- autoreconf -if
-- |
- OPENSSL_SEEDS_ITSELF=yes ./configure \
- --prefix="$PREFIX" --sysconfdir=/etc/ssh \
- --datadir="$PREFIX/share/sshd" \
- --libexecdir="$PREFIX/lib/openssh" \
- --with-privsep-path=/var/lib/sshd
-build-commands:
-- make
-- |
- sed -e "s|@prefix@|$PREFIX|g" \
- -e 's|@STARTUP_SCRIPT_SHELL@|/bin/sh|g' \
- -e 's|@sysconfdir@|/etc/ssh|g' \
- -e 's|@COMMENT_OUT_ECC@||g' \
- sshd-keygen.in >sshd-keygen
-- sed -e "s|@prefix@|$PREFIX|g" opensshd.service.in >opensshd.service
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR/$PREFIX/sbin"
-- chmod go= "$DESTDIR"/var/lib/sshd
-- install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen"
-- install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id"
-- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
-- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service"
-- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service"
diff --git a/strata/cross-bootstrap/pyfilesystem.def b/strata/cross-bootstrap/pyfilesystem.def
new file mode 100644
index 00000000..fae6f7d1
--- /dev/null
+++ b/strata/cross-bootstrap/pyfilesystem.def
@@ -0,0 +1,5 @@
+name: pyfilesystem
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/pyfilesystem.morph b/strata/cross-bootstrap/pyfilesystem.morph
deleted file mode 100644
index a4931dfa..00000000
--- a/strata/cross-bootstrap/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/cross-bootstrap/python-coveragepy.def b/strata/cross-bootstrap/python-coveragepy.def
new file mode 100644
index 00000000..cf8718b3
--- /dev/null
+++ b/strata/cross-bootstrap/python-coveragepy.def
@@ -0,0 +1,5 @@
+name: python-coveragepy
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/python-coveragepy.morph b/strata/cross-bootstrap/python-coveragepy.morph
deleted file mode 100644
index ed5e3d87..00000000
--- a/strata/cross-bootstrap/python-coveragepy.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-coveragepy
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/python-ttystatus.def b/strata/cross-bootstrap/python-ttystatus.def
new file mode 100644
index 00000000..503e7da5
--- /dev/null
+++ b/strata/cross-bootstrap/python-ttystatus.def
@@ -0,0 +1,5 @@
+name: python-ttystatus
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/python-ttystatus.morph b/strata/cross-bootstrap/python-ttystatus.morph
deleted file mode 100644
index e45ef7a8..00000000
--- a/strata/cross-bootstrap/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/cross-bootstrap/rsync.def b/strata/cross-bootstrap/rsync.def
new file mode 100644
index 00000000..3b7e773c
--- /dev/null
+++ b/strata/cross-bootstrap/rsync.def
@@ -0,0 +1,5 @@
+name: rsync
+build-system: autotools
+build-commands:
+- make proto
+- make
diff --git a/strata/cross-bootstrap/rsync.morph b/strata/cross-bootstrap/rsync.morph
deleted file mode 100644
index 9a92878d..00000000
--- a/strata/cross-bootstrap/rsync.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: rsync
-kind: chunk
-build-system: autotools
-build-commands:
-- make proto
-- make
diff --git a/strata/cross-tools.def b/strata/cross-tools.def
new file mode 100644
index 00000000..d6f02424
--- /dev/null
+++ b/strata/cross-tools.def
@@ -0,0 +1,9 @@
+name: cross-tools
+description: Tools used together with cross compilers
+build-depends:
+- name: core
+contents:
+- name: patchelf
+ repo: upstream:patchelf
+ ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703
+ unpetrify-ref: baserock/morph
diff --git a/strata/cross-tools.morph b/strata/cross-tools.morph
deleted file mode 100644
index c3e35e6d..00000000
--- a/strata/cross-tools.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: cross-tools
-kind: stratum
-description: Tools used together with cross compilers
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: patchelf
- repo: upstream:patchelf
- ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/cxmanage.def b/strata/cxmanage.def
new file mode 100644
index 00000000..1b5faf05
--- /dev/null
+++ b/strata/cxmanage.def
@@ -0,0 +1,30 @@
+name: cxmanage
+description: All the tools for calxeda management
+build-depends:
+- name: tools
+contents:
+- name: ipmitool
+ repo: upstream:ipmitool
+ ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd
+ unpetrify-ref: baserock/morph
+- name: pexpect
+ repo: upstream:pexpect
+ ref: 7a8455f21bb45020f3594c59fc8c85cf738e147c
+ unpetrify-ref: baserock/morph
+- name: pyipmi
+ repo: upstream:pyipmi
+ ref: bb7dba84578c05ba87db3c4186a2989c89e4e519
+ unpetrify-ref: baserock/morph
+- name: tftpy
+ repo: upstream:tftpy
+ ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b
+ unpetrify-ref: baserock/morph
+- name: cxmanage
+ repo: upstream:cxmanage
+ ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - ipmitool
+ - pexpect
+ - pyipmi
+ - tftpy
diff --git a/strata/cxmanage.morph b/strata/cxmanage.morph
deleted file mode 100644
index 057558b8..00000000
--- a/strata/cxmanage.morph
+++ /dev/null
@@ -1,36 +0,0 @@
-name: cxmanage
-kind: stratum
-description: All the tools for calxeda management
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: ipmitool
- repo: upstream:ipmitool
- ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pexpect
- morph: strata/cxmanage/pexpect.morph
- repo: upstream:pexpect
- ref: 7a8455f21bb45020f3594c59fc8c85cf738e147c
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pyipmi
- repo: upstream:pyipmi
- ref: bb7dba84578c05ba87db3c4186a2989c89e4e519
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: tftpy
- repo: upstream:tftpy
- ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cxmanage
- repo: upstream:cxmanage
- ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6
- unpetrify-ref: baserock/morph
- build-depends:
- - ipmitool
- - pexpect
- - pyipmi
- - tftpy
diff --git a/strata/cxmanage/pexpect.def b/strata/cxmanage/pexpect.def
new file mode 100644
index 00000000..bd645791
--- /dev/null
+++ b/strata/cxmanage/pexpect.def
@@ -0,0 +1,9 @@
+name: pexpect
+description: |
+ Pexpect is a pure Python module that accomplishes behaviour similar to Expect
+configure-commands:
+- cd pexpect && make
+build-commands:
+- cd pexpect && python setup.py build
+install-commands:
+- cd pexpect && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/cxmanage/pexpect.morph b/strata/cxmanage/pexpect.morph
deleted file mode 100644
index 09254350..00000000
--- a/strata/cxmanage/pexpect.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: pexpect
-kind: chunk
-description: |
- Pexpect is a pure Python module that accomplishes behaviour similar to Expect
-configure-commands:
-- cd pexpect && make
-build-commands:
-- cd pexpect && python setup.py build
-install-commands:
-- cd pexpect && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/databases.def b/strata/databases.def
new file mode 100644
index 00000000..30ccd6ab
--- /dev/null
+++ b/strata/databases.def
@@ -0,0 +1,18 @@
+name: databases
+description: some popular databases
+build-depends:
+- name: tools
+- name: nfs
+contents:
+- name: postgresql
+ repo: upstream:postgresql
+ ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316
+ unpetrify-ref: REL9_3_4
+- name: redis
+ repo: upstream:redis
+ ref: 9ee59fca9c5c429185d35779c2d5db64005091b0
+ unpetrify-ref: baserock/3.0
+- name: memcached
+ repo: upstream:memcached
+ ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e
+ unpetrify-ref: master
diff --git a/strata/databases.morph b/strata/databases.morph
deleted file mode 100644
index cb09c5a3..00000000
--- a/strata/databases.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-name: databases
-kind: stratum
-description: some popular databases
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/nfs.morph
-chunks:
-- name: postgresql
- repo: upstream:postgresql
- ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316
- unpetrify-ref: REL9_3_4
- build-depends: []
-- name: redis
- morph: strata/databases/redis.morph
- repo: upstream:redis
- ref: 9ee59fca9c5c429185d35779c2d5db64005091b0
- unpetrify-ref: baserock/3.0
- build-depends: []
-- name: memcached
- repo: upstream:memcached
- ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e
- unpetrify-ref: master
- build-depends: []
diff --git a/strata/databases/redis.def b/strata/databases/redis.def
new file mode 100644
index 00000000..ef52ceca
--- /dev/null
+++ b/strata/databases/redis.def
@@ -0,0 +1,5 @@
+name: redis
+build-commands:
+- make
+install-commands:
+- make PREFIX="$DESTDIR/$PREFIX" install
diff --git a/strata/databases/redis.morph b/strata/databases/redis.morph
deleted file mode 100644
index 51f602dd..00000000
--- a/strata/databases/redis.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: redis
-kind: chunk
-build-commands:
-- make
-install-commands:
-- make PREFIX="$DESTDIR/$PREFIX" install
diff --git a/strata/enlightenment.def b/strata/enlightenment.def
new file mode 100644
index 00000000..447c1630
--- /dev/null
+++ b/strata/enlightenment.def
@@ -0,0 +1,60 @@
+name: enlightenment
+description: Enlightenment Desktop and Window Manager
+build-depends:
+- name: tools
+- name: x-generic
+- name: lua
+- name: audio-bluetooth
+- name: multimedia-gstreamer-0.10
+- name: connman-common
+contents:
+- name: efl
+ repo: upstream:enlightenment/efl
+ ref: 8f9b565e79552f09a39507ce802786b1fe773d2d
+ unpetrify-ref: baserock/morph
+- name: elementary
+ repo: upstream:enlightenment/elementary
+ ref: e4c97ddffea9c91a291e1a6a7c6ebd1bbf47629a
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - efl
+- name: evas_generic_loaders
+ repo: upstream:enlightenment/evas_generic_loaders
+ ref: ddbdaa35201f4ef64f1a3f3b067a99e84c14565a
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - efl
+- name: enlightenment
+ repo: upstream:enlightenment/enlightenment
+ ref: 041b8d14a22f9e4c7f34abe8b0f9a3a1f5933146
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - efl
+ - elementary
+- name: imlib2
+ repo: upstream:enlightenment/imlib2
+ ref: 6d02661a4c57771888304960ce62d4fdf587be8f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - efl
+ - elementary
+ - enlightenment
+- name: libast
+ repo: upstream:enlightenment/libast
+ ref: 0dbc0a5df55474bf61ca166be40e8de2d9e3a031
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - efl
+ - elementary
+ - enlightenment
+ - imlib2
+- name: eterm
+ repo: upstream:enlightenment/eterm
+ ref: 097234f1f27709ff2444e303350764ea3b80b3ad
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - efl
+ - elementary
+ - enlightenment
+ - libast
+ - imlib2
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
deleted file mode 100644
index 7ef6e22a..00000000
--- a/strata/enlightenment.morph
+++ /dev/null
@@ -1,69 +0,0 @@
-name: enlightenment
-kind: stratum
-description: Enlightenment Desktop and Window Manager
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/x-generic.morph
-- morph: strata/lua.morph
-- morph: strata/audio-bluetooth.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
-- morph: strata/connman-common.morph
-chunks:
-- name: efl
- morph: strata/enlightenment/efl.morph
- repo: upstream:enlightenment/efl
- ref: 8f9b565e79552f09a39507ce802786b1fe773d2d
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: elementary
- morph: strata/enlightenment/elementary.morph
- repo: upstream:enlightenment/elementary
- ref: e4c97ddffea9c91a291e1a6a7c6ebd1bbf47629a
- unpetrify-ref: baserock/morph
- build-depends:
- - efl
-- name: evas_generic_loaders
- morph: strata/enlightenment/evas_generic_loaders.morph
- repo: upstream:enlightenment/evas_generic_loaders
- ref: ddbdaa35201f4ef64f1a3f3b067a99e84c14565a
- unpetrify-ref: baserock/morph
- build-depends:
- - efl
-- name: enlightenment
- morph: strata/enlightenment/enlightenment.morph
- repo: upstream:enlightenment/enlightenment
- ref: 041b8d14a22f9e4c7f34abe8b0f9a3a1f5933146
- unpetrify-ref: baserock/morph
- build-depends:
- - efl
- - elementary
-- name: imlib2
- morph: strata/enlightenment/imlib2.morph
- repo: upstream:enlightenment/imlib2
- ref: 6d02661a4c57771888304960ce62d4fdf587be8f
- unpetrify-ref: baserock/morph
- build-depends:
- - efl
- - elementary
- - enlightenment
-- name: libast
- morph: strata/enlightenment/libast.morph
- repo: upstream:enlightenment/libast
- ref: 0dbc0a5df55474bf61ca166be40e8de2d9e3a031
- unpetrify-ref: baserock/morph
- build-depends:
- - efl
- - elementary
- - enlightenment
- - imlib2
-- name: eterm
- morph: strata/enlightenment/eterm.morph
- repo: upstream:enlightenment/eterm
- ref: 097234f1f27709ff2444e303350764ea3b80b3ad
- unpetrify-ref: baserock/morph
- build-depends:
- - efl
- - elementary
- - enlightenment
- - libast
- - imlib2
diff --git a/strata/enlightenment/efl.def b/strata/enlightenment/efl.def
new file mode 100644
index 00000000..417e4ca5
--- /dev/null
+++ b/strata/enlightenment/efl.def
@@ -0,0 +1,9 @@
+name: efl
+configure-commands:
+- ./autogen.sh --prefix=/usr --with-tests=none --disable-fribidi --disable-image-loader-gif
+ --disable-image-loader-tiff --disable-pulseaudio --disable-gstreamer --disable-audio
+ --disable-physics
+build-commands:
+- make VPATH=/usr/lib64
+install-commands:
+- make DESTDIR="$DESTDIR" VPATH=/usr/lib64 install
diff --git a/strata/enlightenment/efl.morph b/strata/enlightenment/efl.morph
deleted file mode 100644
index ca1c0b57..00000000
--- a/strata/enlightenment/efl.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: efl
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=/usr --with-tests=none --disable-fribidi --disable-image-loader-gif
- --disable-image-loader-tiff --disable-pulseaudio --disable-gstreamer --disable-audio
- --disable-physics
-build-commands:
-- make VPATH=/usr/lib64
-install-commands:
-- make DESTDIR="$DESTDIR" VPATH=/usr/lib64 install
diff --git a/strata/enlightenment/elementary.def b/strata/enlightenment/elementary.def
new file mode 100644
index 00000000..4f859014
--- /dev/null
+++ b/strata/enlightenment/elementary.def
@@ -0,0 +1,7 @@
+name: elementary
+configure-commands:
+- ./autogen.sh --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/elementary.morph b/strata/enlightenment/elementary.morph
deleted file mode 100644
index 3c0bda0d..00000000
--- a/strata/enlightenment/elementary.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: elementary
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/enlightenment.def b/strata/enlightenment/enlightenment.def
new file mode 100644
index 00000000..a9e043ed
--- /dev/null
+++ b/strata/enlightenment/enlightenment.def
@@ -0,0 +1,7 @@
+name: enlightenment
+configure-commands:
+- ./autogen.sh --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/enlightenment.morph b/strata/enlightenment/enlightenment.morph
deleted file mode 100644
index 90f0c646..00000000
--- a/strata/enlightenment/enlightenment.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: enlightenment
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/eterm.def b/strata/enlightenment/eterm.def
new file mode 100644
index 00000000..ec066535
--- /dev/null
+++ b/strata/enlightenment/eterm.def
@@ -0,0 +1,7 @@
+name: eterm
+configure-commands:
+- ./autogen.sh --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/eterm.morph b/strata/enlightenment/eterm.morph
deleted file mode 100644
index 9a98d193..00000000
--- a/strata/enlightenment/eterm.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: eterm
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/evas_generic_loaders.def b/strata/enlightenment/evas_generic_loaders.def
new file mode 100644
index 00000000..9bea8b20
--- /dev/null
+++ b/strata/enlightenment/evas_generic_loaders.def
@@ -0,0 +1,7 @@
+name: evas_generic_loaders
+configure-commands:
+- ./autogen.sh --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/evas_generic_loaders.morph b/strata/enlightenment/evas_generic_loaders.morph
deleted file mode 100644
index ef36a40b..00000000
--- a/strata/enlightenment/evas_generic_loaders.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: evas_generic_loaders
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/imlib2.def b/strata/enlightenment/imlib2.def
new file mode 100644
index 00000000..051f54ec
--- /dev/null
+++ b/strata/enlightenment/imlib2.def
@@ -0,0 +1,7 @@
+name: imlib2
+configure-commands:
+- ./autogen.sh --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/imlib2.morph b/strata/enlightenment/imlib2.morph
deleted file mode 100644
index 82617ad2..00000000
--- a/strata/enlightenment/imlib2.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: imlib2
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/libast.def b/strata/enlightenment/libast.def
new file mode 100644
index 00000000..5ff953fe
--- /dev/null
+++ b/strata/enlightenment/libast.def
@@ -0,0 +1,7 @@
+name: libast
+configure-commands:
+- ./autogen.sh --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/libast.morph b/strata/enlightenment/libast.morph
deleted file mode 100644
index c44e274c..00000000
--- a/strata/enlightenment/libast.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: libast
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/erlang.def b/strata/erlang.def
new file mode 100644
index 00000000..dd7c3c88
--- /dev/null
+++ b/strata/erlang.def
@@ -0,0 +1,9 @@
+name: erlang
+description: stratum for erlang/otp and stuff
+build-depends:
+- name: tools
+contents:
+- name: erlang
+ repo: upstream:erlang
+ ref: d307c9520644d17d5f7597c0154888e2d570b107
+ unpetrify-ref: baserock/morph
diff --git a/strata/erlang.morph b/strata/erlang.morph
deleted file mode 100644
index 05a8e090..00000000
--- a/strata/erlang.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: erlang
-kind: stratum
-description: stratum for erlang/otp and stuff
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: erlang
- morph: strata/erlang/erlang.morph
- repo: upstream:erlang
- ref: d307c9520644d17d5f7597c0154888e2d570b107
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/erlang/erlang.def b/strata/erlang/erlang.def
new file mode 100644
index 00000000..f3b202ca
--- /dev/null
+++ b/strata/erlang/erlang.def
@@ -0,0 +1,8 @@
+name: erlang
+configure-commands:
+- ./otp_build autoconf
+- ./configure --prefix=$PREFIX
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/erlang/erlang.morph b/strata/erlang/erlang.morph
deleted file mode 100644
index feaf04f1..00000000
--- a/strata/erlang/erlang.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: erlang
-kind: chunk
-configure-commands:
-- ./otp_build autoconf
-- ./configure --prefix=$PREFIX
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/foundation.def b/strata/foundation.def
new file mode 100644
index 00000000..6ce7d296
--- /dev/null
+++ b/strata/foundation.def
@@ -0,0 +1,113 @@
+name: foundation
+description: Basic userland runtime system
+build-depends:
+- name: coreutils-common
+contents:
+- name: attr
+ repo: upstream:attr
+ ref: bf32f1769e9895f8546570f0c841a945c93a5b22
+ unpetrify-ref: baserock/morph
+- name: groff
+ repo: upstream:groff
+ ref: c7017a099f954bb6de60e79c876935b1bf438b9a
+ unpetrify-ref: baserock/morph
+- name: kmod
+ repo: upstream:kmod
+ ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4
+ unpetrify-ref: baserock/morph
+- name: libcap2
+ repo: upstream:libcap2
+ ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - attr
+- name: libffi
+ repo: upstream:libffi
+ ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
+ unpetrify-ref: baserock/morph
+- name: libusbx
+ repo: upstream:libusbx
+ ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834
+ unpetrify-ref: baserock/morph
+- name: pciutils
+ repo: upstream:pciutils
+ ref: bae04bd0473c68a2f21b7712a627abb08fd84b29
+ unpetrify-ref: baserock/morph
+- name: usbutils
+ repo: upstream:usbutils
+ ref: 410f1474af0ddb391bc6ec391777f116eee31569
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libusbx
+- name: glib
+ repo: upstream:glib
+ ref: 4125415e7f4d1213fc7122beac0d91af08e37b28
+ build-depends:
+ - libffi
+- name: gobject-introspection
+ repo: upstream:gobject-introspection
+ ref: a543d8563f8e9ca059afb7218c63496f577cd0fc
+ build-depends:
+ - glib
+- name: dbus-pre
+ repo: upstream:dbus
+ ref: ff01faa12daa3481d6a3d2936929c5a2a1fe6fb5
+ unpetrify-ref: baserock/genivi/dbus-1.8.8
+ build-depends:
+ - glib
+- name: systemd
+ repo: upstream:systemd
+ ref: a77af3ec96015b2382ea31020d0a14b482d10a76
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - dbus-pre
+ - gobject-introspection
+ - kmod
+ - libcap2
+ - pciutils
+ - usbutils
+- name: lzo
+ repo: upstream:lzo
+ ref: 2cdfe9375f1145603d002c12be950062ae54da21
+ unpetrify-ref: baserock/morph
+- name: fuse
+ repo: upstream:fuse
+ ref: 13ee8f62d4aa3360adb6956fb30da0c858928fa2
+ unpetrify-ref: baserock/genivi/morph
+- name: btrfs-progs
+ repo: upstream:btrfs-progs
+ ref: 304f215abb836811e6d78e0a3da53d48aa0e7ca7
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - attr
+ - lzo
+- name: dbus
+ repo: upstream:dbus
+ ref: ff01faa12daa3481d6a3d2936929c5a2a1fe6fb5
+ unpetrify-ref: baserock/genivi/dbus-1.8.8
+ build-depends:
+ - glib
+ - systemd
+- name: libxslt
+ repo: upstream:libxslt
+ ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e
+ unpetrify-ref: baserock/morph
+- name: openssh
+ repo: upstream:openssh
+ ref: 233514106dcde5ac61a70f1043de563122e2f1c9
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - groff
+- name: tbdiff
+ repo: baserock:baserock/tbdiff
+ ref: 3190be6906eb21a1ba6878d3c8edb4bd16f925d7
+ unpetrify-ref: master
+ build-depends:
+ - attr
+- name: dbus-glib
+ repo: upstream:dbus-glib
+ ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c
+ unpetrify-ref: dbus-glib_0.102
+ build-depends:
+ - dbus
+ - glib
diff --git a/strata/foundation.morph b/strata/foundation.morph
deleted file mode 100644
index a652fbd6..00000000
--- a/strata/foundation.morph
+++ /dev/null
@@ -1,137 +0,0 @@
-name: foundation
-kind: stratum
-description: Basic userland runtime system
-build-depends:
-- morph: strata/coreutils-common.morph
-chunks:
-- name: attr
- morph: strata/foundation/attr.morph
- repo: upstream:attr
- ref: bf32f1769e9895f8546570f0c841a945c93a5b22
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: groff
- morph: strata/foundation/groff.morph
- repo: upstream:groff
- ref: c7017a099f954bb6de60e79c876935b1bf438b9a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: kmod
- morph: strata/foundation/kmod.morph
- repo: upstream:kmod
- ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libcap2
- morph: strata/foundation/libcap2.morph
- repo: upstream:libcap2
- ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b
- unpetrify-ref: baserock/morph
- build-depends:
- - attr
-- name: libffi
- morph: strata/foundation/libffi.morph
- repo: upstream:libffi
- ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libusbx
- repo: upstream:libusbx
- ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pciutils
- morph: strata/foundation/pciutils.morph
- repo: upstream:pciutils
- ref: bae04bd0473c68a2f21b7712a627abb08fd84b29
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: usbutils
- repo: upstream:usbutils
- ref: 410f1474af0ddb391bc6ec391777f116eee31569
- unpetrify-ref: baserock/morph
- build-depends:
- - libusbx
-- name: glib
- repo: upstream:glib
- ref: 4125415e7f4d1213fc7122beac0d91af08e37b28
- build-depends:
- - libffi
-- name: gobject-introspection
- repo: upstream:gobject-introspection
- ref: a543d8563f8e9ca059afb7218c63496f577cd0fc
- build-depends:
- - glib
-- name: dbus-pre
- morph: strata/foundation/dbus-pre.morph
- repo: upstream:dbus
- ref: ff01faa12daa3481d6a3d2936929c5a2a1fe6fb5
- unpetrify-ref: baserock/genivi/dbus-1.8.8
- build-depends:
- - glib
-- name: systemd
- morph: strata/foundation/systemd.morph
- repo: upstream:systemd
- ref: a77af3ec96015b2382ea31020d0a14b482d10a76
- unpetrify-ref: baserock/morph
- build-depends:
- - dbus-pre
- - gobject-introspection
- - kmod
- - libcap2
- - pciutils
- - usbutils
-- name: lzo
- morph: strata/foundation/lzo.morph
- repo: upstream:lzo
- ref: 2cdfe9375f1145603d002c12be950062ae54da21
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fuse
- morph: strata/foundation/fuse.morph
- repo: upstream:fuse
- ref: 13ee8f62d4aa3360adb6956fb30da0c858928fa2
- unpetrify-ref: baserock/genivi/morph
- build-depends: []
-- name: btrfs-progs
- morph: strata/foundation/btrfs-progs.morph
- repo: upstream:btrfs-progs
- ref: 304f215abb836811e6d78e0a3da53d48aa0e7ca7
- unpetrify-ref: baserock/morph
- build-depends:
- - attr
- - lzo
-- name: dbus
- morph: strata/foundation/dbus.morph
- repo: upstream:dbus
- ref: ff01faa12daa3481d6a3d2936929c5a2a1fe6fb5
- unpetrify-ref: baserock/genivi/dbus-1.8.8
- build-depends:
- - glib
- - systemd
-- name: libxslt
- repo: upstream:libxslt
- ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: openssh
- morph: strata/foundation/openssh.morph
- repo: upstream:openssh
- ref: 233514106dcde5ac61a70f1043de563122e2f1c9
- unpetrify-ref: baserock/morph
- build-depends:
- - groff
-- name: tbdiff
- morph: strata/foundation/tbdiff.morph
- repo: baserock:baserock/tbdiff
- ref: 3190be6906eb21a1ba6878d3c8edb4bd16f925d7
- unpetrify-ref: master
- build-depends:
- - attr
-- name: dbus-glib
- repo: upstream:dbus-glib
- ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c
- unpetrify-ref: dbus-glib_0.102
- build-depends:
- - dbus
- - glib
diff --git a/strata/foundation/attr.def b/strata/foundation/attr.def
new file mode 100644
index 00000000..c7e9f991
--- /dev/null
+++ b/strata/foundation/attr.def
@@ -0,0 +1,13 @@
+name: attr
+description:
+- 'The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch'
+configure-commands:
+- sed -i -e 's,PKG_\(.*\)_DIR\t= ,PKG_\1_DIR\t= \$(DESTDIR),g' include/builddefs.in
+- sed -i -e 's,\$\$LOCAL_CONFIGURE_OPTIONS,\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile
+- make LOCAL_CONFIGURE_OPTIONS="--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin
+ --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include
+ --mandir=/usr/share/man --datadir=/usr/share" configure
+build-commands:
+- make SHELL=/bin/bash
+install-commands:
+- make SHELL=/bin/bash DESTDIR="$DESTDIR" install-lib install-dev
diff --git a/strata/foundation/attr.morph b/strata/foundation/attr.morph
deleted file mode 100644
index 59158a90..00000000
--- a/strata/foundation/attr.morph
+++ /dev/null
@@ -1,14 +0,0 @@
-name: attr
-kind: chunk
-description:
-- 'The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch'
-configure-commands:
-- sed -i -e 's,PKG_\(.*\)_DIR\t= ,PKG_\1_DIR\t= \$(DESTDIR),g' include/builddefs.in
-- sed -i -e 's,\$\$LOCAL_CONFIGURE_OPTIONS,\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile
-- make LOCAL_CONFIGURE_OPTIONS="--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin
- --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include
- --mandir=/usr/share/man --datadir=/usr/share" configure
-build-commands:
-- make SHELL=/bin/bash
-install-commands:
-- make SHELL=/bin/bash DESTDIR="$DESTDIR" install-lib install-dev
diff --git a/strata/foundation/btrfs-progs.def b/strata/foundation/btrfs-progs.def
new file mode 100644
index 00000000..0d7f00f9
--- /dev/null
+++ b/strata/foundation/btrfs-progs.def
@@ -0,0 +1,5 @@
+name: btrfs-progs
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" prefix="$PREFIX" install
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph
deleted file mode 100644
index 356c3f06..00000000
--- a/strata/foundation/btrfs-progs.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: btrfs-progs
-kind: chunk
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" prefix="$PREFIX" install
diff --git a/strata/foundation/dbus-pre.def b/strata/foundation/dbus-pre.def
new file mode 100644
index 00000000..090db71a
--- /dev/null
+++ b/strata/foundation/dbus-pre.def
@@ -0,0 +1,9 @@
+name: dbus-pre
+build-system: autotools
+configure-commands:
+- sh autogen.sh --no-configure
+- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --disable-systemd
+build-commands:
+- make XMLTO_OUTPUT=
+install-commands:
+- make XMLTO_OUTPUT= DESTDIR="$DESTDIR" install
diff --git a/strata/foundation/dbus-pre.morph b/strata/foundation/dbus-pre.morph
deleted file mode 100644
index 3ec008bf..00000000
--- a/strata/foundation/dbus-pre.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: dbus-pre
-kind: chunk
-build-system: autotools
-configure-commands:
-- sh autogen.sh --no-configure
-- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --disable-systemd
-build-commands:
-- make XMLTO_OUTPUT=
-install-commands:
-- make XMLTO_OUTPUT= DESTDIR="$DESTDIR" install
diff --git a/strata/foundation/dbus.def b/strata/foundation/dbus.def
new file mode 100644
index 00000000..3d5ca4fc
--- /dev/null
+++ b/strata/foundation/dbus.def
@@ -0,0 +1,9 @@
+name: dbus
+build-system: autotools
+configure-commands:
+- sh autogen.sh --no-configure
+- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc
+build-commands:
+- make XMLTO_OUTPUT=
+install-commands:
+- make XMLTO_OUTPUT= DESTDIR="$DESTDIR" install
diff --git a/strata/foundation/dbus.morph b/strata/foundation/dbus.morph
deleted file mode 100644
index 255d2915..00000000
--- a/strata/foundation/dbus.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: dbus
-kind: chunk
-build-system: autotools
-configure-commands:
-- sh autogen.sh --no-configure
-- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc
-build-commands:
-- make XMLTO_OUTPUT=
-install-commands:
-- make XMLTO_OUTPUT= DESTDIR="$DESTDIR" install
diff --git a/strata/foundation/fuse.def b/strata/foundation/fuse.def
new file mode 100644
index 00000000..694eb016
--- /dev/null
+++ b/strata/foundation/fuse.def
@@ -0,0 +1,5 @@
+name: fuse
+build-system: autotools
+configure-commands:
+- ./makeconf.sh
+- ./configure --prefix="$PREFIX"
diff --git a/strata/foundation/fuse.morph b/strata/foundation/fuse.morph
deleted file mode 100644
index 6f7fc170..00000000
--- a/strata/foundation/fuse.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: fuse
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./makeconf.sh
-- ./configure --prefix="$PREFIX"
diff --git a/strata/foundation/groff.def b/strata/foundation/groff.def
new file mode 100644
index 00000000..f1fd3c6e
--- /dev/null
+++ b/strata/foundation/groff.def
@@ -0,0 +1,10 @@
+name: groff
+max-jobs: 1
+configure-commands:
+- PAGE=A4 ./configure --prefix="$PREFIX"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- ln -s eqn "$DESTDIR$PREFIX/bin/geqn"
+- ln -s tbl "$DESTDIR$PREFIX/bin/gtbl"
diff --git a/strata/foundation/groff.morph b/strata/foundation/groff.morph
deleted file mode 100644
index fed35b7d..00000000
--- a/strata/foundation/groff.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: groff
-kind: chunk
-max-jobs: 1
-configure-commands:
-- PAGE=A4 ./configure --prefix="$PREFIX"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- ln -s eqn "$DESTDIR$PREFIX/bin/geqn"
-- ln -s tbl "$DESTDIR$PREFIX/bin/gtbl"
diff --git a/strata/foundation/kmod.def b/strata/foundation/kmod.def
new file mode 100644
index 00000000..16785b62
--- /dev/null
+++ b/strata/foundation/kmod.def
@@ -0,0 +1,18 @@
+name: kmod
+configure-commands:
+- rm -rf libkmod/docs
+- sed -i -e'/SUBDIRS/{s/\S*doc\S*//;s/\S*man\S*//}' Makefile.am
+- sed -i -e'/AC_CONFIG_FILES(\[/,/])/{/docs/d}' configure.ac
+- autoreconf -fiv
+- ./configure --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc --without-xz
+ --with-zlib --disable-manpages
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" pkgconfigdir=/usr/lib/pkgconfig install
+- ln -s kmod "$DESTDIR"/bin/modprobe
+- ln -s kmod "$DESTDIR"/bin/lsmod
+- ln -s kmod "$DESTDIR"/bin/rmmod
+- ln -s kmod "$DESTDIR"/bin/insmod
+- ln -s kmod "$DESTDIR"/bin/modinfo
+- ln -s kmod "$DESTDIR"/bin/depmod
diff --git a/strata/foundation/kmod.morph b/strata/foundation/kmod.morph
deleted file mode 100644
index 12ac8692..00000000
--- a/strata/foundation/kmod.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-name: kmod
-kind: chunk
-configure-commands:
-- rm -rf libkmod/docs
-- sed -i -e'/SUBDIRS/{s/\S*doc\S*//;s/\S*man\S*//}' Makefile.am
-- sed -i -e'/AC_CONFIG_FILES(\[/,/])/{/docs/d}' configure.ac
-- autoreconf -fiv
-- ./configure --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc --without-xz
- --with-zlib --disable-manpages
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" pkgconfigdir=/usr/lib/pkgconfig install
-- ln -s kmod "$DESTDIR"/bin/modprobe
-- ln -s kmod "$DESTDIR"/bin/lsmod
-- ln -s kmod "$DESTDIR"/bin/rmmod
-- ln -s kmod "$DESTDIR"/bin/insmod
-- ln -s kmod "$DESTDIR"/bin/modinfo
-- ln -s kmod "$DESTDIR"/bin/depmod
diff --git a/strata/foundation/libcap2.def b/strata/foundation/libcap2.def
new file mode 100644
index 00000000..85412386
--- /dev/null
+++ b/strata/foundation/libcap2.def
@@ -0,0 +1,5 @@
+name: libcap2
+build-commands:
+- make prefix="$PREFIX"
+install-commands:
+- make prefix="$PREFIX" DESTDIR="$DESTDIR" RAISE_SETFCAP=no install lib=lib
diff --git a/strata/foundation/libcap2.morph b/strata/foundation/libcap2.morph
deleted file mode 100644
index 3e4f205e..00000000
--- a/strata/foundation/libcap2.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libcap2
-kind: chunk
-build-commands:
-- make prefix="$PREFIX"
-install-commands:
-- make prefix="$PREFIX" DESTDIR="$DESTDIR" RAISE_SETFCAP=no install lib=lib
diff --git a/strata/foundation/libffi.def b/strata/foundation/libffi.def
new file mode 100644
index 00000000..9447017f
--- /dev/null
+++ b/strata/foundation/libffi.def
@@ -0,0 +1,7 @@
+name: libffi
+build-system: autotools
+install-commands:
+- make DESTDIR="$DESTDIR"/ install
+- mkdir -p "$DESTDIR"/usr/include
+- cp "$TARGET"/include/ffi.h "$DESTDIR"/usr/include/
+- cp "$TARGET"/include/ffitarget.h "$DESTDIR"/usr/include/
diff --git a/strata/foundation/libffi.morph b/strata/foundation/libffi.morph
deleted file mode 100644
index 174477af..00000000
--- a/strata/foundation/libffi.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: libffi
-kind: chunk
-build-system: autotools
-install-commands:
-- make DESTDIR="$DESTDIR"/ install
-- mkdir -p "$DESTDIR"/usr/include
-- cp "$TARGET"/include/ffi.h "$DESTDIR"/usr/include/
-- cp "$TARGET"/include/ffitarget.h "$DESTDIR"/usr/include/
diff --git a/strata/foundation/lzo.def b/strata/foundation/lzo.def
new file mode 100644
index 00000000..d715c1e2
--- /dev/null
+++ b/strata/foundation/lzo.def
@@ -0,0 +1,4 @@
+name: lzo
+build-system: autotools
+configure-commands:
+- ./configure --enable-shared=yes --prefix="$PREFIX"
diff --git a/strata/foundation/lzo.morph b/strata/foundation/lzo.morph
deleted file mode 100644
index a1a7bbc7..00000000
--- a/strata/foundation/lzo.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: lzo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --enable-shared=yes --prefix="$PREFIX"
diff --git a/strata/foundation/openssh.def b/strata/foundation/openssh.def
new file mode 100644
index 00000000..8d44993e
--- /dev/null
+++ b/strata/foundation/openssh.def
@@ -0,0 +1,27 @@
+name: openssh
+configure-commands:
+- autoreconf -if
+- |
+ OPENSSL_SEEDS_ITSELF=yes ./configure \
+ --prefix="$PREFIX" --sysconfdir=/etc/ssh \
+ --datadir="$PREFIX/share/sshd" \
+ --libexecdir="$PREFIX/lib/openssh" \
+ --with-privsep-path=/var/lib/sshd
+build-commands:
+- make
+- |
+ sed -e "s|@prefix@|$PREFIX|g" \
+ -e 's|@STARTUP_SCRIPT_SHELL@|/bin/sh|g' \
+ -e 's|@sysconfdir@|/etc/ssh|g' \
+ -e 's|@COMMENT_OUT_ECC@||g' \
+ sshd-keygen.in >sshd-keygen
+- sed -e "s|@prefix@|$PREFIX|g" opensshd.service.in >opensshd.service
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR/$PREFIX/sbin"
+- chmod go= "$DESTDIR"/var/lib/sshd
+- install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen"
+- install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id"
+- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
+- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service"
+- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service"
diff --git a/strata/foundation/openssh.morph b/strata/foundation/openssh.morph
deleted file mode 100644
index 6c759cb0..00000000
--- a/strata/foundation/openssh.morph
+++ /dev/null
@@ -1,28 +0,0 @@
-name: openssh
-kind: chunk
-configure-commands:
-- autoreconf -if
-- |
- OPENSSL_SEEDS_ITSELF=yes ./configure \
- --prefix="$PREFIX" --sysconfdir=/etc/ssh \
- --datadir="$PREFIX/share/sshd" \
- --libexecdir="$PREFIX/lib/openssh" \
- --with-privsep-path=/var/lib/sshd
-build-commands:
-- make
-- |
- sed -e "s|@prefix@|$PREFIX|g" \
- -e 's|@STARTUP_SCRIPT_SHELL@|/bin/sh|g' \
- -e 's|@sysconfdir@|/etc/ssh|g' \
- -e 's|@COMMENT_OUT_ECC@||g' \
- sshd-keygen.in >sshd-keygen
-- sed -e "s|@prefix@|$PREFIX|g" opensshd.service.in >opensshd.service
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR/$PREFIX/sbin"
-- chmod go= "$DESTDIR"/var/lib/sshd
-- install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen"
-- install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id"
-- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
-- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service"
-- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service"
diff --git a/strata/foundation/pciutils.def b/strata/foundation/pciutils.def
new file mode 100644
index 00000000..323761d9
--- /dev/null
+++ b/strata/foundation/pciutils.def
@@ -0,0 +1,10 @@
+name: pciutils
+configure-commands:
+- make ZLIB=no lib/config.mk
+- echo PREFIX=$PREFIX >>lib/config.mk
+- echo MANDIR=$PREFIX/share/man >>lib/config.mk
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- make DESTDIR="$DESTDIR" install-lib
diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.morph
deleted file mode 100644
index 8ca13bad..00000000
--- a/strata/foundation/pciutils.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: pciutils
-kind: chunk
-configure-commands:
-- make ZLIB=no lib/config.mk
-- echo PREFIX=$PREFIX >>lib/config.mk
-- echo MANDIR=$PREFIX/share/man >>lib/config.mk
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- make DESTDIR="$DESTDIR" install-lib
diff --git a/strata/foundation/systemd.def b/strata/foundation/systemd.def
new file mode 100644
index 00000000..6b3b5f01
--- /dev/null
+++ b/strata/foundation/systemd.def
@@ -0,0 +1,20 @@
+name: systemd
+max-jobs: 1
+build-system: autotools
+configure-commands:
+- sh autogen.sh
+- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc
+ --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix=
+ --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR"/sbin
+- ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init
+- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl
+ "$DESTDIR/sbin/$f"; done
+- rm -f "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
+- touch "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
+- sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service"
+- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount"
+ >"$DESTDIR/etc/systemd/system/tmp.mount"
+- touch "$DESTDIR/etc/machine-id"
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
deleted file mode 100644
index 2a1933d7..00000000
--- a/strata/foundation/systemd.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: systemd
-kind: chunk
-max-jobs: 1
-build-system: autotools
-configure-commands:
-- sh autogen.sh
-- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc
- --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix=
- --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR"/sbin
-- ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init
-- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl
- "$DESTDIR/sbin/$f"; done
-- rm -f "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
-- touch "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
-- sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service"
-- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount"
- >"$DESTDIR/etc/systemd/system/tmp.mount"
-- touch "$DESTDIR/etc/machine-id"
diff --git a/strata/foundation/tbdiff.def b/strata/foundation/tbdiff.def
new file mode 100644
index 00000000..6cc07139
--- /dev/null
+++ b/strata/foundation/tbdiff.def
@@ -0,0 +1,2 @@
+name: tbdiff
+build-system: autotools
diff --git a/strata/foundation/tbdiff.morph b/strata/foundation/tbdiff.morph
deleted file mode 100644
index a907a109..00000000
--- a/strata/foundation/tbdiff.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: tbdiff
-kind: chunk
-build-system: autotools
diff --git a/strata/genivi.def b/strata/genivi.def
new file mode 100644
index 00000000..d2909f53
--- /dev/null
+++ b/strata/genivi.def
@@ -0,0 +1,67 @@
+name: genivi
+description: Software components designed by genivi, for genivi.
+build-depends:
+- name: foundation
+contents:
+- name: linuxquota
+ repo: upstream:linuxquota
+ ref: 0804c89a16736533e440771dc42a15e5d0223902
+ unpetrify-ref: baserock/genivi/morph
+- name: DLT-daemon
+ repo: upstream:DLT-daemon
+ ref: 8b48e73f79b4463393916e4c6696917e3dedd026
+ unpetrify-ref: v2.10.0
+- name: node-startup-controller
+ repo: upstream:node-startup-controller
+ ref: c78fddaddc24a2c49f5ef18896c93403575295ae
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - DLT-daemon
+- name: googletest
+ repo: upstream:googletest
+ ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08
+ unpetrify-ref: baserock/morph
+- name: googlemock
+ repo: upstream:googlemock
+ ref: 0e9998c140079046c396a0e7033bb465abae79cd
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - googletest
+- name: genivi-common-api-runtime
+ repo: upstream:genivi-common-api-runtime
+ ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c
+ unpetrify-ref: 2.1.6
+- name: genivi-common-api-dbus-runtime
+ repo: upstream:genivi-common-api-dbus-runtime
+ ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f
+ unpetrify-ref: 2.1.6-p1
+ build-depends:
+ - genivi-common-api-runtime
+- name: audiomanager
+ repo: upstream:audiomanager
+ ref: 00caae1e41e8891d9a1bafa76028e8119f06fd8a
+ unpetrify-ref: baserock/6.0
+ build-depends:
+ - DLT-daemon
+ - googletest
+ - googlemock
+ - genivi-common-api-runtime
+ - genivi-common-api-dbus-runtime
+- name: itzam-tarball
+ repo: upstream:itzam-tarball
+ ref: 4ebcf671416927b64475da7b810b6016c847bf73
+ unpetrify-ref: baserock/genivi/baseline
+- name: persistence-client-library
+ repo: upstream:genivi/persistence-client-library
+ ref: 0934ba263e69be8453cc3150f997dad28489f0c7
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - DLT-daemon
+ - itzam-tarball
+- name: node-state-manager
+ repo: upstream:node-state-manager
+ ref: dd4a86b9459537d2e85489b36abf80f34d12f098
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - DLT-daemon
+ - persistence-client-library
diff --git a/strata/genivi.morph b/strata/genivi.morph
deleted file mode 100644
index bd0a457d..00000000
--- a/strata/genivi.morph
+++ /dev/null
@@ -1,78 +0,0 @@
-name: genivi
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: strata/foundation.morph
-chunks:
-- name: linuxquota
- morph: strata/genivi/linuxquota.morph
- repo: upstream:linuxquota
- ref: 0804c89a16736533e440771dc42a15e5d0223902
- unpetrify-ref: baserock/genivi/morph
- build-depends: []
-- name: DLT-daemon
- repo: upstream:DLT-daemon
- ref: 8b48e73f79b4463393916e4c6696917e3dedd026
- unpetrify-ref: v2.10.0
- build-depends: []
-- name: node-startup-controller
- morph: strata/genivi/node-startup-controller.morph
- repo: upstream:node-startup-controller
- ref: c78fddaddc24a2c49f5ef18896c93403575295ae
- unpetrify-ref: baserock/morph
- build-depends:
- - DLT-daemon
-- name: googletest
- morph: strata/genivi/googletest.morph
- repo: upstream:googletest
- ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: googlemock
- morph: strata/genivi/googlemock.morph
- repo: upstream:googlemock
- ref: 0e9998c140079046c396a0e7033bb465abae79cd
- unpetrify-ref: baserock/morph
- build-depends:
- - googletest
-- name: genivi-common-api-runtime
- repo: upstream:genivi-common-api-runtime
- ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c
- unpetrify-ref: 2.1.6
- build-depends: []
-- name: genivi-common-api-dbus-runtime
- repo: upstream:genivi-common-api-dbus-runtime
- ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f
- unpetrify-ref: 2.1.6-p1
- build-depends:
- - genivi-common-api-runtime
-- name: audiomanager
- repo: upstream:audiomanager
- ref: 00caae1e41e8891d9a1bafa76028e8119f06fd8a
- unpetrify-ref: baserock/6.0
- build-depends:
- - DLT-daemon
- - googletest
- - googlemock
- - genivi-common-api-runtime
- - genivi-common-api-dbus-runtime
-- name: itzam-tarball
- morph: strata/genivi/itzam-tarball.morph
- repo: upstream:itzam-tarball
- ref: 4ebcf671416927b64475da7b810b6016c847bf73
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: persistence-client-library
- repo: upstream:genivi/persistence-client-library
- ref: 0934ba263e69be8453cc3150f997dad28489f0c7
- unpetrify-ref: baserock/genivi/baseline
- build-depends:
- - DLT-daemon
- - itzam-tarball
-- name: node-state-manager
- repo: upstream:node-state-manager
- ref: dd4a86b9459537d2e85489b36abf80f34d12f098
- unpetrify-ref: baserock/genivi/baseline
- build-depends:
- - DLT-daemon
- - persistence-client-library
diff --git a/strata/genivi/googlemock.def b/strata/genivi/googlemock.def
new file mode 100644
index 00000000..997635c7
--- /dev/null
+++ b/strata/genivi/googlemock.def
@@ -0,0 +1,7 @@
+name: googlemock
+build-system: autotools
+configure-commands:
+- mkdir -p gtest/m4
+- ln -s /usr/share/gtest/m4/acx_pthread.m4 gtest/m4/acx_pthread.m4
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX"
diff --git a/strata/genivi/googlemock.morph b/strata/genivi/googlemock.morph
deleted file mode 100644
index b3eaa952..00000000
--- a/strata/genivi/googlemock.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: googlemock
-kind: chunk
-build-system: autotools
-configure-commands:
-- mkdir -p gtest/m4
-- ln -s /usr/share/gtest/m4/acx_pthread.m4 gtest/m4/acx_pthread.m4
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX"
diff --git a/strata/genivi/googletest.def b/strata/genivi/googletest.def
new file mode 100644
index 00000000..40503809
--- /dev/null
+++ b/strata/genivi/googletest.def
@@ -0,0 +1,6 @@
+name: googletest
+build-system: autotools
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p $DESTDIR/usr/share/gtest/m4
+- install -m 644 m4/acx_pthread.m4 $DESTDIR/usr/share/gtest/m4
diff --git a/strata/genivi/googletest.morph b/strata/genivi/googletest.morph
deleted file mode 100644
index 7723c721..00000000
--- a/strata/genivi/googletest.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: googletest
-kind: chunk
-build-system: autotools
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p $DESTDIR/usr/share/gtest/m4
-- install -m 644 m4/acx_pthread.m4 $DESTDIR/usr/share/gtest/m4
diff --git a/strata/genivi/itzam-tarball.def b/strata/genivi/itzam-tarball.def
new file mode 100644
index 00000000..e0841881
--- /dev/null
+++ b/strata/genivi/itzam-tarball.def
@@ -0,0 +1,9 @@
+name: itzam-tarball
+build-system: autotools
+pre-configure-commands:
+- sed -i 's/GENERIC_LIBRARY_NAME=libitzam/GENERIC_LIBRARY_NAME=itzam/g' configure.ac
+- mkdir m4
+- touch NEWS README AUTHORS ChangeLog
+- autoreconf -ivf
+post-install-commands:
+- install -D -m644 libitzam.pc "$DESTDIR$PREFIX/lib/pkgconfig/libitzam.pc"
diff --git a/strata/genivi/itzam-tarball.morph b/strata/genivi/itzam-tarball.morph
deleted file mode 100644
index eaf2db61..00000000
--- a/strata/genivi/itzam-tarball.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: itzam-tarball
-kind: chunk
-build-system: autotools
-pre-configure-commands:
-- sed -i 's/GENERIC_LIBRARY_NAME=libitzam/GENERIC_LIBRARY_NAME=itzam/g' configure.ac
-- mkdir m4
-- touch NEWS README AUTHORS ChangeLog
-- autoreconf -ivf
-post-install-commands:
-- install -D -m644 libitzam.pc "$DESTDIR$PREFIX/lib/pkgconfig/libitzam.pc"
diff --git a/strata/genivi/linuxquota.def b/strata/genivi/linuxquota.def
new file mode 100644
index 00000000..f2ccf965
--- /dev/null
+++ b/strata/genivi/linuxquota.def
@@ -0,0 +1,9 @@
+name: linuxquota
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make "RPCGEN=rpcgen -Y /usr/bin"
+install-commands:
+- make ROOTDIR="$DESTDIR" install
diff --git a/strata/genivi/linuxquota.morph b/strata/genivi/linuxquota.morph
deleted file mode 100644
index 826696ad..00000000
--- a/strata/genivi/linuxquota.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: linuxquota
-kind: chunk
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX"
-build-commands:
-- make "RPCGEN=rpcgen -Y /usr/bin"
-install-commands:
-- make ROOTDIR="$DESTDIR" install
diff --git a/strata/genivi/node-startup-controller.def b/strata/genivi/node-startup-controller.def
new file mode 100644
index 00000000..a0b85dd3
--- /dev/null
+++ b/strata/genivi/node-startup-controller.def
@@ -0,0 +1,8 @@
+name: node-startup-controller
+configure-commands:
+- sh autogen.sh
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/genivi/node-startup-controller.morph b/strata/genivi/node-startup-controller.morph
deleted file mode 100644
index d3d6dc77..00000000
--- a/strata/genivi/node-startup-controller.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: node-startup-controller
-kind: chunk
-configure-commands:
-- sh autogen.sh
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/gitlab.def b/strata/gitlab.def
new file mode 100644
index 00000000..42f28d93
--- /dev/null
+++ b/strata/gitlab.def
@@ -0,0 +1,17 @@
+name: gitlab
+description: gitlab components for server, ci etc
+build-depends:
+- name: ruby
+contents:
+- name: gitlab-ce
+ repo: upstream:gitlab/gitlab-ce
+ ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425
+ unpetrify-ref: baserock/v7.0.0
+- name: gitlab-ci
+ repo: upstream:gitlab/gitlab-ci
+ ref: c74044d65dec2ba8311e242c84e07a67abd52d37
+ unpetrify-ref: baserock/morph
+- name: gitlab-shell
+ repo: upstream:gitlab/gitlab-shell
+ ref: 0b4106d57223c666d9360339fd3790174aa43800
+ unpetrify-ref: baserock/morph
diff --git a/strata/gitlab.morph b/strata/gitlab.morph
deleted file mode 100644
index 0a1c35bb..00000000
--- a/strata/gitlab.morph
+++ /dev/null
@@ -1,24 +0,0 @@
-name: gitlab
-kind: stratum
-description: gitlab components for server, ci etc
-build-depends:
-- morph: strata/ruby.morph
-chunks:
-- name: gitlab-ce
- morph: strata/gitlab/gitlab-ce.morph
- repo: upstream:gitlab/gitlab-ce
- ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425
- unpetrify-ref: baserock/v7.0.0
- build-depends: []
-- name: gitlab-ci
- morph: strata/gitlab/gitlab-ci.morph
- repo: upstream:gitlab/gitlab-ci
- ref: c74044d65dec2ba8311e242c84e07a67abd52d37
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: gitlab-shell
- morph: strata/gitlab/gitlab-shell.morph
- repo: upstream:gitlab/gitlab-shell
- ref: 0b4106d57223c666d9360339fd3790174aa43800
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/gitlab/gitlab-ce.def b/strata/gitlab/gitlab-ce.def
new file mode 100644
index 00000000..916af2d6
--- /dev/null
+++ b/strata/gitlab/gitlab-ce.def
@@ -0,0 +1,5 @@
+name: gitlab-ce
+install-commands:
+- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ce"
+- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ce"
+- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ce"
diff --git a/strata/gitlab/gitlab-ce.morph b/strata/gitlab/gitlab-ce.morph
deleted file mode 100644
index 571881f8..00000000
--- a/strata/gitlab/gitlab-ce.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gitlab-ce
-kind: chunk
-install-commands:
-- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ce"
-- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ce"
-- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ce"
diff --git a/strata/gitlab/gitlab-ci.def b/strata/gitlab/gitlab-ci.def
new file mode 100644
index 00000000..ba9d683d
--- /dev/null
+++ b/strata/gitlab/gitlab-ci.def
@@ -0,0 +1,5 @@
+name: gitlab-ci
+install-commands:
+- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ci"
+- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ci"
+- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ci"
diff --git a/strata/gitlab/gitlab-ci.morph b/strata/gitlab/gitlab-ci.morph
deleted file mode 100644
index 99d01367..00000000
--- a/strata/gitlab/gitlab-ci.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gitlab-ci
-kind: chunk
-install-commands:
-- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ci"
-- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ci"
-- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ci"
diff --git a/strata/gitlab/gitlab-shell.def b/strata/gitlab/gitlab-shell.def
new file mode 100644
index 00000000..a8bf17c5
--- /dev/null
+++ b/strata/gitlab/gitlab-shell.def
@@ -0,0 +1,5 @@
+name: gitlab-shell
+install-commands:
+- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-shell"
+- cp -R * "$DESTDIR/$PREFIX/share/gitlab-shell"
+- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-shell"
diff --git a/strata/gitlab/gitlab-shell.morph b/strata/gitlab/gitlab-shell.morph
deleted file mode 100644
index 069c6c41..00000000
--- a/strata/gitlab/gitlab-shell.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gitlab-shell
-kind: chunk
-install-commands:
-- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-shell"
-- cp -R * "$DESTDIR/$PREFIX/share/gitlab-shell"
-- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-shell"
diff --git a/strata/graphics-common.def b/strata/graphics-common.def
new file mode 100644
index 00000000..81aa956c
--- /dev/null
+++ b/strata/graphics-common.def
@@ -0,0 +1,49 @@
+name: graphics-common
+build-depends:
+- name: mesa-common
+contents:
+- name: pixman
+ repo: upstream:pixman
+ ref: 87eea99e443b389c978cf37efc52788bf03a0ee0
+ unpetrify-ref: pixman-0.32.6
+- name: freetype2
+ repo: upstream:freetype2
+ ref: ec8853cd18e1a0c275372769bdad37a79550ed66
+ unpetrify-ref: VER-2-5-3
+- name: fontconfig
+ repo: upstream:fontconfig
+ ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a
+ unpetrify-ref: 2.11.1
+ build-depends:
+ - freetype2
+- name: freefont-otf
+ repo: upstream:freefont-otf
+ ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
+ unpetrify-ref: baserock/morph
+- name: libpng
+ repo: upstream:libpng
+ ref: 259fb7761d747655c607efcec7a12ff1f3c24561
+ unpetrify-ref: libpng-1.6.13-signed
+- name: libjpeg
+ repo: upstream:libjpeg
+ ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a
+ unpetrify-ref: baserock/morph
+- name: libtiff
+ repo: upstream:libtiff
+ ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
+ unpetrify-ref: Release-v4-0-3
+- name: cairo
+ repo: upstream:cairo
+ ref: f6fd372a8b31a0bebbdfe36090d6ffc7bab9a2f8
+ unpetrify-ref: 1.14.0
+ build-depends:
+ - fontconfig
+ - freetype2
+ - pixman
+ - libpng
+- name: harfbuzz
+ repo: upstream:harfbuzz
+ ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
+ unpetrify-ref: baserock/0.9.12
+ build-depends:
+ - freetype2
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
deleted file mode 100644
index b187df8f..00000000
--- a/strata/graphics-common.morph
+++ /dev/null
@@ -1,58 +0,0 @@
-name: graphics-common
-kind: stratum
-build-depends:
-- morph: strata/mesa-common.morph
-chunks:
-- name: pixman
- repo: upstream:pixman
- ref: 87eea99e443b389c978cf37efc52788bf03a0ee0
- unpetrify-ref: pixman-0.32.6
- build-depends: []
-- name: freetype2
- repo: upstream:freetype2
- ref: ec8853cd18e1a0c275372769bdad37a79550ed66
- unpetrify-ref: VER-2-5-3
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a
- unpetrify-ref: 2.11.1
- build-depends:
- - freetype2
-- name: freefont-otf
- morph: strata/graphics-common/freefont-otf.morph
- repo: upstream:freefont-otf
- ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libpng
- repo: upstream:libpng
- ref: 259fb7761d747655c607efcec7a12ff1f3c24561
- unpetrify-ref: libpng-1.6.13-signed
- build-depends: []
-- name: libjpeg
- repo: upstream:libjpeg
- ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libtiff
- repo: upstream:libtiff
- ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
- unpetrify-ref: Release-v4-0-3
- build-depends: []
-- name: cairo
- morph: strata/graphics-common/cairo.morph
- repo: upstream:cairo
- ref: f6fd372a8b31a0bebbdfe36090d6ffc7bab9a2f8
- unpetrify-ref: 1.14.0
- build-depends:
- - fontconfig
- - freetype2
- - pixman
- - libpng
-- name: harfbuzz
- repo: upstream:harfbuzz
- ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
- unpetrify-ref: baserock/0.9.12
- build-depends:
- - freetype2
diff --git a/strata/graphics-common/cairo.def b/strata/graphics-common/cairo.def
new file mode 100644
index 00000000..fa782661
--- /dev/null
+++ b/strata/graphics-common/cairo.def
@@ -0,0 +1,4 @@
+name: cairo
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/graphics-common/cairo.morph b/strata/graphics-common/cairo.morph
deleted file mode 100644
index f91ac385..00000000
--- a/strata/graphics-common/cairo.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: cairo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/graphics-common/freefont-otf.def b/strata/graphics-common/freefont-otf.def
new file mode 100644
index 00000000..f043a493
--- /dev/null
+++ b/strata/graphics-common/freefont-otf.def
@@ -0,0 +1,4 @@
+name: freefont-otf
+install-commands:
+- mkdir -p "$DESTDIR"/usr/share/fonts/opentype/freefont
+- install -p *.otf "$DESTDIR"/usr/share/fonts/opentype/freefont
diff --git a/strata/graphics-common/freefont-otf.morph b/strata/graphics-common/freefont-otf.morph
deleted file mode 100644
index f021480d..00000000
--- a/strata/graphics-common/freefont-otf.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: freefont-otf
-kind: chunk
-install-commands:
-- mkdir -p "$DESTDIR"/usr/share/fonts/opentype/freefont
-- install -p *.otf "$DESTDIR"/usr/share/fonts/opentype/freefont
diff --git a/strata/gtk-deps.def b/strata/gtk-deps.def
new file mode 100644
index 00000000..ea9e9999
--- /dev/null
+++ b/strata/gtk-deps.def
@@ -0,0 +1,40 @@
+name: gtk-deps
+description: the GTK+ dependencies stratum
+build-depends:
+- name: foundation
+- name: graphics-common
+- name: x-common
+contents:
+- name: pango
+ repo: upstream:pango
+ ref: e0a21abf52a0b7588b1aa3357818948816ed9103
+ unpetrify-ref: 1.36.8
+- name: shared-mime-info
+ repo: upstream:shared-mime-info
+ ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
+ unpetrify-ref: baserock/morph
+- name: gnome-common
+ repo: upstream:gnome-common
+ ref: d213283fcb5228d05eb2c796579f18240e8467e8
+ unpetrify-ref: 3.12.0
+- name: gdk-pixbuf
+ repo: upstream:gdk-pixbuf
+ ref: b86959aa16e9d49ec6e286bc57d36c5249578c59
+ unpetrify-ref: 2.30.8
+- name: atk
+ repo: upstream:atk
+ ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4
+ unpetrify-ref: ATK_2_12_0
+ build-depends:
+ - gnome-common
+- name: at-spi2-core
+ repo: upstream:at-spi2-core
+ ref: c354b5e8d8157e1018eafeca48642116a65c4ff5
+ unpetrify-ref: AT_SPI2_CORE_2_12_0
+- name: at-spi2-atk
+ repo: upstream:at-spi2-atk
+ ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6
+ unpetrify-ref: AT_SPI2_ATK_2_12_1
+ build-depends:
+ - at-spi2-core
+ - atk
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
deleted file mode 100644
index 799ba87a..00000000
--- a/strata/gtk-deps.morph
+++ /dev/null
@@ -1,48 +0,0 @@
-name: gtk-deps
-kind: stratum
-description: the GTK+ dependencies stratum
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/graphics-common.morph
-- morph: strata/x-common.morph
-chunks:
-- name: pango
- repo: upstream:pango
- ref: e0a21abf52a0b7588b1aa3357818948816ed9103
- unpetrify-ref: 1.36.8
- build-depends: []
-- name: shared-mime-info
- morph: strata/gtk-deps/shared-mime-info.morph
- repo: upstream:shared-mime-info
- ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: gnome-common
- repo: upstream:gnome-common
- ref: d213283fcb5228d05eb2c796579f18240e8467e8
- unpetrify-ref: 3.12.0
- build-depends: []
-- name: gdk-pixbuf
- morph: strata/gtk-deps/gdk-pixbuf.morph
- repo: upstream:gdk-pixbuf
- ref: b86959aa16e9d49ec6e286bc57d36c5249578c59
- unpetrify-ref: 2.30.8
- build-depends: []
-- name: atk
- repo: upstream:atk
- ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4
- unpetrify-ref: ATK_2_12_0
- build-depends:
- - gnome-common
-- name: at-spi2-core
- repo: upstream:at-spi2-core
- ref: c354b5e8d8157e1018eafeca48642116a65c4ff5
- unpetrify-ref: AT_SPI2_CORE_2_12_0
- build-depends: []
-- name: at-spi2-atk
- repo: upstream:at-spi2-atk
- ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6
- unpetrify-ref: AT_SPI2_ATK_2_12_1
- build-depends:
- - at-spi2-core
- - atk
diff --git a/strata/gtk-deps/gdk-pixbuf.def b/strata/gtk-deps/gdk-pixbuf.def
new file mode 100644
index 00000000..06ae22cd
--- /dev/null
+++ b/strata/gtk-deps/gdk-pixbuf.def
@@ -0,0 +1,5 @@
+name: gdk-pixbuf
+build-system: autotools
+install-commands:
+- make DESTDIR=$DESTDIR install
+- LD_LIBRARY_PATH=$DESTDIR/usr/lib $DESTDIR/usr/bin/gdk-pixbuf-query-loaders > $DESTDIR/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
diff --git a/strata/gtk-deps/gdk-pixbuf.morph b/strata/gtk-deps/gdk-pixbuf.morph
deleted file mode 100644
index c89c75c8..00000000
--- a/strata/gtk-deps/gdk-pixbuf.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gdk-pixbuf
-kind: chunk
-build-system: autotools
-install-commands:
-- make DESTDIR=$DESTDIR install
-- LD_LIBRARY_PATH=$DESTDIR/usr/lib $DESTDIR/usr/bin/gdk-pixbuf-query-loaders > $DESTDIR/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
diff --git a/strata/gtk-deps/shared-mime-info.def b/strata/gtk-deps/shared-mime-info.def
new file mode 100644
index 00000000..47c646cd
--- /dev/null
+++ b/strata/gtk-deps/shared-mime-info.def
@@ -0,0 +1,3 @@
+name: shared-mime-info
+max-jobs: 1
+build-system: autotools
diff --git a/strata/gtk-deps/shared-mime-info.morph b/strata/gtk-deps/shared-mime-info.morph
deleted file mode 100644
index e155fde0..00000000
--- a/strata/gtk-deps/shared-mime-info.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: shared-mime-info
-kind: chunk
-max-jobs: 1
-build-system: autotools
diff --git a/strata/gtk2.def b/strata/gtk2.def
new file mode 100644
index 00000000..7b37b7c0
--- /dev/null
+++ b/strata/gtk2.def
@@ -0,0 +1,9 @@
+name: gtk2
+description: the gtk2 stratum
+build-depends:
+- name: gtk-deps
+- name: x-generic
+contents:
+- name: gtk+
+ repo: upstream:gtk+
+ ref: fbf38d16bcc26630f0f721d266509f5bc292f606
diff --git a/strata/gtk2.morph b/strata/gtk2.morph
deleted file mode 100644
index 8ac31eaa..00000000
--- a/strata/gtk2.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: gtk2
-kind: stratum
-description: the gtk2 stratum
-build-depends:
-- morph: strata/gtk-deps.morph
-- morph: strata/x-generic.morph
-chunks:
-- name: gtk+
- morph: strata/gtk2/gtk+.morph
- repo: upstream:gtk+
- ref: fbf38d16bcc26630f0f721d266509f5bc292f606
- build-depends: []
diff --git a/strata/gtk2/gtk+.def b/strata/gtk2/gtk+.def
new file mode 100644
index 00000000..d901499d
--- /dev/null
+++ b/strata/gtk2/gtk+.def
@@ -0,0 +1,10 @@
+name: gtk+
+build-system: autotools
+configure-commands:
+- gdk-pixbuf-query-loaders > loader.cache
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX"
+build-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
+install-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install DESTDIR="$DESTDIR"
diff --git a/strata/gtk2/gtk+.morph b/strata/gtk2/gtk+.morph
deleted file mode 100644
index abbf2510..00000000
--- a/strata/gtk2/gtk+.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: gtk+
-kind: chunk
-build-system: autotools
-configure-commands:
-- gdk-pixbuf-query-loaders > loader.cache
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX"
-build-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
-install-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install DESTDIR="$DESTDIR"
diff --git a/strata/gtk3.def b/strata/gtk3.def
new file mode 100644
index 00000000..a2382df3
--- /dev/null
+++ b/strata/gtk3.def
@@ -0,0 +1,16 @@
+name: gtk3
+description: the gtk3 stratum
+build-depends:
+- name: gtk-deps
+- name: wayland-generic
+contents:
+- name: libepoxy
+ repo: upstream:libepoxy
+ ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
+ unpetrify-ref: v1.2
+- name: gtk3
+ repo: upstream:gtk+
+ ref: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a
+ unpetrify-ref: 3.15.0
+ build-depends:
+ - libepoxy
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
deleted file mode 100644
index f471bf6e..00000000
--- a/strata/gtk3.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-name: gtk3
-kind: stratum
-description: the gtk3 stratum
-build-depends:
-- morph: strata/gtk-deps.morph
-- morph: strata/wayland-generic.morph
-chunks:
-- name: libepoxy
- repo: upstream:libepoxy
- ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
- unpetrify-ref: v1.2
- build-depends: []
-- name: gtk3
- morph: strata/gtk3/gtk3.morph
- repo: upstream:gtk+
- ref: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a
- unpetrify-ref: 3.15.0
- build-depends:
- - libepoxy
diff --git a/strata/gtk3/gtk3.def b/strata/gtk3/gtk3.def
new file mode 100644
index 00000000..a07ac7af
--- /dev/null
+++ b/strata/gtk3/gtk3.def
@@ -0,0 +1,10 @@
+name: gtk3
+build-system: autotools
+configure-commands:
+- gdk-pixbuf-query-loaders > loader.cache
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --enable-wayland-backend
+build-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
+install-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install DESTDIR="$DESTDIR"
diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.morph
deleted file mode 100644
index 4542dc15..00000000
--- a/strata/gtk3/gtk3.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: gtk3
-kind: chunk
-build-system: autotools
-configure-commands:
-- gdk-pixbuf-query-loaders > loader.cache
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --enable-wayland-backend
-build-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
-install-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install DESTDIR="$DESTDIR"
diff --git a/strata/initramfs-utils.def b/strata/initramfs-utils.def
new file mode 100644
index 00000000..e878d6d8
--- /dev/null
+++ b/strata/initramfs-utils.def
@@ -0,0 +1,9 @@
+name: initramfs-utils
+description: stratum for initramfs
+build-depends:
+- name: build-essential
+contents:
+- name: initramfs-scripts
+ repo: baserock:baserock/initramfs-scripts
+ ref: a97dea93d28ba272613029e46a8a0b1f699729d8
+ unpetrify-ref: master
diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.morph
deleted file mode 100644
index b6076cde..00000000
--- a/strata/initramfs-utils.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: initramfs-utils
-kind: stratum
-description: stratum for initramfs
-build-depends:
-- morph: strata/build-essential.morph
-chunks:
-- name: initramfs-scripts
- morph: strata/initramfs-utils/initramfs-scripts.morph
- repo: baserock:baserock/initramfs-scripts
- ref: a97dea93d28ba272613029e46a8a0b1f699729d8
- unpetrify-ref: master
- build-depends: []
diff --git a/strata/initramfs-utils/initramfs-scripts.def b/strata/initramfs-utils/initramfs-scripts.def
new file mode 100644
index 00000000..badd5422
--- /dev/null
+++ b/strata/initramfs-utils/initramfs-scripts.def
@@ -0,0 +1,3 @@
+name: initramfs-scripts
+install-commands:
+- install -m 755 init "$DESTDIR/init"
diff --git a/strata/initramfs-utils/initramfs-scripts.morph b/strata/initramfs-utils/initramfs-scripts.morph
deleted file mode 100644
index 68ed4a7b..00000000
--- a/strata/initramfs-utils/initramfs-scripts.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: initramfs-scripts
-kind: chunk
-install-commands:
-- install -m 755 init "$DESTDIR/init"
diff --git a/strata/input-common.def b/strata/input-common.def
new file mode 100644
index 00000000..5ec6cbd1
--- /dev/null
+++ b/strata/input-common.def
@@ -0,0 +1,24 @@
+name: input-common
+build-depends:
+- name: foundation
+- name: xorg-util-macros-common
+contents:
+- name: mtdev
+ repo: upstream:mtdev-git
+ ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
+ unpetrify-ref: baserock/genivi/baseline
+- name: xkeyboard-config
+ repo: upstream:xkeyboard-config
+ ref: bc3ac1b0d152e929b3532a541596cf9fe286bb9e
+ unpetrify-ref: xkeyboard-config-2.12
+- name: libevdev
+ repo: upstream:libevdev
+ ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
+ unpetrify-ref: baserock/genivi/baseline
+- name: libinput
+ repo: upstream:libinput
+ ref: bb10ec84d3704fc0fb40591bcbffe90f6c77966d
+ unpetrify-ref: 0.5.0
+ build-depends:
+ - mtdev
+ - libevdev
diff --git a/strata/input-common.morph b/strata/input-common.morph
deleted file mode 100644
index 0e9d25e6..00000000
--- a/strata/input-common.morph
+++ /dev/null
@@ -1,29 +0,0 @@
-name: input-common
-kind: stratum
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/xorg-util-macros-common.morph
-chunks:
-- name: mtdev
- repo: upstream:mtdev-git
- ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: xkeyboard-config
- morph: strata/input-common/xkeyboard-config.morph
- repo: upstream:xkeyboard-config
- ref: bc3ac1b0d152e929b3532a541596cf9fe286bb9e
- unpetrify-ref: xkeyboard-config-2.12
- build-depends: []
-- name: libevdev
- repo: upstream:libevdev
- ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: libinput
- repo: upstream:libinput
- ref: bb10ec84d3704fc0fb40591bcbffe90f6c77966d
- unpetrify-ref: 0.5.0
- build-depends:
- - mtdev
- - libevdev
diff --git a/strata/input-common/xkeyboard-config.def b/strata/input-common/xkeyboard-config.def
new file mode 100644
index 00000000..4a06b024
--- /dev/null
+++ b/strata/input-common/xkeyboard-config.def
@@ -0,0 +1,6 @@
+name: xkeyboard-config
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-runtime-deps
+install-commands:
+- mkdir -p "$DESTDIR"/"$PREFIX"/share/X11/xkb/
+- make install DESTDIR="$DESTDIR"
diff --git a/strata/input-common/xkeyboard-config.morph b/strata/input-common/xkeyboard-config.morph
deleted file mode 100644
index ad33b422..00000000
--- a/strata/input-common/xkeyboard-config.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: xkeyboard-config
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-runtime-deps
-install-commands:
-- mkdir -p "$DESTDIR"/"$PREFIX"/share/X11/xkb/
-- make install DESTDIR="$DESTDIR"
diff --git a/strata/libdrm-common.def b/strata/libdrm-common.def
new file mode 100644
index 00000000..7c300ae8
--- /dev/null
+++ b/strata/libdrm-common.def
@@ -0,0 +1,14 @@
+name: libdrm-common
+build-depends:
+- name: xorg-util-macros-common
+contents:
+- name: xorg-lib-libpciaccess
+ repo: upstream:xorg-lib-libpciaccess
+ ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f
+ unpetrify-ref: baserock/morph
+- name: drm
+ repo: upstream:drm
+ ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b
+ unpetrify-ref: baserock/jetson/drm
+ build-depends:
+ - xorg-lib-libpciaccess
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
deleted file mode 100644
index 37bff746..00000000
--- a/strata/libdrm-common.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-name: libdrm-common
-kind: stratum
-build-depends:
-- morph: strata/xorg-util-macros-common.morph
-chunks:
-- name: xorg-lib-libpciaccess
- repo: upstream:xorg-lib-libpciaccess
- ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: drm
- repo: upstream:drm
- morph: strata/libdrm-common/drm.morph
- ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b
- unpetrify-ref: baserock/jetson/drm
- build-depends:
- - xorg-lib-libpciaccess
diff --git a/strata/libdrm-common/drm.def b/strata/libdrm-common/drm.def
new file mode 100644
index 00000000..40e1545e
--- /dev/null
+++ b/strata/libdrm-common/drm.def
@@ -0,0 +1,9 @@
+name: drm
+build-system: autotools
+configure-commands:
+ - NOCONFIGURE=1 ./autogen.sh
+ - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api
+install-commands:
+ - make install DESTDIR="$DESTDIR"
+ - mkdir -p "$DESTDIR"/usr/lib/pkgconfig
+ - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph
deleted file mode 100644
index d3d06fd8..00000000
--- a/strata/libdrm-common/drm.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: drm
-kind: chunk
-build-system: autotools
-configure-commands:
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api
-install-commands:
- - make install DESTDIR="$DESTDIR"
- - mkdir -p "$DESTDIR"/usr/lib/pkgconfig
- - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig
diff --git a/strata/lighttpd-server.def b/strata/lighttpd-server.def
new file mode 100644
index 00000000..72958519
--- /dev/null
+++ b/strata/lighttpd-server.def
@@ -0,0 +1,10 @@
+name: lighttpd-server
+description: lighttpd web server
+build-depends:
+- name: tools
+- name: pcre-utils
+contents:
+- name: lighttpd
+ repo: upstream:lighttpd
+ ref: 12e4e21763da770034267ff0a7b660876930f789
+ unpetrify-ref: baserock/morph
diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph
deleted file mode 100644
index cf3dec19..00000000
--- a/strata/lighttpd-server.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: lighttpd-server
-kind: stratum
-description: lighttpd web server
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/pcre-utils.morph
-chunks:
-- name: lighttpd
- morph: strata/lighttpd-server/lighttpd.morph
- repo: upstream:lighttpd
- ref: 12e4e21763da770034267ff0a7b660876930f789
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/lighttpd-server/lighttpd.def b/strata/lighttpd-server/lighttpd.def
new file mode 100644
index 00000000..cb762f21
--- /dev/null
+++ b/strata/lighttpd-server/lighttpd.def
@@ -0,0 +1,5 @@
+name: lighttpd
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --with-openssl --with-openssl-libs=/usr/lib
diff --git a/strata/lighttpd-server/lighttpd.morph b/strata/lighttpd-server/lighttpd.morph
deleted file mode 100644
index ae371c52..00000000
--- a/strata/lighttpd-server/lighttpd.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: lighttpd
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --with-openssl --with-openssl-libs=/usr/lib
diff --git a/strata/llvm-common.def b/strata/llvm-common.def
new file mode 100644
index 00000000..f92804e6
--- /dev/null
+++ b/strata/llvm-common.def
@@ -0,0 +1,8 @@
+name: llvm-common
+build-depends:
+- name: core
+contents:
+- name: llvm
+ repo: upstream:llvm
+ ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f
+ unpetrify-ref: release_33
diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph
deleted file mode 100644
index 243461d6..00000000
--- a/strata/llvm-common.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: llvm-common
-kind: stratum
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: llvm
- morph: strata/llvm-common/llvm.morph
- repo: upstream:llvm
- ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f
- unpetrify-ref: release_33
- build-depends: []
diff --git a/strata/llvm-common/llvm.def b/strata/llvm-common/llvm.def
new file mode 100644
index 00000000..e73d1cae
--- /dev/null
+++ b/strata/llvm-common/llvm.def
@@ -0,0 +1,7 @@
+name: llvm
+description: Low Level Virtual Machine
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions
+build-commands:
+- make $MAKEFLAGS
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph
deleted file mode 100644
index 9d280062..00000000
--- a/strata/llvm-common/llvm.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: llvm
-kind: chunk
-description: Low Level Virtual Machine
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions
-build-commands:
-- make $MAKEFLAGS
diff --git a/strata/lua.def b/strata/lua.def
new file mode 100644
index 00000000..503c8d91
--- /dev/null
+++ b/strata/lua.def
@@ -0,0 +1,9 @@
+name: lua
+description: Interpreter for the lua scripting language.
+build-depends:
+- name: tools
+contents:
+- name: lua
+ repo: upstream:lua
+ ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
+ unpetrify-ref: baserock/5.1-morph
diff --git a/strata/lua.morph b/strata/lua.morph
deleted file mode 100644
index 5ac3102b..00000000
--- a/strata/lua.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: lua
-kind: stratum
-description: Interpreter for the lua scripting language.
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: lua
- morph: strata/lua/lua.morph
- repo: upstream:lua
- ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
- unpetrify-ref: baserock/5.1-morph
- build-depends: []
diff --git a/strata/lua/lua.def b/strata/lua/lua.def
new file mode 100644
index 00000000..b04c2b63
--- /dev/null
+++ b/strata/lua/lua.def
@@ -0,0 +1,10 @@
+name: lua
+configure-commands:
+- sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
+- sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
+build-commands:
+- make debian_linux INSTALL_TOP="$PREFIX" RPATH="$PREFIX/lib"
+install-commands:
+- make INSTALL_TOP="$DESTDIR/$PREFIX" debian_install
+- mkdir -p "$DESTDIR/$PREFIX/lib/pkgconfig"
+- cp lua5.1.pc "$DESTDIR/$PREFIX/lib/pkgconfig/"
diff --git a/strata/lua/lua.morph b/strata/lua/lua.morph
deleted file mode 100644
index 32aeb5c1..00000000
--- a/strata/lua/lua.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: lua
-kind: chunk
-configure-commands:
-- sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
-- sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
-build-commands:
-- make debian_linux INSTALL_TOP="$PREFIX" RPATH="$PREFIX/lib"
-install-commands:
-- make INSTALL_TOP="$DESTDIR/$PREFIX" debian_install
-- mkdir -p "$DESTDIR/$PREFIX/lib/pkgconfig"
-- cp lua5.1.pc "$DESTDIR/$PREFIX/lib/pkgconfig/"
diff --git a/strata/mesa-common.def b/strata/mesa-common.def
new file mode 100644
index 00000000..8143a4e9
--- /dev/null
+++ b/strata/mesa-common.def
@@ -0,0 +1,10 @@
+name: mesa-common
+build-depends:
+- name: llvm-common
+- name: libdrm-common
+- name: wayland-generic
+contents:
+- name: mesa
+ repo: upstream:mesa
+ ref: 1a9cc5f50db5d27530a3449743b43aac389d781f
+ unpetrify-ref: mesa-10.3.3
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
deleted file mode 100644
index efae2449..00000000
--- a/strata/mesa-common.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: mesa-common
-kind: stratum
-build-depends:
-- morph: strata/llvm-common.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/wayland-generic.morph
-chunks:
-- name: mesa
- morph: strata/mesa-common/mesa.morph
- repo: upstream:mesa
- ref: 1a9cc5f50db5d27530a3449743b43aac389d781f
- unpetrify-ref: mesa-10.3.3
- build-depends: []
diff --git a/strata/mesa-common/mesa.def b/strata/mesa-common/mesa.def
new file mode 100644
index 00000000..c1c25812
--- /dev/null
+++ b/strata/mesa-common/mesa.def
@@ -0,0 +1,22 @@
+name: mesa
+build-system: autotools
+configure-commands:
+- |
+ cpu=$(echo $TARGET | cut -d '-' -f 1)
+ case "$cpu" in
+ armv7lhf)
+ DRIDRIVERS=no
+ GALLIUMDRIVERS=nouveau,freedreno,svga,swrast,vc4
+ ;;
+ *)
+ DRIDRIVERS=yes
+ GALLIUMDRIVERS=yes
+ ;;
+ esac
+ ./autogen.sh --prefix="$PREFIX" \
+ --enable-gles2 \
+ --disable-glx \
+ --with-egl-platforms=drm,wayland \
+ --with-gallium-drivers="$GALLIUMDRIVERS" \
+ --with-dri-drivers="$DRIDRIVERS" \
+ --enable-gallium-egl
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
deleted file mode 100644
index 4194acc2..00000000
--- a/strata/mesa-common/mesa.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-name: mesa
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
- cpu=$(echo $TARGET | cut -d '-' -f 1)
- case "$cpu" in
- armv7lhf)
- DRIDRIVERS=no
- GALLIUMDRIVERS=nouveau,freedreno,svga,swrast,vc4
- ;;
- *)
- DRIDRIVERS=yes
- GALLIUMDRIVERS=yes
- ;;
- esac
- ./autogen.sh --prefix="$PREFIX" \
- --enable-gles2 \
- --disable-glx \
- --with-egl-platforms=drm,wayland \
- --with-gallium-drivers="$GALLIUMDRIVERS" \
- --with-dri-drivers="$DRIDRIVERS" \
- --enable-gallium-egl
diff --git a/strata/morph-utils.def b/strata/morph-utils.def
new file mode 100644
index 00000000..591a430d
--- /dev/null
+++ b/strata/morph-utils.def
@@ -0,0 +1,69 @@
+name: morph-utils
+build-depends:
+- name: core
+contents:
+- name: python-ttystatus
+ repo: upstream:python-ttystatus
+ ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
+ unpetrify-ref: baserock/morph
+- name: python-markdown
+ repo: upstream:python-markdown
+ ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
+ unpetrify-ref: baserock/morph
+- name: git-fat
+ repo: upstream:git-fat
+ ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610
+ unpetrify-ref: baserock/morph
+- name: six
+ repo: upstream:six
+ ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
+ unpetrify-ref: baserock/morph
+- name: pyfilesystem
+ repo: upstream:pyfilesystem
+ ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - six
+- name: python-coveragepy
+ repo: upstream:python-coveragepy
+ ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
+ unpetrify-ref: baserock/morph
+- name: python-coverage-test-runner
+ repo: upstream:python-coverage-test-runner
+ ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coveragepy
+- name: cliapp
+ repo: upstream:cliapp
+ ref: cec20cedd062a3aef1b04f997e77b45090c07806
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coverage-test-runner
+- name: cmdtest
+ repo: upstream:cmdtest
+ ref: ac91791842c6e7e6eda3213916af413255999c7b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - cliapp
+ - python-ttystatus
+ - python-markdown
+- name: bottle
+ repo: upstream:bottle
+ ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
+ unpetrify-ref: baserock/morph
+- name: flup
+ repo: upstream:flup
+ ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
+ unpetrify-ref: baserock/morph
+- name: morph
+ repo: baserock:baserock/morph
+ ref: 9b0b5206a25c1d874d6e17952c4385838e57563e
+ unpetrify-ref: master
+ build-depends:
+ - cliapp
+ - cmdtest
+ - python-coverage-test-runner
+ - pyfilesystem
+ - bottle
+ - flup
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
deleted file mode 100644
index 54292eb0..00000000
--- a/strata/morph-utils.morph
+++ /dev/null
@@ -1,82 +0,0 @@
-name: morph-utils
-kind: stratum
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: python-ttystatus
- morph: strata/morph-utils/python-ttystatus.morph
- repo: upstream:python-ttystatus
- ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-markdown
- repo: upstream:python-markdown
- ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: git-fat
- morph: strata/tools/git-fat.morph
- repo: upstream:git-fat
- ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: six
- repo: upstream:six
- ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pyfilesystem
- morph: strata/morph-utils/pyfilesystem.morph
- repo: upstream:pyfilesystem
- ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
- unpetrify-ref: baserock/morph
- build-depends:
- - six
-- name: python-coveragepy
- morph: strata/morph-utils/python-coveragepy.morph
- repo: upstream:python-coveragepy
- ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-coverage-test-runner
- repo: upstream:python-coverage-test-runner
- ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coveragepy
-- name: cliapp
- repo: upstream:cliapp
- ref: cec20cedd062a3aef1b04f997e77b45090c07806
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coverage-test-runner
-- name: cmdtest
- morph: strata/morph-utils/cmdtest.morph
- repo: upstream:cmdtest
- ref: ac91791842c6e7e6eda3213916af413255999c7b
- unpetrify-ref: baserock/morph
- build-depends:
- - cliapp
- - python-ttystatus
- - python-markdown
-- name: bottle
- repo: upstream:bottle
- ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: flup
- repo: upstream:flup
- ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: morph
- repo: baserock:baserock/morph
- ref: 9b0b5206a25c1d874d6e17952c4385838e57563e
- unpetrify-ref: master
- build-depends:
- - cliapp
- - cmdtest
- - python-coverage-test-runner
- - pyfilesystem
- - bottle
- - flup
diff --git a/strata/morph-utils/cmdtest.def b/strata/morph-utils/cmdtest.def
new file mode 100644
index 00000000..34010c41
--- /dev/null
+++ b/strata/morph-utils/cmdtest.def
@@ -0,0 +1,5 @@
+name: cmdtest
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix=/usr --root "$DESTDIR"
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.def b/strata/morph-utils/pyfilesystem.def
new file mode 100644
index 00000000..fae6f7d1
--- /dev/null
+++ b/strata/morph-utils/pyfilesystem.def
@@ -0,0 +1,5 @@
+name: pyfilesystem
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix="$PREFIX" --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-coveragepy.def b/strata/morph-utils/python-coveragepy.def
new file mode 100644
index 00000000..cf8718b3
--- /dev/null
+++ b/strata/morph-utils/python-coveragepy.def
@@ -0,0 +1,5 @@
+name: python-coveragepy
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/morph-utils/python-coveragepy.morph
deleted file mode 100644
index ed5e3d87..00000000
--- a/strata/morph-utils/python-coveragepy.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-coveragepy
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/morph-utils/python-ttystatus.def b/strata/morph-utils/python-ttystatus.def
new file mode 100644
index 00000000..503e7da5
--- /dev/null
+++ b/strata/morph-utils/python-ttystatus.def
@@ -0,0 +1,5 @@
+name: python-ttystatus
+build-commands:
+- python setup.py build
+install-commands:
+- python setup.py install --prefix=/usr --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/multimedia-gstreamer-0.10.def b/strata/multimedia-gstreamer-0.10.def
new file mode 100644
index 00000000..99cd13f6
--- /dev/null
+++ b/strata/multimedia-gstreamer-0.10.def
@@ -0,0 +1,31 @@
+name: multimedia-gstreamer-0.10
+description: Codecs
+build-depends:
+- name: core
+- name: foundation
+- name: audio-bluetooth
+contents:
+- name: orc
+ repo: upstream:orc
+ ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a
+ unpetrify-ref: baserock/morph
+- name: gstreamer
+ repo: upstream:gstreamer
+ ref: c7e4a97d26396882960fd399b1a5e298e40d2a35
+ unpetrify-ref: baserock/morph/0.10
+ build-depends:
+ - orc
+- name: gstreamer-plugins-base
+ repo: upstream:gstreamer-plugins-base
+ ref: 960c596309dbb983a1d733259adccc45c47006a2
+ unpetrify-ref: baserock/morph/0.10
+ build-depends:
+ - gstreamer
+- name: gstreamer-plugins-good
+ repo: upstream:gstreamer-plugins-good
+ ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3
+ unpetrify-ref: baserock/morph/0.10
+ build-depends:
+ - gstreamer
+ - gstreamer-plugins-base
+ - orc
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
deleted file mode 100644
index ae5fe656..00000000
--- a/strata/multimedia-gstreamer-0.10.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: multimedia-gstreamer-0.10
-kind: stratum
-description: Codecs
-build-depends:
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-- morph: strata/audio-bluetooth.morph
-chunks:
-- name: orc
- repo: upstream:orc
- ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: gstreamer
- repo: upstream:gstreamer
- ref: c7e4a97d26396882960fd399b1a5e298e40d2a35
- unpetrify-ref: baserock/morph/0.10
- build-depends:
- - orc
-- name: gstreamer-plugins-base
- repo: upstream:gstreamer-plugins-base
- ref: 960c596309dbb983a1d733259adccc45c47006a2
- unpetrify-ref: baserock/morph/0.10
- build-depends:
- - gstreamer
-- name: gstreamer-plugins-good
- repo: upstream:gstreamer-plugins-good
- ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3
- unpetrify-ref: baserock/morph/0.10
- build-depends:
- - gstreamer
- - gstreamer-plugins-base
- - orc
diff --git a/strata/multimedia.def b/strata/multimedia.def
new file mode 100644
index 00000000..726f6f56
--- /dev/null
+++ b/strata/multimedia.def
@@ -0,0 +1,37 @@
+name: multimedia
+description: Codecs
+build-depends:
+- name: audio-bluetooth
+contents:
+- name: orc
+ repo: upstream:orc
+ ref: ec132ae118bead13312f126a1f6e5709a2429ff6
+ unpetrify-ref: orc-0.4.19
+- name: gstreamer
+ repo: upstream:gstreamer
+ ref: 0217fba607637860a475d0b5d48a3d4b249ca360
+ unpetrify-ref: baserock/morph/1.2
+ build-depends:
+ - orc
+- name: gstreamer-plugins-base
+ repo: upstream:gstreamer-plugins-base
+ ref: 1263caa96fcc1e3d2963bc27acbcf88b5b17d5dd
+ unpetrify-ref: baserock/morph/1.2
+ build-depends:
+ - gstreamer
+- name: gstreamer-plugins-good
+ repo: upstream:gstreamer-plugins-good
+ ref: b7e3af91197812e41028016d2e75ad2d6530b9b3
+ unpetrify-ref: baserock/morph/1.2
+ build-depends:
+ - gstreamer
+ - gstreamer-plugins-base
+ - orc
+- name: gstreamer-plugins-bad
+ repo: upstream:gstreamer-plugins-bad
+ ref: 343470e7fd1e7a6bb95b953d25b2caf5425d0185
+ unpetrify-ref: baserock/morph/1.2
+ build-depends:
+ - gstreamer
+ - gstreamer-plugins-base
+ - orc
diff --git a/strata/multimedia.morph b/strata/multimedia.morph
deleted file mode 100644
index b0d82984..00000000
--- a/strata/multimedia.morph
+++ /dev/null
@@ -1,39 +0,0 @@
-name: multimedia
-kind: stratum
-description: Codecs
-build-depends:
-- morph: strata/audio-bluetooth.morph
-chunks:
-- name: orc
- repo: upstream:orc
- ref: ec132ae118bead13312f126a1f6e5709a2429ff6
- unpetrify-ref: orc-0.4.19
- build-depends: []
-- name: gstreamer
- repo: upstream:gstreamer
- ref: 0217fba607637860a475d0b5d48a3d4b249ca360
- unpetrify-ref: baserock/morph/1.2
- build-depends:
- - orc
-- name: gstreamer-plugins-base
- repo: upstream:gstreamer-plugins-base
- ref: 1263caa96fcc1e3d2963bc27acbcf88b5b17d5dd
- unpetrify-ref: baserock/morph/1.2
- build-depends:
- - gstreamer
-- name: gstreamer-plugins-good
- repo: upstream:gstreamer-plugins-good
- ref: b7e3af91197812e41028016d2e75ad2d6530b9b3
- unpetrify-ref: baserock/morph/1.2
- build-depends:
- - gstreamer
- - gstreamer-plugins-base
- - orc
-- name: gstreamer-plugins-bad
- repo: upstream:gstreamer-plugins-bad
- ref: 343470e7fd1e7a6bb95b953d25b2caf5425d0185
- unpetrify-ref: baserock/morph/1.2
- build-depends:
- - gstreamer
- - gstreamer-plugins-base
- - orc
diff --git a/strata/network-security.def b/strata/network-security.def
new file mode 100644
index 00000000..5ed1ef90
--- /dev/null
+++ b/strata/network-security.def
@@ -0,0 +1,15 @@
+name: network-security
+build-depends:
+- name: core
+contents:
+- name: nspr
+ repo: upstream:nspr-hg
+ ref: a6ee84946475c1fb7624973af28163f6da247c0d
+ unpetrify-ref: baserock/morph
+- name: nss
+ repo: upstream:nss
+ ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - nspr
+
diff --git a/strata/network-security.morph b/strata/network-security.morph
deleted file mode 100644
index 3d0c7814..00000000
--- a/strata/network-security.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-name: network-security
-kind: stratum
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: nspr
- morph: strata/network-security/nspr.morph
- repo: upstream:nspr-hg
- ref: a6ee84946475c1fb7624973af28163f6da247c0d
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: nss
- morph: strata/network-security/nss.morph
- repo: upstream:nss
- ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487
- unpetrify-ref: baserock/morph
- build-depends:
- - nspr
-
diff --git a/strata/network-security/nspr.def b/strata/network-security/nspr.def
new file mode 100644
index 00000000..d0a3fc48
--- /dev/null
+++ b/strata/network-security/nspr.def
@@ -0,0 +1,11 @@
+name: nspr
+build-system: autotools
+configure-commands:
+- |
+ case "$MORPH_ARCH" in
+ x86_64|ppc64)
+ EXTRA_ARGS="--enable-64bit";;
+ *)
+ EXTRA_ARGS="";;
+ esac
+ ./configure --prefix="$PREFIX" --with-mozilla --with-pthreads $EXTRA_ARGS
diff --git a/strata/network-security/nspr.morph b/strata/network-security/nspr.morph
deleted file mode 100644
index 27613eb4..00000000
--- a/strata/network-security/nspr.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: nspr
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
- case "$MORPH_ARCH" in
- x86_64|ppc64)
- EXTRA_ARGS="--enable-64bit";;
- *)
- EXTRA_ARGS="";;
- esac
- ./configure --prefix="$PREFIX" --with-mozilla --with-pthreads $EXTRA_ARGS
diff --git a/strata/network-security/nss.def b/strata/network-security/nss.def
new file mode 100644
index 00000000..8edc170e
--- /dev/null
+++ b/strata/network-security/nss.def
@@ -0,0 +1,6 @@
+name: nss
+max-jobs: 1
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --libdir="$PREFIX/lib"
diff --git a/strata/network-security/nss.morph b/strata/network-security/nss.morph
deleted file mode 100644
index c83fd174..00000000
--- a/strata/network-security/nss.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: nss
-kind: chunk
-max-jobs: 1
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --libdir="$PREFIX/lib"
diff --git a/strata/nfs.def b/strata/nfs.def
new file mode 100644
index 00000000..570dedf4
--- /dev/null
+++ b/strata/nfs.def
@@ -0,0 +1,26 @@
+name: nfs
+description: NFS utilities
+build-depends:
+- name: foundation
+contents:
+- name: libevent
+ repo: upstream:libevent
+ ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7
+ unpetrify-ref: baserock/release-2.0.21-stable
+- name: ti-rpc
+ repo: upstream:ti-rpc
+ ref: c5a7a19070e74115fc9c26aa6f3dfec1da220c1f
+ unpetrify-ref: baserock/master
+- name: rpcbind
+ repo: upstream:rpcbind
+ ref: aa3ac0d86c258d3e355ae59df31a96da795ecdfa
+ unpetrify-ref: baserock/master
+ build-depends:
+ - ti-rpc
+- name: nfs-utils
+ repo: upstream:nfs-utils
+ ref: 08baf3bc2f66a1ca6401191e19380028d2fc2c6d
+ unpetrify-ref: baserock/master
+ build-depends:
+ - libevent
+ - ti-rpc
diff --git a/strata/nfs.morph b/strata/nfs.morph
deleted file mode 100644
index 68988d54..00000000
--- a/strata/nfs.morph
+++ /dev/null
@@ -1,32 +0,0 @@
-name: nfs
-kind: stratum
-description: NFS utilities
-build-depends:
-- morph: strata/foundation.morph
-chunks:
-- name: libevent
- repo: upstream:libevent
- ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7
- unpetrify-ref: baserock/release-2.0.21-stable
- build-depends: []
-- name: ti-rpc
- morph: strata/nfs/ti-rpc.morph
- repo: upstream:ti-rpc
- ref: c5a7a19070e74115fc9c26aa6f3dfec1da220c1f
- unpetrify-ref: baserock/master
- build-depends: []
-- name: rpcbind
- morph: strata/nfs/rpcbind.morph
- repo: upstream:rpcbind
- ref: aa3ac0d86c258d3e355ae59df31a96da795ecdfa
- unpetrify-ref: baserock/master
- build-depends:
- - ti-rpc
-- name: nfs-utils
- morph: strata/nfs/nfs-utils.morph
- repo: upstream:nfs-utils
- ref: 08baf3bc2f66a1ca6401191e19380028d2fc2c6d
- unpetrify-ref: baserock/master
- build-depends:
- - libevent
- - ti-rpc
diff --git a/strata/nfs/nfs-utils.def b/strata/nfs/nfs-utils.def
new file mode 100644
index 00000000..7f890bc9
--- /dev/null
+++ b/strata/nfs/nfs-utils.def
@@ -0,0 +1,11 @@
+name: nfs-utils
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR"/lib/systemd/system
+- install -m644 proc-fs-nfsd.mount "$DESTDIR"/lib/systemd/system
+- install -m644 nfs-mountd.service "$DESTDIR"/lib/systemd/system
+- install -m644 nfs-server.service "$DESTDIR"/lib/systemd/system
diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.morph
deleted file mode 100644
index c412e1d0..00000000
--- a/strata/nfs/nfs-utils.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: nfs-utils
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR"/lib/systemd/system
-- install -m644 proc-fs-nfsd.mount "$DESTDIR"/lib/systemd/system
-- install -m644 nfs-mountd.service "$DESTDIR"/lib/systemd/system
-- install -m644 nfs-server.service "$DESTDIR"/lib/systemd/system
diff --git a/strata/nfs/rpcbind.def b/strata/nfs/rpcbind.def
new file mode 100644
index 00000000..7b80e19e
--- /dev/null
+++ b/strata/nfs/rpcbind.def
@@ -0,0 +1,10 @@
+name: rpcbind
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --with-rpcuser=nobody --enable-warmstarts
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR"/lib/systemd/system
+- install -m644 rpcbind.service "$DESTDIR"/lib/systemd/system
+- install -m644 rpcbind.socket "$DESTDIR"/lib/systemd/system
diff --git a/strata/nfs/rpcbind.morph b/strata/nfs/rpcbind.morph
deleted file mode 100644
index 0ca929dc..00000000
--- a/strata/nfs/rpcbind.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: rpcbind
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --with-rpcuser=nobody --enable-warmstarts
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR"/lib/systemd/system
-- install -m644 rpcbind.service "$DESTDIR"/lib/systemd/system
-- install -m644 rpcbind.socket "$DESTDIR"/lib/systemd/system
diff --git a/strata/nfs/tcp-wrappers.def b/strata/nfs/tcp-wrappers.def
new file mode 100644
index 00000000..80cfcc51
--- /dev/null
+++ b/strata/nfs/tcp-wrappers.def
@@ -0,0 +1,8 @@
+name: tcp-wrappers
+build-commands:
+- make MAJOR=0 MINOR=7 REL=6 linux
+install-commands:
+- mkdir -p "$DESTDIR"/"$PREFIX"/include
+- install -p -m644 tcpd.h "$DESTDIR"/"$PREFIX"/include
+- mkdir -p "$DESTDIR"/"$PREFIX"/lib
+- cp -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib
diff --git a/strata/nfs/tcp-wrappers.morph b/strata/nfs/tcp-wrappers.morph
deleted file mode 100644
index c68671f6..00000000
--- a/strata/nfs/tcp-wrappers.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: tcp-wrappers
-kind: chunk
-build-commands:
-- make MAJOR=0 MINOR=7 REL=6 linux
-install-commands:
-- mkdir -p "$DESTDIR"/"$PREFIX"/include
-- install -p -m644 tcpd.h "$DESTDIR"/"$PREFIX"/include
-- mkdir -p "$DESTDIR"/"$PREFIX"/lib
-- cp -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib
diff --git a/strata/nfs/ti-rpc.def b/strata/nfs/ti-rpc.def
new file mode 100644
index 00000000..5edecefd
--- /dev/null
+++ b/strata/nfs/ti-rpc.def
@@ -0,0 +1,5 @@
+name: ti-rpc
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc
diff --git a/strata/nfs/ti-rpc.morph b/strata/nfs/ti-rpc.morph
deleted file mode 100644
index 3fb91e1f..00000000
--- a/strata/nfs/ti-rpc.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: ti-rpc
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc
diff --git a/strata/nodejs.def b/strata/nodejs.def
new file mode 100644
index 00000000..ef9f2f32
--- /dev/null
+++ b/strata/nodejs.def
@@ -0,0 +1,9 @@
+name: nodejs
+description: Stratum for nodejs related stuff
+build-depends:
+- name: core
+contents:
+- name: node
+ repo: upstream:node
+ ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
+ unpetrify-ref: v0.10.26
diff --git a/strata/nodejs.morph b/strata/nodejs.morph
deleted file mode 100644
index f8955a01..00000000
--- a/strata/nodejs.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: nodejs
-kind: stratum
-description: Stratum for nodejs related stuff
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: node
- repo: upstream:node
- ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
- unpetrify-ref: v0.10.26
- build-depends: []
diff --git a/strata/openstack-clients.def b/strata/openstack-clients.def
new file mode 100644
index 00000000..cfb1560d
--- /dev/null
+++ b/strata/openstack-clients.def
@@ -0,0 +1,102 @@
+name: openstack-clients
+description: A stratum with OpenStack clients, for OpenStack deployments.
+build-depends:
+- name: tools
+contents:
+- name: jsonschema
+ repo: upstream:jsonschema
+ ref: 292a256b918af1e567982bb801c427cf4ca5b9fe
+ unpetrify-ref: baserock/morph
+- name: python-json-pointer
+ repo: upstream:python-json-pointer
+ ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53
+ unpetrify-ref: baserock/morph
+- name: python-json-patch
+ repo: upstream:python-json-patch
+ ref: 27c7032de25923593fa17cc14f535fb7abd52448
+ unpetrify-ref: baserock/morph
+- name: warlock
+ repo: upstream:warlock
+ ref: 1a0de8a67df8282c42f71014cc871684e8d7c0cf
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - jsonschema
+ - python-json-pointer
+ - python-json-patch
+- name: python-prettytable
+ repo: upstream:python-prettytable
+ ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
+ unpetrify-ref: baserock/morph
+- name: pbr
+ repo: upstream:pbr
+ ref: 510ee9e9dcb94c5884c215fa3535a1f77f3d2a51
+ unpetrify-ref: baserock/morph
+- name: argparse
+ repo: upstream:argparse
+ ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1
+ unpetrify-ref: baserock/morph
+- name: pyopenssl
+ repo: upstream:pyopenssl
+ ref: 6bbf44a00b35fb28df1f66aa194b2fe95eab1ab2
+ unpetrify-ref: baserock/morph
+- name: pyiso8601
+ repo: upstream:pyiso8601
+ ref: ac5470ec9e68332ebc499c4f9f21e7e3cb31ecb6
+ unpetrify-ref: baserock/morph
+- name: python-requests
+ repo: upstream:python-requests
+ ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
+ unpetrify-ref: baserock/morph
+- name: simplejson
+ repo: upstream:simplejson
+ ref: 35816bfe2d0ddeb5ddcc68239683cbb35b7e3ff2
+ unpetrify-ref: baserock/morph
+- name: netaddr
+ repo: upstream:netaddr
+ ref: f64ae19e533ffa5522dcba1fc833975cb2ee88a5
+ unpetrify-ref: baserock/morph
+- name: pytz
+ repo: upstream:pytz
+ ref: 384207f01fd5b8bf1eb20cb64c17679084731944
+ unpetrify-ref: baserock/morph
+- name: babel
+ repo: upstream:babel
+ ref: d764b35bc3910b8f67ff811752df615afa7667f6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - pytz
+- name: python-keystoneclient
+ repo: upstream:python-keystoneclient
+ ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - pbr
+ - pyiso8601
+ - python-prettytable
+ - python-requests
+ - simplejson
+ - netaddr
+ - babel
+- name: python-glanceclient
+ repo: upstream:python-glanceclient
+ ref: 721660612df4454726b723daf902abd23ba0109c
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-prettytable
+ - pbr
+ - argparse
+ - pyopenssl
+ - python-keystoneclient
+ - warlock
+- name: python-novaclient
+ repo: upstream:python-novaclient
+ ref: 9e4530c79e46d392ed8f3e413bca1acffe022fe6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-prettytable
+ - pbr
+ - argparse
+ - pyiso8601
+ - python-requests
+ - simplejson
+ - babel
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
deleted file mode 100644
index 616a8762..00000000
--- a/strata/openstack-clients.morph
+++ /dev/null
@@ -1,117 +0,0 @@
-name: openstack-clients
-kind: stratum
-description: A stratum with OpenStack clients, for OpenStack deployments.
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: jsonschema
- repo: upstream:jsonschema
- ref: 292a256b918af1e567982bb801c427cf4ca5b9fe
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-json-pointer
- repo: upstream:python-json-pointer
- ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-json-patch
- repo: upstream:python-json-patch
- ref: 27c7032de25923593fa17cc14f535fb7abd52448
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: warlock
- repo: upstream:warlock
- ref: 1a0de8a67df8282c42f71014cc871684e8d7c0cf
- unpetrify-ref: baserock/morph
- build-depends:
- - jsonschema
- - python-json-pointer
- - python-json-patch
-- name: python-prettytable
- morph: strata/openstack-clients/python-prettytable.morph
- repo: upstream:python-prettytable
- ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pbr
- repo: upstream:pbr
- ref: 510ee9e9dcb94c5884c215fa3535a1f77f3d2a51
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: argparse
- repo: upstream:argparse
- ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pyopenssl
- repo: upstream:pyopenssl
- ref: 6bbf44a00b35fb28df1f66aa194b2fe95eab1ab2
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pyiso8601
- repo: upstream:pyiso8601
- ref: ac5470ec9e68332ebc499c4f9f21e7e3cb31ecb6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-requests
- repo: upstream:python-requests
- ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: simplejson
- repo: upstream:simplejson
- ref: 35816bfe2d0ddeb5ddcc68239683cbb35b7e3ff2
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: netaddr
- repo: upstream:netaddr
- ref: f64ae19e533ffa5522dcba1fc833975cb2ee88a5
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pytz
- morph: strata/openstack-clients/pytz.morph
- repo: upstream:pytz
- ref: 384207f01fd5b8bf1eb20cb64c17679084731944
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: babel
- repo: upstream:babel
- ref: d764b35bc3910b8f67ff811752df615afa7667f6
- unpetrify-ref: baserock/morph
- build-depends:
- - pytz
-- name: python-keystoneclient
- repo: upstream:python-keystoneclient
- ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b
- unpetrify-ref: baserock/morph
- build-depends:
- - pbr
- - pyiso8601
- - python-prettytable
- - python-requests
- - simplejson
- - netaddr
- - babel
-- name: python-glanceclient
- repo: upstream:python-glanceclient
- ref: 721660612df4454726b723daf902abd23ba0109c
- unpetrify-ref: baserock/morph
- build-depends:
- - python-prettytable
- - pbr
- - argparse
- - pyopenssl
- - python-keystoneclient
- - warlock
-- name: python-novaclient
- repo: upstream:python-novaclient
- ref: 9e4530c79e46d392ed8f3e413bca1acffe022fe6
- unpetrify-ref: baserock/morph
- build-depends:
- - python-prettytable
- - pbr
- - argparse
- - pyiso8601
- - python-requests
- - simplejson
- - babel
diff --git a/strata/openstack-clients/python-prettytable.def b/strata/openstack-clients/python-prettytable.def
new file mode 100644
index 00000000..35620ff0
--- /dev/null
+++ b/strata/openstack-clients/python-prettytable.def
@@ -0,0 +1,5 @@
+name: python-prettytable
+build-commands:
+- cd src && python setup.py build
+install-commands:
+- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/openstack-clients/python-prettytable.morph b/strata/openstack-clients/python-prettytable.morph
deleted file mode 100644
index cf1ac6e1..00000000
--- a/strata/openstack-clients/python-prettytable.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-prettytable
-kind: chunk
-build-commands:
-- cd src && python setup.py build
-install-commands:
-- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/openstack-clients/pytz.def b/strata/openstack-clients/pytz.def
new file mode 100644
index 00000000..b827d9b8
--- /dev/null
+++ b/strata/openstack-clients/pytz.def
@@ -0,0 +1,5 @@
+name: pytz
+build-commands:
+- cd src && python setup.py build
+install-commands:
+- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/openstack-clients/pytz.morph b/strata/openstack-clients/pytz.morph
deleted file mode 100644
index f5557946..00000000
--- a/strata/openstack-clients/pytz.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: pytz
-kind: chunk
-build-commands:
-- cd src && python setup.py build
-install-commands:
-- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/patch-manager-gerrit.def b/strata/patch-manager-gerrit.def
new file mode 100644
index 00000000..9204f179
--- /dev/null
+++ b/strata/patch-manager-gerrit.def
@@ -0,0 +1,8 @@
+name: patch-manager-gerrit
+build-depends:
+- name: tools
+contents:
+- name: gerrit-installation-binaries
+ repo: github:franred/gerrit-installation-binaries
+ ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
+ unpetrify-ref: master
diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.morph
deleted file mode 100644
index bcc03c86..00000000
--- a/strata/patch-manager-gerrit.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: patch-manager-gerrit
-kind: stratum
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: gerrit-installation-binaries
- morph: strata/patch-manager-gerrit/gerrit-installation-binaries.morph
- repo: github:franred/gerrit-installation-binaries
- ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
- unpetrify-ref: master
- build-depends: []
diff --git a/strata/patch-manager-gerrit/gerrit-installation-binaries.def b/strata/patch-manager-gerrit/gerrit-installation-binaries.def
new file mode 100644
index 00000000..366e3ba0
--- /dev/null
+++ b/strata/patch-manager-gerrit/gerrit-installation-binaries.def
@@ -0,0 +1,27 @@
+name: gerrit-installation-binaries
+configure-commands: []
+build-commands:
+- cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX"/bin
+- mkdir -p "$DESTDIR$PREFIX"/lib
+- mkdir -p "$DESTDIR$PREFIX"/share/gerrit
+- cp gerrit-2.9.war "$DESTDIR$PREFIX"/share/gerrit
+- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR$PREFIX"/lib
+- unzip jce_policy-8.zip -d "$DESTDIR$PREFIX"/lib/jdk1.8.0_20/jre/lib/security
+- ln -sfn "$PREFIX"/lib/jdk1.8.0_20/jre/bin/java "$DESTDIR$PREFIX"/bin/
+system-integration:
+ gerrit-installation-binaries-misc:
+ 01-adduser:
+ - adduser -D -h /home/gerrit2 -g 'Gerrit Administrator' -s /bin/sh gerrit2
+ 02-install-gerrit:
+ - |
+ install -D /usr/share/gerrit/gerrit-2.9.war /home/gerrit2/gerrit/gerrit-2.9.war \
+ -o gerrit2 -g gerrit2 -m 644
+ chown gerrit2 /home/gerrit2/gerrit
+ sudo LD_LIBRARY_PATH=/usr/jdk1.8.0_20/jre/lib/amd64/jli \
+ -u gerrit2 java -jar /home/gerrit2/gerrit/gerrit-2.9.war \
+ init --batch -d /home/gerrit2/gerrit/.gerrit_controller \
+ --no-auto-start
+ sed -i "s|canonicalWebUrl =.*|canonicalWebUrl = http://localhost:8080|g" \
+ /home/gerrit2/gerrit/.gerrit_controller/etc/gerrit.config
diff --git a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph b/strata/patch-manager-gerrit/gerrit-installation-binaries.morph
deleted file mode 100644
index b0d1a393..00000000
--- a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph
+++ /dev/null
@@ -1,28 +0,0 @@
-name: gerrit-installation-binaries
-kind: chunk
-configure-commands: []
-build-commands:
-- cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX"/bin
-- mkdir -p "$DESTDIR$PREFIX"/lib
-- mkdir -p "$DESTDIR$PREFIX"/share/gerrit
-- cp gerrit-2.9.war "$DESTDIR$PREFIX"/share/gerrit
-- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR$PREFIX"/lib
-- unzip jce_policy-8.zip -d "$DESTDIR$PREFIX"/lib/jdk1.8.0_20/jre/lib/security
-- ln -sfn "$PREFIX"/lib/jdk1.8.0_20/jre/bin/java "$DESTDIR$PREFIX"/bin/
-system-integration:
- gerrit-installation-binaries-misc:
- 01-adduser:
- - adduser -D -h /home/gerrit2 -g 'Gerrit Administrator' -s /bin/sh gerrit2
- 02-install-gerrit:
- - |
- install -D /usr/share/gerrit/gerrit-2.9.war /home/gerrit2/gerrit/gerrit-2.9.war \
- -o gerrit2 -g gerrit2 -m 644
- chown gerrit2 /home/gerrit2/gerrit
- sudo LD_LIBRARY_PATH=/usr/jdk1.8.0_20/jre/lib/amd64/jli \
- -u gerrit2 java -jar /home/gerrit2/gerrit/gerrit-2.9.war \
- init --batch -d /home/gerrit2/gerrit/.gerrit_controller \
- --no-auto-start
- sed -i "s|canonicalWebUrl =.*|canonicalWebUrl = http://localhost:8080|g" \
- /home/gerrit2/gerrit/.gerrit_controller/etc/gerrit.config
diff --git a/strata/pcre-utils.def b/strata/pcre-utils.def
new file mode 100644
index 00000000..3e0f57f0
--- /dev/null
+++ b/strata/pcre-utils.def
@@ -0,0 +1,8 @@
+name: pcre-utils
+build-depends:
+- name: tools
+contents:
+- name: pcre
+ repo: upstream:pcre
+ ref: 2720152c58e13e7cc7403642ec33127101b9971b
+ unpetrify-ref: baserock/morph
diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph
deleted file mode 100644
index 44d0bab2..00000000
--- a/strata/pcre-utils.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: pcre-utils
-kind: stratum
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: pcre
- repo: upstream:pcre
- ref: 2720152c58e13e7cc7403642ec33127101b9971b
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/qt4-sdk.def b/strata/qt4-sdk.def
new file mode 100644
index 00000000..45bdde01
--- /dev/null
+++ b/strata/qt4-sdk.def
@@ -0,0 +1,9 @@
+name: qt4-sdk
+description: Qt4 Desktop Environment, IDE and Example Apps
+build-depends:
+- name: qt4-tools
+contents:
+- name: qt-creator
+ repo: upstream:qt-creator
+ ref: d5a6b10634c1a3271012e9578e016772ef077d59
+ unpetrify-ref: baserock/morph/2.7
diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph
deleted file mode 100644
index b260c9d9..00000000
--- a/strata/qt4-sdk.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: qt4-sdk
-kind: stratum
-description: Qt4 Desktop Environment, IDE and Example Apps
-build-depends:
-- morph: strata/qt4-tools.morph
-chunks:
-- name: qt-creator
- morph: strata/qt4-sdk/qt-creator.morph
- repo: upstream:qt-creator
- ref: d5a6b10634c1a3271012e9578e016772ef077d59
- unpetrify-ref: baserock/morph/2.7
- build-depends: []
diff --git a/strata/qt4-sdk/qt-creator.def b/strata/qt4-sdk/qt-creator.def
new file mode 100644
index 00000000..19fbd952
--- /dev/null
+++ b/strata/qt4-sdk/qt-creator.def
@@ -0,0 +1,8 @@
+name: qt-creator
+configure-commands:
+- qmake
+build-commands:
+- make
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- ./qhelpgenerator.sh
diff --git a/strata/qt4-sdk/qt-creator.morph b/strata/qt4-sdk/qt-creator.morph
deleted file mode 100644
index 76d9f7d7..00000000
--- a/strata/qt4-sdk/qt-creator.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: qt-creator
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- ./qhelpgenerator.sh
diff --git a/strata/qt4-tools.def b/strata/qt4-tools.def
new file mode 100644
index 00000000..162047b2
--- /dev/null
+++ b/strata/qt4-tools.def
@@ -0,0 +1,28 @@
+name: qt4-tools
+description: Qt4 Development Libraries and Tools
+build-depends:
+- name: tools
+- name: x-generic
+- name: multimedia-gstreamer-0.10
+contents:
+- name: icu
+ repo: upstream:icu
+ ref: ba023548a3bff7277cbea4acade3042ce9d8949e
+ unpetrify-ref: baserock/morph
+- name: ruby-1.8
+ repo: upstream:ruby
+ ref: 7a24f1710028d568ad61d0aa49d5178260178d77
+ unpetrify-ref: baserock/morph/ruby_1_8_7
+- name: ruby-1.9
+ repo: upstream:ruby
+ ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
+ unpetrify-ref: baserock/morph/ruby_1_9_3
+ build-depends:
+ - ruby-1.8
+- name: qt4-tools
+ repo: upstream:qt4-tools
+ ref: a182f020bc1703c20d86ba18f2f6b4ea8889de84
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - icu
+ - ruby-1.9
diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph
deleted file mode 100644
index 18d2cc5f..00000000
--- a/strata/qt4-tools.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: qt4-tools
-kind: stratum
-description: Qt4 Development Libraries and Tools
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/x-generic.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
-chunks:
-- name: icu
- morph: strata/qt4-tools/icu.morph
- repo: upstream:icu
- ref: ba023548a3bff7277cbea4acade3042ce9d8949e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: ruby-1.8
- morph: strata/qt4-tools/ruby-1.8.morph
- repo: upstream:ruby
- ref: 7a24f1710028d568ad61d0aa49d5178260178d77
- unpetrify-ref: baserock/morph/ruby_1_8_7
- build-depends: []
-- name: ruby-1.9
- morph: strata/qt4-tools/ruby-1.9.morph
- repo: upstream:ruby
- ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
- unpetrify-ref: baserock/morph/ruby_1_9_3
- build-depends:
- - ruby-1.8
-- name: qt4-tools
- morph: strata/qt4-tools/qt4-tools.morph
- repo: upstream:qt4-tools
- ref: a182f020bc1703c20d86ba18f2f6b4ea8889de84
- unpetrify-ref: baserock/morph
- build-depends:
- - icu
- - ruby-1.9
diff --git a/strata/qt4-tools/icu.def b/strata/qt4-tools/icu.def
new file mode 100644
index 00000000..fc136fd2
--- /dev/null
+++ b/strata/qt4-tools/icu.def
@@ -0,0 +1,7 @@
+name: icu
+configure-commands:
+- cd source; ./runConfigureICU Linux --prefix=/usr
+build-commands:
+- cd source; unset TARGET ; make
+install-commands:
+- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/qt4-tools/icu.morph b/strata/qt4-tools/icu.morph
deleted file mode 100644
index 37dec07e..00000000
--- a/strata/qt4-tools/icu.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: icu
-kind: chunk
-configure-commands:
-- cd source; ./runConfigureICU Linux --prefix=/usr
-build-commands:
-- cd source; unset TARGET ; make
-install-commands:
-- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/qt4-tools/qt4-tools.def b/strata/qt4-tools/qt4-tools.def
new file mode 100644
index 00000000..228ca7b3
--- /dev/null
+++ b/strata/qt4-tools/qt4-tools.def
@@ -0,0 +1,17 @@
+name: qt4-tools
+max-jobs: 1
+configure-commands:
+- |
+ arch=$(uname -m)
+ if [ "${arch}" != "${arch//arm/}" ] ; then
+ sed 's/g++-unix.conf)/&\nQMAKE_CXXFLAGS += -fno-strict-volatile-bitfields/' \
+ -i mkspecs/linux-g++/qmake.conf
+ else
+ echo Running on x86, not modifying qmake.conf
+ fi
+- ./configure -v -prefix /usr -opensource -confirm-license
+build-commands:
+- make
+- LD_LIBRARY_PATH="$PWD"/lib QT_PLUGIN_PATH="$PWD"/plugins make docs
+install-commands:
+- make install INSTALL_ROOT="$DESTDIR"
diff --git a/strata/qt4-tools/qt4-tools.morph b/strata/qt4-tools/qt4-tools.morph
deleted file mode 100644
index bc4cc17e..00000000
--- a/strata/qt4-tools/qt4-tools.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: qt4-tools
-kind: chunk
-max-jobs: 1
-configure-commands:
-- |
- arch=$(uname -m)
- if [ "${arch}" != "${arch//arm/}" ] ; then
- sed 's/g++-unix.conf)/&\nQMAKE_CXXFLAGS += -fno-strict-volatile-bitfields/' \
- -i mkspecs/linux-g++/qmake.conf
- else
- echo Running on x86, not modifying qmake.conf
- fi
-- ./configure -v -prefix /usr -opensource -confirm-license
-build-commands:
-- make
-- LD_LIBRARY_PATH="$PWD"/lib QT_PLUGIN_PATH="$PWD"/plugins make docs
-install-commands:
-- make install INSTALL_ROOT="$DESTDIR"
diff --git a/strata/qt4-tools/ruby-1.8.def b/strata/qt4-tools/ruby-1.8.def
new file mode 100644
index 00000000..9b36a794
--- /dev/null
+++ b/strata/qt4-tools/ruby-1.8.def
@@ -0,0 +1,8 @@
+name: ruby-1.8
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --program-suffix=-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt4-tools/ruby-1.8.morph b/strata/qt4-tools/ruby-1.8.morph
deleted file mode 100644
index cee282c0..00000000
--- a/strata/qt4-tools/ruby-1.8.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ruby-1.8
-kind: chunk
-configure-commands:
-- autoconf
-- ./configure --prefix=/usr --program-suffix=-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt4-tools/ruby-1.9.def b/strata/qt4-tools/ruby-1.9.def
new file mode 100644
index 00000000..3d54adab
--- /dev/null
+++ b/strata/qt4-tools/ruby-1.9.def
@@ -0,0 +1,8 @@
+name: ruby-1.9
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt4-tools/ruby-1.9.morph b/strata/qt4-tools/ruby-1.9.morph
deleted file mode 100644
index bc697ada..00000000
--- a/strata/qt4-tools/ruby-1.9.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ruby-1.9
-kind: chunk
-configure-commands:
-- autoconf
-- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt5-sdk.def b/strata/qt5-sdk.def
new file mode 100644
index 00000000..f4023d6c
--- /dev/null
+++ b/strata/qt5-sdk.def
@@ -0,0 +1,13 @@
+name: qt5-sdk
+description: Qt5 Desktop Environment, IDE and Example Apps
+build-depends:
+- name: qt5-tools
+contents:
+- name: qt-creator
+ repo: upstream:qt-creator
+ ref: d5a6b10634c1a3271012e9578e016772ef077d59
+ unpetrify-ref: baserock/morph/2.7
+- name: snowshoe
+ repo: upstream:snowshoe
+ ref: 098f931de58072edd5d591cdc4a2ad3c05e83991
+ unpetrify-ref: baserock/morph
diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph
deleted file mode 100644
index f0b3cc2e..00000000
--- a/strata/qt5-sdk.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: qt5-sdk
-kind: stratum
-description: Qt5 Desktop Environment, IDE and Example Apps
-build-depends:
-- morph: strata/qt5-tools.morph
-chunks:
-- name: qt-creator
- morph: strata/qt5-sdk/qt-creator.morph
- repo: upstream:qt-creator
- ref: d5a6b10634c1a3271012e9578e016772ef077d59
- unpetrify-ref: baserock/morph/2.7
- build-depends: []
-- name: snowshoe
- morph: strata/qt5-sdk/snowshoe.morph
- repo: upstream:snowshoe
- ref: 098f931de58072edd5d591cdc4a2ad3c05e83991
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/qt5-sdk/qt-creator.def b/strata/qt5-sdk/qt-creator.def
new file mode 100644
index 00000000..19fbd952
--- /dev/null
+++ b/strata/qt5-sdk/qt-creator.def
@@ -0,0 +1,8 @@
+name: qt-creator
+configure-commands:
+- qmake
+build-commands:
+- make
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- ./qhelpgenerator.sh
diff --git a/strata/qt5-sdk/qt-creator.morph b/strata/qt5-sdk/qt-creator.morph
deleted file mode 100644
index 76d9f7d7..00000000
--- a/strata/qt5-sdk/qt-creator.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: qt-creator
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- ./qhelpgenerator.sh
diff --git a/strata/qt5-sdk/snowshoe.def b/strata/qt5-sdk/snowshoe.def
new file mode 100644
index 00000000..a9ceb5e5
--- /dev/null
+++ b/strata/qt5-sdk/snowshoe.def
@@ -0,0 +1,7 @@
+name: snowshoe
+configure-commands:
+- qmake
+build-commands:
+- make
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-sdk/snowshoe.morph b/strata/qt5-sdk/snowshoe.morph
deleted file mode 100644
index f89ab751..00000000
--- a/strata/qt5-sdk/snowshoe.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: snowshoe
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools.def b/strata/qt5-tools.def
new file mode 100644
index 00000000..d27f49a6
--- /dev/null
+++ b/strata/qt5-tools.def
@@ -0,0 +1,164 @@
+name: qt5-tools
+description: Qt5 Development Libraries and Tools
+build-depends:
+- name: tools
+- name: x-generic
+- name: multimedia-gstreamer-0.10
+contents:
+- name: icu
+ repo: upstream:icu
+ ref: ba023548a3bff7277cbea4acade3042ce9d8949e
+ unpetrify-ref: baserock/morph
+- name: ruby-1.8
+ repo: upstream:ruby
+ ref: 7a24f1710028d568ad61d0aa49d5178260178d77
+ unpetrify-ref: baserock/morph/ruby_1_8_7
+- name: ruby-1.9
+ repo: upstream:ruby
+ ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
+ unpetrify-ref: baserock/morph/ruby_1_9_3
+ build-depends:
+ - ruby-1.8
+- name: qtbase
+ repo: upstream:qt5/qtbase
+ ref: 55f24d7e91e7c906cf4e3a3ef7a4d95ff094a7a8
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - icu
+- name: qtsvg
+ repo: upstream:qt5/qtsvg
+ ref: 552bf3adcc48c669f9dfbda5818142fb18c9e957
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtjsbackend
+ repo: upstream:qt5/qtjsbackend
+ ref: c6978bf56f599a3da8c03b1a7e58102aa84223e7
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtscript
+ repo: upstream:qt5/qtscript
+ ref: d20e99b3bdbcf77b69a92a2ba1b3ca1f1379e7c8
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+- name: qtdeclarative
+ repo: upstream:qt5/qtdeclarative
+ ref: 774d0310883a9526210c4530bbb9d0af26d88699
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+ - qtscript
+- name: qtquick1
+ repo: upstream:qt5/qtquick1
+ ref: b13755a2411dca01e65bb443a399ed130d5dd738
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+ - qtscript
+- name: qt3d
+ repo: upstream:qt5/qt3d
+ ref: 805fbf45a54f1b69f4b13f6dc9f962b07c017d3b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+ - qtscript
+ - qtdeclarative
+- name: qtquickcontrols
+ repo: upstream:qt5/qtquickcontrols
+ ref: acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+ - qtdeclarative
+- name: qtsensors
+ repo: upstream:qt5/qtsensors
+ ref: cd22d77e07af6046be24d0322187a86c9a3c4d1d
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtserialport
+ repo: upstream:qt5/qtserialport
+ ref: b1abca2eee45e7b8ecf71cb5cd1e77a2821fcac2
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtx11extras
+ repo: upstream:qt5/qtx11extras
+ ref: 3b33afd2814c88002e2efc4955e5b1851aff0c58
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtwebkit
+ repo: upstream:qt5/qtwebkit
+ ref: 15a558c03ea7a35f97dfc0b16024d026d20920be
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - icu
+ - ruby-1.9
+ - qtjsbackend
+ - qtdeclarative
+- name: qtwebkit-examples
+ repo: upstream:qt5/qtwebkit-examples
+ ref: fdaa2bb5e47d6ca1d3e8c681f88eae0b9d4ae351
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+ - qtdeclarative
+ - qtwebkit
+- name: qtmultimedia
+ repo: upstream:qt5/qtmultimedia
+ ref: 8b73d090f87f88ee3ae4efc437ac866d05df76be
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtxmlpatterns
+ repo: upstream:qt5/qtxmlpatterns
+ ref: ed713a904ee55f1c345d2d6c35e77892be96977e
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtdoc
+ repo: upstream:qt5/qtdoc
+ ref: 674abef4f06bdde57a272d69750e2a4ac5027ea9
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qtgraphicaleffects
+ repo: upstream:qt5/qtgraphicaleffects
+ ref: e41d08f95d74d7309fc976cb62141b78239de975
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+ - qtdeclarative
+- name: qtimageformats
+ repo: upstream:qt5/qtimageformats
+ ref: 3f7f6126d9832e03a4dcaaca5279220f00126e89
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+- name: qttools
+ repo: upstream:qt5/qttools
+ ref: 1369d91dd095cd4ea2febe759ef6446e41bd2d80
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qtjsbackend
+ - qtdeclarative
+ - qtwebkit
+- name: qttranslations
+ repo: upstream:qt5/qttranslations
+ ref: e91af8e6363a4538f08992b6af51d17b91453080
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - qtbase
+ - qttools
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
deleted file mode 100644
index 1c784bf3..00000000
--- a/strata/qt5-tools.morph
+++ /dev/null
@@ -1,190 +0,0 @@
-name: qt5-tools
-kind: stratum
-description: Qt5 Development Libraries and Tools
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/x-generic.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
-chunks:
-- name: icu
- morph: strata/qt5-tools/icu.morph
- repo: upstream:icu
- ref: ba023548a3bff7277cbea4acade3042ce9d8949e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: ruby-1.8
- morph: strata/qt5-tools/ruby-1.8.morph
- repo: upstream:ruby
- ref: 7a24f1710028d568ad61d0aa49d5178260178d77
- unpetrify-ref: baserock/morph/ruby_1_8_7
- build-depends: []
-- name: ruby-1.9
- morph: strata/qt5-tools/ruby-1.9.morph
- repo: upstream:ruby
- ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
- unpetrify-ref: baserock/morph/ruby_1_9_3
- build-depends:
- - ruby-1.8
-- name: qtbase
- morph: strata/qt5-tools/qtbase.morph
- repo: upstream:qt5/qtbase
- ref: 55f24d7e91e7c906cf4e3a3ef7a4d95ff094a7a8
- unpetrify-ref: baserock/morph
- build-depends:
- - icu
-- name: qtsvg
- morph: strata/qt5-tools/qtsvg.morph
- repo: upstream:qt5/qtsvg
- ref: 552bf3adcc48c669f9dfbda5818142fb18c9e957
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtjsbackend
- morph: strata/qt5-tools/qtjsbackend.morph
- repo: upstream:qt5/qtjsbackend
- ref: c6978bf56f599a3da8c03b1a7e58102aa84223e7
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtscript
- morph: strata/qt5-tools/qtscript.morph
- repo: upstream:qt5/qtscript
- ref: d20e99b3bdbcf77b69a92a2ba1b3ca1f1379e7c8
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
-- name: qtdeclarative
- morph: strata/qt5-tools/qtdeclarative.morph
- repo: upstream:qt5/qtdeclarative
- ref: 774d0310883a9526210c4530bbb9d0af26d88699
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtscript
-- name: qtquick1
- morph: strata/qt5-tools/qtquick1.morph
- repo: upstream:qt5/qtquick1
- ref: b13755a2411dca01e65bb443a399ed130d5dd738
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtscript
-- name: qt3d
- morph: strata/qt5-tools/qt3d.morph
- repo: upstream:qt5/qt3d
- ref: 805fbf45a54f1b69f4b13f6dc9f962b07c017d3b
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtscript
- - qtdeclarative
-- name: qtquickcontrols
- morph: strata/qt5-tools/qtquickcontrols.morph
- repo: upstream:qt5/qtquickcontrols
- ref: acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
-- name: qtsensors
- morph: strata/qt5-tools/qtsensors.morph
- repo: upstream:qt5/qtsensors
- ref: cd22d77e07af6046be24d0322187a86c9a3c4d1d
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtserialport
- morph: strata/qt5-tools/qtserialport.morph
- repo: upstream:qt5/qtserialport
- ref: b1abca2eee45e7b8ecf71cb5cd1e77a2821fcac2
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtx11extras
- morph: strata/qt5-tools/qtx11extras.morph
- repo: upstream:qt5/qtx11extras
- ref: 3b33afd2814c88002e2efc4955e5b1851aff0c58
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtwebkit
- morph: strata/qt5-tools/qtwebkit.morph
- repo: upstream:qt5/qtwebkit
- ref: 15a558c03ea7a35f97dfc0b16024d026d20920be
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - icu
- - ruby-1.9
- - qtjsbackend
- - qtdeclarative
-- name: qtwebkit-examples
- morph: strata/qt5-tools/qtwebkit-examples.morph
- repo: upstream:qt5/qtwebkit-examples
- ref: fdaa2bb5e47d6ca1d3e8c681f88eae0b9d4ae351
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
- - qtwebkit
-- name: qtmultimedia
- morph: strata/qt5-tools/qtmultimedia.morph
- repo: upstream:qt5/qtmultimedia
- ref: 8b73d090f87f88ee3ae4efc437ac866d05df76be
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtxmlpatterns
- morph: strata/qt5-tools/qtxmlpatterns.morph
- repo: upstream:qt5/qtxmlpatterns
- ref: ed713a904ee55f1c345d2d6c35e77892be96977e
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtdoc
- morph: strata/qt5-tools/qtdoc.morph
- repo: upstream:qt5/qtdoc
- ref: 674abef4f06bdde57a272d69750e2a4ac5027ea9
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtgraphicaleffects
- morph: strata/qt5-tools/qtgraphicaleffects.morph
- repo: upstream:qt5/qtgraphicaleffects
- ref: e41d08f95d74d7309fc976cb62141b78239de975
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
-- name: qtimageformats
- morph: strata/qt5-tools/qtimageformats.morph
- repo: upstream:qt5/qtimageformats
- ref: 3f7f6126d9832e03a4dcaaca5279220f00126e89
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qttools
- morph: strata/qt5-tools/qttools.morph
- repo: upstream:qt5/qttools
- ref: 1369d91dd095cd4ea2febe759ef6446e41bd2d80
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
- - qtwebkit
-- name: qttranslations
- morph: strata/qt5-tools/qttranslations.morph
- repo: upstream:qt5/qttranslations
- ref: e91af8e6363a4538f08992b6af51d17b91453080
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qttools
diff --git a/strata/qt5-tools/icu.def b/strata/qt5-tools/icu.def
new file mode 100644
index 00000000..fc136fd2
--- /dev/null
+++ b/strata/qt5-tools/icu.def
@@ -0,0 +1,7 @@
+name: icu
+configure-commands:
+- cd source; ./runConfigureICU Linux --prefix=/usr
+build-commands:
+- cd source; unset TARGET ; make
+install-commands:
+- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/qt5-tools/icu.morph b/strata/qt5-tools/icu.morph
deleted file mode 100644
index 37dec07e..00000000
--- a/strata/qt5-tools/icu.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: icu
-kind: chunk
-configure-commands:
-- cd source; ./runConfigureICU Linux --prefix=/usr
-build-commands:
-- cd source; unset TARGET ; make
-install-commands:
-- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/qt5-tools/qt3d.def b/strata/qt5-tools/qt3d.def
new file mode 100644
index 00000000..73ad6c38
--- /dev/null
+++ b/strata/qt5-tools/qt3d.def
@@ -0,0 +1,9 @@
+name: qt3d
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qt3d.morph b/strata/qt5-tools/qt3d.morph
deleted file mode 100644
index d4e44d4e..00000000
--- a/strata/qt5-tools/qt3d.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qt3d
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtbase.def b/strata/qt5-tools/qtbase.def
new file mode 100644
index 00000000..a313e529
--- /dev/null
+++ b/strata/qt5-tools/qtbase.def
@@ -0,0 +1,14 @@
+name: qtbase
+configure-commands:
+- ./configure -v -prefix /usr -opensource -confirm-license
+build-commands:
+- make
+- touch /qtbase.build/src/corelib/corelib.pro
+- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc
+- make html_docs
+- ./bin/qmake -unset QDOC
+install-commands:
+- make install INSTALL_ROOT="$DESTDIR"
+- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc
+- make install_html_docs INSTALL_ROOT="$DESTDIR"
+- ./bin/qmake -unset QDOC
diff --git a/strata/qt5-tools/qtbase.morph b/strata/qt5-tools/qtbase.morph
deleted file mode 100644
index 1427c4c2..00000000
--- a/strata/qt5-tools/qtbase.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: qtbase
-kind: chunk
-configure-commands:
-- ./configure -v -prefix /usr -opensource -confirm-license
-build-commands:
-- make
-- touch /qtbase.build/src/corelib/corelib.pro
-- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc
-- make html_docs
-- ./bin/qmake -unset QDOC
-install-commands:
-- make install INSTALL_ROOT="$DESTDIR"
-- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc
-- make install_html_docs INSTALL_ROOT="$DESTDIR"
-- ./bin/qmake -unset QDOC
diff --git a/strata/qt5-tools/qtdeclarative.def b/strata/qt5-tools/qtdeclarative.def
new file mode 100644
index 00000000..4333bbd0
--- /dev/null
+++ b/strata/qt5-tools/qtdeclarative.def
@@ -0,0 +1,9 @@
+name: qtdeclarative
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtdeclarative.morph b/strata/qt5-tools/qtdeclarative.morph
deleted file mode 100644
index 9eb02331..00000000
--- a/strata/qt5-tools/qtdeclarative.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtdeclarative
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtdoc.def b/strata/qt5-tools/qtdoc.def
new file mode 100644
index 00000000..78e4befe
--- /dev/null
+++ b/strata/qt5-tools/qtdoc.def
@@ -0,0 +1,7 @@
+name: qtdoc
+configure-commands:
+- qmake
+build-commands:
+- make
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtdoc.morph b/strata/qt5-tools/qtdoc.morph
deleted file mode 100644
index 3b449382..00000000
--- a/strata/qt5-tools/qtdoc.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: qtdoc
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtgraphicaleffects.def b/strata/qt5-tools/qtgraphicaleffects.def
new file mode 100644
index 00000000..abeba83b
--- /dev/null
+++ b/strata/qt5-tools/qtgraphicaleffects.def
@@ -0,0 +1,7 @@
+name: qtgraphicaleffects
+configure-commands:
+- qmake
+build-commands:
+- make
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtgraphicaleffects.morph b/strata/qt5-tools/qtgraphicaleffects.morph
deleted file mode 100644
index 27c42971..00000000
--- a/strata/qt5-tools/qtgraphicaleffects.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: qtgraphicaleffects
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtimageformats.def b/strata/qt5-tools/qtimageformats.def
new file mode 100644
index 00000000..73e101df
--- /dev/null
+++ b/strata/qt5-tools/qtimageformats.def
@@ -0,0 +1,9 @@
+name: qtimageformats
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtimageformats.morph b/strata/qt5-tools/qtimageformats.morph
deleted file mode 100644
index 08323ca1..00000000
--- a/strata/qt5-tools/qtimageformats.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtimageformats
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtjsbackend.def b/strata/qt5-tools/qtjsbackend.def
new file mode 100644
index 00000000..f49b3c21
--- /dev/null
+++ b/strata/qt5-tools/qtjsbackend.def
@@ -0,0 +1,9 @@
+name: qtjsbackend
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtjsbackend.morph b/strata/qt5-tools/qtjsbackend.morph
deleted file mode 100644
index 5813084c..00000000
--- a/strata/qt5-tools/qtjsbackend.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtjsbackend
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtmultimedia.def b/strata/qt5-tools/qtmultimedia.def
new file mode 100644
index 00000000..8000aed2
--- /dev/null
+++ b/strata/qt5-tools/qtmultimedia.def
@@ -0,0 +1,9 @@
+name: qtmultimedia
+configure-commands:
+- qmake
+build-commands:
+- make
+- make install_html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtmultimedia.morph b/strata/qt5-tools/qtmultimedia.morph
deleted file mode 100644
index 537baa08..00000000
--- a/strata/qt5-tools/qtmultimedia.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtmultimedia
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make install_html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtquick1.def b/strata/qt5-tools/qtquick1.def
new file mode 100644
index 00000000..e58e3cf3
--- /dev/null
+++ b/strata/qt5-tools/qtquick1.def
@@ -0,0 +1,9 @@
+name: qtquick1
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtquick1.morph b/strata/qt5-tools/qtquick1.morph
deleted file mode 100644
index d4692445..00000000
--- a/strata/qt5-tools/qtquick1.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtquick1
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtquickcontrols.def b/strata/qt5-tools/qtquickcontrols.def
new file mode 100644
index 00000000..0f8b5d2b
--- /dev/null
+++ b/strata/qt5-tools/qtquickcontrols.def
@@ -0,0 +1,9 @@
+name: qtquickcontrols
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtquickcontrols.morph b/strata/qt5-tools/qtquickcontrols.morph
deleted file mode 100644
index 12051034..00000000
--- a/strata/qt5-tools/qtquickcontrols.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtquickcontrols
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtscript.def b/strata/qt5-tools/qtscript.def
new file mode 100644
index 00000000..b9a83461
--- /dev/null
+++ b/strata/qt5-tools/qtscript.def
@@ -0,0 +1,9 @@
+name: qtscript
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtscript.morph b/strata/qt5-tools/qtscript.morph
deleted file mode 100644
index 6f27842e..00000000
--- a/strata/qt5-tools/qtscript.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtscript
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtsensors.def b/strata/qt5-tools/qtsensors.def
new file mode 100644
index 00000000..8fc9318c
--- /dev/null
+++ b/strata/qt5-tools/qtsensors.def
@@ -0,0 +1,9 @@
+name: qtsensors
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtsensors.morph b/strata/qt5-tools/qtsensors.morph
deleted file mode 100644
index d4b4ec00..00000000
--- a/strata/qt5-tools/qtsensors.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtsensors
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtserialport.def b/strata/qt5-tools/qtserialport.def
new file mode 100644
index 00000000..41cbeff0
--- /dev/null
+++ b/strata/qt5-tools/qtserialport.def
@@ -0,0 +1,9 @@
+name: qtserialport
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtserialport.morph b/strata/qt5-tools/qtserialport.morph
deleted file mode 100644
index 0a623865..00000000
--- a/strata/qt5-tools/qtserialport.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtserialport
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtsvg.def b/strata/qt5-tools/qtsvg.def
new file mode 100644
index 00000000..7eaae454
--- /dev/null
+++ b/strata/qt5-tools/qtsvg.def
@@ -0,0 +1,9 @@
+name: qtsvg
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtsvg.morph b/strata/qt5-tools/qtsvg.morph
deleted file mode 100644
index 40316a3c..00000000
--- a/strata/qt5-tools/qtsvg.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtsvg
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qttools.def b/strata/qt5-tools/qttools.def
new file mode 100644
index 00000000..681526ab
--- /dev/null
+++ b/strata/qt5-tools/qttools.def
@@ -0,0 +1,9 @@
+name: qttools
+configure-commands:
+- qmake
+build-commands:
+- unset TARGET ; make
+- unset TARGET ; make html_docs
+install-commands:
+- unset TARGET ; make install INSTALL_ROOT=$DESTDIR
+- unset TARGET ; make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qttools.morph b/strata/qt5-tools/qttools.morph
deleted file mode 100644
index 1baa10e7..00000000
--- a/strata/qt5-tools/qttools.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qttools
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- unset TARGET ; make
-- unset TARGET ; make html_docs
-install-commands:
-- unset TARGET ; make install INSTALL_ROOT=$DESTDIR
-- unset TARGET ; make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qttranslations.def b/strata/qt5-tools/qttranslations.def
new file mode 100644
index 00000000..2913efad
--- /dev/null
+++ b/strata/qt5-tools/qttranslations.def
@@ -0,0 +1,7 @@
+name: qttranslations
+configure-commands:
+- qmake
+build-commands:
+- make
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qttranslations.morph b/strata/qt5-tools/qttranslations.morph
deleted file mode 100644
index bfb61302..00000000
--- a/strata/qt5-tools/qttranslations.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: qttranslations
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtwebkit-examples.def b/strata/qt5-tools/qtwebkit-examples.def
new file mode 100644
index 00000000..4190358e
--- /dev/null
+++ b/strata/qt5-tools/qtwebkit-examples.def
@@ -0,0 +1,7 @@
+name: qtwebkit-examples
+configure-commands:
+- qmake
+build-commands:
+- make
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtwebkit-examples.morph b/strata/qt5-tools/qtwebkit-examples.morph
deleted file mode 100644
index b6683e65..00000000
--- a/strata/qt5-tools/qtwebkit-examples.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: qtwebkit-examples
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtwebkit.def b/strata/qt5-tools/qtwebkit.def
new file mode 100644
index 00000000..2f8cc98c
--- /dev/null
+++ b/strata/qt5-tools/qtwebkit.def
@@ -0,0 +1,10 @@
+name: qtwebkit
+max-jobs: 1
+configure-commands:
+- QMAKEPATH=/qtwebkit.build/Tools/qmake/mkspecs qmake WebKit.pro
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtwebkit.morph b/strata/qt5-tools/qtwebkit.morph
deleted file mode 100644
index c9348aca..00000000
--- a/strata/qt5-tools/qtwebkit.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: qtwebkit
-kind: chunk
-max-jobs: 1
-configure-commands:
-- QMAKEPATH=/qtwebkit.build/Tools/qmake/mkspecs qmake WebKit.pro
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtx11extras.def b/strata/qt5-tools/qtx11extras.def
new file mode 100644
index 00000000..51266bd5
--- /dev/null
+++ b/strata/qt5-tools/qtx11extras.def
@@ -0,0 +1,9 @@
+name: qtx11extras
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtx11extras.morph b/strata/qt5-tools/qtx11extras.morph
deleted file mode 100644
index edea0acf..00000000
--- a/strata/qt5-tools/qtx11extras.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtx11extras
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtxmlpatterns.def b/strata/qt5-tools/qtxmlpatterns.def
new file mode 100644
index 00000000..d60b27d7
--- /dev/null
+++ b/strata/qt5-tools/qtxmlpatterns.def
@@ -0,0 +1,9 @@
+name: qtxmlpatterns
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtxmlpatterns.morph b/strata/qt5-tools/qtxmlpatterns.morph
deleted file mode 100644
index bdd32d5f..00000000
--- a/strata/qt5-tools/qtxmlpatterns.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qtxmlpatterns
-kind: chunk
-configure-commands:
-- qmake
-build-commands:
-- make
-- make html_docs
-install-commands:
-- make install INSTALL_ROOT=$DESTDIR
-- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/ruby-1.8.def b/strata/qt5-tools/ruby-1.8.def
new file mode 100644
index 00000000..9b36a794
--- /dev/null
+++ b/strata/qt5-tools/ruby-1.8.def
@@ -0,0 +1,8 @@
+name: ruby-1.8
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --program-suffix=-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt5-tools/ruby-1.8.morph b/strata/qt5-tools/ruby-1.8.morph
deleted file mode 100644
index cee282c0..00000000
--- a/strata/qt5-tools/ruby-1.8.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ruby-1.8
-kind: chunk
-configure-commands:
-- autoconf
-- ./configure --prefix=/usr --program-suffix=-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt5-tools/ruby-1.9.def b/strata/qt5-tools/ruby-1.9.def
new file mode 100644
index 00000000..3d54adab
--- /dev/null
+++ b/strata/qt5-tools/ruby-1.9.def
@@ -0,0 +1,8 @@
+name: ruby-1.9
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt5-tools/ruby-1.9.morph b/strata/qt5-tools/ruby-1.9.morph
deleted file mode 100644
index bc697ada..00000000
--- a/strata/qt5-tools/ruby-1.9.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ruby-1.9
-kind: chunk
-configure-commands:
-- autoconf
-- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/ruby.def b/strata/ruby.def
new file mode 100644
index 00000000..21ff1c35
--- /dev/null
+++ b/strata/ruby.def
@@ -0,0 +1,44 @@
+name: ruby
+description: |
+ Ruby and common Ruby build dependencies.
+
+ Most Gem dependencies are not required when building or installing the
+ Gem. They are needed at runtime only. Tools which extend Rake, such as
+ 'hoe' and 'rake-compiler', are exceptions to that rule, and are kept
+ in this stratum so they are always available when building other Gems.
+build-depends:
+- name: tools
+contents:
+- name: ruby-1.8
+ repo: upstream:ruby
+ ref: 7a24f1710028d568ad61d0aa49d5178260178d77
+ unpetrify-ref: baserock/morph/ruby_1_8_7
+- name: libyaml
+ repo: upstream:libyaml-hg
+ ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e
+ unpetrify-ref: master
+- name: ruby
+ repo: upstream:ruby
+ ref: 05604af5a6da635b8bca51269db8b433972e82c0
+ unpetrify-ref: baserock/ruby_2_0_0
+ build-depends:
+ - ruby-1.8
+ - libyaml
+- name: bundler
+ repo: upstream:bundler
+ ref: 0708fbe62617a63300e1cc3b9869cc1280c57ef6
+ unpetrify-ref: baserock/v1.6.2
+ build-depends:
+ - ruby
+- name: hoe
+ repo: upstream:ruby-gems/hoe
+ ref: 50a2706d0f70ece52922ddcc56630e1e0655b83e
+ unpetrify-ref: master
+ build-depends:
+ - ruby
+- name: rake-compiler
+ repo: upstream:ruby-gems/rake-compiler
+ ref: aaed621f6fdb0b0395775fea5464cc83e794fbdb
+ unpetrify-ref: v0.9.3
+ build-depends:
+ - ruby
diff --git a/strata/ruby.morph b/strata/ruby.morph
deleted file mode 100644
index c5bd9993..00000000
--- a/strata/ruby.morph
+++ /dev/null
@@ -1,52 +0,0 @@
-name: ruby
-kind: stratum
-description: |
- Ruby and common Ruby build dependencies.
-
- Most Gem dependencies are not required when building or installing the
- Gem. They are needed at runtime only. Tools which extend Rake, such as
- 'hoe' and 'rake-compiler', are exceptions to that rule, and are kept
- in this stratum so they are always available when building other Gems.
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: ruby-1.8
- morph: strata/ruby/ruby-1.8.morph
- repo: upstream:ruby
- ref: 7a24f1710028d568ad61d0aa49d5178260178d77
- unpetrify-ref: baserock/morph/ruby_1_8_7
- build-depends: []
-- name: libyaml
- repo: upstream:libyaml-hg
- ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e
- unpetrify-ref: master
- build-depends: []
-- name: ruby
- morph: strata/ruby/ruby.morph
- repo: upstream:ruby
- ref: 05604af5a6da635b8bca51269db8b433972e82c0
- unpetrify-ref: baserock/ruby_2_0_0
- build-depends:
- - ruby-1.8
- - libyaml
-- name: bundler
- morph: strata/ruby/bundler.morph
- repo: upstream:bundler
- ref: 0708fbe62617a63300e1cc3b9869cc1280c57ef6
- unpetrify-ref: baserock/v1.6.2
- build-depends:
- - ruby
-- name: hoe
- morph: strata/ruby/hoe.morph
- repo: upstream:ruby-gems/hoe
- ref: 50a2706d0f70ece52922ddcc56630e1e0655b83e
- unpetrify-ref: master
- build-depends:
- - ruby
-- name: rake-compiler
- morph: strata/ruby/rake-compiler.morph
- repo: upstream:ruby-gems/rake-compiler
- ref: aaed621f6fdb0b0395775fea5464cc83e794fbdb
- unpetrify-ref: v0.9.3
- build-depends:
- - ruby
diff --git a/strata/ruby/bundler.def b/strata/ruby/bundler.def
new file mode 100644
index 00000000..1ed62520
--- /dev/null
+++ b/strata/ruby/bundler.def
@@ -0,0 +1,5 @@
+name: bundler
+build-commands:
+- rake build
+install-commands:
+- gem install ./pkg/*gem --bindir "$DESTDIR/$PREFIX/bin" --install-dir "$DESTDIR/$PREFIX/lib/ruby/gems/2.0.0"
diff --git a/strata/ruby/bundler.morph b/strata/ruby/bundler.morph
deleted file mode 100644
index 643ef119..00000000
--- a/strata/ruby/bundler.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: bundler
-kind: chunk
-build-commands:
-- rake build
-install-commands:
-- gem install ./pkg/*gem --bindir "$DESTDIR/$PREFIX/bin" --install-dir "$DESTDIR/$PREFIX/lib/ruby/gems/2.0.0"
diff --git a/strata/ruby/hoe.def b/strata/ruby/hoe.def
new file mode 100644
index 00000000..b0d17ae0
--- /dev/null
+++ b/strata/ruby/hoe.def
@@ -0,0 +1,15 @@
+name: hoe
+description: |
+ Hoe is a rake/rubygems helper for project Rakefiles. It helps you
+ manage, maintain, and release your project and includes a dynamic
+ plug-in system allowing for easy extensibility.
+products:
+- artifact: hoe-doc
+ include:
+ - usr/lib/ruby/gems/\d[\w.]*/doc/.*
+build-commands:
+- rake gem
+install-commands:
+- mkdir -p "$DESTDIR/$(gem environment home)"
+- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
+ --ignore-dependencies --local ./pkg/hoe-*.gem
diff --git a/strata/ruby/hoe.morph b/strata/ruby/hoe.morph
deleted file mode 100644
index 0d06a82a..00000000
--- a/strata/ruby/hoe.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: hoe
-kind: chunk
-description: |
- Hoe is a rake/rubygems helper for project Rakefiles. It helps you
- manage, maintain, and release your project and includes a dynamic
- plug-in system allowing for easy extensibility.
-products:
-- artifact: hoe-doc
- include:
- - usr/lib/ruby/gems/\d[\w.]*/doc/.*
-build-commands:
-- rake gem
-install-commands:
-- mkdir -p "$DESTDIR/$(gem environment home)"
-- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
- --ignore-dependencies --local ./pkg/hoe-*.gem
diff --git a/strata/ruby/rake-compiler.def b/strata/ruby/rake-compiler.def
new file mode 100644
index 00000000..46428b54
--- /dev/null
+++ b/strata/ruby/rake-compiler.def
@@ -0,0 +1,14 @@
+name: rake-compiler
+description: |
+ Provide a standard and simplified way to build and package Ruby
+ extensions (C, Java) using Rake as glue.
+products:
+- artifact: rake-compiler-doc
+ include:
+ - usr/lib/ruby/gems/\d[\w.]*/doc/.*
+build-commands:
+- rake gem
+install-commands:
+- mkdir -p "$DESTDIR/$(gem environment home)"
+- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
+ --ignore-dependencies --local ./pkg/rake-compiler-*.gem
diff --git a/strata/ruby/rake-compiler.morph b/strata/ruby/rake-compiler.morph
deleted file mode 100644
index 9286f14a..00000000
--- a/strata/ruby/rake-compiler.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: rake-compiler
-kind: chunk
-description: |
- Provide a standard and simplified way to build and package Ruby
- extensions (C, Java) using Rake as glue.
-products:
-- artifact: rake-compiler-doc
- include:
- - usr/lib/ruby/gems/\d[\w.]*/doc/.*
-build-commands:
-- rake gem
-install-commands:
-- mkdir -p "$DESTDIR/$(gem environment home)"
-- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
- --ignore-dependencies --local ./pkg/rake-compiler-*.gem
diff --git a/strata/ruby/ruby-1.8.def b/strata/ruby/ruby-1.8.def
new file mode 100644
index 00000000..9b36a794
--- /dev/null
+++ b/strata/ruby/ruby-1.8.def
@@ -0,0 +1,8 @@
+name: ruby-1.8
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --program-suffix=-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/ruby/ruby-1.8.morph b/strata/ruby/ruby-1.8.morph
deleted file mode 100644
index cee282c0..00000000
--- a/strata/ruby/ruby-1.8.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ruby-1.8
-kind: chunk
-configure-commands:
-- autoconf
-- ./configure --prefix=/usr --program-suffix=-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/ruby/ruby.def b/strata/ruby/ruby.def
new file mode 100644
index 00000000..13ab2d44
--- /dev/null
+++ b/strata/ruby/ruby.def
@@ -0,0 +1,8 @@
+name: ruby
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR=$DESTDIR install
diff --git a/strata/ruby/ruby.morph b/strata/ruby/ruby.morph
deleted file mode 100644
index c5d4afe1..00000000
--- a/strata/ruby/ruby.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ruby
-kind: chunk
-configure-commands:
-- autoconf
-- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR=$DESTDIR install
diff --git a/strata/tools.def b/strata/tools.def
new file mode 100644
index 00000000..801e884c
--- /dev/null
+++ b/strata/tools.def
@@ -0,0 +1,78 @@
+name: tools
+description: Extra development tools included in the devel system
+build-depends:
+- name: foundation
+contents:
+- name: distcc
+ repo: upstream:distcc
+ ref: c9691a9604fdf9d6711204999787d332b7141692
+ unpetrify-ref: baserock/morph
+- name: e2fsprogs
+ repo: upstream:e2fsprogs
+ ref: 6a3741ad293031447b95b88431eafa77401a8987
+ unpetrify-ref: v1.42.12
+- name: file
+ repo: upstream:file
+ ref: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7
+ unpetrify-ref: baserock/morph
+- name: gdb
+ repo: upstream:gdb
+ ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8
+ unpetrify-ref: baserock/morph
+- name: less
+ repo: upstream:less
+ ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04
+ unpetrify-ref: baserock/morph
+- name: linux-user-chroot
+ repo: upstream:linux-user-chroot
+ ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
+ unpetrify-ref: baserock/morph
+- name: lsof
+ repo: upstream:lsof
+ ref: fffb8558208586338587027c265fd0eca44466be
+ unpetrify-ref: baserock/morph
+- name: pv
+ repo: upstream:pv
+ ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a
+ unpetrify-ref: baserock/morph
+- name: rsync
+ repo: upstream:rsync
+ ref: 9faf8e0ccff2755cd019ff64d8322226a214b013
+ unpetrify-ref: baserock/morph
+- name: strace
+ repo: upstream:strace
+ ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5
+ unpetrify-ref: baserock/morph
+- name: vala
+ repo: upstream:vala
+ ref: 4e4a02c03445336237b36723b23a91670ef7621b
+ unpetrify-ref: baserock/bootstrap
+- name: vim
+ repo: upstream:vim
+ ref: 592b8c975bf83b4dcf608769bc664a80cb1daf9e
+ unpetrify-ref: baserock/morph
+- name: screen
+ repo: upstream:screen
+ ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467
+ unpetrify-ref: baserock/morph
+- name: u-boot
+ repo: upstream:u-boot
+ ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
+ unpetrify-ref: baserock/morph
+- name: kexec-tools
+ repo: upstream:kexec-tools
+ ref: 9359b61ca44980d33c0bee42b9bb2e36e72835dd
+ unpetrify-ref: baserock/morph
+- name: device-tree-compiler
+ repo: upstream:device-tree-compiler
+ ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
+ unpetrify-ref: baserock/morph
+- name: sudo
+ repo: upstream:sudo
+ ref: a4769dc7999b53260325fb89945bef85714fb338
+ unpetrify-ref: baserock/morph
+- name: procps-ng
+ repo: upstream:procps-ng
+ ref: 85fff468fa263cdd2ff1c0144579527c32333695
+ unpetrify-ref: v3.3.9
+ prefix: /
diff --git a/strata/tools.morph b/strata/tools.morph
deleted file mode 100644
index a09c24f5..00000000
--- a/strata/tools.morph
+++ /dev/null
@@ -1,107 +0,0 @@
-name: tools
-kind: stratum
-description: Extra development tools included in the devel system
-build-depends:
-- morph: strata/foundation.morph
-chunks:
-- name: distcc
- morph: strata/tools/distcc.morph
- repo: upstream:distcc
- ref: c9691a9604fdf9d6711204999787d332b7141692
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: e2fsprogs
- morph: strata/tools/e2fsprogs.morph
- repo: upstream:e2fsprogs
- ref: 6a3741ad293031447b95b88431eafa77401a8987
- unpetrify-ref: v1.42.12
- build-depends: []
-- name: file
- repo: upstream:file
- ref: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: gdb
- repo: upstream:gdb
- ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: less
- repo: upstream:less
- ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: linux-user-chroot
- repo: upstream:linux-user-chroot
- ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: lsof
- morph: strata/tools/lsof.morph
- repo: upstream:lsof
- ref: fffb8558208586338587027c265fd0eca44466be
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pv
- repo: upstream:pv
- ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: rsync
- morph: strata/tools/rsync.morph
- repo: upstream:rsync
- ref: 9faf8e0ccff2755cd019ff64d8322226a214b013
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: strace
- repo: upstream:strace
- ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: vala
- morph: strata/tools/vala.morph
- repo: upstream:vala
- ref: 4e4a02c03445336237b36723b23a91670ef7621b
- unpetrify-ref: baserock/bootstrap
- build-depends: []
-- name: vim
- morph: strata/tools/vim.morph
- repo: upstream:vim
- ref: 592b8c975bf83b4dcf608769bc664a80cb1daf9e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: screen
- morph: strata/tools/screen.morph
- repo: upstream:screen
- ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: u-boot
- morph: strata/tools/u-boot.morph
- repo: upstream:u-boot
- ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: kexec-tools
- morph: strata/tools/kexec-tools.morph
- repo: upstream:kexec-tools
- ref: 9359b61ca44980d33c0bee42b9bb2e36e72835dd
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: device-tree-compiler
- morph: strata/tools/device-tree-compiler.morph
- repo: upstream:device-tree-compiler
- ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: sudo
- repo: upstream:sudo
- ref: a4769dc7999b53260325fb89945bef85714fb338
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: procps-ng
- repo: upstream:procps-ng
- ref: 85fff468fa263cdd2ff1c0144579527c32333695
- unpetrify-ref: v3.3.9
- build-depends: []
- prefix: /
diff --git a/strata/tools/device-tree-compiler.def b/strata/tools/device-tree-compiler.def
new file mode 100644
index 00000000..c5e4bc6f
--- /dev/null
+++ b/strata/tools/device-tree-compiler.def
@@ -0,0 +1,5 @@
+name: device-tree-compiler
+build-commands:
+- make all
+install-commands:
+- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX"
diff --git a/strata/tools/device-tree-compiler.morph b/strata/tools/device-tree-compiler.morph
deleted file mode 100644
index 8abfafc8..00000000
--- a/strata/tools/device-tree-compiler.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: device-tree-compiler
-kind: chunk
-build-commands:
-- make all
-install-commands:
-- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX"
diff --git a/strata/tools/distcc.def b/strata/tools/distcc.def
new file mode 100644
index 00000000..f6084242
--- /dev/null
+++ b/strata/tools/distcc.def
@@ -0,0 +1,5 @@
+name: distcc
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-Werror
diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.morph
deleted file mode 100644
index 9f42b50e..00000000
--- a/strata/tools/distcc.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: distcc
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-Werror
diff --git a/strata/tools/e2fsprogs.def b/strata/tools/e2fsprogs.def
new file mode 100644
index 00000000..4704e329
--- /dev/null
+++ b/strata/tools/e2fsprogs.def
@@ -0,0 +1,20 @@
+name: e2fsprogs
+build-system: autotools
+configure-commands:
+# Configure with the usual paths for binaries and config
+# but also disable whatever we can that is already provided by util-linux
+# Disabling e2fsprofs' libblkid does not work, but we don't have to
+# install it.
+- |
+ ./configure --prefix="$PREFIX" --sysconfdir=/etc \
+ --disable-libuuid --disable-uuidd --disable-fsck
+install-commands:
+# e2fsprogs also includes tools that are provided by util-linux, so we
+# need to selectively exclude them. Removing them directly from DESTDIR
+# causes problems, so we need to remove them beforehand.
+- |
+ td="$(mktemp -d)"
+ make DESTDIR="$td" install
+ find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete
+ find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
+ mv "$td"/* "$DESTDIR"
diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph
deleted file mode 100644
index 801f8abe..00000000
--- a/strata/tools/e2fsprogs.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: e2fsprogs
-kind: chunk
-build-system: autotools
-configure-commands:
-# Configure with the usual paths for binaries and config
-# but also disable whatever we can that is already provided by util-linux
-# Disabling e2fsprofs' libblkid does not work, but we don't have to
-# install it.
-- |
- ./configure --prefix="$PREFIX" --sysconfdir=/etc \
- --disable-libuuid --disable-uuidd --disable-fsck
-install-commands:
-# e2fsprogs also includes tools that are provided by util-linux, so we
-# need to selectively exclude them. Removing them directly from DESTDIR
-# causes problems, so we need to remove them beforehand.
-- |
- td="$(mktemp -d)"
- make DESTDIR="$td" install
- find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete
- find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
- mv "$td"/* "$DESTDIR"
diff --git a/strata/tools/git-fat.def b/strata/tools/git-fat.def
new file mode 100644
index 00000000..2b6cabe6
--- /dev/null
+++ b/strata/tools/git-fat.def
@@ -0,0 +1,3 @@
+name: git-fat
+install-commands:
+- install -D -m 755 git-fat "$DESTDIR/usr/bin/git-fat"
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/strata/tools/kexec-tools.def b/strata/tools/kexec-tools.def
new file mode 100644
index 00000000..8750272c
--- /dev/null
+++ b/strata/tools/kexec-tools.def
@@ -0,0 +1,5 @@
+name: kexec-tools
+build-system: autotools
+configure-commands:
+- ./bootstrap
+- ./configure --prefix="$PREFIX"
diff --git a/strata/tools/kexec-tools.morph b/strata/tools/kexec-tools.morph
deleted file mode 100644
index 118c1ac2..00000000
--- a/strata/tools/kexec-tools.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: kexec-tools
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./bootstrap
-- ./configure --prefix="$PREFIX"
diff --git a/strata/tools/lsof.def b/strata/tools/lsof.def
new file mode 100644
index 00000000..e0a44bf3
--- /dev/null
+++ b/strata/tools/lsof.def
@@ -0,0 +1,11 @@
+name: lsof
+configure-commands:
+- tar xf lsof_*_src.tar
+- cd lsof_*_src/ && ./Configure -n linux
+build-commands:
+- cd lsof_*_src/ && make
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX"/bin
+- mv lsof_*_src/lsof "$DESTDIR$PREFIX"/bin/lsof
+- mkdir -p "$DESTDIR$PREFIX"/man/man8
+- mv lsof_*_src/lsof.8 "$DESTDIR$PREFIX"/man/man8
diff --git a/strata/tools/lsof.morph b/strata/tools/lsof.morph
deleted file mode 100644
index 5fabcd64..00000000
--- a/strata/tools/lsof.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: lsof
-kind: chunk
-configure-commands:
-- tar xf lsof_*_src.tar
-- cd lsof_*_src/ && ./Configure -n linux
-build-commands:
-- cd lsof_*_src/ && make
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX"/bin
-- mv lsof_*_src/lsof "$DESTDIR$PREFIX"/bin/lsof
-- mkdir -p "$DESTDIR$PREFIX"/man/man8
-- mv lsof_*_src/lsof.8 "$DESTDIR$PREFIX"/man/man8
diff --git a/strata/tools/rsync.def b/strata/tools/rsync.def
new file mode 100644
index 00000000..3b7e773c
--- /dev/null
+++ b/strata/tools/rsync.def
@@ -0,0 +1,5 @@
+name: rsync
+build-system: autotools
+build-commands:
+- make proto
+- make
diff --git a/strata/tools/rsync.morph b/strata/tools/rsync.morph
deleted file mode 100644
index 9a92878d..00000000
--- a/strata/tools/rsync.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: rsync
-kind: chunk
-build-system: autotools
-build-commands:
-- make proto
-- make
diff --git a/strata/tools/screen.def b/strata/tools/screen.def
new file mode 100644
index 00000000..39e3dc46
--- /dev/null
+++ b/strata/tools/screen.def
@@ -0,0 +1,10 @@
+name: screen
+description: A terminal multiplexer and sanity tool for many
+max-jobs: 1
+configure-commands:
+- cd ./src && sh autogen.sh
+- cd ./src && ./configure --prefix="$PREFIX"
+build-commands:
+- cd ./src && make
+install-commands:
+- cd ./src && make DESTDIR="$DESTDIR" install
diff --git a/strata/tools/screen.morph b/strata/tools/screen.morph
deleted file mode 100644
index 0b23c5d4..00000000
--- a/strata/tools/screen.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: screen
-kind: chunk
-description: A terminal multiplexer and sanity tool for many
-max-jobs: 1
-configure-commands:
-- cd ./src && sh autogen.sh
-- cd ./src && ./configure --prefix="$PREFIX"
-build-commands:
-- cd ./src && make
-install-commands:
-- cd ./src && make DESTDIR="$DESTDIR" install
diff --git a/strata/tools/u-boot.def b/strata/tools/u-boot.def
new file mode 100644
index 00000000..3b6f5453
--- /dev/null
+++ b/strata/tools/u-boot.def
@@ -0,0 +1,10 @@
+name: u-boot
+build-commands:
+- make tools
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
+- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/tools/u-boot.morph b/strata/tools/u-boot.morph
deleted file mode 100644
index 9be30bc7..00000000
--- a/strata/tools/u-boot.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: u-boot
-kind: chunk
-build-commands:
-- make tools
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX/bin"
-- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/tools/vala.def b/strata/tools/vala.def
new file mode 100644
index 00000000..bcafe779
--- /dev/null
+++ b/strata/tools/vala.def
@@ -0,0 +1,4 @@
+name: vala
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/tools/vala.morph b/strata/tools/vala.morph
deleted file mode 100644
index dcac5d49..00000000
--- a/strata/tools/vala.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: vala
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX"
diff --git a/strata/tools/vim.def b/strata/tools/vim.def
new file mode 100644
index 00000000..b3836f0d
--- /dev/null
+++ b/strata/tools/vim.def
@@ -0,0 +1,9 @@
+name: vim
+build-system: autotools
+configure-commands:
+- echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >>src/feature.h
+- ./configure --prefix="$PREFIX" --enable-multibyte
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR"/etc
+- install -m 644 runtime/vimrc_example.vim "$DESTDIR"/etc/vimrc
diff --git a/strata/tools/vim.morph b/strata/tools/vim.morph
deleted file mode 100644
index 58e1403f..00000000
--- a/strata/tools/vim.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: vim
-kind: chunk
-build-system: autotools
-configure-commands:
-- echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >>src/feature.h
-- ./configure --prefix="$PREFIX" --enable-multibyte
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR"/etc
-- install -m 644 runtime/vimrc_example.vim "$DESTDIR"/etc/vimrc
diff --git a/strata/trove.def b/strata/trove.def
new file mode 100644
index 00000000..1c7a0157
--- /dev/null
+++ b/strata/trove.def
@@ -0,0 +1,166 @@
+name: trove
+description: Trove software
+build-depends:
+- name: tools
+- name: morph-utils
+- name: pcre-utils
+contents:
+- name: lua
+ repo: upstream:lua
+ ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
+ unpetrify-ref: baserock/5.1-morph
+- name: lace
+ repo: upstream:gitano/lace
+ ref: d1b540b6d361d6a1f51e53cdaab69f053340efbb
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
+- name: luxio
+ repo: upstream:luxio
+ ref: be9d125080b9ff2376273e21b75669b65dc88d46
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
+- name: supple
+ repo: upstream:gitano/supple
+ ref: 0963e5706d78d0ae7446ea91af986de1e196eb39
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
+ - luxio
+- name: clod
+ repo: upstream:gitano/clod
+ ref: da15894f42f48d15db997c4355d6b672371a4163
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
+- name: gall
+ repo: upstream:gitano/gall
+ ref: f58c7526fbb0421d7f5446644f01f4cf57035ee2
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
+ - luxio
+- name: lrexlib-pcre
+ repo: upstream:lrexlib
+ ref: 0524a6e3ab6d50cba63c8642a875e246de53d651
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
+- name: gitano
+ repo: upstream:gitano/gitano
+ ref: 4b8ce6875266fdd6609a217dcf2924d7d4815cc2
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
+- name: cgit
+ repo: upstream:cgit
+ ref: acbf4a15e260c711094455dbef7c024f2553fd32
+ unpetrify-ref: baserock/morph
+- name: bzr-tarball
+ repo: upstream:bzr-tarball
+ ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
+ unpetrify-ref: baserock/morph
+- name: python-fastimport
+ repo: upstream:python-fastimport
+ ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
+ unpetrify-ref: baserock/morph
+- name: bzr-fastimport
+ repo: upstream:bzr-fastimport
+ ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - bzr-tarball
+ - python-fastimport
+- name: cvs-tarball
+ repo: upstream:cvs-tarball
+ ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
+ unpetrify-ref: baserock/morph
+- name: libapr-tarball
+ repo: upstream:libapr-tarball
+ ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
+ unpetrify-ref: baserock/morph
+- name: libapr-util-tarball
+ repo: upstream:libapr-util-tarball
+ ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libapr-tarball
+- name: perl-dbi-tarball
+ repo: upstream:perl-dbi-tarball
+ ref: 09e269cff811f0c1881ea0d6b7571173bab8377b
+ unpetrify-ref: baserock/morph
+- name: perl-dbd-sqlite-tarball
+ repo: upstream:perl-dbd-sqlite-tarball
+ ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - perl-dbi-tarball
+- name: libserf-tarball
+ repo: upstream:libserf-tarball
+ ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libapr-tarball
+ - libapr-util-tarball
+- name: swig-tarball
+ repo: upstream:swig-tarball
+ ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
+ unpetrify-ref: baserock/morph
+- name: neon
+ repo: upstream:neon
+ ref: 837374e9d797e216f1de684595cefe791f67c0e4
+ unpetrify-ref: baserock/morph
+- name: subversion-tarball
+ repo: upstream:subversion-tarball
+ ref: 351e074672d9aa6446d5829938b697a3d6b23266
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - swig-tarball
+ - libapr-tarball
+ - libapr-util-tarball
+ - libserf-tarball
+ - neon
+- name: mercurial-tarball
+ repo: upstream:mercurial-tarball
+ ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a
+ unpetrify-ref: baserock/morph
+- name: hg-fast-export
+ repo: upstream:hg-fast-export
+ ref: 09a472aa58da0417a11a22bae172785f7cb2e80f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - mercurial-tarball
+- name: cvsps
+ repo: upstream:cvsps
+ ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49
+ unpetrify-ref: baserock/morph
+- name: lorry
+ repo: baserock:baserock/lorry
+ ref: 9fe25bf02dceec04f0ffd6a05cc47146ceab9904
+ unpetrify-ref: master
+ build-depends:
+ - bzr-tarball
+ - python-fastimport
+ - bzr-fastimport
+ - perl-dbi-tarball
+ - perl-dbd-sqlite-tarball
+ - cvs-tarball
+ - cvsps
+ - subversion-tarball
+ - mercurial-tarball
+ - hg-fast-export
+- name: trove-setup
+ repo: baserock:baserock/trove-setup
+ ref: 5f2dab59ff6e70edf6ffbcd65fe64b487c4380c2
+ unpetrify-ref: master
+- name: lorry-controller
+ repo: baserock:baserock/lorry-controller
+ ref: 689174532cc4920d2ef96bcebeb8a1adaf985804
+ unpetrify-ref: master
+- name: lua-scrypt
+ repo: upstream:lua-scrypt
+ ref: 0d7f74cd3eab7d54fbb13294194de7ea70ac34a5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lua
diff --git a/strata/trove.morph b/strata/trove.morph
deleted file mode 100644
index 3b285372..00000000
--- a/strata/trove.morph
+++ /dev/null
@@ -1,202 +0,0 @@
-name: trove
-kind: stratum
-description: Trove software
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/morph-utils.morph
-- morph: strata/pcre-utils.morph
-chunks:
-- name: lua
- morph: strata/trove/lua.morph
- repo: upstream:lua
- ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
- unpetrify-ref: baserock/5.1-morph
- build-depends: []
-- name: lace
- morph: strata/trove/lace.morph
- repo: upstream:gitano/lace
- ref: d1b540b6d361d6a1f51e53cdaab69f053340efbb
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
-- name: luxio
- morph: strata/trove/luxio.morph
- repo: upstream:luxio
- ref: be9d125080b9ff2376273e21b75669b65dc88d46
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
-- name: supple
- morph: strata/trove/supple.morph
- repo: upstream:gitano/supple
- ref: 0963e5706d78d0ae7446ea91af986de1e196eb39
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
- - luxio
-- name: clod
- morph: strata/trove/clod.morph
- repo: upstream:gitano/clod
- ref: da15894f42f48d15db997c4355d6b672371a4163
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
-- name: gall
- morph: strata/trove/gall.morph
- repo: upstream:gitano/gall
- ref: f58c7526fbb0421d7f5446644f01f4cf57035ee2
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
- - luxio
-- name: lrexlib-pcre
- morph: strata/trove/lrexlib-pcre.morph
- repo: upstream:lrexlib
- ref: 0524a6e3ab6d50cba63c8642a875e246de53d651
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
-- name: gitano
- morph: strata/trove/gitano.morph
- repo: upstream:gitano/gitano
- ref: 4b8ce6875266fdd6609a217dcf2924d7d4815cc2
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
-- name: cgit
- morph: strata/trove/cgit.morph
- repo: upstream:cgit
- ref: acbf4a15e260c711094455dbef7c024f2553fd32
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: bzr-tarball
- repo: upstream:bzr-tarball
- ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-fastimport
- repo: upstream:python-fastimport
- ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: bzr-fastimport
- repo: upstream:bzr-fastimport
- ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
- unpetrify-ref: baserock/morph
- build-depends:
- - bzr-tarball
- - python-fastimport
-- name: cvs-tarball
- morph: strata/trove/cvs-tarball.morph
- repo: upstream:cvs-tarball
- ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libapr-tarball
- repo: upstream:libapr-tarball
- ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libapr-util-tarball
- morph: strata/trove/libapr-util-tarball.morph
- repo: upstream:libapr-util-tarball
- ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
- unpetrify-ref: baserock/morph
- build-depends:
- - libapr-tarball
-- name: perl-dbi-tarball
- morph: strata/trove/perl-dbi-tarball.morph
- repo: upstream:perl-dbi-tarball
- ref: 09e269cff811f0c1881ea0d6b7571173bab8377b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: perl-dbd-sqlite-tarball
- repo: upstream:perl-dbd-sqlite-tarball
- ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
- unpetrify-ref: baserock/morph
- build-depends:
- - perl-dbi-tarball
-- name: libserf-tarball
- repo: upstream:libserf-tarball
- ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
- unpetrify-ref: baserock/morph
- build-depends:
- - libapr-tarball
- - libapr-util-tarball
-- name: swig-tarball
- morph: strata/trove/swig-tarball.morph
- repo: upstream:swig-tarball
- ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: neon
- morph: strata/trove/neon.morph
- repo: upstream:neon
- ref: 837374e9d797e216f1de684595cefe791f67c0e4
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: subversion-tarball
- morph: strata/trove/subversion-tarball.morph
- repo: upstream:subversion-tarball
- ref: 351e074672d9aa6446d5829938b697a3d6b23266
- unpetrify-ref: baserock/morph
- build-depends:
- - swig-tarball
- - libapr-tarball
- - libapr-util-tarball
- - libserf-tarball
- - neon
-- name: mercurial-tarball
- morph: strata/trove/mercurial-tarball.morph
- repo: upstream:mercurial-tarball
- ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: hg-fast-export
- morph: strata/trove/hg-fast-export.morph
- repo: upstream:hg-fast-export
- ref: 09a472aa58da0417a11a22bae172785f7cb2e80f
- unpetrify-ref: baserock/morph
- build-depends:
- - mercurial-tarball
-- name: cvsps
- morph: strata/trove/cvsps.morph
- repo: upstream:cvsps
- ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: lorry
- morph: strata/trove/lorry.morph
- repo: baserock:baserock/lorry
- ref: 9fe25bf02dceec04f0ffd6a05cc47146ceab9904
- unpetrify-ref: master
- build-depends:
- - bzr-tarball
- - python-fastimport
- - bzr-fastimport
- - perl-dbi-tarball
- - perl-dbd-sqlite-tarball
- - cvs-tarball
- - cvsps
- - subversion-tarball
- - mercurial-tarball
- - hg-fast-export
-- name: trove-setup
- morph: strata/trove/trove-setup.morph
- repo: baserock:baserock/trove-setup
- ref: 5f2dab59ff6e70edf6ffbcd65fe64b487c4380c2
- unpetrify-ref: master
- build-depends: []
-- name: lorry-controller
- morph: strata/trove/lorry-controller.morph
- repo: baserock:baserock/lorry-controller
- ref: 689174532cc4920d2ef96bcebeb8a1adaf985804
- unpetrify-ref: master
- build-depends: []
-- name: lua-scrypt
- morph: strata/trove/lua-scrypt.morph
- repo: upstream:lua-scrypt
- ref: 0d7f74cd3eab7d54fbb13294194de7ea70ac34a5
- unpetrify-ref: baserock/morph
- build-depends:
- - lua
diff --git a/strata/trove/cgit.def b/strata/trove/cgit.def
new file mode 100644
index 00000000..fb39a079
--- /dev/null
+++ b/strata/trove/cgit.def
@@ -0,0 +1,5 @@
+name: cgit
+build-commands:
+- make prefix="$PREFIX"
+install-commands:
+- make prefix="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/cgit.morph b/strata/trove/cgit.morph
deleted file mode 100644
index bd373a51..00000000
--- a/strata/trove/cgit.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: cgit
-kind: chunk
-build-commands:
-- make prefix="$PREFIX"
-install-commands:
-- make prefix="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/clod.def b/strata/trove/clod.def
new file mode 100644
index 00000000..bf9c70a3
--- /dev/null
+++ b/strata/trove/clod.def
@@ -0,0 +1,6 @@
+name: clod
+description: Configuration Language Organised (by) Dots.
+build-commands:
+- make
+install-commands:
+- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/clod.morph b/strata/trove/clod.morph
deleted file mode 100644
index e31ca4fb..00000000
--- a/strata/trove/clod.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: clod
-kind: chunk
-description: Configuration Language Organised (by) Dots.
-build-commands:
-- make
-install-commands:
-- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/cvs-tarball.def b/strata/trove/cvs-tarball.def
new file mode 100644
index 00000000..b3fad379
--- /dev/null
+++ b/strata/trove/cvs-tarball.def
@@ -0,0 +1,5 @@
+name: cvs-tarball
+build-system: autotools
+configure-commands:
+- YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi
+ --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath
diff --git a/strata/trove/cvs-tarball.morph b/strata/trove/cvs-tarball.morph
deleted file mode 100644
index e8322017..00000000
--- a/strata/trove/cvs-tarball.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: cvs-tarball
-kind: chunk
-build-system: autotools
-configure-commands:
-- YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi
- --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath
diff --git a/strata/trove/cvsps.def b/strata/trove/cvsps.def
new file mode 100644
index 00000000..69a66203
--- /dev/null
+++ b/strata/trove/cvsps.def
@@ -0,0 +1,5 @@
+name: cvsps
+build-commands:
+- make
+install-commands:
+- make install prefix="$DESTDIR$PREFIX"
diff --git a/strata/trove/cvsps.morph b/strata/trove/cvsps.morph
deleted file mode 100644
index ff53784e..00000000
--- a/strata/trove/cvsps.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: cvsps
-kind: chunk
-build-commands:
-- make
-install-commands:
-- make install prefix="$DESTDIR$PREFIX"
diff --git a/strata/trove/gall.def b/strata/trove/gall.def
new file mode 100644
index 00000000..a3596740
--- /dev/null
+++ b/strata/trove/gall.def
@@ -0,0 +1,6 @@
+name: gall
+description: Git Abstraction Layer for Lua
+build-commands:
+- make
+install-commands:
+- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/gall.morph b/strata/trove/gall.morph
deleted file mode 100644
index c1f2fd47..00000000
--- a/strata/trove/gall.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: gall
-kind: chunk
-description: Git Abstraction Layer for Lua
-build-commands:
-- make
-install-commands:
-- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/gitano.def b/strata/trove/gitano.def
new file mode 100644
index 00000000..41177d08
--- /dev/null
+++ b/strata/trove/gitano.def
@@ -0,0 +1,4 @@
+name: gitano
+install-commands:
+- make install INST_ROOT="$PREFIX" DESTDIR="$DESTDIR"
+- cp scripts/htpasswd "$DESTDIR/$PREFIX/bin"
diff --git a/strata/trove/gitano.morph b/strata/trove/gitano.morph
deleted file mode 100644
index 962224d5..00000000
--- a/strata/trove/gitano.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: gitano
-kind: chunk
-install-commands:
-- make install INST_ROOT="$PREFIX" DESTDIR="$DESTDIR"
-- cp scripts/htpasswd "$DESTDIR/$PREFIX/bin"
diff --git a/strata/trove/hg-fast-export.def b/strata/trove/hg-fast-export.def
new file mode 100644
index 00000000..567357f4
--- /dev/null
+++ b/strata/trove/hg-fast-export.def
@@ -0,0 +1,9 @@
+name: hg-fast-export
+install-commands:
+- install -d "$DESTDIR/$PREFIX/bin"
+- install -m 0755 hg-fast-export.py "$DESTDIR/$PREFIX/bin/"
+- install -m 0755 hg-reset.py "$DESTDIR/$PREFIX/bin/"
+- install -m 0755 hg-fast-export.sh "$DESTDIR/$PREFIX/bin/hg-fast-export"
+- install -m 0755 hg-reset.sh "$DESTDIR/$PREFIX/bin/hg-reset"
+- install -d "$DESTDIR/$PREFIX/lib/python2.7/site-packages"
+- install -m 0644 hg2git.py "$DESTDIR/$PREFIX/lib/python2.7/site-packages/"
diff --git a/strata/trove/hg-fast-export.morph b/strata/trove/hg-fast-export.morph
deleted file mode 100644
index ef99a97a..00000000
--- a/strata/trove/hg-fast-export.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: hg-fast-export
-kind: chunk
-install-commands:
-- install -d "$DESTDIR/$PREFIX/bin"
-- install -m 0755 hg-fast-export.py "$DESTDIR/$PREFIX/bin/"
-- install -m 0755 hg-reset.py "$DESTDIR/$PREFIX/bin/"
-- install -m 0755 hg-fast-export.sh "$DESTDIR/$PREFIX/bin/hg-fast-export"
-- install -m 0755 hg-reset.sh "$DESTDIR/$PREFIX/bin/hg-reset"
-- install -d "$DESTDIR/$PREFIX/lib/python2.7/site-packages"
-- install -m 0644 hg2git.py "$DESTDIR/$PREFIX/lib/python2.7/site-packages/"
diff --git a/strata/trove/lace.def b/strata/trove/lace.def
new file mode 100644
index 00000000..f87b5d37
--- /dev/null
+++ b/strata/trove/lace.def
@@ -0,0 +1,6 @@
+name: lace
+description: Lua Access Control Engine.
+build-commands:
+- make
+install-commands:
+- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/lace.morph b/strata/trove/lace.morph
deleted file mode 100644
index 70752397..00000000
--- a/strata/trove/lace.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: lace
-kind: chunk
-description: Lua Access Control Engine.
-build-commands:
-- make
-install-commands:
-- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/libapr-util-tarball.def b/strata/trove/libapr-util-tarball.def
new file mode 100644
index 00000000..0d909e90
--- /dev/null
+++ b/strata/trove/libapr-util-tarball.def
@@ -0,0 +1,4 @@
+name: libapr-util-tarball
+build-system: autotools
+configure-commands:
+- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config
diff --git a/strata/trove/libapr-util-tarball.morph b/strata/trove/libapr-util-tarball.morph
deleted file mode 100644
index e34e3610..00000000
--- a/strata/trove/libapr-util-tarball.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: libapr-util-tarball
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config
diff --git a/strata/trove/lorry-controller.def b/strata/trove/lorry-controller.def
new file mode 100644
index 00000000..a059a5eb
--- /dev/null
+++ b/strata/trove/lorry-controller.def
@@ -0,0 +1,9 @@
+name: lorry-controller
+build-system: python-distutils
+post-install-commands:
+- install -d 0755 "$DESTDIR/etc/lighttpd"
+- install -m 0644 -D etc/lighttpd/*.conf "$DESTDIR/etc/lighttpd/."
+- |
+ TGT="$DESTDIR/usr/lib/systemd/system"
+ install -d "$TGT/multi-user.target.wants"
+ install -m 0644 units/*.service units/*.timer "$TGT/."
diff --git a/strata/trove/lorry-controller.morph b/strata/trove/lorry-controller.morph
deleted file mode 100644
index 2f90a9a1..00000000
--- a/strata/trove/lorry-controller.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: lorry-controller
-kind: chunk
-build-system: python-distutils
-post-install-commands:
-- install -d 0755 "$DESTDIR/etc/lighttpd"
-- install -m 0644 -D etc/lighttpd/*.conf "$DESTDIR/etc/lighttpd/."
-- |
- TGT="$DESTDIR/usr/lib/systemd/system"
- install -d "$TGT/multi-user.target.wants"
- install -m 0644 units/*.service units/*.timer "$TGT/."
diff --git a/strata/trove/lorry.def b/strata/trove/lorry.def
new file mode 100644
index 00000000..58f90609
--- /dev/null
+++ b/strata/trove/lorry.def
@@ -0,0 +1,2 @@
+name: lorry
+build-system: python-distutils
diff --git a/strata/trove/lorry.morph b/strata/trove/lorry.morph
deleted file mode 100644
index 6b8cb355..00000000
--- a/strata/trove/lorry.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: lorry
-kind: chunk
-build-system: python-distutils
diff --git a/strata/trove/lrexlib-pcre.def b/strata/trove/lrexlib-pcre.def
new file mode 100644
index 00000000..e283e3ce
--- /dev/null
+++ b/strata/trove/lrexlib-pcre.def
@@ -0,0 +1,8 @@
+name: lrexlib-pcre
+description: Lua regular expression library - PCRE build only
+build-commands:
+- gcc -fPIC -DPIC -DVERSION=\"2.7.2\" -o rex_pcre.so -shared src/common.c src/pcre/lpcre.c
+ src/pcre/lpcre_f.c -lpcre
+install-commands:
+- mkdir -p $DESTDIR/usr/lib/lua/5.1/
+- cp rex_pcre.so $DESTDIR/usr/lib/lua/5.1/
diff --git a/strata/trove/lrexlib-pcre.morph b/strata/trove/lrexlib-pcre.morph
deleted file mode 100644
index 63f3b034..00000000
--- a/strata/trove/lrexlib-pcre.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: lrexlib-pcre
-kind: chunk
-description: Lua regular expression library - PCRE build only
-build-commands:
-- gcc -fPIC -DPIC -DVERSION=\"2.7.2\" -o rex_pcre.so -shared src/common.c src/pcre/lpcre.c
- src/pcre/lpcre_f.c -lpcre
-install-commands:
-- mkdir -p $DESTDIR/usr/lib/lua/5.1/
-- cp rex_pcre.so $DESTDIR/usr/lib/lua/5.1/
diff --git a/strata/trove/lua-scrypt.def b/strata/trove/lua-scrypt.def
new file mode 100644
index 00000000..9ae57a5b
--- /dev/null
+++ b/strata/trove/lua-scrypt.def
@@ -0,0 +1,3 @@
+name: lua-scrypt
+install-commands:
+- make lua-5.1-install DESTDIR="$DESTDIR"
diff --git a/strata/trove/lua-scrypt.morph b/strata/trove/lua-scrypt.morph
deleted file mode 100644
index 141b8ec3..00000000
--- a/strata/trove/lua-scrypt.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: lua-scrypt
-kind: chunk
-install-commands:
-- make lua-5.1-install DESTDIR="$DESTDIR"
diff --git a/strata/trove/lua.def b/strata/trove/lua.def
new file mode 100644
index 00000000..b04c2b63
--- /dev/null
+++ b/strata/trove/lua.def
@@ -0,0 +1,10 @@
+name: lua
+configure-commands:
+- sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
+- sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
+build-commands:
+- make debian_linux INSTALL_TOP="$PREFIX" RPATH="$PREFIX/lib"
+install-commands:
+- make INSTALL_TOP="$DESTDIR/$PREFIX" debian_install
+- mkdir -p "$DESTDIR/$PREFIX/lib/pkgconfig"
+- cp lua5.1.pc "$DESTDIR/$PREFIX/lib/pkgconfig/"
diff --git a/strata/trove/lua.morph b/strata/trove/lua.morph
deleted file mode 100644
index 32aeb5c1..00000000
--- a/strata/trove/lua.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: lua
-kind: chunk
-configure-commands:
-- sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
-- sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
-build-commands:
-- make debian_linux INSTALL_TOP="$PREFIX" RPATH="$PREFIX/lib"
-install-commands:
-- make INSTALL_TOP="$DESTDIR/$PREFIX" debian_install
-- mkdir -p "$DESTDIR/$PREFIX/lib/pkgconfig"
-- cp lua5.1.pc "$DESTDIR/$PREFIX/lib/pkgconfig/"
diff --git a/strata/trove/luxio.def b/strata/trove/luxio.def
new file mode 100644
index 00000000..ababc39b
--- /dev/null
+++ b/strata/trove/luxio.def
@@ -0,0 +1,6 @@
+name: luxio
+description: Lua Unix IO (and related stuff).
+build-commands:
+- make lua-5.1
+install-commands:
+- make DESTDIR="$DESTDIR" lua-5.1-install
diff --git a/strata/trove/luxio.morph b/strata/trove/luxio.morph
deleted file mode 100644
index 29aabfaf..00000000
--- a/strata/trove/luxio.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: luxio
-kind: chunk
-description: Lua Unix IO (and related stuff).
-build-commands:
-- make lua-5.1
-install-commands:
-- make DESTDIR="$DESTDIR" lua-5.1-install
diff --git a/strata/trove/mercurial-tarball.def b/strata/trove/mercurial-tarball.def
new file mode 100644
index 00000000..f366b7f2
--- /dev/null
+++ b/strata/trove/mercurial-tarball.def
@@ -0,0 +1,5 @@
+name: mercurial-tarball
+build-commands:
+- make build PREFIX="$PREFIX"
+install-commands:
+- make install-bin PREFIX="$PREFIX" DESTDIR="$DESTDIR"
diff --git a/strata/trove/mercurial-tarball.morph b/strata/trove/mercurial-tarball.morph
deleted file mode 100644
index 03264f56..00000000
--- a/strata/trove/mercurial-tarball.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: mercurial-tarball
-kind: chunk
-build-commands:
-- make build PREFIX="$PREFIX"
-install-commands:
-- make install-bin PREFIX="$PREFIX" DESTDIR="$DESTDIR"
diff --git a/strata/trove/neon.def b/strata/trove/neon.def
new file mode 100644
index 00000000..5faf65c3
--- /dev/null
+++ b/strata/trove/neon.def
@@ -0,0 +1,7 @@
+name: neon
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --with-ssl
+install-commands:
+- make install-lib install-headers install-config DESTDIR="$DESTDIR"
diff --git a/strata/trove/neon.morph b/strata/trove/neon.morph
deleted file mode 100644
index 19f8e83f..00000000
--- a/strata/trove/neon.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: neon
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --with-ssl
-install-commands:
-- make install-lib install-headers install-config DESTDIR="$DESTDIR"
diff --git a/strata/trove/perl-dbi-tarball.def b/strata/trove/perl-dbi-tarball.def
new file mode 100644
index 00000000..f1a48a6b
--- /dev/null
+++ b/strata/trove/perl-dbi-tarball.def
@@ -0,0 +1,4 @@
+name: perl-dbi-tarball
+build-system: cpan
+build-commands:
+- make -j1
diff --git a/strata/trove/perl-dbi-tarball.morph b/strata/trove/perl-dbi-tarball.morph
deleted file mode 100644
index 9eb3a537..00000000
--- a/strata/trove/perl-dbi-tarball.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: perl-dbi-tarball
-kind: chunk
-build-system: cpan
-build-commands:
-- make -j1
diff --git a/strata/trove/subversion-tarball.def b/strata/trove/subversion-tarball.def
new file mode 100644
index 00000000..3441c784
--- /dev/null
+++ b/strata/trove/subversion-tarball.def
@@ -0,0 +1,9 @@
+name: subversion-tarball
+build-system: autotools
+configure-commands:
+- python gen-make.py build.conf
+- ./configure --prefix="$PREFIX" --without-berkeley-db
+install-commands:
+- make install DESTDIR="$DESTDIR"
+- make swig-pl
+- make install-swig-pl DESTDIR="$DESTDIR"
diff --git a/strata/trove/subversion-tarball.morph b/strata/trove/subversion-tarball.morph
deleted file mode 100644
index cb416d53..00000000
--- a/strata/trove/subversion-tarball.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: subversion-tarball
-kind: chunk
-build-system: autotools
-configure-commands:
-- python gen-make.py build.conf
-- ./configure --prefix="$PREFIX" --without-berkeley-db
-install-commands:
-- make install DESTDIR="$DESTDIR"
-- make swig-pl
-- make install-swig-pl DESTDIR="$DESTDIR"
diff --git a/strata/trove/supple.def b/strata/trove/supple.def
new file mode 100644
index 00000000..4fa5b089
--- /dev/null
+++ b/strata/trove/supple.def
@@ -0,0 +1,6 @@
+name: supple
+description: Sandbox (for) Untrusted Procedure Partitioning (in) Lua Engine.
+build-commands:
+- make
+install-commands:
+- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/supple.morph b/strata/trove/supple.morph
deleted file mode 100644
index 6470ba28..00000000
--- a/strata/trove/supple.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: supple
-kind: chunk
-description: Sandbox (for) Untrusted Procedure Partitioning (in) Lua Engine.
-build-commands:
-- make
-install-commands:
-- make INST_BASE="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/trove/swig-tarball.def b/strata/trove/swig-tarball.def
new file mode 100644
index 00000000..feb7cfdb
--- /dev/null
+++ b/strata/trove/swig-tarball.def
@@ -0,0 +1,4 @@
+name: swig-tarball
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-ccache
diff --git a/strata/trove/swig-tarball.morph b/strata/trove/swig-tarball.morph
deleted file mode 100644
index 61f154a4..00000000
--- a/strata/trove/swig-tarball.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: swig-tarball
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --disable-ccache
diff --git a/strata/trove/trove-setup.def b/strata/trove/trove-setup.def
new file mode 100644
index 00000000..7caa3b6b
--- /dev/null
+++ b/strata/trove/trove-setup.def
@@ -0,0 +1,3 @@
+name: trove-setup
+install-commands:
+- make install DESTDIR="$DESTDIR"
diff --git a/strata/trove/trove-setup.morph b/strata/trove/trove-setup.morph
deleted file mode 100644
index 1f49760f..00000000
--- a/strata/trove/trove-setup.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: trove-setup
-kind: chunk
-install-commands:
-- make install DESTDIR="$DESTDIR"
diff --git a/strata/virtualbox-guest-x86_64.def b/strata/virtualbox-guest-x86_64.def
new file mode 100644
index 00000000..055bf8ed
--- /dev/null
+++ b/strata/virtualbox-guest-x86_64.def
@@ -0,0 +1,19 @@
+name: virtualbox-guest-x86_64
+description: |
+ VirtualBox Guest Additions for x86_64
+build-depends:
+- name: tools
+- name: bsp-x86_64-generic
+- name: x-common
+- name: x-generic
+contents:
+- name: yasm
+ repo: upstream:yasm
+ ref: fefefe262eb29081f0bcb4d48f2d476ce5730562
+ unpetrify-ref: baserock/morph
+- name: vboxguest
+ repo: upstream:VirtualBox
+ ref: 617aeb5a3c13f4a46423e8c2fb560449403ad56d
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - yasm
diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph
deleted file mode 100644
index 7ac14158..00000000
--- a/strata/virtualbox-guest-x86_64.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-name: virtualbox-guest-x86_64
-kind: stratum
-description: |
- VirtualBox Guest Additions for x86_64
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/bsp-x86_64-generic.morph
-- morph: strata/x-common.morph
-- morph: strata/x-generic.morph
-chunks:
-- name: yasm
- morph: strata/virtualbox-guest-x86_64/yasm.morph
- repo: upstream:yasm
- ref: fefefe262eb29081f0bcb4d48f2d476ce5730562
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: vboxguest
- morph: strata/virtualbox-guest-x86_64/vboxguest.morph
- repo: upstream:VirtualBox
- ref: 617aeb5a3c13f4a46423e8c2fb560449403ad56d
- unpetrify-ref: baserock/morph
- build-depends:
- - yasm
diff --git a/strata/virtualbox-guest-x86_64/vboxguest.def b/strata/virtualbox-guest-x86_64/vboxguest.def
new file mode 100644
index 00000000..9311b634
--- /dev/null
+++ b/strata/virtualbox-guest-x86_64/vboxguest.def
@@ -0,0 +1,33 @@
+name: vboxguest
+description: |
+ VirtualBox guest additions
+max-jobs: 1
+build-commands:
+- truncate -s0 src/VBox/Additions/common/pam/Makefile.kmk
+- env PATH="${PATH}:$(pwd)/kBuild/bin/linux.amd64/" VBOX_ONLY_ADDITIONS=1 VBOX_ONLY_BUILD=1
+ kmk
+- cd out/linux.amd64/release/bin/additions/src/ && make M="$(pwd)" -C /usr/src/linux
+ modules
+install-commands:
+- cd out/linux.amd64/release/bin/additions/src && make M="$(pwd)" -C /usr/src/linux
+ INSTALL_MOD_PATH="$DESTDIR" modules_install
+- install -m 755 -D -o 0 -g 0 out/linux.amd64/release/bin/additions/mount.vboxsf "$DESTDIR/sbin/mount.vboxsf"
+- install -m 755 -D -o 0 -g 0 out/linux.amd64/release/bin/additions/VBoxService "$DESTDIR/sbin/VBoxService"
+- install -m 755 -D -o 0 -g 0 out/linux.amd64/release/bin/additions/VBoxControl "$DESTDIR/sbin/VBoxControl"
+- |
+ install -m 644 -D -o 0 -g 0 /proc/self/fd/0 "$DESTDIR/lib/systemd/system/virtualbox-guest.service" <<EOS
+ [Unit]
+ Description=VirtualBox Guest Additions
+
+ [Service]
+ ExecStart=/sbin/VBoxService -f
+ Restart=always
+ EOS
+- mkdir -p "$DESTDIR/lib/systemd/system/basic.target.wants"
+- ln -s "/lib/systemd/system/virtualbox-guest.service" "$DESTDIR/lib/systemd/system/basic.target.wants/virtualbox-guest.service"
+- mkdir -p "$DESTDIR/etc/modules-load.d"
+- echo vboxsf > "$DESTDIR/etc/modules-load.d/virtualbox-guest-filesystem.conf"
+system-integration:
+ vboxguest-misc:
+ 00-depmod:
+ - depmod -a $(cd /lib/modules; ls | head -n 1)
diff --git a/strata/virtualbox-guest-x86_64/vboxguest.morph b/strata/virtualbox-guest-x86_64/vboxguest.morph
deleted file mode 100644
index f31c9944..00000000
--- a/strata/virtualbox-guest-x86_64/vboxguest.morph
+++ /dev/null
@@ -1,34 +0,0 @@
-name: vboxguest
-kind: chunk
-description: |
- VirtualBox guest additions
-max-jobs: 1
-build-commands:
-- truncate -s0 src/VBox/Additions/common/pam/Makefile.kmk
-- env PATH="${PATH}:$(pwd)/kBuild/bin/linux.amd64/" VBOX_ONLY_ADDITIONS=1 VBOX_ONLY_BUILD=1
- kmk
-- cd out/linux.amd64/release/bin/additions/src/ && make M="$(pwd)" -C /usr/src/linux
- modules
-install-commands:
-- cd out/linux.amd64/release/bin/additions/src && make M="$(pwd)" -C /usr/src/linux
- INSTALL_MOD_PATH="$DESTDIR" modules_install
-- install -m 755 -D -o 0 -g 0 out/linux.amd64/release/bin/additions/mount.vboxsf "$DESTDIR/sbin/mount.vboxsf"
-- install -m 755 -D -o 0 -g 0 out/linux.amd64/release/bin/additions/VBoxService "$DESTDIR/sbin/VBoxService"
-- install -m 755 -D -o 0 -g 0 out/linux.amd64/release/bin/additions/VBoxControl "$DESTDIR/sbin/VBoxControl"
-- |
- install -m 644 -D -o 0 -g 0 /proc/self/fd/0 "$DESTDIR/lib/systemd/system/virtualbox-guest.service" <<EOS
- [Unit]
- Description=VirtualBox Guest Additions
-
- [Service]
- ExecStart=/sbin/VBoxService -f
- Restart=always
- EOS
-- mkdir -p "$DESTDIR/lib/systemd/system/basic.target.wants"
-- ln -s "/lib/systemd/system/virtualbox-guest.service" "$DESTDIR/lib/systemd/system/basic.target.wants/virtualbox-guest.service"
-- mkdir -p "$DESTDIR/etc/modules-load.d"
-- echo vboxsf > "$DESTDIR/etc/modules-load.d/virtualbox-guest-filesystem.conf"
-system-integration:
- vboxguest-misc:
- 00-depmod:
- - depmod -a $(cd /lib/modules; ls | head -n 1)
diff --git a/strata/virtualbox-guest-x86_64/yasm.def b/strata/virtualbox-guest-x86_64/yasm.def
new file mode 100644
index 00000000..c6e561d4
--- /dev/null
+++ b/strata/virtualbox-guest-x86_64/yasm.def
@@ -0,0 +1,3 @@
+name: yasm
+max-jobs: 1
+build-system: autotools
diff --git a/strata/virtualbox-guest-x86_64/yasm.morph b/strata/virtualbox-guest-x86_64/yasm.morph
deleted file mode 100644
index 437ae97d..00000000
--- a/strata/virtualbox-guest-x86_64/yasm.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: yasm
-kind: chunk
-max-jobs: 1
-build-system: autotools
diff --git a/strata/virtualization.def b/strata/virtualization.def
new file mode 100644
index 00000000..4be68ae8
--- /dev/null
+++ b/strata/virtualization.def
@@ -0,0 +1,105 @@
+name: virtualization
+description: virtualization for baserock
+build-depends:
+- name: connman-common
+contents:
+- name: yajl
+ repo: upstream:yajl
+ ref: 52fc681857228c65c1cb439782da485554875481
+ unpetrify-ref: baserock/morph
+- name: xml-catalog
+ repo: baserock:baserock/xml-catalog
+ ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b
+ unpetrify-ref: master
+- name: lvm2
+ repo: upstream:lvm2
+ ref: 8c5b90b50bdf9f1a7ae1d3c4cf58ce4b0d7c2768
+ unpetrify-ref: baserock/morph
+- name: dnsmasq
+ repo: upstream:dnsmasq
+ ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - lvm2
+- name: qemu
+ repo: upstream:qemu
+ ref: f8d1fb61e65575011a67d7ba97b690feb5630c91
+ unpetrify-ref: baserock/morph
+- name: xorg-util-macros
+ repo: upstream:xorg-util-macros
+ ref: c98b41de5596c675c603ef43ae9570133f1a9921
+ unpetrify-ref: baserock/morph
+- name: libpciaccess
+ repo: upstream:libpciaccess
+ ref: b9c068896914b4132a24839c9ef7f9fcd6282d88
+ unpetrify-ref: master
+ build-depends:
+ - xorg-util-macros
+- name: libvirt
+ repo: upstream:libvirt
+ ref: 13b7bb4acba9b70e015b7faa020b08018885aad8
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libpciaccess
+ - dnsmasq
+ - qemu
+ - xml-catalog
+ - yajl
+- name: pycurl
+ repo: upstream:pycurl
+ ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
+ unpetrify-ref: baserock/morph
+- name: urlgrabber
+ repo: upstream:urlgrabber
+ ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04
+ unpetrify-ref: master
+ build-depends:
+ - pycurl
+- name: cython
+ repo: upstream:cython
+ ref: 005d38d5921a603d5f4d413aae72f98a6d33192f
+ unpetrify-ref: master
+- name: python-lxml
+ repo: upstream:python-lxml
+ ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - cython
+- name: libvirt-python
+ repo: upstream:libvirt-python
+ ref: 4382fc518cbd11d9af5727fb403e175818c25db5
+ unpetrify-ref: v1.2.2
+ build-depends:
+ - libvirt
+ - python-lxml
+ - urlgrabber
+- name: gnome-common
+ repo: upstream:gnome-common
+ ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8
+ unpetrify-ref: 3.7.4
+- name: pygobject
+ repo: upstream:pygobject
+ ref: 276341d7ddab180020c31e6837bd28fd25784de0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - gnome-common
+- name: libsoup
+ repo: upstream:libsoup
+ ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - gnome-common
+- name: libosinfo
+ repo: upstream:libosinfo
+ ref: a86c74c4d3f62bb0e315ab7fc78ec9f7746bdd12
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libsoup
+ - pygobject
+- name: virt-manager
+ repo: upstream:virt-manager
+ ref: 8b7ebd4538ffbd2d246fdeee4f1bb1c452585575
+ unpetrify-ref: v1.0.1
+ build-depends:
+ - libvirt-python
+ - libosinfo
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
deleted file mode 100644
index e3261f84..00000000
--- a/strata/virtualization.morph
+++ /dev/null
@@ -1,123 +0,0 @@
-name: virtualization
-kind: stratum
-description: virtualization for baserock
-build-depends:
-- morph: strata/connman-common.morph
-chunks:
-- name: yajl
- morph: strata/virtualization/yajl.morph
- repo: upstream:yajl
- ref: 52fc681857228c65c1cb439782da485554875481
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xml-catalog
- morph: strata/virtualization/xml-catalog.morph
- repo: baserock:baserock/xml-catalog
- ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b
- unpetrify-ref: master
- build-depends: []
-- name: lvm2
- morph: strata/virtualization/lvm2.morph
- repo: upstream:lvm2
- ref: 8c5b90b50bdf9f1a7ae1d3c4cf58ce4b0d7c2768
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: dnsmasq
- morph: strata/virtualization/dnsmasq.morph
- repo: upstream:dnsmasq
- ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954
- unpetrify-ref: baserock/morph
- build-depends:
- - lvm2
-- name: qemu
- morph: strata/virtualization/qemu.morph
- repo: upstream:qemu
- ref: f8d1fb61e65575011a67d7ba97b690feb5630c91
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-util-macros
- repo: upstream:xorg-util-macros
- ref: c98b41de5596c675c603ef43ae9570133f1a9921
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libpciaccess
- repo: upstream:libpciaccess
- ref: b9c068896914b4132a24839c9ef7f9fcd6282d88
- unpetrify-ref: master
- build-depends:
- - xorg-util-macros
-- name: libvirt
- morph: strata/virtualization/libvirt.morph
- repo: upstream:libvirt
- ref: 13b7bb4acba9b70e015b7faa020b08018885aad8
- unpetrify-ref: baserock/morph
- build-depends:
- - libpciaccess
- - dnsmasq
- - qemu
- - xml-catalog
- - yajl
-- name: pycurl
- repo: upstream:pycurl
- ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: urlgrabber
- repo: upstream:urlgrabber
- ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04
- unpetrify-ref: master
- build-depends:
- - pycurl
-- name: cython
- repo: upstream:cython
- ref: 005d38d5921a603d5f4d413aae72f98a6d33192f
- unpetrify-ref: master
- build-depends: []
-- name: python-lxml
- repo: upstream:python-lxml
- ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92
- unpetrify-ref: baserock/morph
- build-depends:
- - cython
-- name: libvirt-python
- repo: upstream:libvirt-python
- ref: 4382fc518cbd11d9af5727fb403e175818c25db5
- unpetrify-ref: v1.2.2
- build-depends:
- - libvirt
- - python-lxml
- - urlgrabber
-- name: gnome-common
- repo: upstream:gnome-common
- ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8
- unpetrify-ref: 3.7.4
- build-depends: []
-- name: pygobject
- morph: strata/virtualization/pygobject.morph
- repo: upstream:pygobject
- ref: 276341d7ddab180020c31e6837bd28fd25784de0
- unpetrify-ref: baserock/morph
- build-depends:
- - gnome-common
-- name: libsoup
- morph: strata/virtualization/libsoup.morph
- repo: upstream:libsoup
- ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e
- unpetrify-ref: baserock/morph
- build-depends:
- - gnome-common
-- name: libosinfo
- morph: strata/virtualization/libosinfo.morph
- repo: upstream:libosinfo
- ref: a86c74c4d3f62bb0e315ab7fc78ec9f7746bdd12
- unpetrify-ref: baserock/morph
- build-depends:
- - libsoup
- - pygobject
-- name: virt-manager
- repo: upstream:virt-manager
- ref: 8b7ebd4538ffbd2d246fdeee4f1bb1c452585575
- unpetrify-ref: v1.0.1
- build-depends:
- - libvirt-python
- - libosinfo
diff --git a/strata/virtualization/dnsmasq.def b/strata/virtualization/dnsmasq.def
new file mode 100644
index 00000000..dce1d1cb
--- /dev/null
+++ b/strata/virtualization/dnsmasq.def
@@ -0,0 +1,5 @@
+name: dnsmasq
+build-system: autotools
+configure-commands: []
+install-commands:
+- make install PREFIX="$PREFIX" DESTDIR="$DESTDIR"
diff --git a/strata/virtualization/dnsmasq.morph b/strata/virtualization/dnsmasq.morph
deleted file mode 100644
index 4db0bf09..00000000
--- a/strata/virtualization/dnsmasq.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: dnsmasq
-kind: chunk
-build-system: autotools
-configure-commands: []
-install-commands:
-- make install PREFIX="$PREFIX" DESTDIR="$DESTDIR"
diff --git a/strata/virtualization/libosinfo.def b/strata/virtualization/libosinfo.def
new file mode 100644
index 00000000..f5eaf6ce
--- /dev/null
+++ b/strata/virtualization/libosinfo.def
@@ -0,0 +1,5 @@
+name: libosinfo
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc --disable-tests --disable-vala
+ --with-usb-ids-path=usb.ids --with-pci-ids-path=pci.ids
diff --git a/strata/virtualization/libosinfo.morph b/strata/virtualization/libosinfo.morph
deleted file mode 100644
index d5679965..00000000
--- a/strata/virtualization/libosinfo.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libosinfo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc --disable-tests --disable-vala
- --with-usb-ids-path=usb.ids --with-pci-ids-path=pci.ids
diff --git a/strata/virtualization/libsoup.def b/strata/virtualization/libsoup.def
new file mode 100644
index 00000000..e561905f
--- /dev/null
+++ b/strata/virtualization/libsoup.def
@@ -0,0 +1,5 @@
+name: libsoup
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-tls-check
diff --git a/strata/virtualization/libsoup.morph b/strata/virtualization/libsoup.morph
deleted file mode 100644
index 0a5ebef6..00000000
--- a/strata/virtualization/libsoup.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libsoup
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-tls-check
diff --git a/strata/virtualization/libvirt.def b/strata/virtualization/libvirt.def
new file mode 100644
index 00000000..ae6316d6
--- /dev/null
+++ b/strata/virtualization/libvirt.def
@@ -0,0 +1,5 @@
+name: libvirt
+build-system: autotools
+configure-commands:
+- |
+ GNULIB_SRCDIR=gnulib-src ./autogen.sh --without-apparmor --with-attr --without-audit --without-avahi --with-blkid --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs --without-hal --without-netcf --without-numactl --without-openwsman --with-pciaccess --without-readline --without-sanlock --without-sasl --without-selinux --without-ssh2 --with-systemd-daemon --with-udev --with-yajl --without-xen --with-qemu --without-uml --without-openvz --without-vmware --without-phyp --without-xenapi --without-libxl --without-vbox --without-lxc --without-esx --without-hyperv --without-parallels --with-test --with-remote --with-libvirtd --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit --without-firewalld --without-dtrace --without-numad --with-network --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --with-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-wireshark-dissector --with-python --prefix="$PREFIX"
diff --git a/strata/virtualization/libvirt.morph b/strata/virtualization/libvirt.morph
deleted file mode 100644
index 63b5d768..00000000
--- a/strata/virtualization/libvirt.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libvirt
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
- GNULIB_SRCDIR=gnulib-src ./autogen.sh --without-apparmor --with-attr --without-audit --without-avahi --with-blkid --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs --without-hal --without-netcf --without-numactl --without-openwsman --with-pciaccess --without-readline --without-sanlock --without-sasl --without-selinux --without-ssh2 --with-systemd-daemon --with-udev --with-yajl --without-xen --with-qemu --without-uml --without-openvz --without-vmware --without-phyp --without-xenapi --without-libxl --without-vbox --without-lxc --without-esx --without-hyperv --without-parallels --with-test --with-remote --with-libvirtd --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit --without-firewalld --without-dtrace --without-numad --with-network --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --with-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-wireshark-dissector --with-python --prefix="$PREFIX"
diff --git a/strata/virtualization/lvm2.def b/strata/virtualization/lvm2.def
new file mode 100644
index 00000000..9b4e1439
--- /dev/null
+++ b/strata/virtualization/lvm2.def
@@ -0,0 +1,5 @@
+name: lvm2
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --enable-applib --enable-cmdlib --enable-pkgconfig
+ --enable-dmeventd --enable-udev_sync
diff --git a/strata/virtualization/lvm2.morph b/strata/virtualization/lvm2.morph
deleted file mode 100644
index 49c166dc..00000000
--- a/strata/virtualization/lvm2.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: lvm2
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --enable-applib --enable-cmdlib --enable-pkgconfig
- --enable-dmeventd --enable-udev_sync
diff --git a/strata/virtualization/pygobject.def b/strata/virtualization/pygobject.def
new file mode 100644
index 00000000..72f17fc2
--- /dev/null
+++ b/strata/virtualization/pygobject.def
@@ -0,0 +1,4 @@
+name: pygobject
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-cairo
diff --git a/strata/virtualization/pygobject.morph b/strata/virtualization/pygobject.morph
deleted file mode 100644
index a423537e..00000000
--- a/strata/virtualization/pygobject.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: pygobject
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-cairo
diff --git a/strata/virtualization/qemu.def b/strata/virtualization/qemu.def
new file mode 100644
index 00000000..76c4f543
--- /dev/null
+++ b/strata/virtualization/qemu.def
@@ -0,0 +1,4 @@
+name: qemu
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/virtualization/qemu.morph b/strata/virtualization/qemu.morph
deleted file mode 100644
index 17ffbeb6..00000000
--- a/strata/virtualization/qemu.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: qemu
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX"
diff --git a/strata/virtualization/xml-catalog.def b/strata/virtualization/xml-catalog.def
new file mode 100644
index 00000000..9af491b1
--- /dev/null
+++ b/strata/virtualization/xml-catalog.def
@@ -0,0 +1,5 @@
+name: xml-catalog
+install-commands:
+- make DESTDIR="$DESTDIR" install
+post-install-commands:
+- ./post-install.sh
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
diff --git a/strata/virtualization/yajl.def b/strata/virtualization/yajl.def
new file mode 100644
index 00000000..605ac9df
--- /dev/null
+++ b/strata/virtualization/yajl.def
@@ -0,0 +1,7 @@
+name: yajl
+configure-commands:
+- ./configure -p "$PREFIX"
+build-commands:
+- make distro
+install-commands:
+- make install DESTDIR="$DESTDIR"
diff --git a/strata/virtualization/yajl.morph b/strata/virtualization/yajl.morph
deleted file mode 100644
index 3fac99db..00000000
--- a/strata/virtualization/yajl.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: yajl
-kind: chunk
-configure-commands:
-- ./configure -p "$PREFIX"
-build-commands:
-- make distro
-install-commands:
-- make install DESTDIR="$DESTDIR"
diff --git a/strata/wayland-generic.def b/strata/wayland-generic.def
new file mode 100644
index 00000000..f7314a7f
--- /dev/null
+++ b/strata/wayland-generic.def
@@ -0,0 +1,15 @@
+name: wayland-generic
+build-depends:
+- name: foundation
+- name: xorg-util-macros-common
+contents:
+- name: libxkbcommon
+ repo: upstream:xorg-lib-libxkbcommon
+ ref: b721254769212d671a4729f1c88b059979b80efc
+ unpetrify-ref: baserock/genivi/baseline
+- name: wayland
+ repo: upstream:wayland
+ ref: 339e83aa579569711cd14623ca4b2db46256b766
+ unpetrify-ref: 1.6.0
+ build-depends:
+ - libxkbcommon
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
deleted file mode 100644
index 628ff2ad..00000000
--- a/strata/wayland-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: wayland-generic
-kind: stratum
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/xorg-util-macros-common.morph
-chunks:
-- name: libxkbcommon
- repo: upstream:xorg-lib-libxkbcommon
- ref: b721254769212d671a4729f1c88b059979b80efc
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: wayland
- morph: strata/wayland-generic/wayland.morph
- repo: upstream:wayland
- ref: 339e83aa579569711cd14623ca4b2db46256b766
- unpetrify-ref: 1.6.0
- build-depends:
- - libxkbcommon
diff --git a/strata/wayland-generic/wayland.def b/strata/wayland-generic/wayland.def
new file mode 100644
index 00000000..63850992
--- /dev/null
+++ b/strata/wayland-generic/wayland.def
@@ -0,0 +1,6 @@
+name: wayland
+description: Wayland server
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/wayland-generic/wayland.morph b/strata/wayland-generic/wayland.morph
deleted file mode 100644
index 752a5d6e..00000000
--- a/strata/wayland-generic/wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: wayland
-kind: chunk
-description: Wayland server
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/webtools.def b/strata/webtools.def
new file mode 100644
index 00000000..b376a9bf
--- /dev/null
+++ b/strata/webtools.def
@@ -0,0 +1,26 @@
+name: webtools
+description: pip, node and other fun things
+build-depends:
+- name: tools
+- name: pcre-utils
+contents:
+- name: icu
+ repo: upstream:icu
+ ref: ba023548a3bff7277cbea4acade3042ce9d8949e
+ unpetrify-ref: baserock/morph
+- name: libgit2
+ repo: upstream:libgit2
+ ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb
+ unpetrify-ref: master
+- name: tar
+ repo: upstream:tar
+ ref: 0492b656656ca7973b126b8c117804d80952de48
+ unpetrify-ref: baserock/morph
+- name: pip
+ repo: upstream:pip.git
+ ref: d4b691b743a91500cf49119d28a805db8313f129
+ unpetrify-ref: master
+- name: nginx
+ repo: upstream:nginx
+ ref: 37a582c9ea3e731c115e560d31b26f78535b8fca
+ unpetrify-ref: baserock/v1.7.0
diff --git a/strata/webtools.morph b/strata/webtools.morph
deleted file mode 100644
index fd893ae6..00000000
--- a/strata/webtools.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: webtools
-kind: stratum
-description: pip, node and other fun things
-build-depends:
-- morph: strata/tools.morph
-- morph: strata/pcre-utils.morph
-chunks:
-- name: icu
- morph: strata/webtools/icu.morph
- repo: upstream:icu
- ref: ba023548a3bff7277cbea4acade3042ce9d8949e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libgit2
- repo: upstream:libgit2
- ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb
- unpetrify-ref: master
- build-depends: []
-- name: tar
- morph: strata/webtools/tar.morph
- repo: upstream:tar
- ref: 0492b656656ca7973b126b8c117804d80952de48
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pip
- repo: upstream:pip.git
- ref: d4b691b743a91500cf49119d28a805db8313f129
- unpetrify-ref: master
- build-depends: []
-- name: nginx
- morph: strata/webtools/nginx.morph
- repo: upstream:nginx
- ref: 37a582c9ea3e731c115e560d31b26f78535b8fca
- unpetrify-ref: baserock/v1.7.0
- build-depends: []
diff --git a/strata/webtools/icu.def b/strata/webtools/icu.def
new file mode 100644
index 00000000..fc136fd2
--- /dev/null
+++ b/strata/webtools/icu.def
@@ -0,0 +1,7 @@
+name: icu
+configure-commands:
+- cd source; ./runConfigureICU Linux --prefix=/usr
+build-commands:
+- cd source; unset TARGET ; make
+install-commands:
+- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/webtools/icu.morph b/strata/webtools/icu.morph
deleted file mode 100644
index 37dec07e..00000000
--- a/strata/webtools/icu.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: icu
-kind: chunk
-configure-commands:
-- cd source; ./runConfigureICU Linux --prefix=/usr
-build-commands:
-- cd source; unset TARGET ; make
-install-commands:
-- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/webtools/nginx.def b/strata/webtools/nginx.def
new file mode 100644
index 00000000..680d275f
--- /dev/null
+++ b/strata/webtools/nginx.def
@@ -0,0 +1,12 @@
+name: nginx
+configure-commands:
+- |
+ ./configure --prefix=$PREFIX \
+ --conf-path=/etc/nginx/nginx.conf \
+ --pid-path=/etc/nginx/nginx.pid \
+ --error-log-path=/var/log/nginx/error.log \
+ --http-log-path=/var/log/nginx/access.log
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/webtools/nginx.morph b/strata/webtools/nginx.morph
deleted file mode 100644
index 08949ec9..00000000
--- a/strata/webtools/nginx.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: nginx
-kind: chunk
-configure-commands:
-- |
- ./configure --prefix=$PREFIX \
- --conf-path=/etc/nginx/nginx.conf \
- --pid-path=/etc/nginx/nginx.pid \
- --error-log-path=/var/log/nginx/error.log \
- --http-log-path=/var/log/nginx/access.log
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/webtools/tar.def b/strata/webtools/tar.def
new file mode 100644
index 00000000..c7e7693d
--- /dev/null
+++ b/strata/webtools/tar.def
@@ -0,0 +1,9 @@
+name: tar
+configure-commands:
+- bash bootstrap --skip-po
+- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin
+ --disable-nls
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/webtools/tar.morph b/strata/webtools/tar.morph
deleted file mode 100644
index 2253e3b7..00000000
--- a/strata/webtools/tar.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: tar
-kind: chunk
-configure-commands:
-- bash bootstrap --skip-po
-- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin
- --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/weston-genivi.def b/strata/weston-genivi.def
new file mode 100644
index 00000000..14780c9a
--- /dev/null
+++ b/strata/weston-genivi.def
@@ -0,0 +1,24 @@
+name: weston-genivi
+build-depends:
+- name: graphics-common
+- name: input-common
+- name: mesa-common
+- name: libdrm-common
+- name: wayland-generic
+contents:
+- name: linux-pam
+ repo: upstream:linux-pam
+ ref: b1521c97e73b10469f7b34c0571d51c647eca83c
+ unpetrify-ref: Linux-PAM-1.1.8
+- name: weston
+ repo: upstream:weston
+ ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6
+ unpetrify-ref: baserock/genivi/1.3.0
+ build-depends:
+ - linux-pam
+- name: wayland-ivi-extension
+ repo: upstream:genivi/wayland-ivi-extension
+ ref: 43fa65ede93cef9e6c902df2248229ad204b510a
+ unpetrify-ref: master
+ build-depends:
+ - weston
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
deleted file mode 100644
index d47d0ac4..00000000
--- a/strata/weston-genivi.morph
+++ /dev/null
@@ -1,28 +0,0 @@
-name: weston-genivi
-kind: stratum
-build-depends:
-- morph: strata/graphics-common.morph
-- morph: strata/input-common.morph
-- morph: strata/mesa-common.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/wayland-generic.morph
-chunks:
-- name: linux-pam
- repo: upstream:linux-pam
- ref: b1521c97e73b10469f7b34c0571d51c647eca83c
- unpetrify-ref: Linux-PAM-1.1.8
- build-depends: []
-- name: weston
- morph: strata/weston-genivi/weston.morph
- repo: upstream:weston
- ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6
- unpetrify-ref: baserock/genivi/1.3.0
- build-depends:
- - linux-pam
-- name: wayland-ivi-extension
- morph: strata/weston-genivi/wayland-ivi-extension.morph
- repo: upstream:genivi/wayland-ivi-extension
- ref: 43fa65ede93cef9e6c902df2248229ad204b510a
- unpetrify-ref: master
- build-depends:
- - weston
diff --git a/strata/weston-genivi/wayland-ivi-extension.def b/strata/weston-genivi/wayland-ivi-extension.def
new file mode 100644
index 00000000..1dcbc31a
--- /dev/null
+++ b/strata/weston-genivi/wayland-ivi-extension.def
@@ -0,0 +1,7 @@
+name: wayland-ivi-extension
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_C_FLAGS="-I/usr/include/weston"
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR"
diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph
deleted file mode 100644
index bceb2a88..00000000
--- a/strata/weston-genivi/wayland-ivi-extension.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: wayland-ivi-extension
-kind: chunk
-configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_C_FLAGS="-I/usr/include/weston"
-build-commands:
-- make
-install-commands:
-- make install DESTDIR="$DESTDIR"
diff --git a/strata/weston-genivi/weston.def b/strata/weston-genivi/weston.def
new file mode 100644
index 00000000..f5a3de00
--- /dev/null
+++ b/strata/weston-genivi/weston.def
@@ -0,0 +1,52 @@
+name: weston
+description: weston compositor
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- |
+ LDFLAGS='-L/lib64 -lrt' \
+ ./configure --prefix=$PREFIX --disable-xwayland \
+ --disable-x11-compositor \
+ --disable-wayland-compositor --enable-egl \
+ --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
+post-install-commands:
+- install -d "$DESTDIR/usr/share/weston"
+- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
+- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
+- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
+- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
+- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
+- |
+ cat <<EOF >> ivi-shell/weston.ini
+ [ivi-launcher]
+ workspace-id=0
+ icon-id=4001
+ icon=/usr/share/weston/icon_ivi_flower.png
+ path=/usr/bin/weston-flower
+
+ [ivi-launcher]
+ workspace-id=0
+ icon-id=4002
+ icon=/usr/share/weston/icon_ivi_clickdot.png
+ path=/usr/bin/weston-clickdot
+
+ [ivi-launcher]
+ workspace-id=1
+ icon-id=4003
+ icon=/usr/share/weston/icon_ivi_simple-egl.png
+ path=/usr/bin/weston-simple-egl
+
+ [ivi-launcher]
+ workspace-id=1
+ icon-id=4004
+ icon=/usr/share/weston/icon_ivi_simple-shm.png
+ path=/usr/bin/weston-simple-shm
+
+ [ivi-launcher]
+ workspace-id=2
+ icon-id=4005
+ icon=/usr/share/weston/icon_ivi_smoke.png
+ path=/usr/bin/weston-smoke
+ EOF
+- install -d "$DESTDIR/usr/share/doc/weston"
+- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
deleted file mode 100644
index 810ce5e9..00000000
--- a/strata/weston-genivi/weston.morph
+++ /dev/null
@@ -1,53 +0,0 @@
-name: weston
-kind: chunk
-description: weston compositor
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- |
- LDFLAGS='-L/lib64 -lrt' \
- ./configure --prefix=$PREFIX --disable-xwayland \
- --disable-x11-compositor \
- --disable-wayland-compositor --enable-egl \
- --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
-post-install-commands:
-- install -d "$DESTDIR/usr/share/weston"
-- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
-- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
-- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
-- |
- cat <<EOF >> ivi-shell/weston.ini
- [ivi-launcher]
- workspace-id=0
- icon-id=4001
- icon=/usr/share/weston/icon_ivi_flower.png
- path=/usr/bin/weston-flower
-
- [ivi-launcher]
- workspace-id=0
- icon-id=4002
- icon=/usr/share/weston/icon_ivi_clickdot.png
- path=/usr/bin/weston-clickdot
-
- [ivi-launcher]
- workspace-id=1
- icon-id=4003
- icon=/usr/share/weston/icon_ivi_simple-egl.png
- path=/usr/bin/weston-simple-egl
-
- [ivi-launcher]
- workspace-id=1
- icon-id=4004
- icon=/usr/share/weston/icon_ivi_simple-shm.png
- path=/usr/bin/weston-simple-shm
-
- [ivi-launcher]
- workspace-id=2
- icon-id=4005
- icon=/usr/share/weston/icon_ivi_smoke.png
- path=/usr/bin/weston-smoke
- EOF
-- install -d "$DESTDIR/usr/share/doc/weston"
-- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/strata/x-common.def b/strata/x-common.def
new file mode 100644
index 00000000..3aeb0025
--- /dev/null
+++ b/strata/x-common.def
@@ -0,0 +1,282 @@
+name: x-common
+build-depends:
+- name: xorg-util-macros-common
+contents:
+- name: xorg-proto-bigreqsproto
+ repo: upstream:xorg-proto-bigreqsproto
+ ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-compositeproto
+ repo: upstream:xorg-proto-compositeproto
+ ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-damageproto
+ repo: upstream:xorg-proto-damageproto
+ ref: 015b980e5091492dbe681af59569768ba89fbfe0
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-dmxproto
+ repo: upstream:xorg-proto-dmxproto
+ ref: 395f6fcc0a5635907b5e45829e86b29431316184
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-fixesproto
+ repo: upstream:xorg-proto-fixesproto
+ ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-fontsproto
+ repo: upstream:xorg-proto-fontsproto
+ ref: 81e4d4ec53f1f3848ff269fe476c3a1d35d93aef
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-glproto
+ repo: upstream:xorg-proto-glproto
+ ref: 8e3407e02980d088e20041e79bdcdd3737e7827e
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-inputproto
+ repo: upstream:xorg-proto-inputproto
+ ref: f8428123019e7357891bbfc0aef21dbb4d0db10f
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-kbproto
+ repo: upstream:xorg-proto-kbproto
+ ref: f7022f5775350dce3348b7151845a32390e98791
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-xineramaproto
+ repo: upstream:xorg-proto-xineramaproto
+ ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-randrproto
+ repo: upstream:xorg-proto-randrproto
+ ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-recordproto
+ repo: upstream:xorg-proto-recordproto
+ ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-renderproto
+ repo: upstream:xorg-proto-renderproto
+ ref: 935f5ec95a3718c184ff685f5b79b467483b7844
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-resourceproto
+ repo: upstream:xorg-proto-resourceproto
+ ref: ada91f54c98b5a61d3e116fca6bf239a8604730f
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-scrnsaverproto
+ repo: upstream:xorg-proto-scrnsaverproto
+ ref: 614532026e8ec7496216316fb584d6f2af6a7f7b
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-videoproto
+ repo: upstream:xorg-proto-videoproto
+ ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-xcmiscproto
+ repo: upstream:xorg-proto-xcmiscproto
+ ref: 83549077a3c2140b9862709004cd873f1c55e395
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-xextproto
+ repo: upstream:xorg-proto-xextproto
+ ref: f27fcc99d1cf935cc289933326f7d3baacd5107a
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-xf86bigfontproto
+ repo: upstream:xorg-proto-xf86bigfontproto
+ ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-xf86dgaproto
+ repo: upstream:xorg-proto-xf86dgaproto
+ ref: c52b205c3175309be7952774668c87dd2d5ce30e
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-xf86driproto
+ repo: upstream:xorg-proto-xf86driproto
+ ref: cb03b8d49bf063860859c1ed8bcecd055551e93a
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-xf86vidmodeproto
+ repo: upstream:xorg-proto-xf86vidmodeproto
+ ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-x11proto
+ repo: upstream:xorg-proto-x11proto
+ ref: f8c43d587e43fee2c22bd7b5f35a9d4dc8bdb580
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-dri2proto
+ repo: upstream:xorg-proto-dri2proto
+ ref: ead89ad84877551cc15d26b95cb19a3e205df71f
+ unpetrify-ref: baserock/morph
+- name: xorg-proto-dri3proto
+ repo: upstream:xorg-proto-dri3proto
+ ref: 91df0f88b70c268f3580385a7b37543ab8c544c8
+- name: xorg-proto-presentproto
+ repo: upstream:xorg-proto-presentproto
+ ref: ef84007fc4a23d3897b4776906139de9d0698c2a
+- name: xcb-proto
+ repo: upstream:xcb-proto
+ ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640
+ unpetrify-ref: "1.11"
+- name: xorg-lib-libxshmfence
+ repo: upstream:xorg-lib-libxshmfence
+ ref: 9c4f070e1304a3503cfab08f68573443025fc4c9
+ build-depends:
+ - xorg-proto-x11proto
+- name: xorg-lib-libXau
+ repo: upstream:xorg-lib-libXau
+ ref: 1a8a1b2c68967b48c07b56142799b1020f017027
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-proto-x11proto
+- name: xcb-libxcb
+ repo: upstream:xcb-libxcb
+ ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a
+ unpetrify-ref: "1.11"
+ build-depends:
+ - xcb-proto
+ - xorg-lib-libXau
+- name: xorg-lib-libxtrans
+ repo: upstream:xorg-lib-libxtrans
+ ref: bd53f4c8543faf910a7a151241ee07661b4d57ad
+ unpetrify-ref: baserock/morph
+- name: xorg-lib-libX11
+ repo: upstream:xorg-lib-libX11
+ ref: cb107760df33ffc8630677e66e2e50aa37950a5c
+ unpetrify-ref: libX11-1.6.2
+ build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
+ - xorg-lib-libxtrans
+ - xorg-proto-bigreqsproto
+ - xorg-proto-inputproto
+ - xorg-proto-kbproto
+ - xorg-proto-x11proto
+ - xorg-proto-xcmiscproto
+ - xorg-proto-xextproto
+ - xorg-proto-xf86bigfontproto
+- name: xorg-lib-libXext
+ repo: upstream:xorg-lib-libXext
+ ref: 8eee1236041d46a21faba32e0d27c26985267d89
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXau
+ - xorg-proto-x11proto
+ - xorg-proto-xextproto
+- name: xorg-lib-libXi
+ repo: upstream:xorg-lib-libXi
+ ref: 9b26b81477cf3486e5aa0ef8d81af68a0f04df1b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXext
+ - xorg-proto-inputproto
+ - xorg-proto-x11proto
+ - xorg-proto-xextproto
+- name: xorg-util-makedepend
+ repo: upstream:xorg-util-makedepend
+ ref: 87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-proto-x11proto
+- name: xorg-lib-libXfixes
+ repo: upstream:xorg-lib-libXfixes
+ ref: 73a0fbb479f5b7806a3dd0741be55c9abda76220
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXext
+ - xorg-proto-fixesproto
+- name: xorg-lib-libXcomposite
+ repo: upstream:xorg-lib-libXcomposite
+ ref: eda48b1bedaa344ada8e13930c9ab3058b836190
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXfixes
+ - xorg-proto-compositeproto
+- name: xorg-lib-libXrender
+ repo: upstream:xorg-lib-libXrender
+ ref: 1af52cb334377611233d7dc156bc1e6f7923756d
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-proto-renderproto
+- name: xorg-lib-libXrandr
+ repo: upstream:xorg-lib-libXrandr
+ ref: 99a63d10cbbab7d69a52d25d78795a3278506ea9
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXext
+ - xorg-lib-libXrender
+ - xorg-proto-randrproto
+ - xorg-proto-renderproto
+ - xorg-proto-xextproto
+- name: xorg-lib-libXinerama
+ repo: upstream:xorg-lib-libXinerama
+ ref: 470b9356af961ff7d3968b164aa73872b49a5dcc
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXext
+ - xorg-proto-xextproto
+ - xorg-proto-xineramaproto
+- name: xorg-lib-libdmx
+ repo: upstream:xorg-lib-libdmx
+ ref: 9f470c92bc2d194c8abb9154f42864e6c82f43ef
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXext
+ - xorg-proto-dmxproto
+ - xorg-proto-xextproto
+- name: xorg-lib-libXtst
+ repo: upstream:xorg-lib-libXtst
+ ref: 2aafac9474a0a0a0c39797862f823255918cf368
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXext
+ - xorg-lib-libXi
+ - xorg-proto-inputproto
+ - xorg-proto-recordproto
+ - xorg-proto-xextproto
+- name: xorg-lib-libXRes
+ repo: upstream:xorg-lib-libXRes
+ ref: 83e7693515369d57dcd11c2bb1f03563f51bc500
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libX11
+ - xorg-lib-libXext
+ - xorg-proto-resourceproto
+ - xorg-proto-xextproto
+- name: xorg-lib-libXdamage
+ repo: upstream:xorg-lib-libXdamage
+ ref: 0d35761dc39409b70e04dd0786aef6537f92976a
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXfixes
+ - xorg-proto-damageproto
+- name: xorg-lib-libXcursor
+ repo: upstream:xorg-lib-libXcursor
+ ref: 1b98fd6a2e8c00a563187849a585e68c7344468b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXrender
+ - xorg-lib-libXfixes
+ - xorg-proto-fixesproto
+ - xorg-lib-libXau
+ - xorg-lib-libX11
+- name: xorg-proto-printproto
+ repo: upstream:xorg-proto-printproto
+ ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257
+ unpetrify-ref: baserock/morph
+- name: xorg-lib-libXp
+ repo: upstream:xorg-lib-libXp
+ ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-proto-printproto
+ - xorg-proto-xextproto
+ - xorg-lib-libXext
+ - xorg-lib-libX11
+- name: xorg-lib-libXScrnSaver
+ repo: upstream:xorg-lib-libXScrnSaver
+ ref: f388a2ff259ee1c1c6058762e900bb29550e8246
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-proto-scrnsaverproto
+ - xorg-proto-xextproto
+ - xorg-lib-libXext
+ - xorg-lib-libX11
diff --git a/strata/x-common.morph b/strata/x-common.morph
deleted file mode 100644
index f842c7a9..00000000
--- a/strata/x-common.morph
+++ /dev/null
@@ -1,312 +0,0 @@
-name: x-common
-kind: stratum
-build-depends:
-- morph: strata/xorg-util-macros-common.morph
-chunks:
-- name: xorg-proto-bigreqsproto
- repo: upstream:xorg-proto-bigreqsproto
- ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-compositeproto
- repo: upstream:xorg-proto-compositeproto
- ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-damageproto
- repo: upstream:xorg-proto-damageproto
- ref: 015b980e5091492dbe681af59569768ba89fbfe0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-dmxproto
- repo: upstream:xorg-proto-dmxproto
- ref: 395f6fcc0a5635907b5e45829e86b29431316184
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-fixesproto
- repo: upstream:xorg-proto-fixesproto
- ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-fontsproto
- repo: upstream:xorg-proto-fontsproto
- ref: 81e4d4ec53f1f3848ff269fe476c3a1d35d93aef
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-glproto
- repo: upstream:xorg-proto-glproto
- ref: 8e3407e02980d088e20041e79bdcdd3737e7827e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-inputproto
- repo: upstream:xorg-proto-inputproto
- ref: f8428123019e7357891bbfc0aef21dbb4d0db10f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-kbproto
- repo: upstream:xorg-proto-kbproto
- ref: f7022f5775350dce3348b7151845a32390e98791
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-xineramaproto
- repo: upstream:xorg-proto-xineramaproto
- ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-randrproto
- repo: upstream:xorg-proto-randrproto
- ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-recordproto
- repo: upstream:xorg-proto-recordproto
- ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-renderproto
- repo: upstream:xorg-proto-renderproto
- ref: 935f5ec95a3718c184ff685f5b79b467483b7844
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-resourceproto
- repo: upstream:xorg-proto-resourceproto
- ref: ada91f54c98b5a61d3e116fca6bf239a8604730f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-scrnsaverproto
- repo: upstream:xorg-proto-scrnsaverproto
- ref: 614532026e8ec7496216316fb584d6f2af6a7f7b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-videoproto
- repo: upstream:xorg-proto-videoproto
- ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-xcmiscproto
- repo: upstream:xorg-proto-xcmiscproto
- ref: 83549077a3c2140b9862709004cd873f1c55e395
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-xextproto
- repo: upstream:xorg-proto-xextproto
- ref: f27fcc99d1cf935cc289933326f7d3baacd5107a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-xf86bigfontproto
- repo: upstream:xorg-proto-xf86bigfontproto
- ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-xf86dgaproto
- repo: upstream:xorg-proto-xf86dgaproto
- ref: c52b205c3175309be7952774668c87dd2d5ce30e
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-xf86driproto
- repo: upstream:xorg-proto-xf86driproto
- ref: cb03b8d49bf063860859c1ed8bcecd055551e93a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-xf86vidmodeproto
- repo: upstream:xorg-proto-xf86vidmodeproto
- ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-x11proto
- repo: upstream:xorg-proto-x11proto
- ref: f8c43d587e43fee2c22bd7b5f35a9d4dc8bdb580
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-dri2proto
- repo: upstream:xorg-proto-dri2proto
- ref: ead89ad84877551cc15d26b95cb19a3e205df71f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-proto-dri3proto
- repo: upstream:xorg-proto-dri3proto
- ref: 91df0f88b70c268f3580385a7b37543ab8c544c8
- build-depends: []
-- name: xorg-proto-presentproto
- repo: upstream:xorg-proto-presentproto
- ref: ef84007fc4a23d3897b4776906139de9d0698c2a
- build-depends: []
-- name: xcb-proto
- repo: upstream:xcb-proto
- ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640
- unpetrify-ref: "1.11"
- build-depends: []
-- name: xorg-lib-libxshmfence
- repo: upstream:xorg-lib-libxshmfence
- ref: 9c4f070e1304a3503cfab08f68573443025fc4c9
- build-depends:
- - xorg-proto-x11proto
-- name: xorg-lib-libXau
- repo: upstream:xorg-lib-libXau
- ref: 1a8a1b2c68967b48c07b56142799b1020f017027
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-x11proto
-- name: xcb-libxcb
- repo: upstream:xcb-libxcb
- ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a
- unpetrify-ref: "1.11"
- build-depends:
- - xcb-proto
- - xorg-lib-libXau
-- name: xorg-lib-libxtrans
- repo: upstream:xorg-lib-libxtrans
- ref: bd53f4c8543faf910a7a151241ee07661b4d57ad
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libX11
- repo: upstream:xorg-lib-libX11
- ref: cb107760df33ffc8630677e66e2e50aa37950a5c
- unpetrify-ref: libX11-1.6.2
- build-depends:
- - xcb-libxcb
- - xorg-lib-libXau
- - xorg-lib-libxtrans
- - xorg-proto-bigreqsproto
- - xorg-proto-inputproto
- - xorg-proto-kbproto
- - xorg-proto-x11proto
- - xorg-proto-xcmiscproto
- - xorg-proto-xextproto
- - xorg-proto-xf86bigfontproto
-- name: xorg-lib-libXext
- repo: upstream:xorg-lib-libXext
- ref: 8eee1236041d46a21faba32e0d27c26985267d89
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXau
- - xorg-proto-x11proto
- - xorg-proto-xextproto
-- name: xorg-lib-libXi
- repo: upstream:xorg-lib-libXi
- ref: 9b26b81477cf3486e5aa0ef8d81af68a0f04df1b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-inputproto
- - xorg-proto-x11proto
- - xorg-proto-xextproto
-- name: xorg-util-makedepend
- repo: upstream:xorg-util-makedepend
- ref: 87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-x11proto
-- name: xorg-lib-libXfixes
- repo: upstream:xorg-lib-libXfixes
- ref: 73a0fbb479f5b7806a3dd0741be55c9abda76220
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXext
- - xorg-proto-fixesproto
-- name: xorg-lib-libXcomposite
- repo: upstream:xorg-lib-libXcomposite
- ref: eda48b1bedaa344ada8e13930c9ab3058b836190
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXfixes
- - xorg-proto-compositeproto
-- name: xorg-lib-libXrender
- repo: upstream:xorg-lib-libXrender
- ref: 1af52cb334377611233d7dc156bc1e6f7923756d
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-proto-renderproto
-- name: xorg-lib-libXrandr
- repo: upstream:xorg-lib-libXrandr
- ref: 99a63d10cbbab7d69a52d25d78795a3278506ea9
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-lib-libXrender
- - xorg-proto-randrproto
- - xorg-proto-renderproto
- - xorg-proto-xextproto
-- name: xorg-lib-libXinerama
- repo: upstream:xorg-lib-libXinerama
- ref: 470b9356af961ff7d3968b164aa73872b49a5dcc
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-xextproto
- - xorg-proto-xineramaproto
-- name: xorg-lib-libdmx
- repo: upstream:xorg-lib-libdmx
- ref: 9f470c92bc2d194c8abb9154f42864e6c82f43ef
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-dmxproto
- - xorg-proto-xextproto
-- name: xorg-lib-libXtst
- repo: upstream:xorg-lib-libXtst
- ref: 2aafac9474a0a0a0c39797862f823255918cf368
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-lib-libXi
- - xorg-proto-inputproto
- - xorg-proto-recordproto
- - xorg-proto-xextproto
-- name: xorg-lib-libXRes
- repo: upstream:xorg-lib-libXRes
- ref: 83e7693515369d57dcd11c2bb1f03563f51bc500
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-resourceproto
- - xorg-proto-xextproto
-- name: xorg-lib-libXdamage
- repo: upstream:xorg-lib-libXdamage
- ref: 0d35761dc39409b70e04dd0786aef6537f92976a
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXfixes
- - xorg-proto-damageproto
-- name: xorg-lib-libXcursor
- repo: upstream:xorg-lib-libXcursor
- ref: 1b98fd6a2e8c00a563187849a585e68c7344468b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXrender
- - xorg-lib-libXfixes
- - xorg-proto-fixesproto
- - xorg-lib-libXau
- - xorg-lib-libX11
-- name: xorg-proto-printproto
- repo: upstream:xorg-proto-printproto
- ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXp
- repo: upstream:xorg-lib-libXp
- ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-printproto
- - xorg-proto-xextproto
- - xorg-lib-libXext
- - xorg-lib-libX11
-- name: xorg-lib-libXScrnSaver
- repo: upstream:xorg-lib-libXScrnSaver
- ref: f388a2ff259ee1c1c6058762e900bb29550e8246
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-scrnsaverproto
- - xorg-proto-xextproto
- - xorg-lib-libXext
- - xorg-lib-libX11
diff --git a/strata/x-common/drm.def b/strata/x-common/drm.def
new file mode 100644
index 00000000..f5775726
--- /dev/null
+++ b/strata/x-common/drm.def
@@ -0,0 +1,9 @@
+name: drm
+build-system: autotools
+configure-commands:
+ - NOCONFIGURE=1 ./autogen.sh
+ - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api
+install-commands:
+ - make install DESTDIR="$DESTDIR"
+ - mkdir -p "$DESTDIR"/usr/lib/pkgconfig
+ - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig
diff --git a/strata/x-common/llvm.def b/strata/x-common/llvm.def
new file mode 100644
index 00000000..714908d2
--- /dev/null
+++ b/strata/x-common/llvm.def
@@ -0,0 +1,7 @@
+name: llvm
+description: Low Level Virtual Machine
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/llvm --sysconfdir=/etc --enable-shared
+ --enable-libffi --enable-targets=all --disable-expensive-checks --disable-debug-runtime
+ --disable-assertions --enable-optimized
diff --git a/strata/x-generic.def b/strata/x-generic.def
new file mode 100644
index 00000000..9f6f22a3
--- /dev/null
+++ b/strata/x-generic.def
@@ -0,0 +1,168 @@
+name: x-generic
+build-depends:
+- name: foundation
+- name: libdrm-common
+- name: x-common
+- name: graphics-common
+contents:
+- name: xorg-lib-libxkbfile
+ repo: upstream:xorg-lib-libxkbfile
+ ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+ unpetrify-ref: baserock/morph
+- name: xorg-font-util
+ repo: upstream:xorg-font-util
+ ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
+ unpetrify-ref: baserock/morph
+- name: xorg-lib-libfontenc
+ repo: upstream:xorg-lib-libfontenc
+ ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-font-util
+- name: xorg-lib-libXfont
+ repo: upstream:xorg-lib-libXfont
+ ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libfontenc
+- name: xorg-lib-libICE
+ repo: upstream:xorg-lib-libICE
+ ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
+ unpetrify-ref: baserock/morph
+- name: xorg-lib-libSM
+ repo: upstream:xorg-lib-libSM
+ ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libICE
+- name: xorg-lib-libXt
+ repo: upstream:xorg-lib-libXt
+ ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libSM
+- name: xorg-lib-libXmu
+ repo: upstream:xorg-lib-libXmu
+ ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXt
+- name: xorg-lib-libXpm
+ repo: upstream:xorg-lib-libXpm
+ ref: 81608285e11f2455800001a965dfece878861162
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXt
+- name: xorg-lib-libXaw
+ repo: upstream:xorg-lib-libXaw
+ ref: a5630e166921b5b5322b30fb152df01bb6536e42
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXmu
+ - xorg-lib-libXpm
+ - xorg-lib-libXt
+- name: libsha1
+ repo: upstream:libsha1
+ ref: 17173732b9f1b2d4142de27913250b4563db2436
+ unpetrify-ref: baserock/morph
+- name: xserver
+ repo: upstream:xserver
+ ref: b7cbfa882778cf8857577e0da77aa9295f072db3
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libsha1
+ - xorg-font-util
+ - xorg-lib-libXaw
+ - xorg-lib-libXfont
+ - xorg-lib-libXmu
+ - xorg-lib-libXpm
+ - xorg-lib-libXt
+ - xorg-lib-libfontenc
+ - xorg-lib-libxkbfile
+- name: xorg-driver-xf86-video-cirrus
+ repo: upstream:xorg-driver-xf86-video-cirrus
+ ref: 6504929481eab616f064b5d661a057de74b8b488
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-video-fbdev
+ repo: upstream:xorg-driver-xf86-video-fbdev
+ ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-video-vesa
+ repo: upstream:xorg-driver-xf86-video-vesa
+ ref: 29a149544e2120a582043738d5b09dd80e896345
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-input-evdev
+ repo: upstream:xorg-driver-xf86-input-evdev
+ ref: 2b8b0df62ec554952784f2820fb4143c495232b0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-input-keyboard
+ repo: upstream:xorg-driver-xf86-input-keyboard
+ ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-input-mouse
+ repo: upstream:xorg-driver-xf86-input-mouse
+ ref: 585f4030d77accf2a4ba115729ca08da82217863
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-app-xkbcomp
+ repo: upstream:xorg-app-xkbcomp
+ ref: 705b9bbb426410f9510601c7010da51184919b36
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libxkbfile
+- name: xkeyboard-config
+ repo: upstream:xkeyboard-config
+ ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-app-xkbcomp
+- name: xorg-app-xinit
+ repo: upstream:xorg-app-xinit
+ ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
+ unpetrify-ref: baserock/morph
+- name: xorg-lib-libXft
+ repo: upstream:xorg-lib-libXft
+ ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738
+ unpetrify-ref: libXft-2.3.2
+- name: xcb-util
+ repo: upstream:xcb-util
+ ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
+ unpetrify-ref: baserock/morph
+- name: util-wm
+ repo: upstream:util-wm
+ ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
+ unpetrify-ref: baserock/morph
+- name: util-keysyms
+ repo: upstream:util-keysyms
+ ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
+ unpetrify-ref: baserock/morph
+- name: util-image
+ repo: upstream:util-image
+ ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xcb-util
+- name: xterm
+ repo: upstream:xterm
+ ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXaw
+ - xorg-lib-libxkbfile
+- name: xorg-app-xauth
+ repo: upstream:xorg-app-xauth
+ ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXmu
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
deleted file mode 100644
index af42c55e..00000000
--- a/strata/x-generic.morph
+++ /dev/null
@@ -1,180 +0,0 @@
-name: x-generic
-kind: stratum
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/x-common.morph
-- morph: strata/graphics-common.morph
-chunks:
-- name: xorg-lib-libxkbfile
- repo: upstream:xorg-lib-libxkbfile
- ref: 7381c2f9013ef7784c78091fa671e652a62ca706
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-font-util
- repo: upstream:xorg-font-util
- ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libfontenc
- repo: upstream:xorg-lib-libfontenc
- ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-font-util
-- name: xorg-lib-libXfont
- repo: upstream:xorg-lib-libXfont
- ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libfontenc
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xserver
- morph: strata/x-generic/xserver.morph
- repo: upstream:xserver
- ref: b7cbfa882778cf8857577e0da77aa9295f072db3
- unpetrify-ref: baserock/morph
- build-depends:
- - libsha1
- - xorg-font-util
- - xorg-lib-libXaw
- - xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-app-xkbcomp
- repo: upstream:xorg-app-xkbcomp
- ref: 705b9bbb426410f9510601c7010da51184919b36
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738
- unpetrify-ref: libXft-2.3.2
- build-depends: []
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-wm
- repo: upstream:util-wm
- ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-keysyms
- morph: strata/x-generic/util-keysyms.morph
- repo: upstream:util-keysyms
- ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-image
- repo: upstream:util-image
- ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
- unpetrify-ref: baserock/morph
- build-depends:
- - xcb-util
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
-- name: xorg-app-xauth
- repo: upstream:xorg-app-xauth
- ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
diff --git a/strata/x-generic/util-keysyms.def b/strata/x-generic/util-keysyms.def
new file mode 100644
index 00000000..bfe4dee1
--- /dev/null
+++ b/strata/x-generic/util-keysyms.def
@@ -0,0 +1,8 @@
+name: util-keysyms
+configure-commands:
+- git submodule update --init
+- ./autogen.sh --prefix=/usr
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/x-generic/util-keysyms.morph b/strata/x-generic/util-keysyms.morph
deleted file mode 100644
index ddae3707..00000000
--- a/strata/x-generic/util-keysyms.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: util-keysyms
-kind: chunk
-configure-commands:
-- git submodule update --init
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/x-generic/xserver.def b/strata/x-generic/xserver.def
new file mode 100644
index 00000000..ff5b6499
--- /dev/null
+++ b/strata/x-generic/xserver.def
@@ -0,0 +1,4 @@
+name: xserver
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
deleted file mode 100644
index 473f5d32..00000000
--- a/strata/x-generic/xserver.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: xserver
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1
diff --git a/strata/xfce.def b/strata/xfce.def
new file mode 100644
index 00000000..911fff2c
--- /dev/null
+++ b/strata/xfce.def
@@ -0,0 +1,146 @@
+name: xfce
+description: xfce stratum
+build-depends:
+- name: gtk2
+- name: x-generic
+contents:
+- name: libcroco
+ repo: upstream:libcroco
+ ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
+ unpetrify-ref: baserock/morph
+- name: librsvg
+ repo: upstream:librsvg
+ ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
+ unpetrify-ref: baserock/morph
+- name: xfce-dev-tools
+ repo: upstream:xfce/xfce4-dev-tools
+ ref: 9244250ac0c15ba160688758c5dccf97f3f160ef
+ unpetrify-ref: baserock/morph
+- name: libxfce4util
+ repo: upstream:xfce/libxfce4util
+ ref: fc0437fe503c3eaa5ccd4fa68f098bc428f27cad
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xfce-dev-tools
+- name: xfconf
+ repo: upstream:xfce/xfconf
+ ref: ed6ed2f7656a0d5d8cb453cb643061c9a157f2ae
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xfce-dev-tools
+ - libxfce4util
+- name: libxfce4ui
+ repo: upstream:xfce/libxfce4ui
+ ref: a9c2a379709915dfda255d3ca9181fac3f8484d8
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xfce-dev-tools
+ - libxfce4util
+ - xfconf
+- name: garcon
+ repo: upstream:xfce/garcon
+ ref: febd4136365714556f6afbccf4302e8f4550e5d1
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libxfce4util
+- name: perl-uri
+ repo: upstream:libwww-perl/uri
+ ref: 3dd72ded7f043a4f6973781fe594722e2e95f491
+ unpetrify-ref: baserock/morph
+- name: exo
+ repo: upstream:xfce/exo
+ ref: b985c4b5c72ef116d55bbf746c16a05f26afc045
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libxfce4util
+ - libxfce4ui
+ - perl-uri
+- name: libwnck
+ repo: upstream:libwnck
+ ref: 6792abcdf27aceba1012406d51606e84b065a526
+ unpetrify-ref: baserock/xfce-build
+- name: xfce4-panel
+ repo: upstream:xfce/xfce4-panel
+ ref: 6ac8bfcb481781e8e23b101f5c5fdd70cf6d083b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libxfce4ui
+ - garcon
+ - exo
+ - libwnck
+- name: thunar
+ repo: upstream:xfce/thunar
+ ref: 8289f48c200b91cc1e9932e13defb8e6a4765054
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libxfce4ui
+ - exo
+ - garcon
+ - libwnck
+- name: xfce4-settings
+ repo: upstream:xfce/xfce4-settings
+ ref: 697ce5cd4bf4860a0a20c27b557be296c9adf469
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xfce-dev-tools
+ - xfconf
+ - exo
+ - libxfce4ui
+ - garcon
+- name: iceauth
+ repo: upstream:iceauth
+ ref: c07d443d43e53cfe21b53a9a0eafcd6189432867
+ unpetrify-ref: baserock/morph
+- name: xfce4-session
+ repo: upstream:xfce/xfce4-session
+ ref: 2c89b2f12409ca617fc094e2942cb0d69318c7b5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - iceauth
+ - exo
+ - xfce-dev-tools
+ - libxfce4ui
+ - libwnck
+- name: gtk-xfce-engine-2
+ repo: upstream:xfce/gtk-xfce-engine
+ ref: ed44a71f1a4d76ae850483ece41638bb9a3e7781
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xfce-dev-tools
+- name: xfdesktop
+ repo: upstream:xfce/xfdesktop
+ ref: d2f7404da32f29cfec4a704389112fe7183edda5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - exo
+ - libxfce4ui
+ - xfconf
+ - libwnck
+- name: xfwm4
+ repo: upstream:xfce/xfwm4
+ ref: 523ef8a6861af772be3468cd700ad14172c86768
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - exo
+ - libxfce4util
+ - libxfce4ui
+ - xfconf
+ - libwnck
+- name: xfce4-appfinder
+ repo: upstream:xfce/xfce4-appfinder
+ ref: 5c069f13fde648913a59f022957b2c83b5764f39
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - exo
+ - libxfce4ui
+ - garcon
+- name: tumbler
+ repo: upstream:xfce/tumbler
+ ref: f8191f286227a045fbdabd7684c9da81ade518c8
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xfce-dev-tools
+- name: elementary-xfce
+ repo: upstream:elementary-xfce
+ ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779
+ unpetrify-ref: baserock/morph
diff --git a/strata/xfce.morph b/strata/xfce.morph
deleted file mode 100644
index 5678c1fc..00000000
--- a/strata/xfce.morph
+++ /dev/null
@@ -1,171 +0,0 @@
-name: xfce
-kind: stratum
-description: xfce stratum
-build-depends:
-- morph: strata/gtk2.morph
-- morph: strata/x-generic.morph
-chunks:
-- name: libcroco
- repo: upstream:libcroco
- ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: librsvg
- morph: strata/xfce/librsvg.morph
- repo: upstream:librsvg
- ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xfce-dev-tools
- repo: upstream:xfce/xfce4-dev-tools
- ref: 9244250ac0c15ba160688758c5dccf97f3f160ef
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libxfce4util
- morph: strata/xfce/libxfce4util.morph
- repo: upstream:xfce/libxfce4util
- ref: fc0437fe503c3eaa5ccd4fa68f098bc428f27cad
- unpetrify-ref: baserock/morph
- build-depends:
- - xfce-dev-tools
-- name: xfconf
- morph: strata/xfce/xfconf.morph
- repo: upstream:xfce/xfconf
- ref: ed6ed2f7656a0d5d8cb453cb643061c9a157f2ae
- unpetrify-ref: baserock/morph
- build-depends:
- - xfce-dev-tools
- - libxfce4util
-- name: libxfce4ui
- morph: strata/xfce/libxfce4ui.morph
- repo: upstream:xfce/libxfce4ui
- ref: a9c2a379709915dfda255d3ca9181fac3f8484d8
- unpetrify-ref: baserock/morph
- build-depends:
- - xfce-dev-tools
- - libxfce4util
- - xfconf
-- name: garcon
- morph: strata/xfce/garcon.morph
- repo: upstream:xfce/garcon
- ref: febd4136365714556f6afbccf4302e8f4550e5d1
- unpetrify-ref: baserock/morph
- build-depends:
- - libxfce4util
-- name: perl-uri
- repo: upstream:libwww-perl/uri
- ref: 3dd72ded7f043a4f6973781fe594722e2e95f491
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: exo
- morph: strata/xfce/exo.morph
- repo: upstream:xfce/exo
- ref: b985c4b5c72ef116d55bbf746c16a05f26afc045
- unpetrify-ref: baserock/morph
- build-depends:
- - libxfce4util
- - libxfce4ui
- - perl-uri
-- name: libwnck
- morph: strata/xfce/libwnck.morph
- repo: upstream:libwnck
- ref: 6792abcdf27aceba1012406d51606e84b065a526
- unpetrify-ref: baserock/xfce-build
- build-depends: []
-- name: xfce4-panel
- morph: strata/xfce/xfce4-panel.morph
- repo: upstream:xfce/xfce4-panel
- ref: 6ac8bfcb481781e8e23b101f5c5fdd70cf6d083b
- unpetrify-ref: baserock/morph
- build-depends:
- - libxfce4ui
- - garcon
- - exo
- - libwnck
-- name: thunar
- morph: strata/xfce/thunar.morph
- repo: upstream:xfce/thunar
- ref: 8289f48c200b91cc1e9932e13defb8e6a4765054
- unpetrify-ref: baserock/morph
- build-depends:
- - libxfce4ui
- - exo
- - garcon
- - libwnck
-- name: xfce4-settings
- morph: strata/xfce/xfce4-settings.morph
- repo: upstream:xfce/xfce4-settings
- ref: 697ce5cd4bf4860a0a20c27b557be296c9adf469
- unpetrify-ref: baserock/morph
- build-depends:
- - xfce-dev-tools
- - xfconf
- - exo
- - libxfce4ui
- - garcon
-- name: iceauth
- repo: upstream:iceauth
- ref: c07d443d43e53cfe21b53a9a0eafcd6189432867
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xfce4-session
- morph: strata/xfce/xfce4-session.morph
- repo: upstream:xfce/xfce4-session
- ref: 2c89b2f12409ca617fc094e2942cb0d69318c7b5
- unpetrify-ref: baserock/morph
- build-depends:
- - iceauth
- - exo
- - xfce-dev-tools
- - libxfce4ui
- - libwnck
-- name: gtk-xfce-engine-2
- morph: strata/xfce/gtk-xfce-engine-2.morph
- repo: upstream:xfce/gtk-xfce-engine
- ref: ed44a71f1a4d76ae850483ece41638bb9a3e7781
- unpetrify-ref: baserock/morph
- build-depends:
- - xfce-dev-tools
-- name: xfdesktop
- morph: strata/xfce/xfdesktop.morph
- repo: upstream:xfce/xfdesktop
- ref: d2f7404da32f29cfec4a704389112fe7183edda5
- unpetrify-ref: baserock/morph
- build-depends:
- - exo
- - libxfce4ui
- - xfconf
- - libwnck
-- name: xfwm4
- morph: strata/xfce/xfwm4.morph
- repo: upstream:xfce/xfwm4
- ref: 523ef8a6861af772be3468cd700ad14172c86768
- unpetrify-ref: baserock/morph
- build-depends:
- - exo
- - libxfce4util
- - libxfce4ui
- - xfconf
- - libwnck
-- name: xfce4-appfinder
- morph: strata/xfce/xfce4-appfinder.morph
- repo: upstream:xfce/xfce4-appfinder
- ref: 5c069f13fde648913a59f022957b2c83b5764f39
- unpetrify-ref: baserock/morph
- build-depends:
- - exo
- - libxfce4ui
- - garcon
-- name: tumbler
- morph: strata/xfce/tumbler.morph
- repo: upstream:xfce/tumbler
- ref: f8191f286227a045fbdabd7684c9da81ade518c8
- unpetrify-ref: baserock/morph
- build-depends:
- - xfce-dev-tools
-- name: elementary-xfce
- morph: strata/xfce/elementary-xfce.morph
- repo: upstream:elementary-xfce
- ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/xfce/elementary-xfce.def b/strata/xfce/elementary-xfce.def
new file mode 100644
index 00000000..52ad7962
--- /dev/null
+++ b/strata/xfce/elementary-xfce.def
@@ -0,0 +1,9 @@
+name: elementary-xfce
+install-commands:
+- mkdir -p $DESTDIR/usr/share/icons/
+- cp -R elementary-xfce $DESTDIR/usr/share/icons/
+- cp -R elementary-xfce-* $DESTDIR/usr/share/icons/
+- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce
+- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce-dark
+- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce-darker
+- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce-darkest
diff --git a/strata/xfce/elementary-xfce.morph b/strata/xfce/elementary-xfce.morph
deleted file mode 100644
index 978cfdc4..00000000
--- a/strata/xfce/elementary-xfce.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: elementary-xfce
-kind: chunk
-install-commands:
-- mkdir -p $DESTDIR/usr/share/icons/
-- cp -R elementary-xfce $DESTDIR/usr/share/icons/
-- cp -R elementary-xfce-* $DESTDIR/usr/share/icons/
-- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce
-- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce-dark
-- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce-darker
-- gtk-update-icon-cache -t -f $DESTDIR/usr/share/icons/elementary-xfce-darkest
diff --git a/strata/xfce/exo.def b/strata/xfce/exo.def
new file mode 100644
index 00000000..433a075b
--- /dev/null
+++ b/strata/xfce/exo.def
@@ -0,0 +1,7 @@
+name: exo
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/exo.morph b/strata/xfce/exo.morph
deleted file mode 100644
index f5096213..00000000
--- a/strata/xfce/exo.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: exo
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/garcon.def b/strata/xfce/garcon.def
new file mode 100644
index 00000000..709338c4
--- /dev/null
+++ b/strata/xfce/garcon.def
@@ -0,0 +1,7 @@
+name: garcon
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/garcon.morph b/strata/xfce/garcon.morph
deleted file mode 100644
index 569197ff..00000000
--- a/strata/xfce/garcon.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: garcon
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/gtk-xfce-engine-2.def b/strata/xfce/gtk-xfce-engine-2.def
new file mode 100644
index 00000000..a0d12c32
--- /dev/null
+++ b/strata/xfce/gtk-xfce-engine-2.def
@@ -0,0 +1,7 @@
+name: gtk-xfce-engine-2
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/gtk-xfce-engine-2.morph b/strata/xfce/gtk-xfce-engine-2.morph
deleted file mode 100644
index cf1c2530..00000000
--- a/strata/xfce/gtk-xfce-engine-2.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: gtk-xfce-engine-2
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/librsvg.def b/strata/xfce/librsvg.def
new file mode 100644
index 00000000..82cb4399
--- /dev/null
+++ b/strata/xfce/librsvg.def
@@ -0,0 +1,5 @@
+name: librsvg
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-gtk-theme
diff --git a/strata/xfce/librsvg.morph b/strata/xfce/librsvg.morph
deleted file mode 100644
index f4d880ed..00000000
--- a/strata/xfce/librsvg.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: librsvg
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-gtk-theme
diff --git a/strata/xfce/libwnck.def b/strata/xfce/libwnck.def
new file mode 100644
index 00000000..aa965504
--- /dev/null
+++ b/strata/xfce/libwnck.def
@@ -0,0 +1,10 @@
+name: libwnck
+build-system: autotools
+configure-commands:
+- gdk-pixbuf-query-loaders > loader.cache
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX"
+build-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
+install-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install DESTDIR="$DESTDIR"
diff --git a/strata/xfce/libwnck.morph b/strata/xfce/libwnck.morph
deleted file mode 100644
index bb8d7afa..00000000
--- a/strata/xfce/libwnck.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: libwnck
-kind: chunk
-build-system: autotools
-configure-commands:
-- gdk-pixbuf-query-loaders > loader.cache
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX"
-build-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
-install-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install DESTDIR="$DESTDIR"
diff --git a/strata/xfce/libxfce4ui.def b/strata/xfce/libxfce4ui.def
new file mode 100644
index 00000000..f73055d7
--- /dev/null
+++ b/strata/xfce/libxfce4ui.def
@@ -0,0 +1,7 @@
+name: libxfce4ui
+configure-commands:
+- ./autogen.sh --prefix=${PREFIX}
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/libxfce4ui.morph b/strata/xfce/libxfce4ui.morph
deleted file mode 100644
index 5fbd342e..00000000
--- a/strata/xfce/libxfce4ui.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: libxfce4ui
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=${PREFIX}
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/libxfce4util.def b/strata/xfce/libxfce4util.def
new file mode 100644
index 00000000..2c43c1f3
--- /dev/null
+++ b/strata/xfce/libxfce4util.def
@@ -0,0 +1,7 @@
+name: libxfce4util
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/libxfce4util.morph b/strata/xfce/libxfce4util.morph
deleted file mode 100644
index 60a59126..00000000
--- a/strata/xfce/libxfce4util.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: libxfce4util
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/thunar.def b/strata/xfce/thunar.def
new file mode 100644
index 00000000..65508220
--- /dev/null
+++ b/strata/xfce/thunar.def
@@ -0,0 +1,8 @@
+name: thunar
+configure-commands:
+- gdk-pixbuf-query-loaders > loader.cache
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
+install-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install
diff --git a/strata/xfce/thunar.morph b/strata/xfce/thunar.morph
deleted file mode 100644
index 51f76ac5..00000000
--- a/strata/xfce/thunar.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: thunar
-kind: chunk
-configure-commands:
-- gdk-pixbuf-query-loaders > loader.cache
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
-install-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install
diff --git a/strata/xfce/tumbler.def b/strata/xfce/tumbler.def
new file mode 100644
index 00000000..6e14d136
--- /dev/null
+++ b/strata/xfce/tumbler.def
@@ -0,0 +1,7 @@
+name: tumbler
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/tumbler.morph b/strata/xfce/tumbler.morph
deleted file mode 100644
index fe27a783..00000000
--- a/strata/xfce/tumbler.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: tumbler
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/xfce4-appfinder.def b/strata/xfce/xfce4-appfinder.def
new file mode 100644
index 00000000..b05629af
--- /dev/null
+++ b/strata/xfce/xfce4-appfinder.def
@@ -0,0 +1,7 @@
+name: xfce4-appfinder
+configure-commands:
+- ./autogen.sh --prefix=${PREFIX}
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/xfce4-appfinder.morph b/strata/xfce/xfce4-appfinder.morph
deleted file mode 100644
index f8d1fcbe..00000000
--- a/strata/xfce/xfce4-appfinder.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: xfce4-appfinder
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=${PREFIX}
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/xfce4-panel.def b/strata/xfce/xfce4-panel.def
new file mode 100644
index 00000000..3f567833
--- /dev/null
+++ b/strata/xfce/xfce4-panel.def
@@ -0,0 +1,7 @@
+name: xfce4-panel
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/xfce4-panel.morph b/strata/xfce/xfce4-panel.morph
deleted file mode 100644
index fe85e172..00000000
--- a/strata/xfce/xfce4-panel.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: xfce4-panel
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/xfce4-session.def b/strata/xfce/xfce4-session.def
new file mode 100644
index 00000000..ba9983af
--- /dev/null
+++ b/strata/xfce/xfce4-session.def
@@ -0,0 +1,8 @@
+name: xfce4-session
+configure-commands:
+- gdk-pixbuf-query-loaders > loader.cache
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
+install-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install
diff --git a/strata/xfce/xfce4-session.morph b/strata/xfce/xfce4-session.morph
deleted file mode 100644
index 87ffac22..00000000
--- a/strata/xfce/xfce4-session.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: xfce4-session
-kind: chunk
-configure-commands:
-- gdk-pixbuf-query-loaders > loader.cache
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
-install-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install
diff --git a/strata/xfce/xfce4-settings.def b/strata/xfce/xfce4-settings.def
new file mode 100644
index 00000000..abec9332
--- /dev/null
+++ b/strata/xfce/xfce4-settings.def
@@ -0,0 +1,7 @@
+name: xfce4-settings
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/xfce4-settings.morph b/strata/xfce/xfce4-settings.morph
deleted file mode 100644
index 6063dbc1..00000000
--- a/strata/xfce/xfce4-settings.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: xfce4-settings
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/xfconf.def b/strata/xfce/xfconf.def
new file mode 100644
index 00000000..405a286b
--- /dev/null
+++ b/strata/xfce/xfconf.def
@@ -0,0 +1,7 @@
+name: xfconf
+configure-commands:
+- ./autogen.sh --prefix=${PREFIX}
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/xfconf.morph b/strata/xfce/xfconf.morph
deleted file mode 100644
index cfbe741b..00000000
--- a/strata/xfce/xfconf.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: xfconf
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix=${PREFIX}
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/xfdesktop.def b/strata/xfce/xfdesktop.def
new file mode 100644
index 00000000..449fe804
--- /dev/null
+++ b/strata/xfce/xfdesktop.def
@@ -0,0 +1,7 @@
+name: xfdesktop
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/xfce/xfdesktop.morph b/strata/xfce/xfdesktop.morph
deleted file mode 100644
index 4af5a905..00000000
--- a/strata/xfce/xfdesktop.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: xfdesktop
-kind: chunk
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/xfce/xfwm4.def b/strata/xfce/xfwm4.def
new file mode 100644
index 00000000..128da114
--- /dev/null
+++ b/strata/xfce/xfwm4.def
@@ -0,0 +1,10 @@
+name: xfwm4
+configure-commands:
+- gdk-pixbuf-query-loaders > loader.cache
+- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
+build-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
+install-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install
+- install -m 0644 index.theme $DESTDIR/usr/share/icons/hicolor
+- gtk-update-icon-cache $DESTDIR/usr/share/icons/hicolor
diff --git a/strata/xfce/xfwm4.morph b/strata/xfce/xfwm4.morph
deleted file mode 100644
index 0c4e2273..00000000
--- a/strata/xfce/xfwm4.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: xfwm4
-kind: chunk
-configure-commands:
-- gdk-pixbuf-query-loaders > loader.cache
-- ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
-build-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
-install-commands:
-- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install
-- install -m 0644 index.theme $DESTDIR/usr/share/icons/hicolor
-- gtk-update-icon-cache $DESTDIR/usr/share/icons/hicolor
diff --git a/strata/xorg-util-macros-common.def b/strata/xorg-util-macros-common.def
new file mode 100644
index 00000000..84b1234e
--- /dev/null
+++ b/strata/xorg-util-macros-common.def
@@ -0,0 +1,14 @@
+name: xorg-util-macros-common
+build-depends:
+- name: core
+contents:
+- name: xorg-util-macros
+ repo: upstream:xorg-util-macros
+ ref: 9a54b858601bd305de2737b06e609084a2a114c2
+ unpetrify-ref: util-macros-1.19.0
+- name: xcb-pthread-stubs
+ repo: upstream:xcb-pthread-stubs
+ ref: 431d2c0be218d878b9dd3862e4232243c599df4b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-util-macros
diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph
deleted file mode 100644
index b8e67888..00000000
--- a/strata/xorg-util-macros-common.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: xorg-util-macros-common
-kind: stratum
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: xorg-util-macros
- repo: upstream:xorg-util-macros
- ref: 9a54b858601bd305de2737b06e609084a2a114c2
- unpetrify-ref: util-macros-1.19.0
- build-depends: []
-- name: xcb-pthread-stubs
- repo: upstream:xcb-pthread-stubs
- ref: 431d2c0be218d878b9dd3862e4232243c599df4b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-util-macros
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.def b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.def
new file mode 100644
index 00000000..c6d4a26d
--- /dev/null
+++ b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.def
@@ -0,0 +1,14 @@
+name: armv7lhf-cross-toolchain-system-x86_32-generic
+description: A system that contains an ARM cross compiler, intended to be used as
+ a sysroot.
+arch: x86_32
+contents:
+- name: build-essential
+- name: armv7lhf-cross-toolchain
+- name: cross-tools
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
deleted file mode 100644
index e983ba7a..00000000
--- a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-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.def b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.def
new file mode 100644
index 00000000..ef90e532
--- /dev/null
+++ b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.def
@@ -0,0 +1,14 @@
+name: armv7lhf-cross-toolchain-system-x86_64-generic
+description: A system that contains an ARM cross compiler, intended to be used as
+ a sysroot.
+arch: x86_64
+contents:
+- name: build-essential
+- name: armv7lhf-cross-toolchain
+- name: cross-tools
+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
deleted file mode 100644
index 1a8c20bb..00000000
--- a/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-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/base-system-armv7-highbank.def b/systems/base-system-armv7-highbank.def
new file mode 100644
index 00000000..9ce1e976
--- /dev/null
+++ b/systems/base-system-armv7-highbank.def
@@ -0,0 +1,15 @@
+name: base-system-armv7-highbank
+description: The set of strata required to have a minimal system for an ARM highbank
+ system.
+arch: armv7l
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-highbank
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph
deleted file mode 100644
index 4efd3981..00000000
--- a/systems/base-system-armv7-highbank.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: base-system-armv7-highbank
-kind: system
-description: The set of strata required to have a minimal system for an ARM highbank
- system.
-arch: armv7l
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-highbank
- morph: strata/bsp-armv7-highbank.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/base-system-armv7-versatile.def b/systems/base-system-armv7-versatile.def
new file mode 100644
index 00000000..23f87113
--- /dev/null
+++ b/systems/base-system-armv7-versatile.def
@@ -0,0 +1,15 @@
+name: base-system-armv7-versatile
+description: The set of strata required to have a minimal system for an ARM versatile
+ system.
+arch: armv7l
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-versatile
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph
deleted file mode 100644
index 2c3634b5..00000000
--- a/systems/base-system-armv7-versatile.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: base-system-armv7-versatile
-kind: system
-description: The set of strata required to have a minimal system for an ARM versatile
- system.
-arch: armv7l
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-versatile
- morph: strata/bsp-armv7-versatile.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/base-system-armv7b-highbank.def b/systems/base-system-armv7b-highbank.def
new file mode 100644
index 00000000..003b9d4e
--- /dev/null
+++ b/systems/base-system-armv7b-highbank.def
@@ -0,0 +1,15 @@
+name: base-system-armv7b-highbank
+description: The set of strata required to have a minimal system for an ARM highbank
+ system.
+arch: armv7b
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7b-highbank
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph
deleted file mode 100644
index 2218af6f..00000000
--- a/systems/base-system-armv7b-highbank.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: base-system-armv7b-highbank
-kind: system
-description: The set of strata required to have a minimal system for an ARM highbank
- system.
-arch: armv7b
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7b-highbank
- morph: strata/bsp-armv7b-highbank.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/base-system-armv7b-vexpress-tc2.def b/systems/base-system-armv7b-vexpress-tc2.def
new file mode 100644
index 00000000..d018cf21
--- /dev/null
+++ b/systems/base-system-armv7b-vexpress-tc2.def
@@ -0,0 +1,14 @@
+name: base-system-armv7b-vexpress-tc2
+description: A small system for Versatile TC2 boards system.
+arch: armv7b
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7b-vexpress-tc2
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph
deleted file mode 100644
index 83b437a1..00000000
--- a/systems/base-system-armv7b-vexpress-tc2.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-name: base-system-armv7b-vexpress-tc2
-kind: system
-description: A small system for Versatile TC2 boards system.
-arch: armv7b
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7b-vexpress-tc2
- morph: strata/bsp-armv7b-vexpress-tc2.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/base-system-armv7lhf-highbank.def b/systems/base-system-armv7lhf-highbank.def
new file mode 100644
index 00000000..e7706a64
--- /dev/null
+++ b/systems/base-system-armv7lhf-highbank.def
@@ -0,0 +1,15 @@
+name: base-system-armv7lhf-highbank
+description: The set of strata required to have a minimal system for an ARM highbank
+ system.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-highbank
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph
deleted file mode 100644
index f5ced471..00000000
--- a/systems/base-system-armv7lhf-highbank.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: base-system-armv7lhf-highbank
-kind: system
-description: The set of strata required to have a minimal system for an ARM highbank
- system.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-highbank
- morph: strata/bsp-armv7-highbank.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/base-system-ppc64-generic.def b/systems/base-system-ppc64-generic.def
new file mode 100644
index 00000000..ac52185b
--- /dev/null
+++ b/systems/base-system-ppc64-generic.def
@@ -0,0 +1,15 @@
+name: base-system-ppc64-generic
+description: The set of strata required to have a minimal system for a 64-bit ppc64
+ system.
+arch: ppc64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-ppc64-generic
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph
deleted file mode 100644
index 85bc50b4..00000000
--- a/systems/base-system-ppc64-generic.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: base-system-ppc64-generic
-kind: system
-description: The set of strata required to have a minimal system for a 64-bit ppc64
- system.
-arch: ppc64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-ppc64-generic
- morph: strata/bsp-ppc64-generic.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/base-system-x86_32-generic.def b/systems/base-system-x86_32-generic.def
new file mode 100644
index 00000000..eadff928
--- /dev/null
+++ b/systems/base-system-x86_32-generic.def
@@ -0,0 +1,16 @@
+name: base-system-x86_32-generic
+description: The set of strata required to have a basic system for a 32-bit x86 system.
+arch: x86_32
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_32-generic
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic.morph
deleted file mode 100644
index f82d1667..00000000
--- a/systems/base-system-x86_32-generic.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-name: base-system-x86_32-generic
-kind: system
-description: The set of strata required to have a basic system for a 32-bit x86 system.
-arch: x86_32
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-x86_32-generic
- morph: strata/bsp-x86_32-generic.morph
-- name: cloudinit-support
- morph: strata/cloudinit-support.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
diff --git a/systems/base-system-x86_64-generic.def b/systems/base-system-x86_64-generic.def
new file mode 100644
index 00000000..c3c015ec
--- /dev/null
+++ b/systems/base-system-x86_64-generic.def
@@ -0,0 +1,17 @@
+name: base-system-x86_64-generic
+description: The set of strata required to have a minimal system for a 64-bit x86
+ system.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph
deleted file mode 100644
index 1bcafc2a..00000000
--- a/systems/base-system-x86_64-generic.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-name: base-system-x86_64-generic
-kind: system
-description: The set of strata required to have a minimal system for a 64-bit x86
- system.
-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: cloudinit-support
- morph: strata/cloudinit-support.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
diff --git a/systems/build-system-armv7lhf-highbank.def b/systems/build-system-armv7lhf-highbank.def
new file mode 100644
index 00000000..4fa2ced5
--- /dev/null
+++ b/systems/build-system-armv7lhf-highbank.def
@@ -0,0 +1,23 @@
+name: build-system-armv7lhf-highbank
+description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float Calxeda Highbank computers.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-highbank
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
deleted file mode 100644
index 43e701b5..00000000
--- a/systems/build-system-armv7lhf-highbank.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: build-system-armv7lhf-highbank
-kind: system
-description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float Calxeda Highbank computers.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-highbank
- morph: strata/bsp-armv7-highbank.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
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/build-system-armv7lhf-jetson.def b/systems/build-system-armv7lhf-jetson.def
new file mode 100644
index 00000000..a86558f7
--- /dev/null
+++ b/systems/build-system-armv7lhf-jetson.def
@@ -0,0 +1,23 @@
+name: build-system-armv7lhf-jetson
+description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-jetson
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
deleted file mode 100644
index 674b5406..00000000
--- a/systems/build-system-armv7lhf-jetson.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: build-system-armv7lhf-jetson
-kind: system
-description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-jetson
- morph: strata/bsp-jetson.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
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/build-system-ppc64.def b/systems/build-system-ppc64.def
new file mode 100644
index 00000000..521ee7fc
--- /dev/null
+++ b/systems/build-system-ppc64.def
@@ -0,0 +1,23 @@
+name: build-system-ppc64
+description: The system that should be used for building all other Baserock systems for 64-bit POWER computers.
+arch: ppc64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-ppc64-generic
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
deleted file mode 100644
index a317c696..00000000
--- a/systems/build-system-ppc64.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: build-system-ppc64
-kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit POWER computers.
-arch: ppc64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-ppc64-generic
- morph: strata/bsp-ppc64-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
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/build-system-x86_32-chroot.def b/systems/build-system-x86_32-chroot.def
new file mode 100644
index 00000000..36c70278
--- /dev/null
+++ b/systems/build-system-x86_32-chroot.def
@@ -0,0 +1,22 @@
+name: build-system-x86_32-chroot
+description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers, chroot variant.
+arch: x86_32
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
deleted file mode 100644
index 776fa4ab..00000000
--- a/systems/build-system-x86_32-chroot.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-name: build-system-x86_32-chroot
-kind: system
-description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers, chroot variant.
-arch: x86_32
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.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
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/build-system-x86_32.def b/systems/build-system-x86_32.def
new file mode 100644
index 00000000..7dd7aa81
--- /dev/null
+++ b/systems/build-system-x86_32.def
@@ -0,0 +1,23 @@
+name: build-system-x86_32
+description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers.
+arch: x86_32
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_32-generic
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
deleted file mode 100644
index e336d2ec..00000000
--- a/systems/build-system-x86_32.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: build-system-x86_32
-kind: system
-description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers.
-arch: x86_32
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-x86_32-generic
- morph: strata/bsp-x86_32-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
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/build-system-x86_64-chroot.def b/systems/build-system-x86_64-chroot.def
new file mode 100644
index 00000000..68438672
--- /dev/null
+++ b/systems/build-system-x86_64-chroot.def
@@ -0,0 +1,22 @@
+name: build-system-x86_64-chroot
+description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers, chroot variant.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
deleted file mode 100644
index 4cc66226..00000000
--- a/systems/build-system-x86_64-chroot.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-name: build-system-x86_64-chroot
-kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers, chroot variant.
-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: 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
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/build-system-x86_64.def b/systems/build-system-x86_64.def
new file mode 100644
index 00000000..644db3e0
--- /dev/null
+++ b/systems/build-system-x86_64.def
@@ -0,0 +1,23 @@
+name: build-system-x86_64
+description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
deleted file mode 100644
index 6db657a1..00000000
--- a/systems/build-system-x86_64.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: build-system-x86_64
-kind: system
-description: The system that should be used for building all other Baserock systems for 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: nfs
- morph: strata/nfs.morph
-- name: ansible
- morph: strata/ansible.morph
-- name: cloudinit-support
- morph: strata/cloudinit-support.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/ceph-service-x86_64-generic.def b/systems/ceph-service-x86_64-generic.def
new file mode 100644
index 00000000..f4db4f85
--- /dev/null
+++ b/systems/ceph-service-x86_64-generic.def
@@ -0,0 +1,18 @@
+name: ceph-service-x86_64-generic
+description: The set of strata required to have a minimal system for a 64-bit x86
+ system + the service daemons for ceph object, block and file storage.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: network-security
+- name: ceph-service
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- ceph
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
deleted file mode 100644
index 182cf0cd..00000000
--- a/systems/ceph-service-x86_64-generic.morph
+++ /dev/null
@@ -1,25 +0,0 @@
-name: ceph-service-x86_64-generic
-kind: system
-description: The set of strata required to have a minimal system for a 64-bit x86
- system + the service daemons for ceph object, block and file storage.
-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: network-security
- morph: strata/network-security.morph
-- name: ceph-service
- morph: strata/ceph-service.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- ceph
diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.def b/systems/cross-bootstrap-system-armv7lhf-generic.def
new file mode 100644
index 00000000..0662752d
--- /dev/null
+++ b/systems/cross-bootstrap-system-armv7lhf-generic.def
@@ -0,0 +1,7 @@
+name: cross-bootstrap-system-armv7lhf-generic
+description: A system that produces the minimum needed to build a devel system
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph
deleted file mode 100644
index 4eecf7fe..00000000
--- a/systems/cross-bootstrap-system-armv7lhf-generic.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: cross-bootstrap-system-armv7lhf-generic
-kind: system
-description: A system that produces the minimum needed to build a devel system
-arch: armv7lhf
-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/cross-bootstrap-system-ppc64-generic.def b/systems/cross-bootstrap-system-ppc64-generic.def
new file mode 100644
index 00000000..5406e6c0
--- /dev/null
+++ b/systems/cross-bootstrap-system-ppc64-generic.def
@@ -0,0 +1,7 @@
+name: cross-bootstrap-system-ppc64-generic
+description: A system that produces the minimum needed to build a devel system
+arch: ppc64
+contents:
+- name: build-essential
+- name: core
+- name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph
deleted file mode 100644
index 8b274e80..00000000
--- a/systems/cross-bootstrap-system-ppc64-generic.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: cross-bootstrap-system-ppc64-generic
-kind: system
-description: A system that produces the minimum needed to build a devel system
-arch: ppc64
-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/cross-bootstrap-system-x86_64-generic.def b/systems/cross-bootstrap-system-x86_64-generic.def
new file mode 100644
index 00000000..2898a3ec
--- /dev/null
+++ b/systems/cross-bootstrap-system-x86_64-generic.def
@@ -0,0 +1,7 @@
+name: cross-bootstrap-system-x86_64-generic
+description: A system that produces the minimum needed to build a devel system
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph
deleted file mode 100644
index bdd42cf3..00000000
--- a/systems/cross-bootstrap-system-x86_64-generic.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: cross-bootstrap-system-x86_64-generic
-kind: system
-description: A system that produces the minimum needed to build a devel system
-arch: x86_64
-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/cxmanage-system-x86_64-generic.def b/systems/cxmanage-system-x86_64-generic.def
new file mode 100644
index 00000000..537d908f
--- /dev/null
+++ b/systems/cxmanage-system-x86_64-generic.def
@@ -0,0 +1,17 @@
+name: cxmanage-system-x86_64-generic
+description: A baserock development system with calxeda management tools added
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: tools
+- name: cxmanage
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- fstab
diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph
deleted file mode 100644
index 4d731ea3..00000000
--- a/systems/cxmanage-system-x86_64-generic.morph
+++ /dev/null
@@ -1,24 +0,0 @@
-name: cxmanage-system-x86_64-generic
-kind: system
-description: A baserock development system with calxeda management tools added
-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: cxmanage
- morph: strata/cxmanage.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- fstab
diff --git a/systems/devel-system-armv7-chroot.def b/systems/devel-system-armv7-chroot.def
new file mode 100644
index 00000000..4887ee9c
--- /dev/null
+++ b/systems/devel-system-armv7-chroot.def
@@ -0,0 +1,22 @@
+name: devel-system-armv7-chroot
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use as a chroot inside a Linux-based operating system on ARMv7
+ computers using little-endian word order.
+arch: armv7l
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nodejs
+- name: ruby
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
deleted file mode 100644
index 265f63fa..00000000
--- a/systems/devel-system-armv7-chroot.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-name: devel-system-armv7-chroot
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use as a chroot inside a Linux-based operating system on ARMv7
- computers using little-endian word order.
-arch: armv7l
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7-highbank.def b/systems/devel-system-armv7-highbank.def
new file mode 100644
index 00000000..3b233819
--- /dev/null
+++ b/systems/devel-system-armv7-highbank.def
@@ -0,0 +1,23 @@
+name: devel-system-armv7-highbank
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on ARMv7 Calxeda Highbank computers using little-endian word order.
+arch: armv7l
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-highbank
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nodejs
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
deleted file mode 100644
index 91716fc8..00000000
--- a/systems/devel-system-armv7-highbank.morph
+++ /dev/null
@@ -1,34 +0,0 @@
-name: devel-system-armv7-highbank
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on ARMv7 Calxeda Highbank computers using little-endian word order.
-arch: armv7l
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-highbank
- morph: strata/bsp-armv7-highbank.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7-versatile.def b/systems/devel-system-armv7-versatile.def
new file mode 100644
index 00000000..e5e0ef03
--- /dev/null
+++ b/systems/devel-system-armv7-versatile.def
@@ -0,0 +1,23 @@
+name: devel-system-armv7-versatile
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on generic ARMv7 versatile computers using little-endian word order.
+arch: armv7l
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-versatile
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nodejs
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
deleted file mode 100644
index 8e911703..00000000
--- a/systems/devel-system-armv7-versatile.morph
+++ /dev/null
@@ -1,34 +0,0 @@
-name: devel-system-armv7-versatile
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on generic ARMv7 versatile computers using little-endian word order.
-arch: armv7l
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-versatile
- morph: strata/bsp-armv7-versatile.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7-wandboard.def b/systems/devel-system-armv7-wandboard.def
new file mode 100644
index 00000000..f0b2e674
--- /dev/null
+++ b/systems/devel-system-armv7-wandboard.def
@@ -0,0 +1,23 @@
+name: devel-system-armv7-wandboard
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on ARMv7 Wandboard computers using little-endian word order.
+arch: armv7l
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-wandboard
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nodejs
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
deleted file mode 100644
index 973f05ea..00000000
--- a/systems/devel-system-armv7-wandboard.morph
+++ /dev/null
@@ -1,34 +0,0 @@
-name: devel-system-armv7-wandboard
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on ARMv7 Wandboard computers using little-endian word order.
-arch: armv7l
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-wandboard
- morph: strata/bsp-wandboard.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7b-chroot.def b/systems/devel-system-armv7b-chroot.def
new file mode 100644
index 00000000..5710e437
--- /dev/null
+++ b/systems/devel-system-armv7b-chroot.def
@@ -0,0 +1,20 @@
+name: devel-system-armv7b-chroot
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use as a chroot inside a Linux-based operating system on ARMv7 computers
+ using big-endian word order.
+arch: armv7b
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
deleted file mode 100644
index c74e52b3..00000000
--- a/systems/devel-system-armv7b-chroot.morph
+++ /dev/null
@@ -1,27 +0,0 @@
-name: devel-system-armv7b-chroot
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use as a chroot inside a Linux-based operating system on ARMv7 computers
- using big-endian word order.
-arch: armv7b
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7b-highbank.def b/systems/devel-system-armv7b-highbank.def
new file mode 100644
index 00000000..1e148e32
--- /dev/null
+++ b/systems/devel-system-armv7b-highbank.def
@@ -0,0 +1,21 @@
+name: devel-system-armv7b-highbank
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on ARMv7 Calxeda Highbank computers using big-endian word order.
+arch: armv7b
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7b-highbank
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
deleted file mode 100644
index 4f3944c2..00000000
--- a/systems/devel-system-armv7b-highbank.morph
+++ /dev/null
@@ -1,30 +0,0 @@
-name: devel-system-armv7b-highbank
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on ARMv7 Calxeda Highbank computers using big-endian word order.
-arch: armv7b
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7b-highbank
- morph: strata/bsp-armv7b-highbank.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7lhf-chroot.def b/systems/devel-system-armv7lhf-chroot.def
new file mode 100644
index 00000000..9d42c2d2
--- /dev/null
+++ b/systems/devel-system-armv7lhf-chroot.def
@@ -0,0 +1,22 @@
+name: devel-system-armv7lhf-chroot
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on ARMv7 computers using little-endian word order and hardware
+ floating point support.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nodejs
+- name: ruby
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
deleted file mode 100644
index 4d106fba..00000000
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-name: devel-system-armv7lhf-chroot
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on ARMv7 computers using little-endian word order and hardware
- floating point support.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7lhf-highbank.def b/systems/devel-system-armv7lhf-highbank.def
new file mode 100644
index 00000000..3df14d7f
--- /dev/null
+++ b/systems/devel-system-armv7lhf-highbank.def
@@ -0,0 +1,24 @@
+name: devel-system-armv7lhf-highbank
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on ARMv7 Calxeda Highbank computers using little-endian word order
+ and hardware floating-point support.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-highbank
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nodejs
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
deleted file mode 100644
index 7049b1b0..00000000
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: devel-system-armv7lhf-highbank
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on ARMv7 Calxeda Highbank computers using little-endian word order
- and hardware floating-point support.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-highbank
- morph: strata/bsp-armv7-highbank.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7lhf-jetson.def b/systems/devel-system-armv7lhf-jetson.def
new file mode 100644
index 00000000..b2f34c34
--- /dev/null
+++ b/systems/devel-system-armv7lhf-jetson.def
@@ -0,0 +1,24 @@
+name: devel-system-armv7lhf-jetson
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on ARMv7 NVIDIA Jetson TK1 computers using little-endian word order
+ and hardware floating-point support.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nfs
+- name: bsp-jetson
+- name: nodejs
+- name: ruby
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
deleted file mode 100644
index 0bf7da18..00000000
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: devel-system-armv7lhf-jetson
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on ARMv7 NVIDIA Jetson TK1 computers using little-endian word order
- and hardware floating-point support.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nfs
- morph: strata/nfs.morph
-- name: bsp-jetson
- morph: strata/bsp-jetson.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-armv7lhf-wandboard.def b/systems/devel-system-armv7lhf-wandboard.def
new file mode 100644
index 00000000..398948f1
--- /dev/null
+++ b/systems/devel-system-armv7lhf-wandboard.def
@@ -0,0 +1,24 @@
+name: devel-system-armv7lhf-wandboard
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on ARMv7 Wandboard computers using little-endian word order and
+ hardware floating point support.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-wandboard
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: nodejs
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
deleted file mode 100644
index 7c27bcdf..00000000
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: devel-system-armv7lhf-wandboard
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on ARMv7 Wandboard computers using little-endian word order and
- hardware floating point support.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-wandboard
- morph: strata/bsp-wandboard.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-ppc64-chroot.def b/systems/devel-system-ppc64-chroot.def
new file mode 100644
index 00000000..44d614f0
--- /dev/null
+++ b/systems/devel-system-ppc64-chroot.def
@@ -0,0 +1,21 @@
+name: devel-system-ppc64-chroot
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use as a chroot inside a Linux operating system on 64-bit POWER
+ computers.
+arch: ppc64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: ruby
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
deleted file mode 100644
index b74f164c..00000000
--- a/systems/devel-system-ppc64-chroot.morph
+++ /dev/null
@@ -1,29 +0,0 @@
-name: devel-system-ppc64-chroot
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use as a chroot inside a Linux operating system on 64-bit POWER
- computers.
-arch: ppc64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: ruby
- morph: strata/ruby.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-ppc64-generic.def b/systems/devel-system-ppc64-generic.def
new file mode 100644
index 00000000..d61ba717
--- /dev/null
+++ b/systems/devel-system-ppc64-generic.def
@@ -0,0 +1,22 @@
+name: devel-system-ppc64-generic
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on 64-bit POWER computers.
+arch: ppc64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-ppc64-generic
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
deleted file mode 100644
index 16bc7fc3..00000000
--- a/systems/devel-system-ppc64-generic.morph
+++ /dev/null
@@ -1,32 +0,0 @@
-name: devel-system-ppc64-generic
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on 64-bit POWER computers.
-arch: ppc64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-ppc64-generic
- morph: strata/bsp-ppc64-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: ruby
- morph: strata/ruby.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-x86_32-chroot.def b/systems/devel-system-x86_32-chroot.def
new file mode 100644
index 00000000..b672ac3b
--- /dev/null
+++ b/systems/devel-system-x86_32-chroot.def
@@ -0,0 +1,23 @@
+name: devel-system-x86_32-chroot
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use as a chroot inside a Linux operating system on 32-bit Intel x86
+ computers.
+arch: x86_32
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: bsp-x86_both-tools
+- name: nodejs
+- name: ruby
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
deleted file mode 100644
index cf3d6ad1..00000000
--- a/systems/devel-system-x86_32-chroot.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: devel-system-x86_32-chroot
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use as a chroot inside a Linux operating system on 32-bit Intel x86
- computers.
-arch: x86_32
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: bsp-x86_both-tools
- morph: strata/bsp-x86_both-tools.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-x86_32-generic.def b/systems/devel-system-x86_32-generic.def
new file mode 100644
index 00000000..5905a293
--- /dev/null
+++ b/systems/devel-system-x86_32-generic.def
@@ -0,0 +1,25 @@
+name: devel-system-x86_32-generic
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on 32-bit Intel x86 computers.
+arch: x86_32
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_32-generic
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: cloudinit-support
+- name: nodejs
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
deleted file mode 100644
index 5afb6f72..00000000
--- a/systems/devel-system-x86_32-generic.morph
+++ /dev/null
@@ -1,37 +0,0 @@
-name: devel-system-x86_32-generic
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use on 32-bit Intel x86 computers.
-arch: x86_32
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-x86_32-generic
- morph: strata/bsp-x86_32-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: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
diff --git a/systems/devel-system-x86_64-chroot.def b/systems/devel-system-x86_64-chroot.def
new file mode 100644
index 00000000..59303428
--- /dev/null
+++ b/systems/devel-system-x86_64-chroot.def
@@ -0,0 +1,23 @@
+name: devel-system-x86_64-chroot
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use as a chroot inside a Linux operating system on 64-bit Intel x86
+ computers.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: bsp-x86_both-tools
+- name: nodejs
+- name: ruby
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
deleted file mode 100644
index c2da5e1a..00000000
--- a/systems/devel-system-x86_64-chroot.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: devel-system-x86_64-chroot
-kind: system
-description: |
- A system with useful tools for doing Baserock development.
-
- For use as a chroot inside a Linux operating system 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: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: bsp-x86_both-tools
- morph: strata/bsp-x86_both-tools.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/devel-system-x86_64-generic.def b/systems/devel-system-x86_64-generic.def
new file mode 100644
index 00000000..4c412186
--- /dev/null
+++ b/systems/devel-system-x86_64-generic.def
@@ -0,0 +1,25 @@
+name: devel-system-x86_64-generic
+description: |
+ A system with useful tools for doing Baserock development.
+
+ For use on 64-bit Intel x86 computers.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: cloudinit-support
+- name: nodejs
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
deleted file mode 100644
index 969f32b6..00000000
--- a/systems/devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,37 +0,0 @@
-name: devel-system-x86_64-generic
-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: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
diff --git a/systems/devel-system-x86_64-vagrant.def b/systems/devel-system-x86_64-vagrant.def
new file mode 100644
index 00000000..845ccc2f
--- /dev/null
+++ b/systems/devel-system-x86_64-vagrant.def
@@ -0,0 +1,24 @@
+name: devel-system-x86_64-vagrant
+description: |
+ A system with useful tools for doing Baserock development, using Vagrant.
+
+ For use with the Vagrant tool for x86_64 virtual machines.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: tools
+- name: morph-utils
+- name: openstack-clients
+- name: virtualbox-guest-x86_64
+- name: nodejs
+- name: ruby
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vagrant
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
deleted file mode 100644
index 85bbe90c..00000000
--- a/systems/devel-system-x86_64-vagrant.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: devel-system-x86_64-vagrant
-kind: system
-description: |
- A system with useful tools for doing Baserock development, using Vagrant.
-
- For use with the Vagrant tool for x86_64 virtual machines.
-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: virtualbox-guest-x86_64
- morph: strata/virtualbox-guest-x86_64.morph
-- name: nodejs
- morph: strata/nodejs.morph
-- name: ruby
- morph: strata/ruby.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- vagrant
diff --git a/systems/distbuild-system-x86_64-openstack.def b/systems/distbuild-system-x86_64-openstack.def
new file mode 100644
index 00000000..623dda78
--- /dev/null
+++ b/systems/distbuild-system-x86_64-openstack.def
@@ -0,0 +1,24 @@
+name: distbuild-system-x86_64
+description: Morph distributed build node for x86_64
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: tools
+- name: morph-utils
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+- name: openstack-clients
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+- mason
+- cloud-init
diff --git a/systems/distbuild-system-x86_64-openstack.morph b/systems/distbuild-system-x86_64-openstack.morph
deleted file mode 100644
index 483d8b99..00000000
--- a/systems/distbuild-system-x86_64-openstack.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: distbuild-system-x86_64
-kind: system
-description: Morph distributed build node for x86_64
-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: 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
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.def b/systems/genivi-baseline-system-armv7lhf-jetson.def
new file mode 100644
index 00000000..19ed8702
--- /dev/null
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.def
@@ -0,0 +1,27 @@
+name: genivi-baseline-system-armv7lhf-jetson
+description: A GENIVI baseline system for a Jetson TK.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-jetson
+- name: connectivity
+- name: connman-common
+- name: audio-bluetooth
+- name: libdrm-common
+- name: multimedia
+- name: genivi
+- name: wayland-generic
+- name: graphics-common
+- name: input-common
+- name: mesa-common
+- name: weston-genivi
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+- fstab
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
deleted file mode 100644
index 59cca3e8..00000000
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ /dev/null
@@ -1,43 +0,0 @@
-name: genivi-baseline-system-armv7lhf-jetson
-kind: system
-description: A GENIVI baseline system for a Jetson TK.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-jetson
- morph: strata/bsp-jetson.morph
-- name: connectivity
- morph: strata/connectivity.morph
-- name: connman-common
- morph: strata/connman-common.morph
-- name: audio-bluetooth
- morph: strata/audio-bluetooth.morph
-- name: libdrm-common
- morph: strata/libdrm-common.morph
-- name: multimedia
- morph: strata/multimedia.morph
-- name: genivi
- morph: strata/genivi.morph
-- name: wayland-generic
- morph: strata/wayland-generic.morph
-- name: graphics-common
- morph: strata/graphics-common.morph
-- name: input-common
- morph: strata/input-common.morph
-- name: mesa-common
- morph: strata/mesa-common.morph
-- name: weston-genivi
- morph: strata/weston-genivi.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
-- fstab
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.def b/systems/genivi-baseline-system-armv7lhf-versatile.def
new file mode 100644
index 00000000..17bc9b48
--- /dev/null
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.def
@@ -0,0 +1,26 @@
+name: genivi-baseline-system-armv7lhf-versatile
+description: A GENIVI baseline system for an ARMv7 system.
+arch: armv7lhf
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-armv7-versatile
+- name: connectivity
+- name: connman-common
+- name: audio-bluetooth
+- name: libdrm-common
+- name: multimedia
+- name: genivi
+- name: wayland-generic
+- name: graphics-common
+- name: input-common
+- name: weston-genivi
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+- fstab
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
deleted file mode 100644
index ccc1419d..00000000
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ /dev/null
@@ -1,41 +0,0 @@
-name: genivi-baseline-system-armv7lhf-versatile
-kind: system
-description: A GENIVI baseline system for an ARMv7 system.
-arch: armv7lhf
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: core
- morph: strata/core.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: bsp-armv7-versatile
- morph: strata/bsp-armv7-versatile.morph
-- name: connectivity
- morph: strata/connectivity.morph
-- name: connman-common
- morph: strata/connman-common.morph
-- name: audio-bluetooth
- morph: strata/audio-bluetooth.morph
-- name: libdrm-common
- morph: strata/libdrm-common.morph
-- name: multimedia
- morph: strata/multimedia.morph
-- name: genivi
- morph: strata/genivi.morph
-- name: wayland-generic
- morph: strata/wayland-generic.morph
-- name: graphics-common
- morph: strata/graphics-common.morph
-- name: input-common
- morph: strata/input-common.morph
-- name: weston-genivi
- morph: strata/weston-genivi.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
-- fstab
diff --git a/systems/genivi-baseline-system-x86_64-generic.def b/systems/genivi-baseline-system-x86_64-generic.def
new file mode 100644
index 00000000..0968fbad
--- /dev/null
+++ b/systems/genivi-baseline-system-x86_64-generic.def
@@ -0,0 +1,27 @@
+name: genivi-baseline-system-x86_64-generic
+description: A GENIVI baseline system for a 64-bit x86 system.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: connectivity
+- name: connman-common
+- name: audio-bluetooth
+- name: libdrm-common
+- name: multimedia
+- name: genivi
+- name: wayland-generic
+- name: graphics-common
+- name: input-common
+- name: llvm-common
+- name: mesa-common
+- name: weston-genivi
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
deleted file mode 100644
index 883c0efe..00000000
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ /dev/null
@@ -1,44 +0,0 @@
-name: genivi-baseline-system-x86_64-generic
-kind: system
-description: A GENIVI baseline system for a 64-bit x86 system.
-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: connectivity
- morph: strata/connectivity.morph
-- name: connman-common
- morph: strata/connman-common.morph
-- name: audio-bluetooth
- morph: strata/audio-bluetooth.morph
-- name: libdrm-common
- morph: strata/libdrm-common.morph
-- name: multimedia
- morph: strata/multimedia.morph
-- name: genivi
- morph: strata/genivi.morph
-- name: wayland-generic
- morph: strata/wayland-generic.morph
-- name: graphics-common
- morph: strata/graphics-common.morph
-- name: input-common
- morph: strata/input-common.morph
-- name: llvm-common
- morph: strata/llvm-common.morph
-- name: mesa-common
- morph: strata/mesa-common.morph
-- name: weston-genivi
- morph: strata/weston-genivi.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
diff --git a/systems/gerrit-x86_64.def b/systems/gerrit-x86_64.def
new file mode 100644
index 00000000..fad1c6a7
--- /dev/null
+++ b/systems/gerrit-x86_64.def
@@ -0,0 +1,22 @@
+name: gerrit-x86_64
+description: system to install gerrit on it
+arch: x86_64
+contents:
+- name: build-essential
+- name: bsp-x86_64-generic
+- name: foundation
+- name: core
+- name: tools
+- name: nfs
+- name: databases
+- name: network-security
+- name: cloudinit-support
+- name: patch-manager-gerrit
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
+- gerrit
diff --git a/systems/gerrit-x86_64.morph b/systems/gerrit-x86_64.morph
deleted file mode 100644
index 0dbca14e..00000000
--- a/systems/gerrit-x86_64.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-name: gerrit-x86_64
-kind: system
-description: system to install gerrit on it
-arch: x86_64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: bsp-x86_64-generic
- morph: strata/bsp-x86_64-generic.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: core
- morph: strata/core.morph
-- name: tools
- morph: strata/tools.morph
-- name: nfs
- morph: strata/nfs.morph
-- name: databases
- morph: strata/databases.morph
-- name: network-security
- morph: strata/network-security.morph
-- name: cloudinit-support
- morph: strata/cloudinit-support.morph
-- name: patch-manager-gerrit
- morph: strata/patch-manager-gerrit.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-- gerrit
diff --git a/systems/gitlab-ci-runner.def b/systems/gitlab-ci-runner.def
new file mode 100644
index 00000000..7b802163
--- /dev/null
+++ b/systems/gitlab-ci-runner.def
@@ -0,0 +1,29 @@
+name: gitlab-ci-runner
+description: A system to run build tests as part of GitLab CI architecture.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: connectivity
+- name: connman-common
+- name: audio-bluetooth
+- name: x-common
+- name: x-generic
+- name: multimedia
+- name: genivi
+- name: tools
+- name: virtualization
+- name: openstack-clients
+- name: databases
+- name: pcre-utils
+- name: webtools
+- name: ruby
+- name: nfs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
deleted file mode 100644
index f7398793..00000000
--- a/systems/gitlab-ci-runner.morph
+++ /dev/null
@@ -1,49 +0,0 @@
-name: gitlab-ci-runner
-kind: system
-description: A system to run build tests as part of GitLab CI architecture.
-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: connectivity
- morph: strata/connectivity.morph
-- name: connman-common
- morph: strata/connman-common.morph
-- name: audio-bluetooth
- morph: strata/audio-bluetooth.morph
-- name: x-common
- morph: strata/x-common.morph
-- name: x-generic
- morph: strata/x-generic.morph
-- name: multimedia
- morph: strata/multimedia.morph
-- name: genivi
- morph: strata/genivi.morph
-- name: tools
- morph: strata/tools.morph
-- name: virtualization
- morph: strata/virtualization.morph
-- name: openstack-clients
- morph: strata/openstack-clients.morph
-- name: databases
- morph: strata/databases.morph
-- name: pcre-utils
- morph: strata/pcre-utils.morph
-- name: webtools
- morph: strata/webtools.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: nfs
- morph: strata/nfs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/gitlab-server.def b/systems/gitlab-server.def
new file mode 100644
index 00000000..f2be5a56
--- /dev/null
+++ b/systems/gitlab-server.def
@@ -0,0 +1,23 @@
+name: gitlab-server
+description: system which hosts a gitlab server
+arch: x86_64
+contents:
+- name: build-essential
+- name: bsp-x86_64-generic
+- name: foundation
+- name: core
+- name: tools
+- name: nfs
+- name: databases
+- name: pcre-utils
+- name: webtools
+- name: ruby
+- name: gitlab
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- gitlab
+- fstab
diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph
deleted file mode 100644
index a9c9bbd3..00000000
--- a/systems/gitlab-server.morph
+++ /dev/null
@@ -1,35 +0,0 @@
-name: gitlab-server
-kind: system
-description: system which hosts a gitlab server
-arch: x86_64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: bsp-x86_64-generic
- morph: strata/bsp-x86_64-generic.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: core
- morph: strata/core.morph
-- name: tools
- morph: strata/tools.morph
-- name: nfs
- morph: strata/nfs.morph
-- name: databases
- morph: strata/databases.morph
-- name: pcre-utils
- morph: strata/pcre-utils.morph
-- name: webtools
- morph: strata/webtools.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: gitlab
- morph: strata/gitlab.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- gitlab
-- fstab
diff --git a/systems/initramfs-x86_64.def b/systems/initramfs-x86_64.def
new file mode 100644
index 00000000..e249c812
--- /dev/null
+++ b/systems/initramfs-x86_64.def
@@ -0,0 +1,8 @@
+name: initramfs-x86_64
+description: Initramfs for x86_64
+arch: x86_64
+contents:
+- name: build-essential
+ artifacts:
+ - build-essential-minimal
+- name: initramfs-utils
diff --git a/systems/initramfs-x86_64.morph b/systems/initramfs-x86_64.morph
deleted file mode 100644
index 4bb0020d..00000000
--- a/systems/initramfs-x86_64.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: initramfs-x86_64
-kind: system
-description: Initramfs for x86_64
-arch: x86_64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
- artifacts:
- - build-essential-minimal
-- name: initramfs-utils
- morph: strata/initramfs-utils.morph
diff --git a/systems/minimal-system-x86_32-generic.def b/systems/minimal-system-x86_32-generic.def
new file mode 100644
index 00000000..e0ed1ff0
--- /dev/null
+++ b/systems/minimal-system-x86_32-generic.def
@@ -0,0 +1,17 @@
+name: minimal-system-x86_32-generic
+description: The set of strata required to have a minimal system for a 32-bit x86
+ system.
+arch: x86_32
+contents:
+- name: build-essential
+ artifacts:
+ - build-essential-minimal
+- name: bsp-x86_32-generic
+ artifacts:
+ - bsp-x86_32-generic-runtime
+configuration-extensions:
+- set-hostname
+- simple-network
+- nfsboot
+- install-files
+- busybox-init
diff --git a/systems/minimal-system-x86_32-generic.morph b/systems/minimal-system-x86_32-generic.morph
deleted file mode 100644
index 6c48361f..00000000
--- a/systems/minimal-system-x86_32-generic.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: minimal-system-x86_32-generic
-kind: system
-description: The set of strata required to have a minimal system for a 32-bit x86
- system.
-arch: x86_32
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
- artifacts:
- - build-essential-minimal
-- name: bsp-x86_32-generic
- morph: strata/bsp-x86_32-generic.morph
- artifacts:
- - bsp-x86_32-generic-runtime
-configuration-extensions:
-- set-hostname
-- simple-network
-- nfsboot
-- install-files
-- busybox-init
diff --git a/systems/minimal-system-x86_64-generic.def b/systems/minimal-system-x86_64-generic.def
new file mode 100644
index 00000000..5394c277
--- /dev/null
+++ b/systems/minimal-system-x86_64-generic.def
@@ -0,0 +1,17 @@
+name: minimal-system-x86_64-generic
+description: The set of strata required to have a minimal system for a 64-bit x86
+ system.
+arch: x86_64
+contents:
+- name: build-essential
+ artifacts:
+ - build-essential-minimal
+- name: bsp-x86_64-generic
+ artifacts:
+ - bsp-x86_64-generic-runtime
+configuration-extensions:
+- set-hostname
+- simple-network
+- nfsboot
+- install-files
+- busybox-init
diff --git a/systems/minimal-system-x86_64-generic.morph b/systems/minimal-system-x86_64-generic.morph
deleted file mode 100644
index 02fb7deb..00000000
--- a/systems/minimal-system-x86_64-generic.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-name: minimal-system-x86_64-generic
-kind: system
-description: The set of strata required to have a minimal system for a 64-bit x86
- system.
-arch: x86_64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
- artifacts:
- - build-essential-minimal
-- name: bsp-x86_64-generic
- morph: strata/bsp-x86_64-generic.morph
- artifacts:
- - bsp-x86_64-generic-runtime
-configuration-extensions:
-- set-hostname
-- simple-network
-- nfsboot
-- install-files
-- busybox-init
diff --git a/systems/nodejs-system-x86_64.def b/systems/nodejs-system-x86_64.def
new file mode 100644
index 00000000..c3d6cbb0
--- /dev/null
+++ b/systems/nodejs-system-x86_64.def
@@ -0,0 +1,16 @@
+name: nodejs-system-x86_64
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: nodejs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
deleted file mode 100644
index b34d6626..00000000
--- a/systems/nodejs-system-x86_64.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-name: nodejs-system-x86_64
-kind: system
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-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: nodejs
- morph: strata/nodejs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/qt4-devel-system-x86_64-generic.def b/systems/qt4-devel-system-x86_64-generic.def
new file mode 100644
index 00000000..724a1e63
--- /dev/null
+++ b/systems/qt4-devel-system-x86_64-generic.def
@@ -0,0 +1,26 @@
+name: qt4-devel-system-x86_64-generic
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: audio-bluetooth
+- name: multimedia-gstreamer-0.10
+- name: bsp-x86_64-generic
+- name: tools
+- name: x-common
+- name: x-generic
+- name: qt4-tools
+- name: qt4-sdk
+- name: lua
+- name: connectivity
+- name: connman-common
+- name: enlightenment
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
deleted file mode 100644
index 0b4e4638..00000000
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,42 +0,0 @@
-name: qt4-devel-system-x86_64-generic
-kind: system
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-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: audio-bluetooth
- morph: strata/audio-bluetooth.morph
-- name: multimedia-gstreamer-0.10
- morph: strata/multimedia-gstreamer-0.10.morph
-- name: bsp-x86_64-generic
- morph: strata/bsp-x86_64-generic.morph
-- name: tools
- morph: strata/tools.morph
-- name: x-common
- morph: strata/x-common.morph
-- name: x-generic
- morph: strata/x-generic.morph
-- name: qt4-tools
- morph: strata/qt4-tools.morph
-- name: qt4-sdk
- morph: strata/qt4-sdk.morph
-- name: lua
- morph: strata/lua.morph
-- name: connectivity
- morph: strata/connectivity.morph
-- name: connman-common
- morph: strata/connman-common.morph
-- name: enlightenment
- morph: strata/enlightenment.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/qt5-devel-system-x86_64-generic.def b/systems/qt5-devel-system-x86_64-generic.def
new file mode 100644
index 00000000..9458a114
--- /dev/null
+++ b/systems/qt5-devel-system-x86_64-generic.def
@@ -0,0 +1,26 @@
+name: qt5-devel-system-x86_64-generic
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: audio-bluetooth
+- name: multimedia-gstreamer-0.10
+- name: bsp-x86_64-generic
+- name: tools
+- name: x-common
+- name: x-generic
+- name: qt5-tools
+- name: qt5-sdk
+- name: lua
+- name: connectivity
+- name: connman-common
+- name: enlightenment
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
deleted file mode 100644
index 7171c0ca..00000000
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,42 +0,0 @@
-name: qt5-devel-system-x86_64-generic
-kind: system
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-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: audio-bluetooth
- morph: strata/audio-bluetooth.morph
-- name: multimedia-gstreamer-0.10
- morph: strata/multimedia-gstreamer-0.10.morph
-- name: bsp-x86_64-generic
- morph: strata/bsp-x86_64-generic.morph
-- name: tools
- morph: strata/tools.morph
-- name: x-common
- morph: strata/x-common.morph
-- name: x-generic
- morph: strata/x-generic.morph
-- name: qt5-tools
- morph: strata/qt5-tools.morph
-- name: qt5-sdk
- morph: strata/qt5-sdk.morph
-- name: lua
- morph: strata/lua.morph
-- name: connectivity
- morph: strata/connectivity.morph
-- name: connman-common
- morph: strata/connman-common.morph
-- name: enlightenment
- morph: strata/enlightenment.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/trove-system-x86_64.def b/systems/trove-system-x86_64.def
new file mode 100644
index 00000000..0d70ae08
--- /dev/null
+++ b/systems/trove-system-x86_64.def
@@ -0,0 +1,24 @@
+name: trove-system-x86_64
+description: Trove server
+arch: x86_64
+contents:
+- name: build-essential
+- name: bsp-x86_64-generic
+- name: foundation
+- name: core
+- name: tools
+- name: morph-utils
+- name: pcre-utils
+- name: trove
+- name: lighttpd-server
+- name: nfs
+- name: ansible
+- name: cloudinit-support
+configuration-extensions:
+- set-hostname
+- trove
+- nfsboot-server
+- fstab
+- simple-network
+- install-files
+- cloud-init
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
deleted file mode 100644
index d603f531..00000000
--- a/systems/trove-system-x86_64.morph
+++ /dev/null
@@ -1,37 +0,0 @@
-name: trove-system-x86_64
-kind: system
-description: Trove server
-arch: x86_64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: bsp-x86_64-generic
- morph: strata/bsp-x86_64-generic.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: core
- morph: strata/core.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: pcre-utils
- morph: strata/pcre-utils.morph
-- name: trove
- morph: strata/trove.morph
-- name: lighttpd-server
- morph: strata/lighttpd-server.morph
-- name: nfs
- morph: strata/nfs.morph
-- name: ansible
- morph: strata/ansible.morph
-- name: cloudinit-support
- morph: strata/cloudinit-support.morph
-configuration-extensions:
-- set-hostname
-- trove
-- nfsboot-server
-- fstab
-- simple-network
-- install-files
-- cloud-init
diff --git a/systems/web-system-x86_64-generic.def b/systems/web-system-x86_64-generic.def
new file mode 100644
index 00000000..c1b7e082
--- /dev/null
+++ b/systems/web-system-x86_64-generic.def
@@ -0,0 +1,23 @@
+name: web-system-x86_64-generic
+description: system with web tools
+arch: x86_64
+contents:
+- name: build-essential
+- name: bsp-x86_64-generic
+- name: foundation
+- name: core
+- name: tools
+- name: nfs
+- name: databases
+- name: pcre-utils
+- name: lighttpd-server
+- name: webtools
+- name: erlang
+- name: ruby
+- name: nodejs
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph
deleted file mode 100644
index e916cffc..00000000
--- a/systems/web-system-x86_64-generic.morph
+++ /dev/null
@@ -1,37 +0,0 @@
-name: web-system-x86_64-generic
-kind: system
-description: system with web tools
-arch: x86_64
-strata:
-- name: build-essential
- morph: strata/build-essential.morph
-- name: bsp-x86_64-generic
- morph: strata/bsp-x86_64-generic.morph
-- name: foundation
- morph: strata/foundation.morph
-- name: core
- morph: strata/core.morph
-- name: tools
- morph: strata/tools.morph
-- name: nfs
- morph: strata/nfs.morph
-- name: databases
- morph: strata/databases.morph
-- name: pcre-utils
- morph: strata/pcre-utils.morph
-- name: lighttpd-server
- morph: strata/lighttpd-server.morph
-- name: webtools
- morph: strata/webtools.morph
-- name: erlang
- morph: strata/erlang.morph
-- name: ruby
- morph: strata/ruby.morph
-- name: nodejs
- morph: strata/nodejs.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/xfce-system.def b/systems/xfce-system.def
new file mode 100644
index 00000000..49bc30c2
--- /dev/null
+++ b/systems/xfce-system.def
@@ -0,0 +1,25 @@
+name: xfce-system
+description: A GENIVI devel with XFCE
+arch: x86_64
+contents:
+- name: build-essential
+- name: core
+- name: foundation
+- name: bsp-x86_64-generic
+- name: connectivity
+- name: connman-common
+- name: audio-bluetooth
+- name: x-common
+- name: x-generic
+- name: multimedia
+- name: genivi
+- name: gtk2
+- name: tools
+- name: morph-utils
+- name: xfce
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
deleted file mode 100644
index 1a2f8a97..00000000
--- a/systems/xfce-system.morph
+++ /dev/null
@@ -1,41 +0,0 @@
-name: xfce-system
-kind: system
-description: A GENIVI devel with XFCE
-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: connectivity
- morph: strata/connectivity.morph
-- name: connman-common
- morph: strata/connman-common.morph
-- name: audio-bluetooth
- morph: strata/audio-bluetooth.morph
-- name: x-common
- morph: strata/x-common.morph
-- name: x-generic
- morph: strata/x-generic.morph
-- name: multimedia
- morph: strata/multimedia.morph
-- name: genivi
- morph: strata/genivi.morph
-- name: gtk2
- morph: strata/gtk2.morph
-- name: tools
- morph: strata/tools.morph
-- name: morph-utils
- morph: strata/morph-utils.morph
-- name: xfce
- morph: strata/xfce.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files