summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-04 18:38:44 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-04 18:38:44 (GMT)
commitd3e7539744f3b4773ea40a1b637b5742b1996e2e (patch)
tree3e84b28db27b49fa4ae20882b7c2a38c98b0abb2
parent8093f464b98a25e9cc41b662198fa012bb1115ec (diff)
parente6d356ba1c202095761670cfcc4bb77831ee05c7 (diff)
downloaddefinitions-d3e7539744f3b4773ea40a1b637b5742b1996e2e.tar.gz
Merge remote-tracking branch 'origin/baserock/pedroalvarez/weston-arm'
-rw-r--r--genivi-baseline-system-armv7-versatile.morph1
-rw-r--r--genivi-baseline-system-x86_64-generic.morph1
-rw-r--r--wayland-armv7-versatile.morph74
-rw-r--r--wayland-x86_64-generic.morph76
4 files changed, 138 insertions, 14 deletions
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index efa122a..2c4354b 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -22,3 +22,4 @@ strata:
- morph: multimedia
- morph: genivi
- morph: genivi-x-armv7-versatile
+- morph: wayland-armv7-versatile
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 1ed20b5..3b9f7dc 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -22,3 +22,4 @@ strata:
- morph: multimedia
- morph: genivi
- morph: genivi-x-x86_64-generic
+- morph: wayland-x86_64-generic
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index 8734567..9b77947 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -1,20 +1,17 @@
name: wayland-armv7-versatile
kind: stratum
build-depends:
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
- morph: x-common
chunks:
- name: libxkbcommon
repo: upstream:xorg-lib-libxkbcommon
- ref: bb620df7aa98c129687382e4866e643b8482fc59
- unpetrify-ref: baserock/morph
+ ref: b721254769212d671a4729f1c88b059979b80efc
+ unpetrify-ref: baserock/genivi/baseline
build-depends: []
- name: wayland
repo: upstream:wayland
- ref: 006abd0a68e96749beeebf08aad298036b3fbfd4
- unpetrify-ref: baserock/genivi/wayland
+ ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c
+ unpetrify-ref: baserock/1.4.0
build-depends:
- libxkbcommon
- name: mesa-wayland
@@ -23,3 +20,66 @@ chunks:
unpetrify-ref: baserock/genivi/baseline-armv7-versatile
build-depends:
- wayland
+- name: pixman
+ repo: upstream:pixman
+ ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: cairo
+ repo: upstream:cairo
+ ref: 86fd783959c537b8c0fd49fd979881178ca9a24e
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - 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
+ 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: weston
+ repo: upstream:weston
+ ref: e2136e1f2494c2c1732f0afeba9a7050bdd48e42
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - wayland
+ - mesa-wayland
+ - libinput
+ - cairo
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 7a8962a..2b9f581 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -1,20 +1,17 @@
name: wayland-x86_64-generic
kind: stratum
build-depends:
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
- morph: x-common
chunks:
- name: libxkbcommon
repo: upstream:xorg-lib-libxkbcommon
- ref: bb620df7aa98c129687382e4866e643b8482fc59
- unpetrify-ref: baserock/morph
+ ref: b721254769212d671a4729f1c88b059979b80efc
+ unpetrify-ref: baserock/genivi/baseline
build-depends: []
- name: wayland
repo: upstream:wayland
- ref: 006abd0a68e96749beeebf08aad298036b3fbfd4
- unpetrify-ref: baserock/genivi/wayland
+ ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c
+ unpetrify-ref: baserock/1.4.0
build-depends:
- libxkbcommon
- name: mesa-wayland
@@ -23,3 +20,68 @@ chunks:
unpetrify-ref: baserock/genivi/morph
build-depends:
- wayland
+- name: pixman
+ repo: upstream:pixman
+ ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: cairo
+ repo: upstream:cairo
+ ref: 86fd783959c537b8c0fd49fd979881178ca9a24e
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - 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
+ 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: weston
+ repo: upstream:weston
+ ref: e2136e1f2494c2c1732f0afeba9a7050bdd48e42
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - wayland
+ - mesa-wayland
+ - libinput
+ - cairo
+ - pixman
+ - libxkbcommon