From 7576acb83db5a5504c0662b82c2974c620d444fb Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 6 Jan 2016 16:57:52 +0000 Subject: Stop using input-genivi for GENIVI systems This version is, not needed since the upgrade to weston 1.9 on these systems Change-Id: I36f569edd4abb125b9ddebe9ddcf58d5cf3888d8 --- strata/input-genivi.morph | 39 ---------------------- strata/input-genivi/libxkbcommon-no-x11.morph | 12 ------- strata/input-genivi/xkeyboard-config.morph | 7 ---- strata/weston-genivi.morph | 2 +- .../genivi-baseline-system-armv7lhf-jetson.morph | 4 +-- ...genivi-baseline-system-armv7lhf-versatile.morph | 4 +-- .../genivi-baseline-system-x86_64-generic.morph | 4 +-- systems/genivi-demo-platform-armv7lhf-jetson.morph | 4 +-- systems/genivi-demo-platform-x86_64-generic.morph | 4 +-- 9 files changed, 11 insertions(+), 69 deletions(-) delete mode 100644 strata/input-genivi.morph delete mode 100644 strata/input-genivi/libxkbcommon-no-x11.morph delete mode 100644 strata/input-genivi/xkeyboard-config.morph diff --git a/strata/input-genivi.morph b/strata/input-genivi.morph deleted file mode 100644 index 5e86e704..00000000 --- a/strata/input-genivi.morph +++ /dev/null @@ -1,39 +0,0 @@ -name: input-genivi -kind: stratum -description: | - Input components for GENIVI Demo Platform. GDP needs libinput 0.7, - because 0.8+ changed function signatures that weston uses. -build-depends: -- morph: strata/foundation.morph -- morph: strata/xorg-util-macros-common.morph -chunks: -- name: mtdev - repo: upstream:mtdev-git - ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d - unpetrify-ref: v1.1.5 - build-system: autotools -- name: xkeyboard-config - morph: strata/input-genivi/xkeyboard-config.morph - repo: upstream:xkeyboard-config - ref: 26f344c93f8c6141e9233eb68088ba4fd56bc9ef - unpetrify-ref: xkeyboard-config-2.14 -- name: libevdev - repo: upstream:libevdev - ref: 6f03fd49fb949e46ebccb5dfb54489584896c791 - unpetrify-ref: libevdev-1.4.2 - build-system: autotools -- name: libinput@genivi - repo: upstream:libinput - ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f - unpetrify-ref: 0.7.0 - build-system: autotools - build-depends: - - mtdev - - libevdev -- name: libxkbcommon-no-x11 - repo: upstream:xorg-lib-libxkbcommon - ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 - morph: strata/input-genivi/libxkbcommon-no-x11.morph - unpetrify-ref: xkbcommon-0.5.0 - build-depends: - - xkeyboard-config diff --git a/strata/input-genivi/libxkbcommon-no-x11.morph b/strata/input-genivi/libxkbcommon-no-x11.morph deleted file mode 100644 index 95165aaf..00000000 --- a/strata/input-genivi/libxkbcommon-no-x11.morph +++ /dev/null @@ -1,12 +0,0 @@ -name: libxkbcommon-no-x11 -kind: chunk - -description: | - xkbcommon is a library to handle keyboard descriptions. - - This version is built without X11 support. If built with X11 support, - it depends on the xcb-xkb library. - -build-system: autotools -configure-commands: -- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-x11 diff --git a/strata/input-genivi/xkeyboard-config.morph b/strata/input-genivi/xkeyboard-config.morph deleted file mode 100644 index 2195befe..00000000 --- a/strata/input-genivi/xkeyboard-config.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: xkeyboard-config -kind: chunk -configure-commands: -- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-runtime-deps -install-commands: -- mkdir -p "$DESTDIR"/"$PREFIX"/share/X11/xkb/ -- make install DESTDIR="$DESTDIR" diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 78978e78..2fb1e78d 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -2,7 +2,7 @@ name: weston-genivi kind: stratum build-depends: - morph: strata/graphics-common.morph -- morph: strata/input-genivi.morph +- morph: strata/input-common.morph - morph: strata/mesa-common.morph - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 59e2c86f..138ecc8c 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -31,8 +31,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-genivi - morph: strata/input-genivi.morph +- name: input-common + morph: strata/input-common.morph - name: mesa-common morph: strata/mesa-common.morph - name: x-common diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 6a69e3b2..09662627 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -31,8 +31,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-genivi - morph: strata/input-genivi.morph +- name: input-common + morph: strata/input-common.morph - name: x-common morph: strata/x-common.morph - name: weston-genivi diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index 693437b4..d80ca21e 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -31,8 +31,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-genivi - morph: strata/input-genivi.morph +- name: input-common + morph: strata/input-common.morph - name: llvm-common morph: strata/llvm-common.morph - name: mesa-common diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph index f6bded35..c99739e1 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -35,8 +35,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-genivi - morph: strata/input-genivi.morph +- name: input-common + morph: strata/input-common.morph - name: mesa-common morph: strata/mesa-common.morph - name: x-common diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index 724d3bf9..83d510b7 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -35,8 +35,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-genivi - morph: strata/input-genivi.morph +- name: input-common + morph: strata/input-common.morph - name: llvm-common morph: strata/llvm-common.morph - name: mesa-common -- cgit v1.2.1