summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-26 18:20:19 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-08-27 09:48:54 +0100
commitf0321ef4027af9f626110f2eb31f78663ed08bb6 (patch)
tree8cc077e0c7bb09515f80f2037b61953601a8c10f
parent8089ee05d77128d50a0f8df73d322b5b11224e0b (diff)
downloaddefinitions-f0321ef4027af9f626110f2eb31f78663ed08bb6.tar.gz
Move weston to its own stratum
-rw-r--r--strata/wayland-generic.morph21
-rw-r--r--strata/weston-genivi.morph19
-rw-r--r--strata/weston-genivi/wayland-ivi-extension.morph (renamed from strata/wayland-generic/wayland-ivi-extension.morph)0
-rw-r--r--strata/weston-genivi/weston.morph (renamed from strata/wayland-generic/weston.morph)40
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph2
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
6 files changed, 59 insertions, 25 deletions
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 5c8313f2..8240f635 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -112,24 +112,3 @@ chunks:
- fontconfig
- freetype2
- freefont-otf
-- name: weston
- morph: strata/wayland-generic/weston.morph
- repo: upstream:weston
- ref: 8658e06e69cc3944e89684a2de619e479751633f
- unpetrify-ref: baserock/genivi/baseline-h-1.1
- build-depends:
- - pango
- - wayland
- - mesa
- - libinput
- - cairo
- - pixman
- - libxkbcommon
-- name: wayland-ivi-extension
- morph: strata/wayland-generic/wayland-ivi-extension.morph
- repo: upstream:genivi/wayland-ivi-extension
- ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
- unpetrify-ref: baserock/genivi/baseline-h-1.1
- build-depends:
- - wayland
- - weston
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
new file mode 100644
index 00000000..356a5564
--- /dev/null
+++ b/strata/weston-genivi.morph
@@ -0,0 +1,19 @@
+name: weston-genivi
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: weston
+ morph: strata/weston-genivi/weston.morph
+ repo: upstream:weston
+ ref: 8658e06e69cc3944e89684a2de619e479751633f
+ unpetrify-ref: baserock/genivi/baseline-h-1.1
+ build-depends: []
+- name: wayland-ivi-extension
+ morph: strata/weston-genivi/wayland-ivi-extension.morph
+ repo: upstream:genivi/wayland-ivi-extension
+ ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
+ unpetrify-ref: baserock/genivi/baseline-h-1.1
+ build-depends:
+ - weston
diff --git a/strata/wayland-generic/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph
index c3308ce7..c3308ce7 100644
--- a/strata/wayland-generic/wayland-ivi-extension.morph
+++ b/strata/weston-genivi/wayland-ivi-extension.morph
diff --git a/strata/wayland-generic/weston.morph b/strata/weston-genivi/weston.morph
index 8ce58496..e12a5fc1 100644
--- a/strata/wayland-generic/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -4,12 +4,17 @@ description: weston compositor
build-system: autotools
configure-commands:
- autoreconf -ivf
-- |
- LDFLAGS='-L/lib64 -lrt' \
+- 'LDFLAGS=''-L/lib64 -lrt'' \
+
./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
+
--disable-drm-compositor --disable-x11-compositor \
+
--disable-wayland-compositor --disable-weston-launch --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/"
@@ -17,37 +22,64 @@ post-install-commands:
- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
-- |
- cat <<EOF >> ivi-shell/weston.ini
+- 'cat <<EOF >> ivi-shell/weston.ini
+
[ivi-launcher]
+
workspace-id=0
+
icon-id=4001
+
icon=/usr/share/weston/icon_ivi_flower.png
+
path=/usr/bin/weston-flower
+
[ivi-launcher]
+
workspace-id=0
+
icon-id=4002
+
icon=/usr/share/weston/icon_ivi_clickdot.png
+
path=/usr/bin/weston-clickdot
+
[ivi-launcher]
+
workspace-id=1
+
icon-id=4003
+
icon=/usr/share/weston/icon_ivi_simple-egl.png
+
path=/usr/bin/weston-simple-egl
+
[ivi-launcher]
+
workspace-id=1
+
icon-id=4004
+
icon=/usr/share/weston/icon_ivi_simple-shm.png
+
path=/usr/bin/weston-simple-shm
+
[ivi-launcher]
+
workspace-id=2
+
icon-id=4005
+
icon=/usr/share/weston/icon_ivi_smoke.png
+
path=/usr/bin/weston-smoke
+
EOF
+
+ '
- install -d "$DESTDIR/usr/share/doc/weston"
- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index f8409b04..82f99735 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
+- name: weston-genivi
+ morph: strata/weston-genivi.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 10326469..8747b3a2 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
+- name: weston-genivi
+ morph: strata/weston-genivi.morph
configuration-extensions:
- set-hostname
- add-config-files