summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-28 00:22:14 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-28 10:46:22 (GMT)
commit7bbdf1f098496546481db75fb37077776ee62aa8 (patch)
tree3cd0818e7ebed96c7dcdba28c24ad1225c6b804f
parent021367d3c00599e730af1c907fba071038b9b1c9 (diff)
downloaddefinitions-7bbdf1f098496546481db75fb37077776ee62aa8.tar.gz
Move common input components from wayland-generic to input-common stratum
This is libinput library and deps These are common dependencies to weston and clutter/gtk
-rw-r--r--strata/input-common.morph45
-rw-r--r--strata/input-common/linux-api-headers.morph (renamed from strata/wayland-generic/linux-api-headers.morph)0
-rw-r--r--strata/wayland-generic.morph42
-rw-r--r--strata/weston-genivi.morph1
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph2
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
6 files changed, 50 insertions, 42 deletions
diff --git a/strata/input-common.morph b/strata/input-common.morph
new file mode 100644
index 0000000..d3831b4
--- /dev/null
+++ b/strata/input-common.morph
@@ -0,0 +1,45 @@
+name: input-common
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+chunks:
+- 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/input-common/linux-api-headers.morph
+ repo: upstream:linux
+ ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: libinput
+ repo: upstream:libinput
+ ref: 0.5.0
+ build-depends:
+ - mtdev
+ - libevdev
+ - linux-api-headers
diff --git a/strata/wayland-generic/linux-api-headers.morph b/strata/input-common/linux-api-headers.morph
index 595138f..595138f 100644
--- a/strata/wayland-generic/linux-api-headers.morph
+++ b/strata/input-common/linux-api-headers.morph
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 6bc1518..d24ffcc 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -21,45 +21,3 @@ chunks:
unpetrify-ref: baserock/gnome
build-depends:
- wayland
-- 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-generic/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
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 1f62b5a..c29020a 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -2,6 +2,7 @@ name: weston-genivi
kind: stratum
build-depends:
- morph: strata/graphics-common.morph
+- morph: strata/input-common.morph
- morph: strata/x-common.morph
- morph: strata/wayland-generic.morph
chunks:
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index aec413d..7c28317 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/wayland-generic.morph
- name: graphics-common
morph: strata/graphics-common.morph
+- name: input-common
+ morph: strata/input-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions:
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 711011c..1ebefae 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/wayland-generic.morph
- name: graphics-common
morph: strata/graphics-common.morph
+- name: input-common
+ morph: strata/input-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions: