Split bluetooth and audio-server (pulseaudio) in different stratareview/javier_jardón/split_bluez_audio

Change-Id: I5bd5d79581ed59833002f27f10b596202d8d06bb

18 files changed, 72 insertions, 36 deletions

diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index ccf59f81..20d17638 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -17,8 +17,10 @@ strata:
   morph: strata/connman-common.morph
 - name: device-management
   morph: strata/device-management.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: glib-common
   morph: strata/glib-common.morph
 - name: libdrm-common
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 74493383..3f42ff43 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -17,8 +17,10 @@ strata:
   morph: strata/connman-common.morph
 - name: device-management
   morph: strata/device-management.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: glib-common
   morph: strata/glib-common.morph
 - name: libdrm-common
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index bbef3ee3..dcfb3762 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -17,8 +17,10 @@ strata:
   morph: strata/connman-common.morph
 - name: device-management
   morph: strata/device-management.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: glib-common
   morph: strata/glib-common.morph
 - name: libdrm-common
diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph
index 08700b8f..8593fac8 100644
--- a/systems/genivi-demo-platform-armv7lhf-jetson.morph
+++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph
@@ -23,8 +23,10 @@ strata:
   morph: strata/connman-common.morph
 - name: device-management
   morph: strata/device-management.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
 - name: multimedia-common
diff --git a/systems/genivi-demo-platform-x86_32-generic.morph b/systems/genivi-demo-platform-x86_32-generic.morph
index afacbe97..77276e2d 100644
--- a/systems/genivi-demo-platform-x86_32-generic.morph
+++ b/systems/genivi-demo-platform-x86_32-generic.morph
@@ -23,8 +23,10 @@ strata:
   morph: strata/connman-common.morph
 - name: device-management
   morph: strata/device-management.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
 - name: multimedia-common
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index cfdb5c82..3063eb1f 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -23,8 +23,10 @@ strata:
   morph: strata/connman-common.morph
 - name: device-management
   morph: strata/device-management.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
 - name: multimedia-common
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
index df82e800..96c6e5bb 100644
--- a/systems/gnome-system-armv7lhf-jetson.morph
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -3,8 +3,8 @@ kind: system
 description: A GNOME system system.
 arch: armv7lhf
 strata:
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
 - name: bsp-jetson
   morph: strata/bsp-jetson.morph
 - name: build-essential
@@ -55,6 +55,8 @@ strata:
   morph: strata/ruby.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: wayland-generic
   morph: strata/wayland-generic.morph
 - name: weston-common
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 3a53ab87..80c86b28 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -3,8 +3,8 @@ kind: system
 description: A GNOME system system.
 arch: x86_64
 strata:
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
 - name: build-essential
@@ -85,6 +85,8 @@ strata:
   morph: strata/samba.morph
 - name: secret-service
   morph: strata/secret-service.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: spell-checking
   morph: strata/spell-checking.morph
 - name: storage-management
diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/systems/ivi-system-armv7lhf-jetson.morph
index 5e10db6d..175c2e7b 100644
--- a/systems/ivi-system-armv7lhf-jetson.morph
+++ b/systems/ivi-system-armv7lhf-jetson.morph
@@ -3,8 +3,8 @@ kind: system
 description: A generic IVI system with components from GENIVI and AGL
 arch: armv7lhf
 strata:
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
 - name: build-essential
@@ -73,6 +73,8 @@ strata:
   morph: strata/samba.morph
 - name: secret-service
   morph: strata/secret-service.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: spell-checking
   morph: strata/spell-checking.morph
 - name: storage-management
diff --git a/systems/ivi-system-x86_32.morph b/systems/ivi-system-x86_32.morph
index 2f7c4145..f88325ed 100644
--- a/systems/ivi-system-x86_32.morph
+++ b/systems/ivi-system-x86_32.morph
@@ -3,8 +3,8 @@ kind: system
 description: A generic IVI system with components from GENIVI and AGL
 arch: x86_32
 strata:
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
 - name: bsp-x86_both-tools
   morph: strata/bsp-x86_both-tools.morph
 - name: bsp-x86_32-ivi
@@ -81,6 +81,8 @@ strata:
   morph: strata/samba.morph
 - name: secret-service
   morph: strata/secret-service.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: spell-checking
   morph: strata/spell-checking.morph
 - name: storage-management
diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph
index bbf7b998..146c2821 100644
--- a/systems/ivi-system-x86_64.morph
+++ b/systems/ivi-system-x86_64.morph
@@ -3,8 +3,8 @@ kind: system
 description: A generic IVI system with components from GENIVI and AGL
 arch: x86_64
 strata:
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
 - name: bsp-x86_both-tools
   morph: strata/bsp-x86_both-tools.morph
 - name: bsp-x86_64-ivi
@@ -81,6 +81,8 @@ strata:
   morph: strata/samba.morph
 - name: secret-service
   morph: strata/secret-service.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: spell-checking
   morph: strata/spell-checking.morph
 - name: storage-management
diff --git a/systems/java-build-system-x86_64-generic.morph b/systems/java-build-system-x86_64-generic.morph
index b60637ba..275d84e8 100644
--- a/systems/java-build-system-x86_64-generic.morph
+++ b/systems/java-build-system-x86_64-generic.morph
@@ -73,8 +73,10 @@ strata:
   morph: strata/java.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index d6a84fd6..6197088b 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -10,8 +10,10 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: multimedia-common
   morph: strata/multimedia-common.morph
 - name: multimedia-gstreamer-0.10
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index eb393f12..61be08f6 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -10,8 +10,10 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: multimedia-common
   morph: strata/multimedia-common.morph
 - name: multimedia-gstreamer
diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph
index 13ccd9d8..1d739dad 100644
--- a/systems/weston-qt5-system-x86_64.morph
+++ b/systems/weston-qt5-system-x86_64.morph
@@ -14,8 +14,10 @@ strata:
   morph: strata/device-management.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
 - name: multimedia-common
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index 5b25ebd0..93bfb6db 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -18,8 +18,8 @@ strata:
   morph: strata/bsp-jetson.morph
 - name: connectivity
   morph: strata/connectivity.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
 - name: multimedia-common
@@ -36,6 +36,8 @@ strata:
   morph: strata/llvm-common.morph
 - name: mesa-common
   morph: strata/mesa-common.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: weston-common
   morph: strata/weston-common.morph
 - name: x-common
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 5e91fb71..65514cbb 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -17,8 +17,8 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: connectivity
   morph: strata/connectivity.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
 - name: multimedia-common
@@ -35,6 +35,8 @@ strata:
   morph: strata/llvm-common.morph
 - name: mesa-common
   morph: strata/mesa-common.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: weston-common
   morph: strata/weston-common.morph
 - name: x-common
diff --git a/systems/xfce-system-x86_64.morph b/systems/xfce-system-x86_64.morph
index 807a6309..dbf5f56c 100644
--- a/systems/xfce-system-x86_64.morph
+++ b/systems/xfce-system-x86_64.morph
@@ -23,8 +23,10 @@ strata:
   morph: strata/connman-common.morph
 - name: input-common
   morph: strata/input-common.morph
-- name: audio-bluetooth
-  morph: strata/audio-bluetooth.morph
+- name: bluetooth
+  morph: strata/bluetooth.morph
+- name: sound-server-pulseaudio
+  morph: strata/sound-server-pulseaudio.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
 - name: mesa-common