diff options
| author |   Stephane Desneux <stephane.desneux@iot.bzh> | 2018-10-10 13:43:40 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-10-12 20:14:57 +0000 |
| commit | 92ba3cb5da1a5a8add6eb14370531b9019407777 (patch) | |
| tree | b25524e51ce1187d0d8762cd21b6e603cdafbf28 | |
| parent | e8c10f790cf4cc1c996cbd5be1555f859a95d44c (diff) | |
Pull agl-audio-plugin and pulseaudio conditionnaly
If agl-pulseaudio feature is not set, pulseaudio (or agl-audio-plugin)
shouldn't be pulled in images.
Currently, agl-service-radio requires either 4a or pulseaudio. So a temporary
hack has to be made to remove it from core services packagegroup if dependencies are not met.
Bug-AGL: SPEC-1802, SPEC-1811
Change-Id: Ief7a88cc288aba5c818ea7e7cbfede0ffb87c639
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb b/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb index 5b763d3e3..1b74b45ab 100644 --- a/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb +++ b/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" # build-time dependencies DEPENDS = "rtl-sdr glib-2.0 gstreamer1.0 libusb-compat" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , 'pulseaudio', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , bb.utils.contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d), d)}" inherit cmake aglwgt pkgconfig diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb index 27606947d..8e32e3ac6 100644 --- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb @@ -11,7 +11,7 @@ PACKAGES = "\ " RDEPENDS_${PN} += "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , 'agl-audio-plugin', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , bb.utils.contains('DISTRO_FEATURES','pulseaudio','agl-audio-plugin','',d) , d)} \ alsa-utils \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-misc', '' , d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio bluetooth', '\ 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 f70c9daa8..ab2b4c62a 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 @@ -23,7 +23,7 @@ agl-service-mediascanner \ agl-service-navigation \ agl-service-network \ agl-service-nfc \ -agl-service-radio \ +${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', 'agl-service-radio', bb.utils.contains('DISTRO_FEATURES', 'pulseaudio','agl-service-radio','',d), d)} \ agl-service-signal-composer \ agl-service-steering-wheel \ agl-service-unicens \ |