diff options
Diffstat (limited to 'strata')
142 files changed, 462 insertions, 787 deletions
diff --git a/strata/CPAN-Mini-Inject.morph b/strata/CPAN-Mini-Inject.morph index d4566bd3..40c950b8 100644 --- a/strata/CPAN-Mini-Inject.morph +++ b/strata/CPAN-Mini-Inject.morph @@ -1,10 +1,7 @@ name: CPAN-Mini-Inject -kind: stratum +kind: assemblage description: A collection of perl distributions used by CPAN::Mini::Inject -build-depends: -- morph: strata/core.morph -- morph: strata/perl-common.morph -chunks: +contents: - name: Archive-Zip repo: upstream:cpan/Archive-Zip-tarball ref: 42c8b23669eac442a303190dad44d78cea63cf59 @@ -304,3 +301,4 @@ chunks: - WWW-RobotRules - Net-HTTP - CPAN-Checksums +configuration-extensions: [] diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 720a277f..c9018d19 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -1,12 +1,6 @@ name: NetworkManager-common -kind: stratum -build-depends: -- morph: strata/bluetooth.morph -- morph: strata/connectivity.morph -- morph: strata/device-management.morph -- morph: strata/network-security.morph -- morph: strata/privileges-management.morph -chunks: +kind: assemblage +contents: - name: libmbim repo: upstream:libmbim ref: 50cddf48823f05ec124afad80c0d948184e19b00 @@ -44,3 +38,4 @@ chunks: - ModemManager - libndp - readline6 +configuration-extensions: [] diff --git a/strata/WebKitGtk1-common.morph b/strata/WebKitGtk1-common.morph index bf92e354..b09148dd 100644 --- a/strata/WebKitGtk1-common.morph +++ b/strata/WebKitGtk1-common.morph @@ -1,19 +1,10 @@ name: WebKitGtk1-common -kind: stratum +kind: assemblage description: WebKitGtk1 stratum (deprecated WebKitGtk API) -build-depends: -- morph: strata/geolocation.morph -- morph: strata/gtk2.morph -- morph: strata/gtk3.morph -- morph: strata/libsoup-common.morph -- morph: strata/multimedia-gstreamer.morph -- morph: strata/mesa-common.morph -- morph: strata/ruby.morph -- morph: strata/secret-service.morph -- morph: strata/spell-checking.morph -chunks: +contents: - name: WebKitGtk1 morph: strata/WebKitGtk1-common/WebKitGtk1.morph repo: upstream:WebKitGtk-tarball ref: 41386e9cb918eed93b3f13648cbef387e371e451 unpetrify-ref: webkitgtk-2.4.9 +configuration-extensions: [] diff --git a/strata/ansible.morph b/strata/ansible.morph index f21cb222..631d0761 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -1,10 +1,7 @@ name: ansible -kind: stratum +kind: assemblage description: A stratum with ansible and its dependencies -build-depends: -- morph: strata/core.morph -- morph: strata/python-common.morph -chunks: +contents: - name: ansible morph: strata/ansible/ansible.morph repo: upstream:ansible @@ -24,3 +21,4 @@ chunks: repo: upstream:openstack/openstack-ansible-modules ref: 451dcdeadfd35615a867d5e59a684e4aa82959ae unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 3e32f7e5..72122f65 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -1,11 +1,7 @@ name: apache-httpd-server -kind: stratum +kind: assemblage description: apache http web server and some utilities related to it -build-depends: -- morph: strata/tools.morph -- morph: strata/pcre-utils.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: apr morph: strata/apache-httpd-server/apr.morph repo: upstream:apache/apr @@ -39,3 +35,4 @@ chunks: - apr - httpd-server - mod_wsgi-metrics +configuration-extensions: [] diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph index 4a105f2d..6a28d886 100644 --- a/strata/armv7lhf-cross-toolchain.morph +++ b/strata/armv7lhf-cross-toolchain.morph @@ -1,9 +1,7 @@ name: armv7lhf-cross-toolchain -kind: stratum +kind: assemblage description: Stratum for building an armv7lhf cross compiler for your native system. -build-depends: -- morph: strata/build-essential.morph -chunks: +contents: - name: armv7lhf-cross-binutils morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph repo: upstream:binutils-tarball @@ -52,3 +50,4 @@ chunks: - armv7lhf-cross-binutils - armv7lhf-cross-gcc - armv7lhf-cross-glibc +configuration-extensions: [] diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index bc01a9a6..f932ff81 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -1,10 +1,7 @@ name: baserock-import -kind: stratum +kind: assemblage description: Tools for importing software into Baserock definitions. -build-depends: -- morph: strata/python-common.morph -- morph: strata/morph-utils.morph -chunks: +contents: - name: ansicolor repo: upstream:python-packages/ansicolor ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef @@ -22,3 +19,4 @@ chunks: build-system: python-distutils build-depends: - ansicolor +configuration-extensions: [] diff --git a/strata/bluetooth.morph b/strata/bluetooth.morph index 60f1b126..07e48b4d 100644 --- a/strata/bluetooth.morph +++ b/strata/bluetooth.morph @@ -1,10 +1,7 @@ name: bluetooth -kind: stratum +kind: assemblage description: Components required for bluetooth. -build-depends: -- morph: strata/glib-common.morph -- morph: strata/foundation.morph -chunks: +contents: - name: libical morph: strata/bluetooth/libical.morph repo: upstream:libical-git @@ -37,3 +34,4 @@ chunks: build-depends: - bluez - libical +configuration-extensions: [] diff --git a/strata/bsp-armv5l-openbmc-aspeed.morph b/strata/bsp-armv5l-openbmc-aspeed.morph index d7e1f180..332fa588 100644 --- a/strata/bsp-armv5l-openbmc-aspeed.morph +++ b/strata/bsp-armv5l-openbmc-aspeed.morph @@ -1,11 +1,9 @@ name: bsp-armv5l-openbmc-aspeed -kind: stratum +kind: assemblage description: | The set of platform specific components required for booting armvl5-openbmc-aspeed based systems -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-armv5l-openbmc-aspeed morph: strata/bsp-armv5l-openbmc-aspeed/linux-armv5l-openbmc-aspeed.morph repo: upstream:linux-stable @@ -16,3 +14,4 @@ chunks: repo: upstream:u-boot ref: af962087db0b88f4073f8f5a6184cb7f011d224d unpetrify-ref: baserock/v2013.07+aspeed_wedge +configuration-extensions: [] diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph index 9ac97e6c..dd272495 100644 --- a/strata/bsp-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank.morph @@ -1,9 +1,7 @@ name: bsp-armv7-highbank -kind: stratum +kind: assemblage description: The platform dependent components required to boot an ARM highbank board. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-armv7-highbank morph: strata/bsp-armv7-highbank/linux-armv7-highbank.morph repo: upstream:linux-stable @@ -15,3 +13,4 @@ chunks: ref: f35b5e46feabab668a44df5b33f3558629f94dfc unpetrify-ref: v3.15.10 +configuration-extensions: [] diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph index 470f6c56..bc25d5d6 100644 --- a/strata/bsp-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile.morph @@ -1,12 +1,11 @@ name: bsp-armv7-versatile -kind: stratum +kind: assemblage description: The platform dependent components required to boot an ARM versatile development board. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-armv7-versatile morph: strata/bsp-armv7-versatile/linux-armv7-versatile.morph repo: upstream:linux-stable ref: 660613d1a4e94144490850b6c3d350331860fac4 unpetrify-ref: v3.19.2 +configuration-extensions: [] diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph index 397b9fcb..e8a59ec7 100644 --- a/strata/bsp-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank.morph @@ -1,9 +1,7 @@ name: bsp-armv7b-highbank -kind: stratum +kind: assemblage description: The platform dependent components required to boot an ARM highbank board. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-armv7b-highbank morph: strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph repo: upstream:linux-stable @@ -15,3 +13,4 @@ chunks: ref: f35b5e46feabab668a44df5b33f3558629f94dfc unpetrify-ref: v3.15.10 +configuration-extensions: [] diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index ea67c386..c56fbc2a 100644 --- a/strata/bsp-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2.morph @@ -1,11 +1,10 @@ name: bsp-armv7b-vexpress-tc2 -kind: stratum +kind: assemblage description: The platform dependent components required to boot Versatile TC2 board -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-armv7b-vexpress-tc2 morph: strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph repo: upstream:linux-stable ref: 660613d1a4e94144490850b6c3d350331860fac4 unpetrify-ref: v3.19.2 +configuration-extensions: [] diff --git a/strata/bsp-armv7l-altera-socfpga-devkit.morph b/strata/bsp-armv7l-altera-socfpga-devkit.morph index 403e04e1..0ceeb6b5 100644 --- a/strata/bsp-armv7l-altera-socfpga-devkit.morph +++ b/strata/bsp-armv7l-altera-socfpga-devkit.morph @@ -1,12 +1,9 @@ name: bsp-armv7l-altera-socfpga-devkit -kind: stratum +kind: assemblage description: | The platform dependent components required to boot the Altera Cortex-A9 HPS core on an Altera SoCFPGA development kit. -build-depends: -- morph: strata/coreutils-common.morph -- morph: strata/tools.morph -chunks: +contents: - name: u-boot-tools@socfpga-devkit morph: strata/bsp-armv7l-altera-socfpga-devkit/u-boot-tools@socfpga-devkit.morph repo: upstream:u-boot @@ -37,3 +34,4 @@ chunks: repo: upstream:linux ref: e26081808edadfd257c6c9d81014e3b25e9a6118 unpetrify-ref: v4.1-rc4 +configuration-extensions: [] diff --git a/strata/bsp-armv8b64-generic.morph b/strata/bsp-armv8b64-generic.morph index 636e62b4..d1c7028b 100644 --- a/strata/bsp-armv8b64-generic.morph +++ b/strata/bsp-armv8b64-generic.morph @@ -1,15 +1,14 @@ name: bsp-armv8b64-generic -kind: stratum +kind: assemblage description: | The set of platform specific components required for booting generic ARMv8 systems in big-endian mode, such as the 64-bit APM XGene ARM based m400 Moonshot cartridge. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-armv8b64-generic morph: strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph repo: upstream:linux ref: cd1397b1f6e429b82e94565b0af93c6bd44e4271 unpetrify-ref: baserock/bjdooks/m400-be3 build-depends: [] +configuration-extensions: [] diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph index ca74dbe3..715e050a 100644 --- a/strata/bsp-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic.morph @@ -1,14 +1,13 @@ name: bsp-armv8l64-generic -kind: stratum +kind: assemblage description: | The set of platform specific components required for booting armv8l64-based systems, like the 64-bit APM XGene ARM based m400 Moonshot cartridge. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-armv8l64-generic morph: strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph repo: upstream:linux ref: 5f06398ae6a04f414932243de38b5cf3d264ff84 unpetrify-ref: baserock/apm-xgene-m400-moonshot-cartridge +configuration-extensions: [] diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 3a8ff560..5ee6ff44 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -1,5 +1,5 @@ name: bsp-jetson -kind: stratum +kind: assemblage description: | Platform-specific chunks for NVIDIA Jetson TK1 @@ -9,9 +9,7 @@ description: | 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: +contents: - name: device-tree-compiler@jetson morph: strata/bsp-jetson/device-tree-compiler@jetson.morph repo: upstream:device-tree-compiler @@ -34,3 +32,4 @@ chunks: repo: upstream:linux-firmware ref: 6ebf5d57d9f6d0cf05558baef1af2b90a3fe98ed unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph index ea606a75..278a8e15 100644 --- a/strata/bsp-ppc64-generic.morph +++ b/strata/bsp-ppc64-generic.morph @@ -1,11 +1,10 @@ name: bsp-ppc64-generic -kind: stratum +kind: assemblage description: The platform dependent components required to boot a ppc64 board. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: linux-ppc64 morph: strata/bsp-ppc64-generic/linux-ppc64.morph repo: upstream:linux ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76 unpetrify-ref: v4.0 +configuration-extensions: [] diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index ba704b1b..18351355 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -1,9 +1,7 @@ name: bsp-wandboard -kind: stratum +kind: assemblage description: The platform dependent components required to boot an wandboard ARM board. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: u-boot@wandboard morph: strata/bsp-wandboard/u-boot@wandboard.morph repo: upstream:u-boot @@ -16,3 +14,4 @@ chunks: unpetrify-ref: v3.19.2 build-depends: - u-boot@wandboard +configuration-extensions: [] diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 73ef77c5..c2e3fb98 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -1,12 +1,8 @@ name: bsp-x86_32-generic -kind: stratum +kind: assemblage description: The set of platform specific components required for booting a 32-bit x86 based system. -build-depends: -# nasm wants asciidoc and xmlto for generating its docs -# so include docutils here -- morph: strata/docutils.morph -chunks: +contents: - name: linux-x86-32-generic morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph repo: upstream:linux @@ -24,3 +20,4 @@ chunks: unpetrify-ref: baserock/syslinux-4.06-gcc5-glibc2.20 build-depends: - nasm +configuration-extensions: [] diff --git a/strata/bsp-x86_32-ivi.morph b/strata/bsp-x86_32-ivi.morph index 860540d5..87e64e25 100644 --- a/strata/bsp-x86_32-ivi.morph +++ b/strata/bsp-x86_32-ivi.morph @@ -1,12 +1,11 @@ name: bsp-x86_32-ivi -kind: stratum -description: Set of components required for booting a 32-bit - x86 based system, with some options specific to IVI systems. -build-depends: -- morph: strata/bsp-x86_both-tools.morph -chunks: +kind: assemblage +description: Set of components required for booting a 32-bit x86 based system, with + some options specific to IVI systems. +contents: - name: linux-x86-32-ivi morph: strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph repo: upstream:linux ref: 523d939ef98fd712632d93a5a2b588e477a7565e unpetrify-ref: v4.7 +configuration-extensions: [] diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index fb83ae66..53d3b5c5 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -1,12 +1,8 @@ name: bsp-x86_64-generic -kind: stratum +kind: assemblage description: The set of platform specific components required for booting a 64-bit x86 based system. -build-depends: -# nasm wants asciidoc and xmlto for generating its docs -# so include docutils here -- morph: strata/docutils.morph -chunks: +contents: - name: linux-x86-64-generic morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph repo: upstream:linux @@ -24,3 +20,4 @@ chunks: unpetrify-ref: baserock/syslinux-4.06-gcc5-glibc2.20 build-depends: - nasm +configuration-extensions: [] diff --git a/strata/bsp-x86_64-ivi.morph b/strata/bsp-x86_64-ivi.morph index f86a8d09..60cb9531 100644 --- a/strata/bsp-x86_64-ivi.morph +++ b/strata/bsp-x86_64-ivi.morph @@ -1,12 +1,11 @@ name: bsp-x86_64-ivi -kind: stratum -description: Set of components required for booting a 64-bit - x86 based system, with some options specific to IVI systems. -build-depends: -- morph: strata/bsp-x86_both-tools.morph -chunks: +kind: assemblage +description: Set of components required for booting a 64-bit x86 based system, with + some options specific to IVI systems. +contents: - name: linux-x86-64-ivi morph: strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph repo: upstream:linux ref: 523d939ef98fd712632d93a5a2b588e477a7565e unpetrify-ref: v4.7 +configuration-extensions: [] diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index f5102cc0..8456d4a4 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -1,12 +1,8 @@ name: bsp-x86_both-tools -kind: stratum +kind: assemblage description: The set of platform specific components required for configuring a bootable x86 based system. -build-depends: -# nasm wants asciidoc and xmlto for generating its docs -# so include docutils here -- morph: strata/docutils.morph -chunks: +contents: - name: nasm morph: strata/bsp-x86_both-tools/nasm.morph repo: upstream:nasm @@ -19,3 +15,4 @@ chunks: unpetrify-ref: baserock/syslinux-4.06-gcc5-glibc2.20 build-depends: - nasm +configuration-extensions: [] diff --git a/strata/build-essential.morph b/strata/build-essential.morph index c1b09172..d3763153 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -1,5 +1,5 @@ name: build-essential -kind: stratum +kind: assemblage description: | Toolchain stratum @@ -47,7 +47,7 @@ products: - fhs-dirs-.* - busybox-.* - glibc-nss -chunks: +contents: - name: stage1-binutils morph: strata/build-essential/stage1-binutils.morph repo: upstream:binutils-tarball @@ -409,3 +409,4 @@ chunks: - stage2-reset-specs - glibc - zlib +configuration-extensions: [] diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 0cd09dc4..fb43d3de 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -1,10 +1,6 @@ name: ceph-service -kind: stratum -build-depends: -- morph: strata/cpp-common-libs.morph -- morph: strata/foundation.morph -- morph: strata/network-security.morph -chunks: +kind: assemblage +contents: - name: libaio morph: strata/ceph-service/libaio.morph repo: upstream:libaio @@ -71,3 +67,4 @@ chunks: url: https://github.com/ceph/libs3.git ceph-object-corpus: url: https://github.com/ceph/ceph-object-corpus.git +configuration-extensions: [] diff --git a/strata/chef.morph b/strata/chef.morph index e9d6120d..e67c9e5c 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -1,10 +1,7 @@ name: chef -kind: stratum +kind: assemblage description: Autogenerated by Baserock import tool -build-depends: -- morph: strata/ruby.morph -- morph: strata/core.morph -chunks: +contents: - name: yajl morph: strata/chef/yajl.morph repo: upstream:yajl @@ -191,3 +188,4 @@ chunks: unpetrify-ref: master build-depends: - libpopt +configuration-extensions: [] diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 4cb15542..a3188ca3 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -1,12 +1,7 @@ name: cloudinit-support -kind: stratum +kind: assemblage description: A stratum with cloudinit to fit a system in the OpenStack cloud. -build-depends: -- morph: strata/build-essential.morph -- morph: strata/python2-core.morph -- morph: strata/python-common.morph -- morph: strata/foundation.morph -chunks: +contents: - name: python-cheetah repo: upstream:python-cheetah ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed @@ -19,3 +14,4 @@ chunks: unpetrify-ref: baserock/morph build-depends: - python-cheetah +configuration-extensions: [] diff --git a/strata/connectivity.morph b/strata/connectivity.morph index 823ead65..83361f87 100644 --- a/strata/connectivity.morph +++ b/strata/connectivity.morph @@ -1,8 +1,6 @@ name: connectivity -kind: stratum -build-depends: -- morph: strata/foundation.morph -chunks: +kind: assemblage +contents: - name: mobile-broadband-provider-info repo: upstream:mobile-broadband-provider-info ref: 4ed19e11c2975105b71b956440acdb25d46a347d @@ -25,3 +23,4 @@ chunks: ref: 482c6d3731e2681cb4baae835c294840300197e6 unpetrify-ref: v1.4.21 build-system: autotools +configuration-extensions: [] diff --git a/strata/connman-common.morph b/strata/connman-common.morph index e5fc2692..0e440f70 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -1,9 +1,6 @@ name: connman-common -kind: stratum -build-depends: -- morph: strata/connectivity.morph -- morph: strata/glib-common.morph -chunks: +kind: assemblage +contents: - name: connman morph: strata/connman-common/connman.morph repo: upstream:connman @@ -14,3 +11,4 @@ chunks: repo: upstream:ofono ref: 979e8e21b9c3b9a0f5d07f21d2840d8ac1c700a1 unpetrify-ref: '1.18' +configuration-extensions: [] diff --git a/strata/corba.morph b/strata/corba.morph index d9848f76..2af3fe01 100644 --- a/strata/corba.morph +++ b/strata/corba.morph @@ -1,17 +1,16 @@ name: corba -kind: stratum -build-depends: - - morph: strata/core.morph -chunks: - - name: MPC - repo: upstream:MPC - morph: strata/corba/MPC.morph - ref: c2cddd1335036f1ca3610274a155d2222a8b5f7c - unpetrify-ref: ACE+TAO-6_3_4 - - name: ACE_TAO - morph: strata/corba/ACE_TAO.morph - repo: upstream:ATCD - ref: b9ab94b74529a926864c154675559fd6a1d8998b - unpetrify-ref: ACE+TAO-6_3_4 - build-depends: - - MPC +kind: assemblage +contents: +- name: MPC + repo: upstream:MPC + morph: strata/corba/MPC.morph + ref: c2cddd1335036f1ca3610274a155d2222a8b5f7c + unpetrify-ref: ACE+TAO-6_3_4 +- name: ACE_TAO + morph: strata/corba/ACE_TAO.morph + repo: upstream:ATCD + ref: b9ab94b74529a926864c154675559fd6a1d8998b + unpetrify-ref: ACE+TAO-6_3_4 + build-depends: + - MPC +configuration-extensions: [] diff --git a/strata/core.morph b/strata/core.morph index 4d71b37e..9cf2126d 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -1,10 +1,8 @@ name: core -kind: stratum +kind: assemblage 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: +contents: - name: gdbm morph: strata/core/gdbm.morph repo: upstream:gdbm-tarball @@ -47,6 +45,7 @@ chunks: - perl - texinfo-tarball - name: help2man + kind: chunk repo: upstream:help2man ref: 83bab7e2e8e24a380266a9a247c029c49b0de666 unpetrify-ref: baserock/v1.46.5 @@ -77,6 +76,7 @@ chunks: ref: 670c2bbcffe873a2b8589ed140c12e7923ef20c0 unpetrify-ref: file-5.22 build-system: autotools + kind: chunk - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat @@ -422,3 +422,4 @@ chunks: - autoconf - automake - libtool +configuration-extensions: [] diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index c22fcfac..3cdaaf35 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -1,12 +1,10 @@ name: coreutils-common -kind: stratum +kind: assemblage 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: +contents: - name: coreutils morph: strata/coreutils-common/coreutils.morph repo: upstream:coreutils @@ -65,3 +63,4 @@ chunks: ref: a5b5cbefb83935ce95ec62b9cadc8ec73026d33a unpetrify-ref: jq-1.5 build-system: autotools +configuration-extensions: [] diff --git a/strata/cpp-common-libs.morph b/strata/cpp-common-libs.morph index 470f0155..2345b650 100644 --- a/strata/cpp-common-libs.morph +++ b/strata/cpp-common-libs.morph @@ -1,11 +1,10 @@ name: cpp-common-libs -kind: stratum +kind: assemblage description: C++ common libraries -build-depends: -- morph: strata/python2-core.morph -chunks: +contents: - name: boost morph: strata/cpp-common-libs/boost.morph repo: upstream:boost-tarball ref: ed232fdd34968697a68783b3195b1da4226915b5 unpetrify-ref: boost_1_57_0 +configuration-extensions: [] diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 9248101a..37d98b44 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -1,10 +1,7 @@ name: cross-bootstrap -kind: stratum +kind: assemblage description: The minimal development tools to build a baserock devel system -build-depends: -- morph: strata/core.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: groff morph: strata/cross-bootstrap/groff.morph repo: upstream:groff-git @@ -27,3 +24,4 @@ chunks: repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 +configuration-extensions: [] diff --git a/strata/cross-tools.morph b/strata/cross-tools.morph index 795d3936..fff4a73f 100644 --- a/strata/cross-tools.morph +++ b/strata/cross-tools.morph @@ -1,11 +1,10 @@ name: cross-tools -kind: stratum +kind: assemblage description: Tools used together with cross compilers -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: patchelf repo: upstream:patchelf ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703 unpetrify-ref: baserock/morph build-system: autotools +configuration-extensions: [] diff --git a/strata/cups.morph b/strata/cups.morph index b10bcd6c..a1ea1605 100644 --- a/strata/cups.morph +++ b/strata/cups.morph @@ -1,11 +1,10 @@ name: cups -kind: stratum +kind: assemblage description: Cups printer driver -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: cups morph: strata/cups/cups.morph repo: upstream:cups ref: f28bae1aeae3964fba4f0728263657405f63c417 unpetrify-ref: release-1.7.0 +configuration-extensions: [] diff --git a/strata/cxmanage.morph b/strata/cxmanage.morph index adc9faba..7aa61c0f 100644 --- a/strata/cxmanage.morph +++ b/strata/cxmanage.morph @@ -1,9 +1,7 @@ name: cxmanage -kind: stratum +kind: assemblage description: All the tools for calxeda management -build-depends: -- morph: strata/tools.morph -chunks: +contents: - name: ipmitool repo: upstream:ipmitool ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd @@ -34,3 +32,4 @@ chunks: - pexpect - pyipmi - tftpy +configuration-extensions: [] diff --git a/strata/data-indexing-management.morph b/strata/data-indexing-management.morph index 097f2d72..74885647 100644 --- a/strata/data-indexing-management.morph +++ b/strata/data-indexing-management.morph @@ -1,12 +1,7 @@ name: data-indexing-management -kind: stratum +kind: assemblage description: Components to index data -build-depends: -- morph: strata/graphics-common.morph -- morph: strata/icu-common.morph -- morph: strata/multimedia-gstreamer.morph -- morph: strata/vala-common.morph -chunks: +contents: - name: libexif repo: upstream:libexif-tarball ref: 0c6a5fa0d9719a40748d8726b4543f02f70518c1 @@ -38,3 +33,4 @@ chunks: - libexif - libmediaart - totem-pl-parser +configuration-extensions: [] diff --git a/strata/databases.morph b/strata/databases.morph index 444cca9a..49966bf6 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -1,11 +1,7 @@ name: databases -kind: stratum +kind: assemblage description: some popular databases and some utils related to databases -build-depends: -- morph: strata/tools.morph -- morph: strata/nfs.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: postgresql repo: upstream:postgresql ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316 @@ -33,3 +29,4 @@ chunks: ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db unpetrify-ref: master build-system: python-distutils +configuration-extensions: [] diff --git a/strata/device-management.morph b/strata/device-management.morph index e0ed4a25..dfa149be 100644 --- a/strata/device-management.morph +++ b/strata/device-management.morph @@ -1,12 +1,10 @@ name: device-management -kind: stratum +kind: assemblage description: libraries that provides access to devices -build-depends: -- morph: strata/foundation.morph -- morph: strata/glib-common.morph -chunks: +contents: - name: libgudev repo: upstream:libgudev ref: d722339aae9065a379acc0c421e8bbab866d5a38 - unpetrify-ref: "230" + unpetrify-ref: '230' build-system: autotools +configuration-extensions: [] diff --git a/strata/devtools.morph b/strata/devtools.morph index 41dd501c..9bb341e8 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -1,15 +1,11 @@ name: devtools -kind: stratum +kind: assemblage description: | Extra development tools included in the devel system, this stratum is here to help reduce unnecessary building, chunks added to this stratum should not have any dependants (please don't build-depend on this stratum) -build-depends: -- morph: strata/core.morph -- morph: strata/python2-core.morph -- morph: strata/docutils.morph -chunks: +contents: - name: nano morph: strata/devtools/nano.morph repo: upstream:nano-tarball @@ -53,3 +49,4 @@ chunks: ref: 59e2537794d91c1375d391293f8fd89ca8b794a8 unpetrify-ref: iotop-0.6 build-system: python-distutils +configuration-extensions: [] diff --git a/strata/django.morph b/strata/django.morph index 01f471f2..deab17ab 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -1,10 +1,7 @@ name: django -kind: stratum +kind: assemblage description: Stratum with Django and its plugins and dependencies. -build-depends: -- morph: strata/foundation.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: django repo: upstream:python-packages/django ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb @@ -13,12 +10,12 @@ chunks: - name: django-appconf repo: upstream:python-packages/django-appconf ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5 - unpetrify-ref: "0.6" + unpetrify-ref: '0.6' build-system: python-distutils - name: django-compressor repo: upstream:python-packages/django-compressor ref: e747dce3d7e04fe595bbfed54f9554c2725eb757 - unpetrify-ref: "1.4" + unpetrify-ref: '1.4' build-system: python-distutils build-depends: - django-appconf @@ -35,3 +32,4 @@ chunks: build-depends: - django - pyscss +configuration-extensions: [] diff --git a/strata/dlna-services.morph b/strata/dlna-services.morph index 2c4f1104..f5ecf6a0 100644 --- a/strata/dlna-services.morph +++ b/strata/dlna-services.morph @@ -1,11 +1,7 @@ name: dlna-services -kind: stratum +kind: assemblage description: provides DLNA services -build-depends: -- morph: strata/data-indexing-management.morph -- morph: strata/docutils.morph -- morph: strata/vala-common.morph -chunks: +contents: - name: gssdp morph: strata/dlna-services/gssdp.morph repo: upstream:gnome/gssdp @@ -49,3 +45,4 @@ chunks: - gupnp - gupnp-av - gupnp-dlna +configuration-extensions: [] diff --git a/strata/docutils.morph b/strata/docutils.morph index e76cc7a2..6129dd58 100644 --- a/strata/docutils.morph +++ b/strata/docutils.morph @@ -1,9 +1,7 @@ name: docutils -kind: stratum +kind: assemblage description: Stuff for generating documentation -build-depends: -- morph: strata/python2-core.morph -chunks: +contents: - name: xml-catalog morph: strata/docutils/xml-catalog.morph repo: baserock:baserock/xml-catalog @@ -15,6 +13,7 @@ chunks: ref: c8f0ce32a8075e9ab21e5cf734fb96195455264d unpetrify-ref: docbook-xml-4.5 build-depends: + # This is a little awkward, we don't really build-depend on xml-catalog, # but if we don't include it as a build dependency # then we won't have the existing xml catalog in our staging area @@ -31,6 +30,7 @@ chunks: ref: 802da9dd5d4bc18f46a916eedc0c5c1980a15e59 unpetrify-ref: docbook-xsl-1.78.1 build-depends: + # Same issue as above, except this time we don't want to overwrite # the catalog that now contains the XML DTDs. - docbook-xml @@ -50,3 +50,4 @@ chunks: build-depends: - docbook-xml - docbook-xsl +configuration-extensions: [] diff --git a/strata/elixir.morph b/strata/elixir.morph index dd46ed64..feb08568 100644 --- a/strata/elixir.morph +++ b/strata/elixir.morph @@ -1,11 +1,10 @@ name: elixir -kind: stratum +kind: assemblage description: stratum for elixir -build-depends: -- morph: strata/erlang.morph -chunks: +contents: - name: elixir morph: strata/elixir/elixir.morph repo: upstream:elixir - ref: 737ac62926db7a692e2fe67c27b696cfd0866674 + ref: 737ac62926db7a692e2fe67c27b696cfd0866674 unpetrify-ref: v1.2.3 +configuration-extensions: [] diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 5c1dc2c0..3cc0f536 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -1,14 +1,7 @@ name: enlightenment -kind: stratum +kind: assemblage description: Enlightenment Desktop and Window Manager -build-depends: -- morph: strata/tools.morph -- morph: strata/x-generic.morph -- morph: strata/lua51.morph -- morph: strata/bluetooth.morph -- morph: strata/multimedia-gstreamer.morph -- morph: strata/connman-common.morph -chunks: +contents: - name: fribidi repo: upstream:fribidi ref: c9916f2ab289126a32febcc4754efc73a011fb0c @@ -78,3 +71,4 @@ chunks: - enlightenment - libast - imlib2 +configuration-extensions: [] diff --git a/strata/erlang.morph b/strata/erlang.morph index 3aad68e8..068681c7 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -1,9 +1,7 @@ name: erlang -kind: stratum +kind: assemblage description: stratum for erlang/otp and stuff -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: erlang morph: strata/erlang/erlang.morph repo: upstream:erlang @@ -16,3 +14,4 @@ chunks: unpetrify-ref: master build-depends: - erlang +configuration-extensions: [] diff --git a/strata/fail2ban-common.morph b/strata/fail2ban-common.morph index a6d1b175..2282e677 100644 --- a/strata/fail2ban-common.morph +++ b/strata/fail2ban-common.morph @@ -1,14 +1,13 @@ name: fail2ban-common -kind: stratum +kind: assemblage description: | This stratum only installs fail2ban. You will need to configure it afterwards. It's recommended to include iptables in the system too. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: fail2ban morph: strata/fail2ban-common/fail2ban.morph repo: upstream:fail2ban ref: 70ba5cb0054f0869930b8cd2dc1bb836653dd289 - unpetrify-ref: "0.9.3" + unpetrify-ref: 0.9.3 +configuration-extensions: [] diff --git a/strata/flatpak-common.morph b/strata/flatpak-common.morph index 56557302..014e69af 100644 --- a/strata/flatpak-common.morph +++ b/strata/flatpak-common.morph @@ -1,10 +1,6 @@ name: flatpak-common -kind: stratum -build-depends: -- morph: strata/ostree-core.morph -- morph: strata/privileges-management.morph -- morph: strata/x-common.morph -chunks: +kind: assemblage +contents: - name: elfutils morph: strata/flatpak-common/elfutils.morph repo: upstream:elfutils @@ -22,3 +18,4 @@ chunks: url: upstream:libglnx bubblewrap: url: upstream:bubblewrap +configuration-extensions: [] diff --git a/strata/foundation.morph b/strata/foundation.morph index e260b99f..e999160f 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -1,9 +1,7 @@ name: foundation -kind: stratum +kind: assemblage description: Basic userland runtime system -build-depends: -- morph: strata/coreutils-common.morph -chunks: +contents: - name: bash-completion repo: upstream:bash-completion ref: 3085c7e12179817a02a611016606391295c69942 @@ -125,3 +123,4 @@ chunks: repo: upstream:libarchive ref: 19f23e191f9d3e1dd2a518735046100419965804 unpetrify-ref: v3.1.2 +configuration-extensions: [] diff --git a/strata/geolocation.morph b/strata/geolocation.morph index f6d654fc..2f13e320 100644 --- a/strata/geolocation.morph +++ b/strata/geolocation.morph @@ -1,11 +1,7 @@ name: geolocation -kind: stratum +kind: assemblage description: libraries/services that provides location information -build-depends: -- morph: strata/glib-common.morph -- morph: strata/libsoup-common.morph -- morph: strata/NetworkManager-common.morph -chunks: +contents: - name: geocode-glib repo: upstream:gnome/geocode-glib ref: a3e183e40053b4bd0fd0b25a070f60597270397a @@ -16,3 +12,4 @@ chunks: repo: upstream:geoclue ref: ae8f7ab2f1e90f61931c652f2f65996c30c79e87 unpetrify-ref: 2.4.0 +configuration-extensions: [] diff --git a/strata/glib-common.morph b/strata/glib-common.morph index 218c206e..3b4ef10c 100644 --- a/strata/glib-common.morph +++ b/strata/glib-common.morph @@ -1,10 +1,7 @@ name: glib-common -kind: stratum +kind: assemblage description: GLib and dependencies -build-depends: -- morph: strata/python2-core.morph -- morph: strata/pcre-utils.morph -chunks: +contents: - name: gtk-doc-stub repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 @@ -36,3 +33,4 @@ chunks: - glib - gobject-introspection - gtk-doc-stub +configuration-extensions: [] diff --git a/strata/gnome.morph b/strata/gnome.morph index 67aa05a4..c26aaed2 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -1,30 +1,7 @@ name: gnome -kind: stratum +kind: assemblage description: GNOME stratum -build-depends: -- morph: strata/bluetooth.morph -- morph: strata/icu-common.morph -- morph: strata/input-common.morph -- morph: strata/data-indexing-management.morph -- morph: strata/vala-common.morph -- morph: strata/geolocation.morph -- morph: strata/gtk2.morph -- morph: strata/gtk3.morph -- morph: strata/libsoup-common.morph -- morph: strata/NetworkManager-common.morph -- morph: strata/multimedia-gstreamer.morph -- morph: strata/network-security.morph -- morph: strata/privileges-management.morph -- morph: strata/python3-gobject.morph -- morph: strata/wayland-generic.morph -- morph: strata/ruby.morph -- morph: strata/samba.morph -- morph: strata/secret-service.morph -- morph: strata/sound-server-pulseaudio.morph -- morph: strata/spell-checking.morph -- morph: strata/cups.morph -- morph: strata/WebKitGtk1-common.morph -chunks: +contents: - name: dconf morph: strata/gnome/dconf.morph repo: upstream:dconf @@ -961,3 +938,4 @@ chunks: - libgweather - libnotify - yelp-tools +configuration-extensions: [] diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index c3848719..162eaef1 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -1,11 +1,6 @@ name: graphics-common -kind: stratum -build-depends: -- morph: strata/glib-common.morph -- morph: strata/mesa-common.morph -- morph: strata/x-common.morph -- morph: strata/icu-common.morph -chunks: +kind: assemblage +contents: - name: pixman morph: strata/graphics-common/pixman.morph repo: upstream:pixman @@ -108,3 +103,4 @@ chunks: ref: fcd94e925a9377cccfcf9de6db278126a52b97a4 unpetrify-ref: v0.4.3-rc1 build-system: autotools +configuration-extensions: [] diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index 8b1c7b00..9ed77f93 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -1,11 +1,7 @@ name: gtk-deps -kind: stratum +kind: assemblage description: the GTK+ dependencies stratum -build-depends: -- morph: strata/core.morph -- morph: strata/graphics-common.morph -- morph: strata/x-common.morph -chunks: +contents: - name: pango repo: upstream:pango ref: 8daf1de02f8ac7e05b4788dcd6a209ef06e6e03a @@ -53,3 +49,4 @@ chunks: - gdk-pixbuf - libcroco - pango +configuration-extensions: [] diff --git a/strata/gtk2.morph b/strata/gtk2.morph index 4c8db88a..554a1fe2 100644 --- a/strata/gtk2.morph +++ b/strata/gtk2.morph @@ -1,12 +1,10 @@ name: gtk2 -kind: stratum +kind: assemblage description: the gtk2 stratum -build-depends: -- morph: strata/gtk-deps.morph -- morph: strata/x-common.morph -chunks: +contents: - name: gtk+ morph: strata/gtk2/gtk+.morph repo: upstream:gtk+ ref: b5b055721378ffe0269613e49ab5741a315eeb00 unpetrify-ref: 2.24.28 +configuration-extensions: [] diff --git a/strata/gtk3.morph b/strata/gtk3.morph index 280d671e..7e60b13c 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -1,13 +1,10 @@ name: gtk3 -kind: stratum +kind: assemblage description: the gtk3 stratum -build-depends: -- morph: strata/gtk-deps.morph -- morph: strata/wayland-generic.morph -- morph: strata/x-common.morph -chunks: +contents: - name: gtk3 morph: strata/gtk3/gtk3.morph repo: upstream:gtk+ ref: bbf775301a08b9a578ef7f647bc35fe13e816241 unpetrify-ref: 3.20.6 +configuration-extensions: [] diff --git a/strata/icu-common.morph b/strata/icu-common.morph index 3ac48524..8163729f 100644 --- a/strata/icu-common.morph +++ b/strata/icu-common.morph @@ -1,10 +1,9 @@ name: icu-common -kind: stratum -build-depends: -- morph: strata/coreutils-common.morph -chunks: +kind: assemblage +contents: - name: icu morph: strata/icu-common/icu.morph repo: upstream:icu ref: e2bd11ca1374cccfa50b7d27507ba9fe581be76a unpetrify-ref: icu4c-52_1-src +configuration-extensions: [] diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.morph index 610997f3..52e98702 100644 --- a/strata/initramfs-utils.morph +++ b/strata/initramfs-utils.morph @@ -1,11 +1,10 @@ name: initramfs-utils -kind: stratum +kind: assemblage description: stratum for initramfs -build-depends: -- morph: strata/build-essential.morph -chunks: +contents: - name: initramfs-scripts repo: baserock:baserock/initramfs-scripts ref: e5c71f0ca075bd29ffd55ec0c25804585bc21046 unpetrify-ref: master build-system: autotools +configuration-extensions: [] diff --git a/strata/input-common.morph b/strata/input-common.morph index a2df41cd..ba98ea6e 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -1,12 +1,6 @@ name: input-common -kind: stratum -build-depends: -- morph: strata/device-management.morph -- morph: strata/foundation.morph -- morph: strata/glib-common.morph -- morph: strata/xorg-util-macros-common.morph -- morph: strata/x-common.morph -chunks: +kind: assemblage +contents: - name: mtdev repo: upstream:mtdev-git ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d @@ -42,4 +36,5 @@ chunks: morph: strata/input-common/libxkbcommon-no-x11.morph unpetrify-ref: xkbcommon-0.5.0 build-depends: - - xkeyboard-config + - xkeyboard-config +configuration-extensions: [] diff --git a/strata/installer-utils.morph b/strata/installer-utils.morph index ddc714b6..95d81051 100644 --- a/strata/installer-utils.morph +++ b/strata/installer-utils.morph @@ -1,11 +1,10 @@ name: installer-utils -kind: stratum +kind: assemblage description: stratum for Baserock installer script. -build-depends: -- morph: strata/build-essential.morph -chunks: +contents: - name: installer-scripts morph: strata/installer-utils/installer-scripts.morph repo: baserock:baserock/installer-scripts ref: a1629ded9eb499b55b547cd8caa0ade8233b32f4 unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/ivi-common.morph b/strata/ivi-common.morph index 80c519b1..e48cd257 100644 --- a/strata/ivi-common.morph +++ b/strata/ivi-common.morph @@ -1,12 +1,10 @@ name: ivi-common -kind: stratum +kind: assemblage description: Components shared with different IVI systems -build-depends: -- morph: strata/cpp-common-libs.morph -- morph: strata/glib-common.morph -chunks: +contents: - name: automotive-message-broker morph: strata/ivi-common/automotive-message-broker.morph repo: upstream:automotive-message-broker ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 unpetrify-ref: '0.14' +configuration-extensions: [] diff --git a/strata/java.morph b/strata/java.morph index f10bb8a1..21f58768 100644 --- a/strata/java.morph +++ b/strata/java.morph @@ -1,13 +1,9 @@ name: java -kind: stratum +kind: assemblage description: | This stratum contains everything necessary to compile and run Java applications and build OpenJDK from source. -build-depends: -- morph: strata/core.morph -- morph: strata/x-common.morph -- morph: strata/graphics-common.morph -chunks: +contents: - name: java-binary morph: strata/java/java-binary.morph repo: github:jmacarthur/openjdk-binary @@ -20,3 +16,4 @@ chunks: unpetrify-ref: ANT_194 build-depends: - java-binary +configuration-extensions: [] diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 1ee7c9b1..b1cfb1ef 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -1,8 +1,6 @@ name: libdrm-common -kind: stratum -build-depends: -- morph: strata/xorg-util-macros-common.morph -chunks: +kind: assemblage +contents: - name: xorg-lib-libpciaccess repo: upstream:xorg-lib-libpciaccess ref: bbd1acdd1d25b9a68f4b7913a4094af20d7cf78f @@ -15,3 +13,4 @@ chunks: unpetrify-ref: libdrm-2.4.67 build-depends: - xorg-lib-libpciaccess +configuration-extensions: [] diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph index 759a842c..a24d7afa 100644 --- a/strata/libsoup-common.morph +++ b/strata/libsoup-common.morph @@ -1,11 +1,9 @@ name: libsoup-common -kind: stratum -build-depends: -- morph: strata/core.morph -- morph: strata/glib-common.morph -chunks: +kind: assemblage +contents: - name: libsoup morph: strata/libsoup-common/libsoup.morph repo: upstream:libsoup ref: c29630a8fdb4e6997ec27da4af545bddefab35ad unpetrify-ref: 2.48.0 +configuration-extensions: [] diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph index 9aa166fd..812a2289 100644 --- a/strata/lighttpd-server.morph +++ b/strata/lighttpd-server.morph @@ -1,12 +1,10 @@ name: lighttpd-server -kind: stratum +kind: assemblage description: lighttpd web server -build-depends: -- morph: strata/tools.morph -- morph: strata/pcre-utils.morph -chunks: +contents: - name: lighttpd morph: strata/lighttpd-server/lighttpd.morph repo: upstream:lighttpd ref: 12e4e21763da770034267ff0a7b660876930f789 unpetrify-ref: baserock/morph +configuration-extensions: [] diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 794a7fc5..9533514d 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -1,10 +1,9 @@ name: llvm-common -kind: stratum -build-depends: -- morph: strata/core.morph -chunks: +kind: assemblage +contents: - name: llvm morph: strata/llvm-common/llvm.morph repo: upstream:llvm ref: 19ade095e8c3ea61f84b71074433309f0c7c7b3b unpetrify-ref: release_36 +configuration-extensions: [] diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 5f45793c..7a82d52a 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -1,16 +1,14 @@ name: lorry-controller -kind: stratum +kind: assemblage description: | Lorry Controller mirroring service. This is a component of Trove, but can also be used with other Git servers. -build-depends: -- morph: strata/python-cliapp.morph -- morph: strata/python-wsgi.morph -chunks: +contents: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph repo: baserock:baserock/lorry-controller ref: dddd2e37953d795e4004b1d2722c25ec652135ad unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/lorry.morph b/strata/lorry.morph index c5913c4f..71f7fec1 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -1,5 +1,5 @@ name: lorry -kind: stratum +kind: assemblage description: | Lorry and tools for working with version control systems other than Git. @@ -9,11 +9,7 @@ description: | The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available by this stratum. -build-depends: -- morph: strata/foundation.morph -- morph: strata/python-cliapp.morph -- morph: strata/pcre-utils.morph # for swig -chunks: +contents: - name: bzr-tarball repo: upstream:bzr-tarball ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52 @@ -123,3 +119,4 @@ chunks: - subversion-tarball - mercurial-tarball - hg-fast-export +configuration-extensions: [] diff --git a/strata/lua51.morph b/strata/lua51.morph index b386fba8..201f9dad 100644 --- a/strata/lua51.morph +++ b/strata/lua51.morph @@ -1,9 +1,7 @@ name: lua51 -kind: stratum +kind: assemblage description: Interpreter for the lua scripting language. -build-depends: -- morph: strata/tools.morph -chunks: +contents: - name: lua51 morph: strata/lua51/lua51.morph repo: upstream:lua @@ -14,3 +12,4 @@ chunks: repo: upstream:luajit2 ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d unpetrify-ref: v2.0.3 +configuration-extensions: [] diff --git a/strata/lua53.morph b/strata/lua53.morph index 5cea88fb..f14b3277 100644 --- a/strata/lua53.morph +++ b/strata/lua53.morph @@ -1,11 +1,10 @@ name: lua53 -kind: stratum +kind: assemblage description: Interpreter for the lua 5.3 scripting language. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: lua53 morph: strata/lua53/lua53.morph repo: upstream:lua-github ref: a7d799273a401040945826dbe1bd9edb8dab0662 unpetrify-ref: baserock/5.3.2 +configuration-extensions: [] diff --git a/strata/lvm.morph b/strata/lvm.morph index 92a06f41..59c3da48 100644 --- a/strata/lvm.morph +++ b/strata/lvm.morph @@ -1,15 +1,14 @@ name: lvm -kind: stratum +kind: assemblage description: | LVM userland tools. LVM is a logical volume manager for the Linux kernel. This stratum contains the tools necessary to manage volumes with LVM. -build-depends: -- morph: strata/foundation.morph -chunks: +contents: - name: lvm2 morph: strata/lvm/lvm2.morph repo: upstream:lvm2 ref: fa01faaa4aa96de834ba7e8fbb9d9aff908571c3 unpetrify-ref: v2_02_115 +configuration-extensions: [] diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 64e75b88..fbe22849 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -1,13 +1,6 @@ name: mesa-common -kind: stratum -build-depends: -- morph: strata/foundation.morph -- morph: strata/llvm-common.morph -- morph: strata/libdrm-common.morph -- morph: strata/wayland-generic.morph -- morph: strata/python2-core.morph -- morph: strata/x-common.morph -chunks: +kind: assemblage +contents: - name: mesa morph: strata/mesa-common/mesa.morph repo: upstream:mesa @@ -20,3 +13,4 @@ chunks: build-system: autotools build-depends: - mesa +configuration-extensions: [] diff --git a/strata/mesa-demos-common.morph b/strata/mesa-demos-common.morph index eb20c822..18c290bb 100644 --- a/strata/mesa-demos-common.morph +++ b/strata/mesa-demos-common.morph @@ -1,8 +1,6 @@ name: mesa-demos-common -kind: stratum -build-depends: -- morph: strata/mesa-common.morph -chunks: +kind: assemblage +contents: - name: xorg-util-makedepend repo: upstream:xorg-util-makedepend ref: 30859adfd6a6523a92a637ca26bd61ce59680a1b @@ -35,3 +33,4 @@ chunks: - glu - glew - glut +configuration-extensions: [] diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index f713ba18..60c4c4e4 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -1,13 +1,6 @@ name: morph-utils -kind: stratum -build-depends: -- morph: strata/core.morph -- morph: strata/ostree-core.morph -- morph: strata/python-cliapp.morph -- morph: strata/python2-core.morph -- morph: strata/python-pygobject.morph -- morph: strata/python-wsgi.morph -chunks: +kind: assemblage +contents: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph repo: upstream:python-ttystatus @@ -52,3 +45,4 @@ chunks: ref: f3de88b82bf5e3902c44f6c30aed065e56626ee6 unpetrify-ref: 0.10.5 build-system: python-distutils +configuration-extensions: [] diff --git a/strata/mtd-utilities.morph b/strata/mtd-utilities.morph index 67ff09a8..70dba84c 100644 --- a/strata/mtd-utilities.morph +++ b/strata/mtd-utilities.morph @@ -1,11 +1,9 @@ name: mtd-utilities -kind: stratum -build-depends: -- morph: strata/foundation.morph -- morph: strata/core.morph -chunks: +kind: assemblage +contents: - name: mtd-utils morph: strata/mtd-utilities/mtd-utils.morph repo: upstream:mtd-utils ref: 9f107132a6a073cce37434ca9cda6917dd8d866b unpetrify-ref: v1.5.1 +configuration-extensions: [] diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph index 3df50d0d..886eb04a 100644 --- a/strata/multimedia-common.morph +++ b/strata/multimedia-common.morph @@ -1,9 +1,7 @@ name: multimedia-common -kind: stratum +kind: assemblage description: Mutimedia Libraries -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: opus repo: upstream:opus ref: 655cc54c564b84ef2827f0b2152ce3811046201e @@ -62,3 +60,4 @@ chunks: repo: upstream:orc ref: 831886d1f70d3cc21a913b2e335da38af4cae524 unpetrify-ref: orc-0.4.25 +configuration-extensions: [] diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index 67e870a2..4eaa422b 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -1,16 +1,11 @@ name: multimedia-gstreamer-0.10 -kind: stratum +kind: assemblage description: Codecs -build-depends: -- morph: strata/core.morph -- morph: strata/foundation.morph -- morph: strata/multimedia-common.morph -- morph: strata/sound-server-pulseaudio.morph -chunks: +contents: - name: gstreamer@0.10 repo: upstream:gstreamer ref: 76fc67b18c38e7f6c9cfacc4e4d0ed11d3b2c548 - unpetrify-ref: "0.10" + unpetrify-ref: '0.10' build-system: autotools submodules: common: @@ -19,7 +14,7 @@ chunks: repo: upstream:gstreamer-plugins-base morph: strata/multimedia-gstreamer-0.10/gstreamer-plugins-base@0.10.morph ref: 1e1e6eaf3f0dd11f6618154d9739cbe3e007d206 - unpetrify-ref: "0.10" + unpetrify-ref: '0.10' build-depends: - gstreamer@0.10 submodules: @@ -36,3 +31,4 @@ chunks: submodules: common: url: upstream:gstreamer-common +configuration-extensions: [] diff --git a/strata/multimedia-gstreamer-openmax-generic.morph b/strata/multimedia-gstreamer-openmax-generic.morph index 1a006971..a2742b6c 100644 --- a/strata/multimedia-gstreamer-openmax-generic.morph +++ b/strata/multimedia-gstreamer-openmax-generic.morph @@ -1,9 +1,7 @@ name: multimedia-gstreamer-openmax-generic -kind: stratum +kind: assemblage description: GStreamer OpenMAX IL wrapper plugin -build-depends: -- morph: strata/multimedia-gstreamer.morph -chunks: +contents: - name: gst-omx morph: strata/multimedia-gstreamer-openmax-generic/gst-omx.morph repo: upstream:gst-omx @@ -12,3 +10,4 @@ chunks: submodules: common: url: upstream:gstreamer-common +configuration-extensions: [] diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 6ac83824..f7f10ebc 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -1,13 +1,7 @@ name: multimedia-gstreamer -kind: stratum +kind: assemblage description: GStreamer multimedia components -build-depends: -- morph: strata/libsoup-common.morph -- morph: strata/multimedia-common.morph -- morph: strata/mesa-common.morph -- morph: strata/graphics-common.morph -- morph: strata/sound-server-pulseaudio.morph -chunks: +contents: - name: gstreamer repo: upstream:gstreamer ref: 1abf889dddc75b4e4db2f4505a4287cb20878d27 @@ -61,3 +55,4 @@ chunks: url: upstream:ffmpeg common: url: upstream:gstreamer-common +configuration-extensions: [] diff --git a/strata/multimedia-hardware-codecs-x86.morph b/strata/multimedia-hardware-codecs-x86.morph index 83a32f70..a9b72f10 100644 --- a/strata/multimedia-hardware-codecs-x86.morph +++ b/strata/multimedia-hardware-codecs-x86.morph @@ -1,12 +1,7 @@ name: multimedia-hardware-codecs-x86 -kind: stratum +kind: assemblage description: Hardware accelerated codecs for x86 -build-depends: -- morph: strata/multimedia-gstreamer.morph -- morph: strata/libdrm-common.morph -- morph: strata/wayland-generic.morph -- morph: strata/x-common.morph -chunks: +contents: - name: libva repo: upstream:libva ref: 304bc13e244f9d5e185a0d8a87fcf3a3eb5a8bd8 @@ -29,3 +24,4 @@ chunks: submodules: common: url: upstream:gstreamer-common +configuration-extensions: [] diff --git a/strata/navigation.morph b/strata/navigation.morph index 669f4084..8473d707 100644 --- a/strata/navigation.morph +++ b/strata/navigation.morph @@ -1,11 +1,10 @@ name: navigation -kind: stratum +kind: assemblage description: Stratum that provides navigation libraries / services -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: navit morph: strata/navigation/navit.morph repo: upstream:navit-svn ref: 358812af2c27c4abe324beb205e6d156b96fb1ea unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/network-security.morph b/strata/network-security.morph index 0f6b4ce2..50902f86 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -1,9 +1,7 @@ name: network-security -kind: stratum +kind: assemblage description: This stratum provides SSL/TLS libraries -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: nspr morph: strata/network-security/nspr.morph repo: upstream:nspr-hg @@ -45,3 +43,4 @@ chunks: submodules: devel/openssl: url: upstream:openssl-new +configuration-extensions: [] diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph index d452b72b..4b6cf3e0 100644 --- a/strata/networking-utils.morph +++ b/strata/networking-utils.morph @@ -1,14 +1,12 @@ name: networking-utils -kind: stratum +kind: assemblage description: | Stratum which contains utils to works with networks: create, enable, filter... This stratum requires kernel config flags which are not enabled in the default Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get an idea of what is needed. -build-depends: -- morph: strata/foundation.morph -chunks: +contents: - name: ebtables morph: strata/networking-utils/ebtables.morph repo: upstream:ebtables @@ -103,3 +101,4 @@ chunks: - libnetfilter_cttimeout - libnetfilter_cthelper - libnetfilter_queue +configuration-extensions: [] diff --git a/strata/nfs.morph b/strata/nfs.morph index e05d585c..2f71e553 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -1,9 +1,7 @@ name: nfs -kind: stratum +kind: assemblage description: NFS utilities -build-depends: -- morph: strata/foundation.morph -chunks: +contents: - name: libevent repo: upstream:libevent ref: 0b49ae34594533daa82c06a506078de9e336a013 @@ -29,3 +27,4 @@ chunks: build-depends: - libevent - ti-rpc +configuration-extensions: [] diff --git a/strata/nodejs.morph b/strata/nodejs.morph index d7aa4ef1..60fb9c80 100644 --- a/strata/nodejs.morph +++ b/strata/nodejs.morph @@ -1,12 +1,10 @@ name: nodejs -kind: stratum +kind: assemblage description: Stratum for nodejs related stuff -build-depends: -- morph: strata/core.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: node morph: strata/nodejs/node.morph repo: upstream:node ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e unpetrify-ref: v0.10.26 +configuration-extensions: [] diff --git a/strata/ntpd.morph b/strata/ntpd.morph index 4c5483e5..b79f7551 100644 --- a/strata/ntpd.morph +++ b/strata/ntpd.morph @@ -1,10 +1,9 @@ name: ntpd -kind: stratum -build-depends: -- morph: strata/foundation.morph -chunks: +kind: assemblage +contents: - name: ntpd morph: strata/ntpd/ntpd.morph repo: upstream:ntp ref: b2ccf8dd31d1457ae9f0ae270054117179220370 unpetrify-ref: ntp-4.2.8p2 +configuration-extensions: [] diff --git a/strata/ocaml-language.morph b/strata/ocaml-language.morph index 3364763d..f1903af7 100644 --- a/strata/ocaml-language.morph +++ b/strata/ocaml-language.morph @@ -1,11 +1,10 @@ name: ocaml-language -kind: stratum +kind: assemblage description: | OCaml -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: ocaml morph: strata/ocaml/ocaml.morph repo: upstream:ocaml ref: fa7961d5fada53056f38a9ae36615df26352028a +configuration-extensions: [] diff --git a/strata/openbmc.morph b/strata/openbmc.morph index b1309a2a..9d2374fb 100644 --- a/strata/openbmc.morph +++ b/strata/openbmc.morph @@ -1,10 +1,7 @@ name: openbmc -kind: stratum +kind: assemblage description: OpenBMC components -build-depends: -- morph: strata/build-essential.morph -- morph: strata/core.morph -chunks: +contents: - name: i2c-tools morph: strata/openbmc/i2c-tools.morph repo: upstream:i2c-tools @@ -20,3 +17,4 @@ chunks: morph: strata/openbmc/isc-dhcp.morph ref: f800382616186a5d30e28d8b2c51e97a9a8360f2 unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 05b0e028..dd3002a4 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -1,9 +1,7 @@ name: openstack-clients -kind: stratum +kind: assemblage description: Stratum with all the OpenStack clients and their dependencies. -build-depends: -- morph: strata/openstack-common.morph -chunks: +contents: - name: warlock repo: upstream:warlock ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60 @@ -75,7 +73,7 @@ chunks: morph: strata/openstack-clients/cliff-tablib.morph repo: upstream:python-packages/cliff-tablib ref: a83bf47d7dfbb690dd53e189c532f0859898db04 - unpetrify-ref: "1.1" + unpetrify-ref: '1.1' - name: python-neutronclient repo: upstream:openstack/python-neutronclient ref: aa1215a5ad063b299d32ef319eb63d5210249a9b @@ -152,3 +150,4 @@ chunks: repo: upstream:python-packages/appdirs ref: 57f2bc44a8bca99bac6c57496c8b3fdea26f94d5 unpetrify-ref: 1.4.0 +configuration-extensions: [] diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 91ea24eb..c0cfdaa6 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -1,12 +1,9 @@ name: openstack-common -kind: stratum +kind: assemblage description: | Stratum with the python packages needed to compile openstack clients and services. -build-depends: -- morph: strata/python-common.morph -- morph: strata/foundation.morph -chunks: +contents: - name: pycparser repo: upstream:python-packages/pycparser ref: c926670643ebb5f88a2bf56579fc9934c82be6d2 @@ -14,7 +11,7 @@ chunks: build-system: python-distutils - name: cffi repo: upstream:python-packages/cffi - ref: 40b9759b5bbf9f6a4efa1168acc9a60890527f6f + ref: 40b9759b5bbf9f6a4efa1168acc9a60890527f6f unpetrify-ref: release-1.6 build-system: python-distutils build-depends: @@ -80,7 +77,7 @@ chunks: - name: pyopenssl repo: upstream:python-packages/pyopenssl ref: 0146d447e63a737b4f05a1164d5950eff68543e7 - unpetrify-ref: "0.14" + unpetrify-ref: '0.14' build-system: python-distutils - name: oslo-i18n repo: upstream:openstack/oslo-i18n @@ -137,3 +134,4 @@ chunks: ref: 5ad87be617c2cc1dd31625688172e964db2756dc unpetrify-ref: 1.5.2 build-system: python-distutils +configuration-extensions: [] diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index ac7ed111..0e61ec29 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -1,14 +1,7 @@ name: openstack-services -kind: stratum +kind: assemblage description: Openstack clients and services -build-depends: -- morph: strata/erlang.morph -- morph: strata/django.morph -- morph: strata/xstatic.morph -- morph: strata/openstack-clients.morph -- morph: strata/test-tools.morph -- morph: strata/python-tools.morph -chunks: +contents: - name: erlang-sd_notify morph: strata/openstack-services/erlang-sd_notify.morph repo: upstream:erlang-modules/erlang-sd_notify @@ -803,3 +796,4 @@ chunks: - oslo-messaging - retrying - posix-ipc-tarball +configuration-extensions: [] diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph index 26159df3..1eda4cac 100644 --- a/strata/ostree-core.morph +++ b/strata/ostree-core.morph @@ -1,10 +1,6 @@ name: ostree-core -kind: stratum -build-depends: -- morph: strata/core.morph -- morph: strata/libsoup-common.morph -- morph: strata/foundation.morph -chunks: +kind: assemblage +contents: - name: libassuan morph: strata/ostree-core/libassuan.morph repo: upstream:libassuan @@ -35,3 +31,4 @@ chunks: url: upstream:libglnx bsdiff: url: upstream:bsdiff +configuration-extensions: [] diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph index d8820256..9ca9c1fd 100644 --- a/strata/pcre-utils.morph +++ b/strata/pcre-utils.morph @@ -1,10 +1,9 @@ name: pcre-utils -kind: stratum -build-depends: -- morph: strata/tools.morph -chunks: +kind: assemblage +contents: - name: pcre repo: upstream:pcre morph: strata/pcre-utils/pcre.morph ref: b2b477a2025ee7501243e5b6a54ef4f6dbfb666b unpetrify-ref: pcre-8.39 +configuration-extensions: [] diff --git a/strata/perl-common.morph b/strata/perl-common.morph index 2947f053..ef68f601 100644 --- a/strata/perl-common.morph +++ b/strata/perl-common.morph @@ -1,9 +1,7 @@ name: perl-common -kind: stratum +kind: assemblage description: Common perl dependencies -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: Try-Tiny repo: upstream:cpan/Try-Tiny-tarball ref: b0ac2743153dd707789f7541af790f5a53843a36 @@ -386,3 +384,4 @@ chunks: ref: 8538680d8b9b92f693f7e03b48332627d4b129a0 unpetrify-ref: master build-system: cpan +configuration-extensions: [] diff --git a/strata/privileges-management.morph b/strata/privileges-management.morph index f00fdde8..971222e9 100644 --- a/strata/privileges-management.morph +++ b/strata/privileges-management.morph @@ -1,12 +1,7 @@ name: privileges-management -kind: stratum +kind: assemblage description: Toolkit for controlling system-wide privileges -build-depends: -- morph: strata/foundation.morph -- morph: strata/glib-common.morph -- morph: strata/network-security.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: mozjs17 morph: strata/privileges-management/mozjs17.morph repo: upstream:mozilla/mozjs17 @@ -19,3 +14,4 @@ chunks: unpetrify-ref: master build-depends: - mozjs17 +configuration-extensions: [] diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph index d143007d..dcf176f3 100644 --- a/strata/python-cliapp.morph +++ b/strata/python-cliapp.morph @@ -1,10 +1,8 @@ name: python-cliapp -kind: stratum +kind: assemblage description: | Cliapp command line application framework. -build-depends: -- morph: strata/python2-core.morph -chunks: +contents: - name: python-coveragepy morph: strata/python-cliapp/python-coveragepy.morph repo: upstream:python-coveragepy @@ -24,3 +22,4 @@ chunks: build-system: python-distutils build-depends: - python-coverage-test-runner +configuration-extensions: [] diff --git a/strata/python-common.morph b/strata/python-common.morph index 9777c1df..dded8820 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -1,9 +1,7 @@ name: python-common -kind: stratum +kind: assemblage description: Common dependencies of some python chunks -build-depends: -- morph: strata/python2-core.morph -chunks: +contents: - name: pycrypto morph: strata/python-common/pycrypto.morph repo: upstream:python-packages/pycrypto @@ -25,7 +23,7 @@ chunks: - name: markupsafe repo: upstream:markupsafe ref: feb1d70c16df62f60dcb521d127fdad8819fc036 - unpetrify-ref: "0.23" + unpetrify-ref: '0.23' build-system: python-distutils - name: jinja2 repo: upstream:jinja2 @@ -64,12 +62,12 @@ chunks: - name: kazoo repo: upstream:python-packages/kazoo.git ref: 93a718ea4c20df797766742c3d74de281613c651 - unpetrify-ref: "2.0" + unpetrify-ref: '2.0' build-system: python-distutils - name: webob repo: upstream:python-packages/webob ref: ae0ac90f22f9e1ff351e445f92330efd89195f51 - unpetrify-ref: "1.4" + unpetrify-ref: '1.4' build-system: python-distutils - name: python-decorator repo: upstream:python-packages/python-decorator @@ -91,3 +89,4 @@ chunks: ref: 7e510acde274d2c806d38057f352e8525ee7ae9d unpetrify-ref: v5.0.4-release build-system: python-distutils +configuration-extensions: [] diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph index a6667be2..e3ea9b90 100644 --- a/strata/python-pygobject.morph +++ b/strata/python-pygobject.morph @@ -1,13 +1,11 @@ name: python-pygobject -kind: stratum +kind: assemblage description: | Python GObject bindings -build-depends: -- morph: strata/python2-core.morph -- morph: strata/glib-common.morph -chunks: +contents: - name: pygobject morph: strata/python-pygobject/pygobject.morph repo: upstream:pygobject ref: 276341d7ddab180020c31e6837bd28fd25784de0 unpetrify-ref: baserock/morph +configuration-extensions: [] diff --git a/strata/python-tools.morph b/strata/python-tools.morph index d61fe150..e6836bd4 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -1,10 +1,8 @@ name: python-tools -kind: stratum +kind: assemblage description: | A stratum for useful python tools that we don't want to include in core. -build-depends: -- morph: strata/python2-core.morph -chunks: +contents: - name: virtualenv repo: upstream:python-packages/virtualenv ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c @@ -27,3 +25,4 @@ chunks: ref: ba998d7a4e5fce0ea3a3e701ff446bbe4ca406b5 unpetrify-ref: pylint-1.4.2 build-system: python-distutils +configuration-extensions: [] diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph index cd72e398..d419a109 100644 --- a/strata/python-wsgi.morph +++ b/strata/python-wsgi.morph @@ -1,10 +1,8 @@ name: python-wsgi -kind: stratum +kind: assemblage description: | Python modules for web applications using Web Server Gateway Interface. -build-depends: -- morph: strata/python2-core.morph -chunks: +contents: - name: bottle repo: upstream:bottle ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f @@ -15,3 +13,4 @@ chunks: ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph build-system: python-distutils +configuration-extensions: [] diff --git a/strata/python2-core.morph b/strata/python2-core.morph index 2ae41d34..e0d8df85 100644 --- a/strata/python2-core.morph +++ b/strata/python2-core.morph @@ -1,12 +1,9 @@ name: python2-core -kind: stratum +kind: assemblage description: | Some "core" Python 2 packages, including the CPython interpreter itself. -build-depends: -- morph: strata/core.morph - -chunks: +contents: - name: python2 morph: strata/python2-core/python2.morph repo: upstream:cpython @@ -67,7 +64,7 @@ chunks: - name: cython2 repo: upstream:cython ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d - unpetrify-ref: "0.22" + unpetrify-ref: '0.22' build-system: python-distutils build-depends: - python2 @@ -105,3 +102,4 @@ chunks: build-depends: - python2 - python2-setuptools +configuration-extensions: [] diff --git a/strata/python3-core.morph b/strata/python3-core.morph index 18bd5cc6..770ee13c 100644 --- a/strata/python3-core.morph +++ b/strata/python3-core.morph @@ -1,14 +1,11 @@ name: python3-core -kind: stratum +kind: assemblage description: | Some "core" Python packages, for Python 3. The CPython interpreter for Python 3 is in core.morph. -build-depends: -- morph: strata/core.morph - -chunks: +contents: - name: mako repo: upstream:python-packages/mako.git ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 @@ -56,3 +53,4 @@ chunks: ref: 35b60f390098d3306c03eee27ceec8cf8a493579 unpetrify-ref: v2.3.0 build-system: python3-distutils +configuration-extensions: [] diff --git a/strata/python3-gobject.morph b/strata/python3-gobject.morph index 1e2db195..ff0e3c42 100644 --- a/strata/python3-gobject.morph +++ b/strata/python3-gobject.morph @@ -1,13 +1,11 @@ name: python3-gobject -kind: stratum +kind: assemblage description: | Python 3 GObject bindings -build-depends: -- morph: strata/core.morph -- morph: strata/glib-common.morph -chunks: +contents: - name: python3-gobject morph: strata/python3-gobject/python3-gobject.morph repo: upstream:pygobject ref: 8e7f6f1458cf1c162c13422c72562b00433b762b unpetrify-ref: pygobject-3-18 +configuration-extensions: [] diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph index 107d76be..054f6cee 100644 --- a/strata/qt4-sdk.morph +++ b/strata/qt4-sdk.morph @@ -1,9 +1,7 @@ name: qt4-sdk -kind: stratum +kind: assemblage description: Qt4 Desktop Environment, IDE and Example Apps -build-depends: -- morph: strata/qt4-tools.morph -chunks: +contents: - name: qt-creator morph: strata/qt4-sdk/qt-creator.morph repo: upstream:qt-creator @@ -12,3 +10,4 @@ chunks: submodules: qbs: url: upstream:qbs +configuration-extensions: [] diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph index 577c467d..83326a9d 100644 --- a/strata/qt4-tools.morph +++ b/strata/qt4-tools.morph @@ -1,12 +1,7 @@ name: qt4-tools -kind: stratum +kind: assemblage description: Qt4 Development Libraries and Tools -build-depends: -- morph: strata/icu-common.morph -- morph: strata/tools.morph -- morph: strata/x-generic.morph -- morph: strata/multimedia-gstreamer-0.10.morph -chunks: +contents: - name: ruby-1.8 morph: strata/qt4-tools/ruby-1.8.morph repo: upstream:ruby @@ -26,3 +21,4 @@ chunks: unpetrify-ref: baserock/morph build-depends: - ruby-1.9 +configuration-extensions: [] diff --git a/strata/qt5-ivi.morph b/strata/qt5-ivi.morph index 16e7cd26..0f4c70a7 100644 --- a/strata/qt5-ivi.morph +++ b/strata/qt5-ivi.morph @@ -1,10 +1,7 @@ name: qt5-ivi -kind: stratum +kind: assemblage description: Qt5 IVI stratum -build-depends: -- morph: strata/ruby.morph -- morph: strata/qt5-tools.morph -chunks: +contents: - name: qtapplicationmanager morph: strata/qt5-ivi/qtapplicationmanager.morph repo: upstream:qt5/qtapplicationmanager @@ -15,3 +12,4 @@ chunks: ref: 36616e36cb1f0b30aa9ca7977af7a5b682689f7a unpetrify-ref: 5.7 build-system: qmake +configuration-extensions: [] diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index 0d556d38..86879aa5 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -1,10 +1,7 @@ name: qt5-sdk -kind: stratum +kind: assemblage description: Qt5 Desktop Environment, IDE and Example Apps -build-depends: -- morph: strata/qt5-tools.morph -- morph: strata/qt5-tools-qtwebkit.morph -chunks: +contents: - name: qt-creator morph: strata/qt5-sdk/qt-creator.morph repo: upstream:qt-creator @@ -13,3 +10,4 @@ chunks: submodules: qbs: url: upstream:qbs +configuration-extensions: [] diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index a4830aff..b37c871a 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -1,12 +1,10 @@ name: qt5-tools-qtmultimedia -kind: stratum +kind: assemblage description: Qt5 QtMultimedia Development Libraries and Tools -build-depends: -- morph: strata/qt5-tools.morph -- morph: strata/multimedia-gstreamer.morph -chunks: +contents: - name: qtmultimedia repo: upstream:qt5/qtmultimedia ref: 9985224a89b830dc182b428f491b6187d6f0e1ba unpetrify-ref: v5.6.0 build-system: qmake +configuration-extensions: [] diff --git a/strata/qt5-tools-qtwayland.morph b/strata/qt5-tools-qtwayland.morph index 54dcf1e2..05a8121b 100644 --- a/strata/qt5-tools-qtwayland.morph +++ b/strata/qt5-tools-qtwayland.morph @@ -1,12 +1,10 @@ name: qt5-tools-qtwayland -kind: stratum +kind: assemblage description: Qt5 Wayland module -build-depends: -- morph: strata/input-common.morph -- morph: strata/qt5-tools.morph -chunks: +contents: - name: qtwayland morph: strata/qt5-tools-qtwayland/qtwayland.morph repo: upstream:qt5/qtwayland ref: ebba84e70fe3610affc3974f51c8ed6d539377aa unpetrify-ref: baserock/v5.6.0-15-gebba84e+ivi-shell +configuration-extensions: [] diff --git a/strata/qt5-tools-qtwebengine.morph b/strata/qt5-tools-qtwebengine.morph index 9c954f5f..06962703 100644 --- a/strata/qt5-tools-qtwebengine.morph +++ b/strata/qt5-tools-qtwebengine.morph @@ -1,11 +1,7 @@ name: qt5-tools-qtwebengine -kind: stratum +kind: assemblage description: Qt5 WebEngine Development Libraries and Tools -build-depends: -- morph: strata/multimedia-gstreamer.morph -- morph: strata/qt5-tools.morph -- morph: strata/ruby.morph -chunks: +contents: - name: qtwebengine repo: upstream:qt5/qtwebengine ref: 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f @@ -14,3 +10,4 @@ chunks: submodules: src/3rdparty: url: upstream:qt5/qtwebengine-chromium.git +configuration-extensions: [] diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 5d298e4d..3b92ede6 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -1,11 +1,7 @@ name: qt5-tools-qtwebkit -kind: stratum +kind: assemblage description: Qt5 WebKit Development Libraries and Tools -build-depends: -- morph: strata/multimedia-gstreamer.morph -- morph: strata/qt5-tools.morph -- morph: strata/ruby.morph -chunks: +contents: - name: qtwebkit repo: upstream:qt5/qtwebkit ref: 7205faf1a546a690f68176989100109e9a3335b7 @@ -32,3 +28,4 @@ chunks: build-system: qmake build-depends: - qttools +configuration-extensions: [] diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 7424a41c..bc82a43c 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -1,11 +1,7 @@ name: qt5-tools -kind: stratum +kind: assemblage description: Qt5 Development Libraries and Tools -build-depends: -- morph: strata/icu-common.morph -- morph: strata/tools.morph -- morph: strata/x-generic.morph -chunks: +contents: - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase @@ -127,3 +123,4 @@ chunks: build-system: qmake build-depends: - qtbase +configuration-extensions: [] diff --git a/strata/ruby.morph b/strata/ruby.morph index 10eb932e..63565934 100644 --- a/strata/ruby.morph +++ b/strata/ruby.morph @@ -1,5 +1,5 @@ name: ruby -kind: stratum +kind: assemblage description: | Ruby and common Ruby build dependencies. @@ -7,9 +7,7 @@ description: | 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: +contents: - name: ruby-1.8 morph: strata/ruby/ruby-1.8.morph repo: upstream:ruby @@ -49,3 +47,4 @@ chunks: unpetrify-ref: v0.9.3 build-depends: - ruby +configuration-extensions: [] diff --git a/strata/rvi.morph b/strata/rvi.morph index 74b02423..3fba04c0 100644 --- a/strata/rvi.morph +++ b/strata/rvi.morph @@ -1,11 +1,9 @@ name: rvi -kind: stratum -build-depends: -- morph: strata/bluetooth.morph -- morph: strata/erlang.morph -chunks: +kind: assemblage +contents: - name: rvi_core morph: strata/rvi/rvi_core.morph repo: upstream:rvi/rvi_core ref: 9a3db2baecdddbfba8e8bfeb71038e4de6a44225 unpetrify-ref: v0.5.0 +configuration-extensions: [] diff --git a/strata/samba.morph b/strata/samba.morph index 97e72c7a..3c1de28e 100644 --- a/strata/samba.morph +++ b/strata/samba.morph @@ -1,13 +1,10 @@ name: samba -kind: stratum +kind: assemblage description: Simple samba server -build-depends: -- morph: strata/core.morph -- morph: strata/foundation.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: samba morph: strata/samba/samba.morph repo: upstream:samba ref: 704592c14dfedbe98e95d43860d062dc6338bca3 unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/sandboxing.morph b/strata/sandboxing.morph index 64de36c3..67c804d7 100644 --- a/strata/sandboxing.morph +++ b/strata/sandboxing.morph @@ -1,11 +1,9 @@ name: sandboxing -kind: stratum +kind: assemblage description: | Libraries/tools for running programs/commands in a (partially) isolated environment. -build-depends: -- morph: strata/python2-core.morph -chunks: +contents: - name: sandboxlib repo: upstream:sandboxlib ref: ce30050daa10fa32801e8f798911b36aa82343a4 @@ -16,3 +14,4 @@ chunks: ref: 40e0b71d556414dfe150a74937f2c8a68d351d6d unpetrify-ref: v2015.1 build-system: autotools +configuration-extensions: [] diff --git a/strata/secret-service.morph b/strata/secret-service.morph index b6f9e896..6b0d9b44 100644 --- a/strata/secret-service.morph +++ b/strata/secret-service.morph @@ -1,13 +1,7 @@ name: secret-service -kind: stratum +kind: assemblage description: Service implementing the DBus Secret Service API -build-depends: -- morph: strata/foundation.morph -- morph: strata/glib-common.morph -- morph: strata/gtk3.morph -- morph: strata/network-security.morph -- morph: strata/vala-common.morph -chunks: +contents: - name: gcr repo: upstream:gnome/gcr ref: 289ba4859fd170285f51e6bbfe91f2aac3b9170d @@ -25,3 +19,4 @@ chunks: repo: upstream:gnome/libsecret ref: 4d76cf7dd8e55d93bb58164a1fff38113ba97af5 unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/sound-server-pulseaudio.morph b/strata/sound-server-pulseaudio.morph index bf081d0b..2e1a43d1 100644 --- a/strata/sound-server-pulseaudio.morph +++ b/strata/sound-server-pulseaudio.morph @@ -1,9 +1,7 @@ name: sound-server-pulseaudio -kind: stratum +kind: assemblage description: Components required for pulseaudio. -build-depends: -- morph: strata/bluetooth.morph -chunks: +contents: - name: libatomic_ops repo: upstream:libatomic_ops ref: 0a58f5d63969c10d2141af89cb7a53df786909ab @@ -55,7 +53,7 @@ chunks: - name: sbc repo: upstream:sbc ref: 24812c660036a693f8770766aa6fdea667de05d0 - unpetrify-ref: "1.3" + unpetrify-ref: '1.3' build-system: autotools build-depends: - libsndfile @@ -78,3 +76,4 @@ chunks: - alsa-lib - sbc - webrtc-audio-processing +configuration-extensions: [] diff --git a/strata/spell-checking.morph b/strata/spell-checking.morph index dfe8b997..c8e4fb1a 100644 --- a/strata/spell-checking.morph +++ b/strata/spell-checking.morph @@ -1,9 +1,7 @@ name: spell-checking -kind: stratum +kind: assemblage description: Spell checking libraries -build-depends: -- morph: strata/glib-common.morph -chunks: +contents: - name: enchant repo: upstream:enchant ref: 6d8b6bb15f09a14c90fb900eb2ecf1172d7cf6cf @@ -14,3 +12,4 @@ chunks: ref: 7f28cf7edb54cc1bc4eaa09672e0bc043b1da70b unpetrify-ref: master build-system: autotools +configuration-extensions: [] diff --git a/strata/storage-management.morph b/strata/storage-management.morph index c972d0d3..140a4380 100644 --- a/strata/storage-management.morph +++ b/strata/storage-management.morph @@ -1,12 +1,7 @@ name: storage-management -kind: stratum +kind: assemblage description: libraries/services that provides access to storage -build-depends: -- morph: strata/device-management.morph -- morph: strata/glib-common.morph -- morph: strata/privileges-management.morph -- morph: strata/secret-service.morph -chunks: +contents: - name: libatasmart morph: strata/storage-management/libatasmart.morph repo: upstream:libatasmart @@ -38,3 +33,4 @@ chunks: - libgphoto2 - libmtp - udisks +configuration-extensions: [] diff --git a/strata/swift.morph b/strata/swift.morph index 41fd0c75..47b6d1d8 100644 --- a/strata/swift.morph +++ b/strata/swift.morph @@ -1,11 +1,7 @@ name: swift -kind: stratum +kind: assemblage description: Distributed object storage -build-depends: -# openstack-common is required for simplejson, cffi, greenlet, -# eventlet, pastedeploy, netifaces -- morph: strata/openstack-common.morph -chunks: +contents: - name: dnspython repo: upstream:python-packages/dnspython ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3 @@ -51,3 +47,4 @@ chunks: - dnspython - xattr - pyeclib +configuration-extensions: [] diff --git a/strata/test-tools.morph b/strata/test-tools.morph index 49d53972..51ac339f 100644 --- a/strata/test-tools.morph +++ b/strata/test-tools.morph @@ -1,9 +1,7 @@ name: test-tools -kind: stratum +kind: assemblage description: Tools and frameworks used for testing -build-depends: -- morph: strata/python-common.morph -chunks: +contents: - name: python-test-extras repo: upstream:python-packages/python-test-extras.git ref: cdeb596f01241e9c779332e86f6edcd0c2e8e9f0 @@ -131,3 +129,4 @@ chunks: - fixtures - check - cppunit +configuration-extensions: [] diff --git a/strata/tools.morph b/strata/tools.morph index c17da999..d4b93b39 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -1,9 +1,7 @@ name: tools -kind: stratum +kind: assemblage description: Various tools -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: distcc morph: strata/tools/distcc.morph repo: upstream:distcc @@ -67,3 +65,4 @@ chunks: repo: upstream:zip ref: e52e9d6a339aad5fcff464cf207da51c02996e39 unpetrify-ref: zip30 +configuration-extensions: [] diff --git a/strata/trove.morph b/strata/trove.morph index fa5c45e0..e9d36042 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -1,12 +1,7 @@ name: trove -kind: stratum +kind: assemblage description: Trove software -build-depends: -- morph: strata/python2-core.morph -- morph: strata/tools.morph -- morph: strata/morph-utils.morph -- morph: strata/pcre-utils.morph -chunks: +contents: - name: lua morph: strata/trove/lua.morph repo: upstream:lua @@ -99,3 +94,4 @@ chunks: unpetrify-ref: baserock/morph build-depends: - lua +configuration-extensions: [] diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph index acb094ea..8873d185 100644 --- a/strata/unionfs-fuse-group.morph +++ b/strata/unionfs-fuse-group.morph @@ -1,5 +1,5 @@ name: unionfs-fuse-group -kind: stratum +kind: assemblage description: | User-space union file system. @@ -8,13 +8,10 @@ description: | than 'overlayfs', because it runs outside rather than inside the kernel, but 'overlayfs' is only available in Linux 3.18 and newer. -build-depends: -# Depends on foundation for 'fuse', and maybe other stuff. -- morph: strata/foundation.morph - -chunks: +contents: - name: unionfs-fuse morph: strata/unionfs-fuse-group/unionfs-fuse.morph repo: upstream:unionfs-fuse ref: efac5b7aa91ec860f8f430a8d21060fe53a07002 unpetrify-ref: v0.26 +configuration-extensions: [] diff --git a/strata/vala-common.morph b/strata/vala-common.morph index e1438de3..cdda170a 100644 --- a/strata/vala-common.morph +++ b/strata/vala-common.morph @@ -1,10 +1,7 @@ name: vala-common -kind: stratum +kind: assemblage description: Vala compiler -build-depends: -- morph: strata/core.morph -- morph: strata/glib-common.morph -chunks: +contents: - name: vala-bootstrap morph: strata/vala-common/vala-bootstrap.morph repo: upstream:vala @@ -33,3 +30,4 @@ chunks: build-depends: - m4-common - vala +configuration-extensions: [] diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph index fadcec92..04a31f1b 100644 --- a/strata/virtualbox-guest-x86_64.morph +++ b/strata/virtualbox-guest-x86_64.morph @@ -1,13 +1,8 @@ name: virtualbox-guest-x86_64 -kind: stratum +kind: assemblage 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: +contents: - name: yasm morph: strata/virtualbox-guest-x86_64/yasm.morph repo: upstream:yasm @@ -20,3 +15,4 @@ chunks: unpetrify-ref: baserock/morph build-depends: - yasm +configuration-extensions: [] diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 32131bc5..c0c6c56d 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -1,20 +1,11 @@ name: virtualization -kind: stratum +kind: assemblage description: | Virtualization for baserock NOTE: this stratum requires kernel support, please see openstack bsp kernel history to check which config are needed for openvswitch or libvirt, for example. -build-depends: -- morph: strata/libsoup-common.morph -- morph: strata/python2-core.morph -- morph: strata/python-pygobject.morph -- morph: strata/connman-common.morph -- morph: strata/lvm.morph -- morph: strata/xorg-util-macros-common.morph -- morph: strata/networking-utils.morph -- morph: strata/docutils.morph -chunks: +contents: - name: yajl morph: strata/virtualization/yajl.morph repo: upstream:yajl @@ -115,3 +106,4 @@ chunks: repo: upstream:openvswitch ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f unpetrify-ref: master +configuration-extensions: [] diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index cb890ed0..39870b2a 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -1,8 +1,6 @@ name: wayland-generic -kind: stratum -build-depends: -- morph: strata/core.morph -chunks: +kind: assemblage +contents: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland @@ -15,3 +13,4 @@ chunks: build-system: autotools build-depends: - wayland +configuration-extensions: [] diff --git a/strata/webtools.morph b/strata/webtools.morph index 495a4f3c..764fac7c 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -1,11 +1,7 @@ name: webtools -kind: stratum +kind: assemblage description: web things -build-depends: -- morph: strata/icu-common.morph -- morph: strata/tools.morph -- morph: strata/pcre-utils.morph -chunks: +contents: - name: libgit2 repo: upstream:libgit2 ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb @@ -16,3 +12,4 @@ chunks: repo: upstream:nginx ref: 37a582c9ea3e731c115e560d31b26f78535b8fca unpetrify-ref: baserock/v1.7.0 +configuration-extensions: [] diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 93818920..6ea2e46f 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -1,14 +1,9 @@ name: weston-common -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: +kind: assemblage +contents: - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston ref: 2e5232b980eaa1074023a65dd7941e80b72a763c unpetrify-ref: baserock/weston-1.11.0/tegra +configuration-extensions: [] diff --git a/strata/x-common.morph b/strata/x-common.morph index bcb8ad9b..2446f654 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -1,8 +1,6 @@ name: x-common -kind: stratum -build-depends: -- morph: strata/xorg-util-macros-common.morph -chunks: +kind: assemblage +contents: - name: xorg-proto-bigreqsproto repo: upstream:xorg-proto-bigreqsproto ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db @@ -364,3 +362,4 @@ chunks: build-depends: - xorg-lib-libX11 - xorg-proto-kbproto +configuration-extensions: [] diff --git a/strata/x-drivers.morph b/strata/x-drivers.morph index faf646f2..82143253 100644 --- a/strata/x-drivers.morph +++ b/strata/x-drivers.morph @@ -1,9 +1,6 @@ name: x-drivers -kind: stratum -build-depends: -- morph: strata/input-common.morph -- morph: strata/x-generic.morph -chunks: +kind: assemblage +contents: - name: xorg-driver-xf86-video-fbdev repo: upstream:xorg-driver-xf86-video-fbdev ref: 679ed9a4e6b54227df191c580e3ef641e075db19 @@ -24,3 +21,4 @@ chunks: ref: 44f4b2ed7075d424e3621f30815e11875b364c27 unpetrify-ref: xf86-input-libinput-0.15.0 build-system: autotools +configuration-extensions: [] diff --git a/strata/x-generic.morph b/strata/x-generic.morph index d9462426..e6eb8608 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -1,12 +1,6 @@ name: x-generic -kind: stratum -build-depends: -- morph: strata/foundation.morph -- morph: strata/libdrm-common.morph -- morph: strata/mesa-common.morph -- morph: strata/x-common.morph -- morph: strata/graphics-common.morph -chunks: +kind: assemblage +contents: - name: xorg-font-util repo: upstream:xorg-font-util ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87 @@ -44,3 +38,4 @@ chunks: ref: 4e85bce64acef1fa0ddff04d59737444e942ff12 unpetrify-ref: baserock/morph build-system: autotools +configuration-extensions: [] diff --git a/strata/xfce.morph b/strata/xfce.morph index 8b1d69f4..5487e66e 100644 --- a/strata/xfce.morph +++ b/strata/xfce.morph @@ -1,10 +1,7 @@ name: xfce -kind: stratum +kind: assemblage description: xfce stratum -build-depends: -- morph: strata/gtk2.morph -- morph: strata/sound-server-pulseaudio.morph -chunks: +contents: - name: xfce-dev-tools repo: upstream:xfce/xfce4-dev-tools ref: 9244250ac0c15ba160688758c5dccf97f3f160ef @@ -157,3 +154,4 @@ chunks: repo: upstream:elementary-xfce ref: 9681d40e7a3545c96dfb1670e00514acfad5b089 unpetrify-ref: v0.5 +configuration-extensions: [] diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph index 7e252a90..d16c9683 100644 --- a/strata/xorg-util-macros-common.morph +++ b/strata/xorg-util-macros-common.morph @@ -1,8 +1,6 @@ name: xorg-util-macros-common -kind: stratum -build-depends: -- morph: strata/core.morph -chunks: +kind: assemblage +contents: - name: xorg-util-macros repo: upstream:xorg-util-macros ref: 9a54b858601bd305de2737b06e609084a2a114c2 @@ -15,3 +13,4 @@ chunks: build-system: autotools build-depends: - xorg-util-macros +configuration-extensions: [] diff --git a/strata/xstatic.morph b/strata/xstatic.morph index e396003b..bddefba3 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -1,5 +1,5 @@ name: xstatic -kind: stratum +kind: assemblage description: | Stratum with Xstatic and some xstatic libraries. @@ -8,10 +8,7 @@ description: | This conflicts with the 'everything from Git' policy of Baserock, but it is required right now for the Openstack system to work. -build-depends: -- morph: strata/foundation.morph -- morph: strata/python2-core.morph -chunks: +contents: - name: xstatic repo: upstream:xstatic ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2 @@ -152,3 +149,4 @@ chunks: ref: a4ac0b809ab0d84c636a760215839bb6d68d0113 unpetrify-ref: master build-system: python-distutils +configuration-extensions: [] diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph index 83ce2e05..a01d78b1 100644 --- a/strata/zookeeper-client.morph +++ b/strata/zookeeper-client.morph @@ -1,5 +1,5 @@ name: zookeeper-client -kind: stratum +kind: assemblage description: | This stratum installs a small demonstration program for the client side of ZooKeeper. The program can take up to two @@ -7,10 +7,9 @@ description: | (1) The IP address of the ZooKeeper server to connect to (2) The type of client that this will be (default client types are typeOneNode & typeTwoNode) -build-depends: -- morph: strata/zookeeper.morph -chunks: +contents: - name: zookeeper-client morph: strata/zookeeper/zookeeper-client.morph repo: baserock:tests/zookeeper-test ref: master +configuration-extensions: [] diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 483a3fde..8e368a1b 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -1,11 +1,10 @@ name: zookeeper-server -kind: stratum +kind: assemblage description: This Stratum installs a zookeeper server and small program to populate it with default data. -build-depends: -- morph: strata/zookeeper.morph -chunks: +contents: - name: zookeeper-server morph: strata/zookeeper/zookeeper-server.morph repo: baserock:tests/zookeeper-test ref: master +configuration-extensions: [] diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph index e345b6d1..065e99b4 100644 --- a/strata/zookeeper.morph +++ b/strata/zookeeper.morph @@ -1,14 +1,11 @@ name: zookeeper -kind: stratum +kind: assemblage description: | This stratum installs zookeeper and its dependencies. -build-depends: -- morph: strata/core.morph -- morph: strata/test-tools.morph -- morph: strata/java.morph -chunks: +contents: - name: zookeeper morph: strata/zookeeper/zookeeper.morph repo: upstream:zookeeper ref: baserock/mikesmith/zookeeper unpetrify-ref: trunk +configuration-extensions: [] |