summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-28 00:22:10 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-28 10:46:22 (GMT)
commitfa35f9272d937f67f73632d7b4b97491c93bd035 (patch)
tree7a9df0fd9a651d7e009de1448269c04eb0e050ad
parent529cf76e1a276e6324ffa38eef71dcf7d700ad12 (diff)
downloaddefinitions-fa35f9272d937f67f73632d7b4b97491c93bd035.tar.gz
Build only one wayland independent of the architecture
This makes gtk (and everything that is on top) independent of the architecture we are building.
-rw-r--r--strata/genivi-wayland-armv7-versatile.morph15
-rw-r--r--strata/genivi-wayland-generic.morph (renamed from strata/genivi-wayland-x86_64-generic.morph)4
-rw-r--r--strata/gtk-deps.morph2
-rw-r--r--strata/gtk3.morph2
-rw-r--r--strata/wayland-armv7-versatile.morph136
-rw-r--r--strata/wayland-armv7-versatile/cairo.morph5
-rw-r--r--strata/wayland-armv7-versatile/freefont-otf.morph5
-rw-r--r--strata/wayland-armv7-versatile/linux-api-headers.morph9
-rw-r--r--strata/wayland-armv7-versatile/mesa-wayland.morph7
-rw-r--r--strata/wayland-armv7-versatile/wayland-ivi-extension.morph8
-rw-r--r--strata/wayland-armv7-versatile/wayland.morph7
-rw-r--r--strata/wayland-armv7-versatile/weston.morph53
-rw-r--r--strata/wayland-generic.morph (renamed from strata/wayland-x86_64-generic.morph)19
-rw-r--r--strata/wayland-generic/cairo.morph (renamed from strata/wayland-x86_64-generic/cairo.morph)0
-rw-r--r--strata/wayland-generic/freefont-otf.morph (renamed from strata/wayland-x86_64-generic/freefont-otf.morph)0
-rw-r--r--strata/wayland-generic/linux-api-headers.morph (renamed from strata/wayland-x86_64-generic/linux-api-headers.morph)0
-rw-r--r--strata/wayland-generic/mesa-wayland.morph (renamed from strata/wayland-x86_64-generic/mesa-wayland.morph)0
-rw-r--r--strata/wayland-generic/wayland-ivi-extension.morph (renamed from strata/wayland-x86_64-generic/wayland-ivi-extension.morph)0
-rw-r--r--strata/wayland-generic/wayland.morph (renamed from strata/wayland-x86_64-generic/wayland.morph)0
-rw-r--r--strata/wayland-generic/weston.morph (renamed from strata/wayland-x86_64-generic/weston.morph)0
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph4
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph4
22 files changed, 17 insertions, 263 deletions
diff --git a/strata/genivi-wayland-armv7-versatile.morph b/strata/genivi-wayland-armv7-versatile.morph
deleted file mode 100644
index b61d861..0000000
--- a/strata/genivi-wayland-armv7-versatile.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: genivi-wayland-armv7-versatile
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-- morph: strata/genivi-foundation.morph
-- morph: strata/genivi.morph
-- morph: strata/wayland-armv7-versatile.morph
-chunks:
-- name: layer_management-wayland
- repo: upstream:layer_management
- ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
diff --git a/strata/genivi-wayland-x86_64-generic.morph b/strata/genivi-wayland-generic.morph
index eedbecc..3f9eb24 100644
--- a/strata/genivi-wayland-x86_64-generic.morph
+++ b/strata/genivi-wayland-generic.morph
@@ -1,4 +1,4 @@
-name: genivi-wayland-x86_64-generic
+name: genivi-wayland-generic
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
@@ -6,7 +6,7 @@ build-depends:
- morph: strata/foundation.morph
- morph: strata/genivi-foundation.morph
- morph: strata/genivi.morph
-- morph: strata/wayland-x86_64-generic.morph
+- morph: strata/wayland-generic.morph
chunks:
- name: layer_management-wayland
repo: upstream:layer_management
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 71637b1..0d9d745 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -5,7 +5,7 @@ build-depends:
- morph: strata/foundation.morph
- morph: strata/x-common.morph
- morph: strata/x-generic.morph
-- morph: strata/wayland-x86_64-generic.morph
+- morph: strata/wayland-generic.morph
chunks:
- name: shared-mime-info
morph: strata/gtk-deps/shared-mime-info.morph
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 3452621..d70c5b5 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -4,7 +4,7 @@ description: the gtk3 stratum
build-depends:
- morph: strata/gtk-deps.morph
- morph: strata/x-generic.morph
-- morph: strata/wayland-x86_64-generic.morph
+- morph: strata/wayland-generic.morph
chunks:
- name: gtk3
morph: strata/gtk3/gtk3.morph
diff --git a/strata/wayland-armv7-versatile.morph b/strata/wayland-armv7-versatile.morph
deleted file mode 100644
index e989186..0000000
--- a/strata/wayland-armv7-versatile.morph
+++ /dev/null
@@ -1,136 +0,0 @@
-name: wayland-armv7-versatile
-kind: stratum
-build-depends:
-- morph: strata/x-common.morph
-chunks:
-- name: libxkbcommon
- repo: upstream:xorg-lib-libxkbcommon
- ref: b721254769212d671a4729f1c88b059979b80efc
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: wayland
- morph: strata/wayland-armv7-versatile/wayland.morph
- repo: upstream:wayland
- ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c
- unpetrify-ref: baserock/1.4.0
- build-depends:
- - libxkbcommon
-- name: mesa-wayland
- morph: strata/wayland-armv7-versatile/mesa-wayland.morph
- repo: upstream:mesa
- ref: e51e5d4f9875e9a970d7560c6ac0bfed933facc5
- unpetrify-ref: baserock/arm/10.0.4-gallium
- build-depends:
- - wayland
-- name: pixman
- repo: upstream:pixman
- ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: freetype2
- repo: upstream:freetype2
- ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
-- name: freefont-otf
- morph: strata/wayland-armv7-versatile/freefont-otf.morph
- repo: upstream:freefont-otf
- ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cairo
- morph: strata/wayland-armv7-versatile/cairo.morph
- repo: upstream:cairo
- ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
- unpetrify-ref: baserock/genivi/1.12.10
- build-depends:
- - fontconfig
- - freetype2
- - wayland
- - mesa-wayland
- - pixman
-- name: mtdev
- repo: upstream:mtdev-git
- ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: xorg-lib-libxkbfile
- repo: upstream:xorg-lib-libxkbfile
- ref: 7381c2f9013ef7784c78091fa671e652a62ca706
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-app-xkbcomp
- repo: upstream:xorg-app-xkbcomp
- ref: 705b9bbb426410f9510601c7010da51184919b36
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: libevdev
- repo: upstream:libevdev
- ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
-- name: linux-api-headers
- morph: strata/wayland-armv7-versatile/linux-api-headers.morph
- repo: upstream:linux
- ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libinput
- repo: upstream:libinput
- ref: f0fd32db8f3df558e1d763dfa2db76cdca260323
- unpetrify-ref: baserock/genivi/baseline
- build-depends:
- - libxkbcommon
- - mtdev
- - libevdev
- - linux-api-headers
-- name: harfbuzz
- repo: upstream:harfbuzz
- ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
- unpetrify-ref: baserock/0.9.12
- build-depends:
- - freetype2
-- name: pango
- repo: upstream:pango
- ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
- unpetrify-ref: baserock/1.36.3
- build-depends:
- - cairo
- - harfbuzz
- - fontconfig
- - freetype2
- - freefont-otf
-- name: weston
- morph: strata/wayland-armv7-versatile/weston.morph
- repo: upstream:weston
- ref: 8658e06e69cc3944e89684a2de619e479751633f
- unpetrify-ref: baserock/genivi/baseline-h-1.1
- build-depends:
- - pango
- - pixman
- - libxkbcommon
- - wayland
- - mesa-wayland
- - libinput
- - cairo
-- name: wayland-ivi-extension
- morph: strata/wayland-armv7-versatile/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/wayland-armv7-versatile/cairo.morph b/strata/wayland-armv7-versatile/cairo.morph
deleted file mode 100644
index f91ac38..0000000
--- a/strata/wayland-armv7-versatile/cairo.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: cairo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/wayland-armv7-versatile/freefont-otf.morph b/strata/wayland-armv7-versatile/freefont-otf.morph
deleted file mode 100644
index e5c6c48..0000000
--- a/strata/wayland-armv7-versatile/freefont-otf.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: freefont-otf
-kind: chunk
-install-commands:
-- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont
-- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont
diff --git a/strata/wayland-armv7-versatile/linux-api-headers.morph b/strata/wayland-armv7-versatile/linux-api-headers.morph
deleted file mode 100644
index 595138f..0000000
--- a/strata/wayland-armv7-versatile/linux-api-headers.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: linux-api-headers
-kind: chunk
-build-commands:
-- make mrproper
-- make headers_check
-install-commands:
-- make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/wayland-armv7-versatile/mesa-wayland.morph b/strata/wayland-armv7-versatile/mesa-wayland.morph
deleted file mode 100644
index f39c424..0000000
--- a/strata/wayland-armv7-versatile/mesa-wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: mesa-wayland
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm
- --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=swrast
- --with-state-trackers=egl
diff --git a/strata/wayland-armv7-versatile/wayland-ivi-extension.morph b/strata/wayland-armv7-versatile/wayland-ivi-extension.morph
deleted file mode 100644
index c3308ce..0000000
--- a/strata/wayland-armv7-versatile/wayland-ivi-extension.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: wayland-ivi-extension
-kind: chunk
-configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
-build-commands:
-- make
-install-commands:
-- make install DESTDIR=$DESTDIR
diff --git a/strata/wayland-armv7-versatile/wayland.morph b/strata/wayland-armv7-versatile/wayland.morph
deleted file mode 100644
index 752a5d6..0000000
--- a/strata/wayland-armv7-versatile/wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: wayland
-kind: chunk
-description: Wayland server
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/wayland-armv7-versatile/weston.morph b/strata/wayland-armv7-versatile/weston.morph
deleted file mode 100644
index 8ce5849..0000000
--- a/strata/wayland-armv7-versatile/weston.morph
+++ /dev/null
@@ -1,53 +0,0 @@
-name: weston
-kind: chunk
-description: weston compositor
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- |
- 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/"
-- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
-- 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
- [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/strata/wayland-x86_64-generic.morph b/strata/wayland-generic.morph
index 9827068..5c5c825 100644
--- a/strata/wayland-x86_64-generic.morph
+++ b/strata/wayland-generic.morph
@@ -1,4 +1,4 @@
-name: wayland-x86_64-generic
+name: wayland-generic
kind: stratum
build-depends:
- morph: strata/x-common.morph
@@ -9,14 +9,13 @@ chunks:
unpetrify-ref: baserock/genivi/baseline
build-depends: []
- name: wayland
- morph: strata/wayland-x86_64-generic/wayland.morph
+ morph: strata/wayland-generic/wayland.morph
repo: upstream:wayland
- ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c
- unpetrify-ref: baserock/1.4.0
+ ref: baserock/gnome
build-depends:
- libxkbcommon
- name: mesa-wayland
- morph: strata/wayland-x86_64-generic/mesa-wayland.morph
+ morph: strata/wayland-generic/mesa-wayland.morph
repo: upstream:mesa
ref: a77b370b4ba1045e2612650503cf45827af94a12
unpetrify-ref: baserock/10.0.4-gallium
@@ -39,13 +38,13 @@ chunks:
build-depends:
- freetype2
- name: freefont-otf
- morph: strata/wayland-x86_64-generic/freefont-otf.morph
+ morph: strata/wayland-generic/freefont-otf.morph
repo: upstream:freefont-otf
ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
unpetrify-ref: baserock/morph
build-depends: []
- name: cairo
- morph: strata/wayland-x86_64-generic/cairo.morph
+ morph: strata/wayland-generic/cairo.morph
repo: upstream:cairo
ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
unpetrify-ref: baserock/genivi/1.12.10
@@ -83,7 +82,7 @@ chunks:
unpetrify-ref: baserock/genivi/baseline
build-depends: []
- name: linux-api-headers
- morph: strata/wayland-x86_64-generic/linux-api-headers.morph
+ morph: strata/wayland-generic/linux-api-headers.morph
repo: upstream:linux
ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
unpetrify-ref: baserock/morph
@@ -114,7 +113,7 @@ chunks:
- freetype2
- freefont-otf
- name: weston
- morph: strata/wayland-x86_64-generic/weston.morph
+ morph: strata/wayland-generic/weston.morph
repo: upstream:weston
ref: 8658e06e69cc3944e89684a2de619e479751633f
unpetrify-ref: baserock/genivi/baseline-h-1.1
@@ -127,7 +126,7 @@ chunks:
- pixman
- libxkbcommon
- name: wayland-ivi-extension
- morph: strata/wayland-x86_64-generic/wayland-ivi-extension.morph
+ morph: strata/wayland-generic/wayland-ivi-extension.morph
repo: upstream:genivi/wayland-ivi-extension
ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
unpetrify-ref: baserock/genivi/baseline-h-1.1
diff --git a/strata/wayland-x86_64-generic/cairo.morph b/strata/wayland-generic/cairo.morph
index f91ac38..f91ac38 100644
--- a/strata/wayland-x86_64-generic/cairo.morph
+++ b/strata/wayland-generic/cairo.morph
diff --git a/strata/wayland-x86_64-generic/freefont-otf.morph b/strata/wayland-generic/freefont-otf.morph
index e5c6c48..e5c6c48 100644
--- a/strata/wayland-x86_64-generic/freefont-otf.morph
+++ b/strata/wayland-generic/freefont-otf.morph
diff --git a/strata/wayland-x86_64-generic/linux-api-headers.morph b/strata/wayland-generic/linux-api-headers.morph
index 595138f..595138f 100644
--- a/strata/wayland-x86_64-generic/linux-api-headers.morph
+++ b/strata/wayland-generic/linux-api-headers.morph
diff --git a/strata/wayland-x86_64-generic/mesa-wayland.morph b/strata/wayland-generic/mesa-wayland.morph
index 06dfeee..06dfeee 100644
--- a/strata/wayland-x86_64-generic/mesa-wayland.morph
+++ b/strata/wayland-generic/mesa-wayland.morph
diff --git a/strata/wayland-x86_64-generic/wayland-ivi-extension.morph b/strata/wayland-generic/wayland-ivi-extension.morph
index c3308ce..c3308ce 100644
--- a/strata/wayland-x86_64-generic/wayland-ivi-extension.morph
+++ b/strata/wayland-generic/wayland-ivi-extension.morph
diff --git a/strata/wayland-x86_64-generic/wayland.morph b/strata/wayland-generic/wayland.morph
index 752a5d6..752a5d6 100644
--- a/strata/wayland-x86_64-generic/wayland.morph
+++ b/strata/wayland-generic/wayland.morph
diff --git a/strata/wayland-x86_64-generic/weston.morph b/strata/wayland-generic/weston.morph
index 8ce5849..8ce5849 100644
--- a/strata/wayland-x86_64-generic/weston.morph
+++ b/strata/wayland-generic/weston.morph
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 7844e42..f8409b0 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -23,8 +23,8 @@ strata:
morph: strata/multimedia.morph
- name: genivi
morph: strata/genivi.morph
-- name: wayland-armv7-versatile
- morph: strata/wayland-armv7-versatile.morph
+- name: wayland-generic
+ morph: strata/wayland-generic.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 1e5e687..1032646 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -23,8 +23,8 @@ strata:
morph: strata/multimedia.morph
- name: genivi
morph: strata/genivi.morph
-- name: wayland-x86_64-generic
- morph: strata/wayland-x86_64-generic.morph
+- name: wayland-generic
+ morph: strata/wayland-generic.morph
configuration-extensions:
- set-hostname
- add-config-files