aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2019-06-09 19:58:25 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2019-06-23 00:38:53 +0200
commitc0288d2da00b12251199f3b693add13fb18ff354 (patch)
tree3d43f06c5a8b7756dc6872e289758f76623fa913
parent075d872edc9fbec1463e0ef164a2db88f5f5427b (diff)
Move the agl-service-radio to the graphical profile
The agl-service-radio relies on gstreamer. Unfortunately the gstreamer recipe is currently setup to also pull-in wayland (due to a compile-flag if wayland is in DISTRO_FEATURES). To keep the distro aligned, we don't want to change the DISTRO_FEATURES between the profiles, thus we move the agl-service radio to the graphical profile where we include weston anyway by default. For now this means there is no radio service (or mediaplayer service) w/o wayland installed as well. In case we get this requirement, we'll have to work on the gstreamer recipe and its split. v2: fix bbapend in meta-agl-bsp/meta-rcar-gen3 v3: put packagegroup-agl-graphical-multimedia.bbappend in graphical profile (not the best place IMHO) This fixes the non-graphical build. Bug-AGL: SPEC-2500 Change-Id: I5ebec7d7713510f3fcd50ae425d7f8cbb6328016 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb1
-rw-r--r--meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb1
-rw-r--r--meta-agl-profile-graphical/recipes-apis/agl-service-radio/agl-service-radio_git.bb (renamed from meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb)0
-rw-r--r--meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend (renamed from meta-agl-profile-core/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend)0
-rw-r--r--meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb (renamed from meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb)2
-rw-r--r--meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend (renamed from meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bbappend)2
-rw-r--r--meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb3
-rw-r--r--meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb1
8 files changed, 5 insertions, 5 deletions
diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
index 6e8ad8220..82cfb3a19 100644
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
+++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
@@ -24,7 +24,6 @@ agl-service-mediascanner \
agl-service-navigation \
agl-service-network \
agl-service-nfc \
-${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \
agl-service-signal-composer \
agl-service-steering-wheel \
agl-service-unicens \
diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
index fb784d52d..383b14417 100644
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
+++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
@@ -19,7 +19,6 @@ RDEPENDS_${PN} += "\
RDEPENDS_${PN} += "\
packagegroup-agl-core-connectivity \
packagegroup-agl-core-navigation \
- packagegroup-agl-core-multimedia \
packagegroup-agl-core-os-commonlibs \
packagegroup-agl-core-services \
packagegroup-agl-core-security \
diff --git a/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb b/meta-agl-profile-graphical/recipes-apis/agl-service-radio/agl-service-radio_git.bb
index b8f48ed7e..b8f48ed7e 100644
--- a/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb
+++ b/meta-agl-profile-graphical/recipes-apis/agl-service-radio/agl-service-radio_git.bb
diff --git a/meta-agl-profile-core/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend b/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend
index 86a181fbb..86a181fbb 100644
--- a/meta-agl-profile-core/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend
+++ b/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-good/gstreamer1.0-plugins-good_%.bbappend
diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
index 674c4e3cc..cd37cb7d5 100644
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb
+++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
inherit packagegroup
PACKAGES = "\
- packagegroup-agl-core-multimedia \
+ packagegroup-agl-graphical-multimedia \
"
RDEPENDS_${PN} += "\
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bbappend b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend
index 6d9415d33..4a98a233c 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bbappend
+++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend
@@ -1,4 +1,4 @@
-RDEPENDS_${PN} += "\
+RDEPENDS_${PN}_append_ulcb = "\
${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-kernel-modules','',d)} \
${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-libs','',d)} \
${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-gstreamer1.0-plugins','',d)} \
diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb
index b80089a94..2ebb3d62a 100644
--- a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb
+++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb
@@ -10,5 +10,6 @@ PACKAGES = "\
ALLOW_EMPTY_${PN} = "1"
RDEPENDS_${PN} += "\
-agl-service-mediaplayer \
+${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-mediaplayer', '', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \
"
diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
index ced2b53da..406ebcdb4 100644
--- a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
+++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
@@ -15,6 +15,7 @@ RDEPENDS_${PN} += "\
packagegroup-agl-image-minimal \
packagegroup-agl-graphical-weston \
packagegroup-agl-graphical-services \
+ packagegroup-agl-graphical-multimedia \
"
# FIXME: Removed due to issues building against weston 5.0.0:
# waltham-transmitter