summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-28 01:22:12 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-28 11:46:22 +0100
commitc3d6de72c552a95267c1815b4a1fcbe1199c0581 (patch)
treee41a2bf2bd315197830c2ee393849c9331a2c5dd
parente0736b45a40321cb8b70ae5d4ff2d46b3dba41d4 (diff)
downloaddefinitions-c3d6de72c552a95267c1815b4a1fcbe1199c0581.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)0
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph2
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
6 files changed, 23 insertions, 21 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..8ce58496 100644
--- a/strata/wayland-generic/weston.morph
+++ b/strata/weston-genivi/weston.morph
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