Use weston-genivi-gdp and create a systemd service to start weston

4 files changed, 67 insertions, 3 deletions

diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index d2d5cd05..f119baea 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -8,7 +8,7 @@ build-depends:
 - morph: strata/qt5-tools-qtwebkit.morph
 - morph: strata/genivi.morph
 - morph: strata/wayland-generic.morph
-- morph: strata/weston-genivi.morph
+- morph: strata/weston-genivi-gdp.morph
 - morph: strata/python-pygobject.morph
 chunks:
 - name: mm-common
diff --git a/strata/weston-genivi-gdp.morph b/strata/weston-genivi-gdp.morph
new file mode 100644
index 00000000..1531068b
--- /dev/null
+++ b/strata/weston-genivi-gdp.morph
@@ -0,0 +1,21 @@
+name: weston-genivi-gdp
+kind: stratum
+build-depends:
+- morph: strata/graphics-common.morph
+- morph: strata/input-genivi.morph
+- morph: strata/mesa-common.morph
+- morph: strata/libdrm-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: weston
+  morph: strata/weston-genivi/weston-gdp.morph
+  repo: upstream:weston
+  ref: 1a43127064349577d1d41a910d8ed1a39caf2867
+  unpetrify-ref: baserock/genivi/genivi-demo-platform
+- name: wayland-ivi-extension
+  morph: strata/weston-genivi/wayland-ivi-extension.morph
+  repo: upstream:genivi/wayland-ivi-extension
+  ref: bac7fc24bb94e37e33f447b58ec74240bb248841
+  unpetrify-ref: 1.3.91
+  build-depends:
+  - weston
diff --git a/strata/weston-genivi/weston-gdp.morph b/strata/weston-genivi/weston-gdp.morph
new file mode 100644
index 00000000..71f3c84d
--- /dev/null
+++ b/strata/weston-genivi/weston-gdp.morph
@@ -0,0 +1,43 @@
+name: weston-gdp
+kind: chunk
+description: weston compositor
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- |
+  cpu=$(echo $TARGET | cut -d '-' -f 1)
+  case "$cpu" in
+  armv7lhf)
+    export WESTON_NATIVE_BACKEND=drm-backend.so
+    ;;
+  *)
+    export WESTON_NATIVE_BACKEND=fbdev-backend.so
+    ;;
+  esac
+  LDFLAGS='-L/lib64 -lrt' \
+  $
+  ./configure --prefix=$PREFIX --disable-xwayland \
+  --disable-x11-compositor \
+  --disable-wayland-compositor  --enable-egl \
+  --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
+post-install-commands:
+- install -d "$DESTDIR/usr/share/weston"
+- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
+- sed -i 's/hmi-controller.so/ivi-controller.so/' ivi-shell/weston.ini
+- install -d "$DESTDIR/root/.config"
+- install -m 0644 ivi-shell/weston.ini "$DESTDIR/root/.config/weston.ini"
+- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants/"
+- |
+  cat > "$DESTDIR/lib/systemd/system/weston.service" <<EOF
+  [Unit]
+  Description=Weston reference Wayland compositor
+  After=dbus.service 
+
+  [Service]
+  ExecStart=/usr/bin/weston-launch -u root -- --log=/tmp/weston.log
+  ExecStop=/usr/bin/killall -s KILL weston
+
+  [Install]
+  WantedBy=multi-user.target
+  EOF
+- cd "$DESTDIR/lib/systemd/system/multi-user.target.wants/" && ln -s ../weston.service .
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index 82bdc09f..59788eb5 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -37,8 +37,8 @@ strata:
   morph: strata/mesa-common-vm.morph
 - name: x-common
   morph: strata/x-common.morph
-- name: weston-genivi
-  morph: strata/weston-genivi.morph
+- name: weston-genivi-gdp
+  morph: strata/weston-genivi-gdp.morph
 - name: ruby
   morph: strata/ruby.morph
 - name: qt5-tools