summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build-essential.morph2
-rw-r--r--core.morph2
-rw-r--r--cross-bootstrap.morph2
-rw-r--r--devel-system-ppc64-chroot.morph2
-rw-r--r--devel-system-ppc64-generic.morph2
-rw-r--r--devel-system-x86_32-chroot.morph2
-rw-r--r--devel-system-x86_32-generic.morph2
-rw-r--r--devel-system-x86_64-chroot.morph2
-rw-r--r--devel-system-x86_64-generic.morph2
-rw-r--r--genivi-baseline-system-armv7lhf-versatile.morph (renamed from genivi-baseline-system-armv7-versatile.morph)4
-rw-r--r--genivi.morph4
-rw-r--r--gtk2.morph4
-rw-r--r--nodejs-system-x86_64.morph2
-rw-r--r--openstack-clients.morph (renamed from glanceclient.morph)16
-rw-r--r--release.morph54
-rw-r--r--tools.morph4
-rw-r--r--virtualization.morph2
-rw-r--r--wayland-armv7-versatile.morph6
-rw-r--r--wayland-x86_64-generic.morph6
19 files changed, 69 insertions, 51 deletions
diff --git a/build-essential.morph b/build-essential.morph
index 7729611b..51837088 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -242,7 +242,7 @@ chunks:
prefix: /usr
- name: busybox
repo: upstream:busybox
- ref: eeb9014f28e3aa00673a0fad127e7420da4392db
+ ref: bf06394ab87ff22662084c82c1821847c25b7f21
unpetrify-ref: baserock/build-essential
build-depends:
- stage2-binutils
diff --git a/core.morph b/core.morph
index f8faf1f4..09802864 100644
--- a/core.morph
+++ b/core.morph
@@ -12,7 +12,7 @@ chunks:
build-depends: []
- name: cmake
repo: upstream:cmake
- ref: 7f9a761e761046a479fda38ee13f5dacd94ceeea
+ ref: 99c4f0a49237633372f218a44e3503e0a2bddae6
unpetrify-ref: baserock/morph
build-depends: []
- name: gdbm
diff --git a/cross-bootstrap.morph b/cross-bootstrap.morph
index 3234befc..eb5374fd 100644
--- a/cross-bootstrap.morph
+++ b/cross-bootstrap.morph
@@ -6,7 +6,7 @@ build-depends:
chunks:
- name: six
repo: upstream:six
- ref: e0841d716953710ab9bca9d1715a710df9c61ca0
+ ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
unpetrify-ref: baserock/morph
build-depends: []
- name: groff
diff --git a/devel-system-ppc64-chroot.morph b/devel-system-ppc64-chroot.morph
index 4b4f6b57..dfb2b7c8 100644
--- a/devel-system-ppc64-chroot.morph
+++ b/devel-system-ppc64-chroot.morph
@@ -14,4 +14,4 @@ strata:
- morph: core
- morph: foundation
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph
index 3dcdce7d..1297acba 100644
--- a/devel-system-ppc64-generic.morph
+++ b/devel-system-ppc64-generic.morph
@@ -23,4 +23,4 @@ strata:
- morph: genivi
- morph: genivi-x-ppc64-generic
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_32-chroot.morph b/devel-system-x86_32-chroot.morph
index 3341b440..e5cc2043 100644
--- a/devel-system-x86_32-chroot.morph
+++ b/devel-system-x86_32-chroot.morph
@@ -14,4 +14,4 @@ strata:
- morph: core
- morph: foundation
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 0a375420..42d363b5 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -23,4 +23,4 @@ strata:
- morph: genivi
- morph: genivi-x-x86_64-generic
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_64-chroot.morph b/devel-system-x86_64-chroot.morph
index 99ac6272..04ab534c 100644
--- a/devel-system-x86_64-chroot.morph
+++ b/devel-system-x86_64-chroot.morph
@@ -14,4 +14,4 @@ strata:
- morph: core
- morph: foundation
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index aac19b96..7048df53 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -24,4 +24,4 @@ strata:
- morph: genivi-x-x86_64-generic
- morph: tools
- morph: virtualization
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7lhf-versatile.morph
index 32c69100..31185c94 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7lhf-versatile.morph
@@ -1,4 +1,4 @@
-arch: armv7l
+arch: armv7lhf
configuration-extensions:
- set-hostname
- add-config-files
@@ -9,7 +9,7 @@ configuration-extensions:
- fstab
description: A GENIVI baseline system for an ARMv7 system.
kind: system
-name: genivi-baseline-system-armv7-versatile
+name: genivi-baseline-system-armv7lhf-versatile
strata:
- morph: build-essential
- morph: core
diff --git a/genivi.morph b/genivi.morph
index 70384d3c..caf7ff99 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -6,8 +6,8 @@ build-depends:
chunks:
- name: DLT-daemon
repo: upstream:DLT-daemon
- ref: 6ab10c022d4464628fc2b848b5a56bf1eaafe857
- unpetrify-ref: v2.9.1
+ ref: 8b48e73f79b4463393916e4c6696917e3dedd026
+ unpetrify-ref: v2.10.0
build-depends: []
- name: node-startup-controller
repo: upstream:node-startup-controller
diff --git a/gtk2.morph b/gtk2.morph
index 74156fcd..82afb7e6 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -58,8 +58,8 @@ chunks:
build-depends: []
- name: colm
repo: upstream:colm
- ref: fc633086748169632e93b945259197ba46f27695
- unpetrify-ref: master
+ ref: 746b80d9b15dceca54dff43123d56ffcb6e42f06
+ unpetrify-ref: 0.11.1
build-depends: []
- name: ragel
repo: upstream:ragel
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
index 876f1432..0018fbdf 100644
--- a/nodejs-system-x86_64.morph
+++ b/nodejs-system-x86_64.morph
@@ -24,5 +24,5 @@ strata:
- morph: genivi-x-x86_64-generic
- morph: tools
- morph: virtualization
-- morph: glanceclient
+- morph: openstack-clients
- morph: nodejs
diff --git a/glanceclient.morph b/openstack-clients.morph
index 5d80a73f..fc130872 100644
--- a/glanceclient.morph
+++ b/openstack-clients.morph
@@ -1,6 +1,6 @@
-name: glanceclient
+name: openstack-clients
kind: stratum
-description: A stratum with glanceclient to let the Openstack deployment.
+description: A stratum with OpenStack clients, for OpenStack deployments.
build-depends:
- morph: tools
chunks:
@@ -101,3 +101,15 @@ chunks:
- pyopenssl
- python-keystoneclient
- warlock
+- name: python-novaclient
+ repo: upstream:python-novaclient
+ ref: 9e4530c79e46d392ed8f3e413bca1acffe022fe6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-prettytable
+ - pbr
+ - argparse
+ - pyiso8601
+ - python-requests
+ - simplejson
+ - babel
diff --git a/release.morph b/release.morph
index c0493d9a..40d938e2 100644
--- a/release.morph
+++ b/release.morph
@@ -3,58 +3,64 @@ kind: cluster
description: |
Deploy all the systems for we support in a release.
systems:
-- morph: base-system-armv7-highbank
+- morph: devel-system-armv7lhf-highbank
deploy:
- as-tar:
- type: tar
- location: /src/release/baserock-13-base-system-armv7-highbank.tar
-- morph: devel-system-armv7-highbank
- deploy:
- as-tar:
- type: tar
- location: /src/release/baserock-13-devel-system-armv7-highbank.tar
-- morph: base-system-armv7b-highbank
- deploy:
- as-tar:
+ release:
type: tar
- location: /src/release/baserock-13-base-system-armv7b-highbank.tar
-- morph: devel-system-armv7b-highbank
+ location: /src/release/baserock-14.20-devel-system-armv7lhf-highbank.tar
+- morph: genivi-baseline-system-armv7lhf-versatile
deploy:
- as-tar:
- type: tar
- location: /src/release/baserock-13-devel-system-armv7b-highbank.tar
-- morph: devel-system-armv7-wandboard
+ # NOTE: to fully deploy this system requires fishing in the artifact cache
+ # for the kernel artifact. We should fix deployment to extract the kernel
+ # artifact for us.
+ release:
+ type: rawdisk
+ location: /src/release/baserock-14.20-genivi-baseline-system-armv7lhf-versatile.img
+ DISK_SIZE: 4G
+ FSTAB_ROOT: /dev/mmcblk0 / btrfs default,rw,noatime 0 1
+ VERSION_LABEL: baserock-14.20
+- morph: devel-system-x86_32-chroot
deploy:
release:
type: tar
- location: /src/release/baserock-13-devel-system-armv7-wandboard.tar
+ location: /src/release/baserock-14.20-devel-system-x86_32-chroot.tar
- morph: base-system-x86_32-generic
deploy:
release:
type: rawdisk
- location: /src/release/baserock-13-base-system-x86_32-generic.img
+ location: /src/release/baserock-14.20-base-system-x86_32-generic.img
DISK_SIZE: 4G
+ VERSION_LABEL: baserock-14.20
- morph: devel-system-x86_32-generic
deploy:
release:
type: rawdisk
- location: /src/release/baserock-13-devel-system-x86_32-generic.img
+ location: /src/release/baserock-14.20-devel-system-x86_32-generic.img
DISK_SIZE: 4G
+ VERSION_LABEL: baserock-14.20
+- morph: devel-system-x86_64-chroot
+ deploy:
+ release:
+ type: tar
+ location: /src/release/baserock-14.20-devel-system-x86_64-chroot.tar
- morph: base-system-x86_64-generic
deploy:
release:
type: rawdisk
- location: /src/release/baserock-13-base-system-x86_64-generic.img
+ location: /src/release/baserock-14.20-base-system-x86_64-generic.img
DISK_SIZE: 4G
+ VERSION_LABEL: baserock-14.20
- morph: devel-system-x86_64-generic
deploy:
release:
type: rawdisk
- location: /src/release/baserock-13-devel-system-x86_64-generic.img
+ location: /src/release/baserock-14.20-devel-system-x86_64-generic.img
DISK_SIZE: 4G
+ VERSION_LABEL: baserock-14.20
- morph: genivi-baseline-system-x86_64-generic
deploy:
release:
type: rawdisk
- location: /src/release/baserock-13-genivi-baseline-system-x86_64-generic.img
+ location: /src/release/baserock-14.20-genivi-baseline-system-x86_64-generic.img
DISK_SIZE: 4G
+ VERSION_LABEL: baserock-14.20
diff --git a/tools.morph b/tools.morph
index 834ea701..dcba3f80 100644
--- a/tools.morph
+++ b/tools.morph
@@ -6,7 +6,7 @@ build-depends:
chunks:
- name: six
repo: upstream:six
- ref: e0841d716953710ab9bca9d1715a710df9c61ca0
+ ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
unpetrify-ref: baserock/morph
build-depends: []
- name: python-ttystatus
@@ -92,7 +92,7 @@ chunks:
- six
- name: morph
repo: baserock:baserock/morph
- ref: f23b51aaa0dff06c7926e803b0f09103c60147a4
+ ref: 06b61dd0344d8e3bf1039dffc964e1e58556e75d
unpetrify-ref: master
build-depends:
- cliapp
diff --git a/virtualization.morph b/virtualization.morph
index 4300b627..33e662b4 100644
--- a/virtualization.morph
+++ b/virtualization.morph
@@ -27,7 +27,7 @@ chunks:
- lvm2
- name: qemu
repo: upstream:qemu
- ref: 5e4eac434b4ff85af2a8821cce8a4ef2b12d8e5e
+ ref: f8d1fb61e65575011a67d7ba97b690feb5630c91
unpetrify-ref: baserock/morph
build-depends: []
- name: xorg-util-macros
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index a882611f..1bc2019c 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -110,8 +110,8 @@ chunks:
- freefont-otf
- name: weston
repo: upstream:weston
- ref: 74f7c94c9186f8fc9ea8f50ab5d5f805d679d05f
- unpetrify-ref: baserock/weston-ivi-shell-1.4.0-v12
+ ref: 721c0f13ab80eb209983c1d73e168df4ffb70ddc
+ unpetrify-ref: baserock/genivi/weston-ivi-shell-patches
build-depends:
- pango
- pixman
@@ -122,7 +122,7 @@ chunks:
- cairo
- name: wayland-ivi-extension
repo: upstream:genivi/wayland-ivi-extension
- ref: 04485758e5aa78f7c7eb548fd117b2001dc416e6
+ ref: 167029fad4d2896491093ee313a663f2f057217e
unpetrify-ref: baserock/genivi/baseline
build-depends:
- wayland
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index b76ea8ca..6441a1f3 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -110,8 +110,8 @@ chunks:
- freefont-otf
- name: weston
repo: upstream:weston
- ref: 74f7c94c9186f8fc9ea8f50ab5d5f805d679d05f
- unpetrify-ref: baserock/weston-ivi-shell-1.4.0-v12
+ ref: 721c0f13ab80eb209983c1d73e168df4ffb70ddc
+ unpetrify-ref: baserock/genivi/weston-ivi-shell-patches
build-depends:
- pango
- wayland
@@ -122,7 +122,7 @@ chunks:
- libxkbcommon
- name: wayland-ivi-extension
repo: upstream:genivi/wayland-ivi-extension
- ref: 04485758e5aa78f7c7eb548fd117b2001dc416e6
+ ref: 167029fad4d2896491093ee313a663f2f057217e
unpetrify-ref: baserock/genivi/baseline
build-depends:
- wayland