summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-27 15:47:49 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-30 17:14:10 +0000
commit7f35f3f675f5b51f2658520a58e981cfd9f588ad (patch)
tree818b5dd4d9b6009b417bd412741498a8b0e0f027 /clusters
parent0056d99aa0b88c9f9eb877096cda6bbc2c954184 (diff)
downloaddefinitions-7f35f3f675f5b51f2658520a58e981cfd9f588ad.tar.gz
extensions: Add genivi.configure and use it in GENIVI systemsGENIVI-K1.0.1baserock/pedroalvarez/gdp-rebase3
This extension allow us to do at configure time: - Configure different weston.ini files (for GENIVI baseline and GDP) - Enable weston.service - Set different backends in weston.service Change-Id: Idfdb8b3d0e881d2da43eeefe86e42ca6876bb790
Diffstat (limited to 'clusters')
-rw-r--r--clusters/ci.morph6
-rw-r--r--clusters/gdp-jetson-upgrade.morph3
-rw-r--r--clusters/release.morph6
3 files changed, 15 insertions, 0 deletions
diff --git a/clusters/ci.morph b/clusters/ci.morph
index c4784e60..240e3d4f 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -65,6 +65,9 @@ systems:
location: genivi-baseline-system-x86_64-generic.img
DISK_SIZE: 4G
KERNEL_ARGS: vga=788
+ GENIVI_WESTON_BACKEND: fbdev
+ GENIVI_WESTON_CONFIG: baseline
+ GENIVI_WESTON_AUTOSTART: False
- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph
deploy:
genivi-baseline-system-armv7lhf-jetson:
@@ -78,6 +81,9 @@ systems:
BOOTLOADER_INSTALL: none
KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
nouveau.pstate=1
+ GENIVI_WESTON_BACKEND: drm
+ GENIVI_WESTON_CONFIG: baseline
+ GENIVI_WESTON_AUTOSTART: True
- morph: systems/openstack-system-x86_64.morph
deploy:
openstack-system-x86_64:
diff --git a/clusters/gdp-jetson-upgrade.morph b/clusters/gdp-jetson-upgrade.morph
index 2147454a..33eb8ec1 100644
--- a/clusters/gdp-jetson-upgrade.morph
+++ b/clusters/gdp-jetson-upgrade.morph
@@ -10,6 +10,9 @@ systems:
BOOTLOADER_INSTALL: "none"
KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
+ GENIVI_WESTON_BACKEND: drm
+ GENIVI_WESTON_CONFIG: gdp
+ GENIVI_WESTON_AUTOSTART: True
deploy:
self:
type: extensions/ssh-rsync
diff --git a/clusters/release.morph b/clusters/release.morph
index dee5b2de..a34a87e3 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph
@@ -63,6 +63,9 @@ systems:
KERNEL_ARGS: vga=788
INITRAMFS_PATH: boot/initramfs.gz
HOSTNAME: genivi-baseline-system-x86-64-generic
+ GENIVI_WESTON_BACKEND: fbdev
+ GENIVI_WESTON_CONFIG: baseline
+ GENIVI_WESTON_AUTOSTART: False
subsystems:
- morph: systems/initramfs-x86_64.morph
deploy:
@@ -83,3 +86,6 @@ systems:
KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
nouveau.pstate=1
HOSTNAME: genivi-baseline-system-armv7lhf-jetson
+ GENIVI_WESTON_BACKEND: drm
+ GENIVI_WESTON_CONFIG: baseline
+ GENIVI_WESTON_AUTOSTART: False