Merge branch 'master' of git://git.baserock.org/baserock/baserock/definitions

Conflicts:
	README
	strata/python2-core/pyyaml.morph~
	strata/trove.morph

11 files changed, 38 insertions, 10 deletions

diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 59e2c86f..ccf59f81 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: glib-common
@@ -31,8 +33,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..74493383 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: glib-common
@@ -31,8 +33,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..bbef3ee3 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: glib-common
@@ -31,8 +33,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 d683a33e..b2eef775 100644
--- a/systems/genivi-demo-platform-armv7lhf-jetson.morph
+++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: libdrm-common
@@ -27,14 +29,16 @@ strata:
   morph: strata/multimedia-common.morph
 - name: multimedia-gstreamer
   morph: strata/multimedia-gstreamer.morph
+- name: navigation
+  morph: strata/navigation.morph
 - name: genivi
   morph: strata/genivi.morph
 - name: wayland-generic
   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 7b92faf1..17f077ad 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: libdrm-common
@@ -27,14 +29,16 @@ strata:
   morph: strata/multimedia-common.morph
 - name: multimedia-gstreamer
   morph: strata/multimedia-gstreamer.morph
+- name: navigation
+  morph: strata/navigation.morph
 - name: genivi
   morph: strata/genivi.morph
 - name: wayland-generic
   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/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
index 44cf5e80..c64b03f5 100644
--- a/systems/gnome-system-armv7lhf-jetson.morph
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/core.morph
 - name: data-indexing-management
   morph: strata/data-indexing-management.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: dlna-services
   morph: strata/dlna-services.morph
 - name: foundation
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 2068397f..431da3b0 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/core.morph
 - name: data-indexing-management
   morph: strata/data-indexing-management.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: dlna-services
   morph: strata/dlna-services.morph
 - name: foundation
@@ -45,6 +47,8 @@ strata:
   morph: strata/multimedia-hardware-codecs-x86.morph
 - name: multimedia-gstreamer
   morph: strata/multimedia-gstreamer.morph
+- name: multimedia-gstreamer-openmax-generic
+  morph: strata/multimedia-gstreamer-openmax-generic.morph
 - name: privileges-management
   morph: strata/privileges-management.morph
 - name: python2-core
diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph
index b7fe546a..1e19a543 100644
--- a/systems/weston-qt5-system-x86_64.morph
+++ b/systems/weston-qt5-system-x86_64.morph
@@ -10,6 +10,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: audio-bluetooth
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index 652c4690..5b25ebd0 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -10,6 +10,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-jetson
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 0adfa767..5e91fb71 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -9,6 +9,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
diff --git a/systems/xfce-system-x86_64.morph b/systems/xfce-system-x86_64.morph
index fedddd57..62616000 100644
--- a/systems/xfce-system-x86_64.morph
+++ b/systems/xfce-system-x86_64.morph
@@ -9,6 +9,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: python2-core
   morph: strata/python2-core.morph
 - name: foundation