11:49 a.m.
+1
I've tested this with tbd, but not with morph.
On 2016-02-18 15:46, Daniel Firth wrote:
From: Dan Firth <dan.firth(a)codethink.co.uk>
---
VERSION | 2 +-
schemas/stratum.json-schema | 9 ++++++
strata/ansible.morph | 9 ++++++
strata/ceph-service.morph | 15 ++++++++++
strata/chef.morph | 6 ++++
strata/core.morph | 11 +++++++
strata/coreutils-common.morph | 17 +++++++++++
strata/devtools.morph | 3 ++
strata/foundation.morph | 3 ++
strata/genivi-demo-platform.morph | 5 +++-
strata/gnome.morph | 46
++++++++++++++++++++++++++++-
strata/multimedia-gstreamer-0.10.morph | 9 ++++++
strata/multimedia-gstreamer.morph | 17 +++++++++++
strata/multimedia-hardware-codecs-x86.morph | 3 ++
strata/openstack-services.morph | 20 +++++++++++++
strata/ostree-core.morph | 5 ++++
strata/qt4-sdk.morph | 3 ++
strata/qt5-sdk.morph | 3 ++
strata/qt5-tools.morph | 3 ++
strata/tools.morph | 3 ++
strata/trove.morph | 19 ++++++++++++
strata/vala-common.morph | 3 ++
strata/virtualization.morph | 26 ++++++++++++++++
strata/x-common.morph | 12 ++++++++
strata/xdg-app-common.morph | 3 ++
25 files changed, 252 insertions(+), 3 deletions(-)
diff --git a/VERSION b/VERSION
index e8b0c16..9a47f2b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-version: 7
+version: 8
diff --git a/schemas/stratum.json-schema
b/schemas/stratum.json-schema
index 0330f37..655d6ad 100644
--- a/schemas/stratum.json-schema
+++ b/schemas/stratum.json-schema
@@ -62,6 +62,15 @@ definitions:
# artifact.
patternProperties:
^.*$: { type: string }
+ submodules:
+ $ref: "#/definitions/submodule-reference"
+
+ submodule-reference:
+ type: object
+ properties:
+ url: { type: string }
+ submodules:
+ $ref: "#/definitions/submodule-reference"
# This doesn't need any special treatment in the Baserock data
model because
# it's a link to another stratum definition, without any extra
info.
diff --git a/strata/ansible.morph b/strata/ansible.morph
index 43ebc2b..583093f 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -10,6 +10,15 @@ chunks:
repo: upstream:ansible
ref: 0a7124541247cc613352054f4bc0c3e116e0b657
unpetrify-ref: baserock/v1.8.4
+ submodules:
+ lib/ansible/modules/core:
+ url: upstream:ansible-modules-core.git
+ v2/ansible/modules/core:
+ url: upstream:ansible-modules-core.git
+ v2/ansible/modules/extras:
+ url: upstream:ansible-modules-extras.git
+ lib/ansible/modules/extras:
+ url: upstream:ansible-modules-extras.git
- name: openstack-ansible-modules
morph: strata/ansible/openstack-ansible-modules.morph
repo: upstream:openstack/openstack-ansible-modules
diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph
index c428a1b..39e1c91 100644
--- a/strata/ceph-service.morph
+++ b/strata/ceph-service.morph
@@ -61,3 +61,18 @@ chunks:
- libeditline
- keyutils
- boost
+ submodules:
+ src/erasure-code/jerasure/gf-complete:
+ url: https://github.com/ceph/gf-complete.git
+ src/civetweb:
+ url: https://github.com/ceph/civetweb
+ ceph-erasure-code-corpus:
+ url: https://github.com/ceph/ceph-erasure-code-corpus.git
+ src/rocksdb:
+ url: https://github.com/ceph/rocksdb
+ src/erasure-code/jerasure/jerasure:
+ url: https://github.com/ceph/jerasure.git
+ src/libs3:
+ url: https://github.com/ceph/libs3.git
+ ceph-object-corpus:
+ url: https://github.com/ceph/ceph-object-corpus.git
diff --git a/strata/chef.morph b/strata/chef.morph
index 9a7f6e7..7a72fc3 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -17,6 +17,9 @@ chunks:
unpetrify-ref: 1.0.1
build-depends:
- yajl
+ submodules:
+ ext/libyajl2/vendor/yajl:
+ url: https://github.com/lloyd/yajl.git
- name: chef-12.0.0.alpha.0
morph: strata/chef/chef-master.morph
repo: upstream:ruby-gems/chef
@@ -49,6 +52,9 @@ chunks:
unpetrify-ref: master
build-depends:
- libyajl2-1.0.1
+ submodules:
+ ext/libyajl2/vendored:
+ url: https://github.com/lloyd/yajl
- name: hashie-2.1.2
morph: strata/chef/hashie-2.1.2.morph
repo: upstream:ruby-gems/hashie
diff --git a/strata/core.morph b/strata/core.morph
index 3301033..ef5176a 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -197,6 +197,11 @@ chunks:
- git-minimal
- help2man
- mini-utils
+ submodules:
+ submodules/autoconf:
+ url: upstream:autoconf
+ gnulib:
+ url: upstream:gnulib
- name: patch
morph: strata/core/patch.morph
repo: upstream:patch
@@ -208,6 +213,9 @@ chunks:
- bison
- git-minimal
- mini-utils
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: xz
repo: upstream:xz
ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
@@ -233,6 +241,9 @@ chunks:
- patch
- texinfo-tarball
- xz
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: pkg-config
morph: strata/core/pkg-config.morph
repo: upstream:pkg-config
diff --git a/strata/coreutils-common.morph
b/strata/coreutils-common.morph
index 2ad2d86..476b311 100644
--- a/strata/coreutils-common.morph
+++ b/strata/coreutils-common.morph
@@ -12,6 +12,9 @@ chunks:
repo: upstream:coreutils
ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
unpetrify-ref: baserock/8.23
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: sed
morph: strata/coreutils-common/sed.morph
repo: upstream:sed
@@ -19,6 +22,9 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- coreutils
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: diff
morph: strata/coreutils-common/diff.morph
repo: upstream:diffutils
@@ -26,6 +32,9 @@ chunks:
unpetrify-ref: baserock/v3.3
build-depends:
- coreutils
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: tar
morph: strata/coreutils-common/tar.morph
repo: upstream:tar
@@ -33,8 +42,16 @@ chunks:
unpetrify-ref: baserock/release_1_28
build-depends:
- coreutils
+ submodules:
+ paxutils:
+ url: upstream:paxutils
+ gnulib:
+ url: upstream:gnulib
- name: findutils
morph: strata/coreutils-common/findutils.morph
repo: upstream:findutils
ref: ee6b25541336f9d74624ca814538ddc8c67f0732
unpetrify-ref: baserock/v4.5.14
+ submodules:
+ gnulib:
+ url: upstream:gnulib
diff --git a/strata/devtools.morph b/strata/devtools.morph
index ae50096..9e95165 100644
--- a/strata/devtools.morph
+++ b/strata/devtools.morph
@@ -45,6 +45,9 @@ chunks:
repo: upstream:wget
ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f
unpetrify-ref: baserock/v1.16.3
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: git
morph: strata/devtools/git.morph
repo: upstream:git
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 4e1052b..2e91cf8 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -68,6 +68,9 @@ chunks:
build-system: autotools
build-depends:
- libusb
+ submodules:
+ usbhid-dump:
+ url: upstream:usbhid-dump
- name: lzo
morph: strata/foundation/lzo.morph
repo: upstream:lzo
diff --git a/strata/genivi-demo-platform.morph
b/strata/genivi-demo-platform.morph
index b314877..aa3c5f2 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -15,11 +15,14 @@ chunks:
repo: upstream:genivi/browser-poc
ref: d90501f8bd3edcd35eae72efbfb4583ba8f3cdfc
unpetrify-ref: baserock/genivi/genivi-demo-platform
+ submodules:
+ documentation/designdocument/cls:
+ url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git
- name: automotive-message-broker
morph: strata/genivi-demo-platform/automotive-message-broker.morph
repo: upstream:automotive-message-broker
ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089
- unpetrify-ref: "0.14"
+ unpetrify-ref: '0.14'
- name: audiomanager-poc
morph: strata/genivi-demo-platform/audiomanager-poc.morph
repo: upstream:audiomanager
diff --git a/strata/gnome.morph b/strata/gnome.morph
index eef24ba..8b7d59c 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -98,6 +98,7 @@ chunks:
- iso-codes
- yelp-tools
build-system: autotools
+ submodules: {}
- name: libnotify
repo: upstream:gnome/libnotify
ref: 2f2c5649ef210b1dffeb46cddf062d20e1518ccf
@@ -268,6 +269,9 @@ chunks:
- libnotify
- lcms2
- upower
+ submodules:
+ plugins/media-keys/gvc:
+ url: upstream:gnome/libgnome-volume-control
- name: zenity
repo: upstream:zenity
ref: d7135db2bdfdca812c0165f90e4611af9c7c6a50
@@ -414,6 +418,9 @@ chunks:
- librest
- telepathy-glib
- WebKitGtk
+ submodules:
+ telepathy-account-widgets:
+ url: upstream:gnome/telepathy-account-widgets
- name: liboauth
repo: upstream:liboauth
ref: 9ff9d2902caf8a85c5019c11214d73e67053ba69
@@ -516,6 +523,11 @@ chunks:
- startup-notification
- telepathy-glib
- network-manager-applet
+ submodules:
+ src/gvc:
+ url: upstream:gnome/libgnome-volume-control
+ data/theme/gnome-shell-sass:
+ url: upstream:gnome/gnome-shell-sass
- name: gnome-session
morph: strata/gnome/gnome-session.morph
repo: upstream:gnome/gnome-session
@@ -596,6 +608,9 @@ chunks:
- nettle
- libtasn1
- p11-kit
+ submodules:
+ devel/openssl:
+ url: upstream:openssl-new
- name: glib-networking
morph: strata/gnome/glib-networking.morph
repo: upstream:gnome/glib-networking
@@ -651,6 +666,9 @@ chunks:
- gsettings-desktop-schemas
- libexif
- tracker
+ submodules:
+ libgd:
+ url: upstream:gnome/libgd
- name: desktop-file-utils
morph: strata/gnome/desktop-file-utils.morph
repo: upstream:desktop-file-utils
@@ -744,6 +762,9 @@ chunks:
build-system: autotools
build-depends:
- libnice
+ submodules:
+ common:
+ url: upstream:gstreamer-common
- name: telepathy-farstream
repo: upstream:telepathy-farstream
ref: 0b1bba79cfe94e7676fe69e9e0d2e3983a3c14c5
@@ -760,6 +781,9 @@ chunks:
build-depends:
- libnice
- telepathy-glib
+ submodules:
+ lib/ext/wocky:
+ url: upstream:wocky
- name: telepathy-salut
morph: strata/gnome/telepathy-salut.morph
repo: upstream:telepathy-salut
@@ -767,6 +791,9 @@ chunks:
unpetrify-ref: baserock/telepathy-salut-0.8.1
build-depends:
- telepathy-glib
+ submodules:
+ lib/ext/wocky:
+ url: upstream:wocky
- name: telepathy-idle
repo: upstream:telepathy-idle
ref: 55e9841a4af51d7f014395475526b700abec4d0b
@@ -919,6 +946,11 @@ chunks:
- libpwquality
- libwacom
- network-manager-applet
+ submodules:
+ libgd:
+ url: upstream:gnome/libgd
+ panels/sound/gvc:
+ url: upstream:gnome/libgnome-volume-control
- name: gnome-initial-setup
morph: strata/gnome/gnome-initial-setup.morph
repo: upstream:gnome/gnome-initial-setup
@@ -1004,9 +1036,12 @@ chunks:
- libpeas
- totem-pl-parser
- yelp-tools
+ submodules:
+ libgd:
+ url: upstream:gnome/libgd
- name: yelp
repo: upstream:gnome/yelp
- morph: strata/gnome/yelp.morph
+ morph: strata/gnome/yelp.morph
ref: 9932283ce9610f969e023a0dc326c81159c06a15
unpetrify-ref: 3.18.1
build-depends:
@@ -1038,6 +1073,9 @@ chunks:
- iso-codes
- libpeas
- yelp-tools
+ submodules:
+ libgd:
+ url: upstream:gnome/libgd
- name: gnome-calendar
repo: upstream:gnome/gnome-calendar
ref: 5292e9d57442067701ce94eea54b4b12d13b7aa3
@@ -1086,6 +1124,9 @@ chunks:
- telepathy-mission-control
- WebKitGtk1
- yelp-tools
+ submodules:
+ telepathy-account-widgets:
+ url: upstream:gnome/telepathy-account-widgets
- name: gnome-contacts
repo: upstream:gnome/gnome-contacts
ref: 3715ec79662989038d5055bb74aa0b728b40edb5
@@ -1099,6 +1140,9 @@ chunks:
- libchamplain
- libnotify
- telepathy-glib
+ submodules:
+ libgd:
+ url: upstream:gnome/libgd
- name: gnome-maps
repo: upstream:gnome/gnome-maps
ref: 6d6e8afd54735e565a0c81cb761f22bb82d142db
diff --git a/strata/multimedia-gstreamer-0.10.morph
b/strata/multimedia-gstreamer-0.10.morph
index a9c84ca..6f9d9f6 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -19,6 +19,9 @@ chunks:
build-system: autotools
build-depends:
- orc
+ submodules:
+ common:
+ url: upstream:gstreamer-common
- name: gstreamer-plugins-base(a)0.10
repo: upstream:gstreamer-plugins-base
ref: 960c596309dbb983a1d733259adccc45c47006a2
@@ -26,6 +29,9 @@ chunks:
build-system: autotools
build-depends:
- gstreamer(a)0.10
+ submodules:
+ common:
+ url: upstream:gstreamer-common
- name: gstreamer-plugins-good(a)0.10
repo: upstream:gstreamer-plugins-good
ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3
@@ -35,3 +41,6 @@ chunks:
- gstreamer(a)0.10
- gstreamer-plugins-base(a)0.10
- orc
+ submodules:
+ common:
+ url: upstream:gstreamer-common
diff --git a/strata/multimedia-gstreamer.morph
b/strata/multimedia-gstreamer.morph
index 0cef379..884fc9f 100644
--- a/strata/multimedia-gstreamer.morph
+++ b/strata/multimedia-gstreamer.morph
@@ -20,6 +20,9 @@ chunks:
build-system: autotools
build-depends:
- orc
+ submodules:
+ common:
+ url: upstream:gstreamer-common
- name: gstreamer-plugins-base
repo: upstream:gstreamer-plugins-base
ref: 644cd58c5a1142580ad133a5122986581cf4d8ef
@@ -28,6 +31,9 @@ chunks:
build-depends:
- gstreamer
- orc
+ submodules:
+ common:
+ url: upstream:gstreamer-common
- name: gstreamer-plugins-good
repo: upstream:gstreamer-plugins-good
ref: e6fb1b485dd2726e6c65d938c5ea4d002cf1036e
@@ -37,6 +43,9 @@ chunks:
- gstreamer
- gstreamer-plugins-base
- orc
+ submodules:
+ common:
+ url: upstream:gstreamer-common
- name: gstreamer-plugins-bad
repo: upstream:gstreamer-plugins-bad
ref: 9a2e845040c3aafff00159a6b0031e123cad4b2f
@@ -46,6 +55,9 @@ chunks:
- gstreamer
- gstreamer-plugins-base
- orc
+ submodules:
+ common:
+ url: upstream:gstreamer-common
- name: gst-libav
morph: strata/multimedia-gstreamer/gst-libav.morph
repo: upstream:gst-libav
@@ -55,3 +67,8 @@ chunks:
- gstreamer
- gstreamer-plugins-base
- orc
+ submodules:
+ gst-libs/ext/libav:
+ url: upstream:ffmpeg
+ common:
+ url: upstream:gstreamer-common
diff --git a/strata/multimedia-hardware-codecs-x86.morph
b/strata/multimedia-hardware-codecs-x86.morph
index 421d55e..d53698e 100644
--- a/strata/multimedia-hardware-codecs-x86.morph
+++ b/strata/multimedia-hardware-codecs-x86.morph
@@ -26,3 +26,6 @@ chunks:
build-system: autotools
build-depends:
- libva
+ submodules:
+ common:
+ url: upstream:gstreamer-common
diff --git a/strata/openstack-services.morph
b/strata/openstack-services.morph
index 0b8e7ac..789799c 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -43,6 +43,11 @@ chunks:
unpetrify-ref: baserock/v1.6.1
build-depends:
- py-amqp
+ submodules:
+ rabbitmq-codegen:
+ url: upstream:rabbitmq-codegen.git
+ rabbitmq-c:
+ url: upstream:python-packages/rabbitmq-c-github-ask.git
- name: anyjson
repo: upstream:python-packages/anyjson
ref: 016506078e94718e1fe750eb5083ab5ba07498c8
@@ -125,6 +130,9 @@ chunks:
ref: cce3ebd658f28aeb7dd54561554dedf5259303dc
unpetrify-ref: baserock/v0.5.4
build-system: python-distutils
+ submodules:
+ ext/spec:
+ url: upstream:mustache-spec
- name: pies
repo: upstream:python-packages/pies.git
ref: 593dcce07fdb3e8d0053a863a7aba7f2ce8a6c9c
@@ -215,6 +223,11 @@ chunks:
build-system: python-distutils
build-depends:
- sphinx
+ submodules:
+ doc/sphinxext:
+ url: upstream:numpydoc.git
+ doc/scipy-sphinx-theme:
+ url: upstream:scipy-sphinx-theme.git
- name: websockify
repo: upstream:python-packages/websockify
ref: 2f025741f86419d4ad5702dabf5903db3dbfe77c
@@ -222,6 +235,9 @@ chunks:
build-system: python-distutils
build-depends:
- numpy
+ submodules:
+ include/web-socket-js-project:
+ url: upstream:web-socket-js.git
- name: httplib2
repo: upstream:python-packages/httplib2
ref: f9f797223d075874b0031aea832152688ec23fef
@@ -666,6 +682,7 @@ chunks:
ref: 8675c3e3e620df5ba9fd7e570c554b773429bd78
unpetrify-ref: v0.9.3
build-system: python-distutils
+ submodules: {}
- name: werkzeug
repo: upstream:python-packages/werkzeug
ref: 96e49709d627a7766077cff4c98ebf3cad868ceb
@@ -730,6 +747,9 @@ chunks:
repo: upstream:novnc
ref: 97be997f62d59c028fc45323b00e3b93fafe4eb4
unpetrify-ref: baserock/v0.5.1
+ submodules:
+ include/web-socket-js-project:
+ url: upstream:web-socket-js
- name: pyserial
repo: upstream:python-packages/pyserial
ref: bcfc1ec2fdb9a8c9c867481d7673e85fe512e667
diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph
index 5d0297e..1f753b4 100644
--- a/strata/ostree-core.morph
+++ b/strata/ostree-core.morph
@@ -30,3 +30,8 @@ chunks:
build-depends:
- gpgme
- libgsystem
+ submodules:
+ libglnx:
+ url: upstream:libglnx
+ bsdiff:
+ url: upstream:bsdiff
diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph
index 0533ea5..107d76b 100644
--- a/strata/qt4-sdk.morph
+++ b/strata/qt4-sdk.morph
@@ -9,3 +9,6 @@ chunks:
repo: upstream:qt-creator
ref: d5a6b10634c1a3271012e9578e016772ef077d59
unpetrify-ref: baserock/morph/2.7
+ submodules:
+ qbs:
+ url: upstream:qbs
diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph
index d4c76ee..9db7b32 100644
--- a/strata/qt5-sdk.morph
+++ b/strata/qt5-sdk.morph
@@ -10,3 +10,6 @@ chunks:
repo: upstream:qt-creator
ref: d81cd236df1cc6bc6977c438f0edbff35eef6682
unpetrify-ref: baserock/3.3.0
+ submodules:
+ qbs:
+ url: upstream:qbs
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 085643f..5cff38a 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -33,6 +33,9 @@ chunks:
build-depends:
- qtbase
- qtscript
+ submodules:
+ tests/manual/v4/test262:
+ url: git://github.com/tronical/test262.git
- name: qtquick1
morph: strata/qt5-tools/qtquick1.morph
repo: upstream:qt5/qtquick1
diff --git a/strata/tools.morph b/strata/tools.morph
index 0a71ace..c79e83c 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -64,6 +64,9 @@ chunks:
repo: upstream:parted
ref: 387e96e6eac59d84e9a688422b4b321ae9beaa20
unpetrify-ref: baserock/v3.2
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: zip
morph: strata/tools/zip.morph
repo: upstream:zip
diff --git a/strata/trove.morph b/strata/trove.morph
index 736df38..bfc1250 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -19,6 +19,9 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- lua
+ submodules:
+ extras/luacov:
+ url: upstream:gitano/luacov
- name: luxio
morph: strata/trove/luxio.morph
repo: upstream:luxio
@@ -34,6 +37,9 @@ chunks:
build-depends:
- lua
- luxio
+ submodules:
+ extras/luacov:
+ url: upstream:gitano/luacov
- name: clod
morph: strata/trove/clod.morph
repo: upstream:gitano/clod
@@ -41,6 +47,9 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- lua
+ submodules:
+ extras/luacov:
+ url: upstream:gitano/luacov
- name: gall
morph: strata/trove/gall.morph
repo: upstream:gitano/gall
@@ -49,6 +58,13 @@ chunks:
build-depends:
- lua
- luxio
+ submodules:
+ libgit2:
+ url: upstream:gitano/libgit2
+ luagit2:
+ url: upstream:gitano/luagit2
+ extras/luacov:
+ url: upstream:gitano/luacov
- name: lrexlib-pcre
morph: strata/trove/lrexlib-pcre.morph
repo: upstream:lrexlib
@@ -68,6 +84,9 @@ chunks:
repo: upstream:cgit
ref: dc881acb0c857c783b611c03294d79a7553a4ec7
unpetrify-ref: baserock/v0.12
+ submodules:
+ git:
+ url: upstream:git
- name: trove-setup
morph: strata/trove/trove-setup.morph
repo: baserock:baserock/trove-setup
diff --git a/strata/vala-common.morph b/strata/vala-common.morph
index 7827703..e1438de 100644
--- a/strata/vala-common.morph
+++ b/strata/vala-common.morph
@@ -22,6 +22,9 @@ chunks:
ref: 6e9a4d3b35c5ce8af050e66d8caff96070c57d34
unpetrify-ref: baserock/2015-12-15
build-system: autotools
+ submodules:
+ autoconf-archive:
+ url: upstream:autoconf-archive
- name: libgee
repo: upstream:gnome/libgee
ref: 4301ab58efc217409c588a5527f68990b4e3d220
diff --git a/strata/virtualization.morph
b/strata/virtualization.morph
index 2a91fa1..32131bc 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -30,6 +30,29 @@ chunks:
repo: upstream:qemu
ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d
unpetrify-ref: baserock/v2.2.0
+ submodules:
+ roms/openbios:
+ url: upstream:qemu-openbios
+ dtc:
+ url: upstream:device-tree-compiler
+ roms/openhackware:
+ url: upstream:qemu-openhackware
+ roms/seabios:
+ url: upstream:qemu-seabios
+ roms/vgabios:
+ url: upstream:qemu-vgabios
+ roms/u-boot:
+ url: upstream:u-boot
+ roms/SLOF:
+ url: upstream:qemu-SLOF
+ roms/qemu-palcode:
+ url: upstream:qemu-palcode
+ roms/ipxe:
+ url: upstream:qemu-ipxe
+ roms/sgabios:
+ url: upstream:qemu-sgabios
+ pixman:
+ url: upstream:pixman
- name: libpciaccess
repo: upstream:libpciaccess
ref: b9c068896914b4132a24839c9ef7f9fcd6282d88
@@ -51,6 +74,9 @@ chunks:
- qemu
- yajl
- dmidecode
+ submodules:
+ gnulib:
+ url: upstream:gnulib
- name: pycurl
repo: upstream:pycurl
ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 3325494..65212bb 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -160,6 +160,9 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ submodules:
+ m4:
+ url: upstream:xcb/util-common-m4
- name: util-wm
repo: upstream:util-wm
ref: fb7afc3f291c8cc072d327cd8d97ab1db3283c21
@@ -167,6 +170,9 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ submodules:
+ m4:
+ url: upstream:xcb/util-common-m4
- name: util-keysyms
repo: upstream:util-keysyms
ref: edb763a8837d3932690b9d6d77cb7e20a9ab8013
@@ -174,6 +180,9 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ submodules:
+ m4:
+ url: upstream:xcb/util-common-m4
- name: util-image
repo: upstream:util-image
ref: f20f25a1c017c58d5d7dfffc6e9adc8d31879152
@@ -182,6 +191,9 @@ chunks:
build-depends:
- xcb-libxcb
- xcb-util
+ submodules:
+ m4:
+ url: upstream:xcb/util-common-m4
- name: xorg-lib-libxtrans
repo: upstream:xorg-lib-libxtrans
ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
diff --git a/strata/xdg-app-common.morph
b/strata/xdg-app-common.morph
index 23ab1ec..722b54a 100644
--- a/strata/xdg-app-common.morph
+++ b/strata/xdg-app-common.morph
@@ -9,3 +9,6 @@ chunks:
repo: upstream:xdg-app
ref: aa535b7b01f4dd406e9bed0dfe4a0de2b8e56565
unpetrify-ref: baserock/0.4.4
+ submodules:
+ libglnx:
+ url: upstream:libglnx