From 09c9893ee8eb23ab1208f818757b60d84f0cd640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 20 Feb 2015 14:13:13 +0000 Subject: Make multimedia and multimedia-gstreamer-0.10 depend on multimedia-common Change the systems as well so nothing break --- systems/genivi-baseline-system-armv7lhf-jetson.morph | 2 ++ systems/genivi-baseline-system-armv7lhf-versatile.morph | 2 ++ systems/genivi-baseline-system-x86_64-generic.morph | 2 ++ systems/gitlab-ci-runner.morph | 2 ++ systems/qt4-devel-system-x86_64-generic.morph | 2 ++ systems/qt5-devel-system-x86_64-generic.morph | 2 ++ systems/weston-system-armv7lhf-jetson.morph | 2 ++ systems/weston-system-x86_64-generic.morph | 2 ++ systems/xfce-system.morph | 2 ++ 9 files changed, 18 insertions(+) (limited to 'systems') diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 5cbfddbe..74000f5f 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index a5f07750..0fc7a30a 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index f5fb571e..20c9c13f 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index b4e20ec7..6c2af7a9 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -21,6 +21,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 9a23bdeb..0a98f205 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -12,6 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia-gstreamer-0.10 morph: strata/multimedia-gstreamer-0.10.morph - name: bsp-x86_64-generic diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 1a78ff4f..57d1f122 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -12,6 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: bsp-x86_64-generic diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 2e139755..062324ff 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: wayland-generic diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index de099697..f9c6280b 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: wayland-generic diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 697ea52d..3f0a2465 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -23,6 +23,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi -- cgit v1.2.1 From b6461f046ff67295ce3aaea38689800aea7570a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 20 Feb 2015 15:47:31 +0000 Subject: Rename multimedia to multimedia-gstreamer --- systems/genivi-baseline-system-armv7lhf-jetson.morph | 4 ++-- systems/genivi-baseline-system-armv7lhf-versatile.morph | 4 ++-- systems/genivi-baseline-system-x86_64-generic.morph | 4 ++-- systems/gitlab-ci-runner.morph | 4 ++-- systems/qt5-devel-system-x86_64-generic.morph | 4 ++-- systems/weston-system-armv7lhf-jetson.morph | 4 ++-- systems/weston-system-x86_64-generic.morph | 4 ++-- systems/xfce-system.morph | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'systems') diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 74000f5f..50581561 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -21,8 +21,8 @@ strata: morph: strata/libdrm-common.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 0fc7a30a..16bed197 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -21,8 +21,8 @@ strata: morph: strata/libdrm-common.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index 20c9c13f..f4828688 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -21,8 +21,8 @@ strata: morph: strata/libdrm-common.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 6c2af7a9..979b73b0 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -23,8 +23,8 @@ strata: morph: strata/x-generic.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: tools diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 57d1f122..0f768536 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -14,8 +14,8 @@ strata: morph: strata/audio-bluetooth.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 062324ff..e1979d44 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -21,8 +21,8 @@ strata: morph: strata/libdrm-common.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index f9c6280b..dfa5c3df 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -21,8 +21,8 @@ strata: morph: strata/libdrm-common.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 3f0a2465..5aea4f7b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -25,8 +25,8 @@ strata: morph: strata/x-generic.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: gtk2 -- cgit v1.2.1