From 7f35f3f675f5b51f2658520a58e981cfd9f588ad Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 27 Oct 2015 15:47:49 +0000
Subject: extensions: Add genivi.configure and use it in GENIVI systems

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
---
 clusters/ci.morph                 | 6 ++++++
 clusters/gdp-jetson-upgrade.morph | 3 +++
 clusters/release.morph            | 6 ++++++
 3 files changed, 15 insertions(+)

(limited to 'clusters')

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
-- 
cgit v1.2.1