aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2018-10-02 20:58:48 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-10-08 09:04:12 +0000
commit4c527dd56caf43145d3d6b232cced98383ec3427 (patch)
tree4362944a451b2f8c8bdaea25f74297afe8e94337
parent78588a4a9eaa1b150bb84d793bc4f1bdfaba9fb0 (diff)
pulseaudio-dev included conditionnaly in -crosssdk images
As pulseaudio is now optional, agl-demo-platform-html5-crosssdk and agl-image-graphical-qt5-crosssdk shouldn't include pulseaudio-dev unconditionnaly. This change duplicates in those two images what is done in agl-demo-platform-crosssdk. Bug-AGL: SPEC-1601 Change-Id: Ib75c6a8015567fa6b5acbc6afd98ac06b2550a87 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
-rwxr-xr-xmeta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb2
-rwxr-xr-xmeta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb
index a81472bb7..a278e0956 100755
--- a/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb
+++ b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb
@@ -33,7 +33,7 @@ TOOLCHAIN_HOST_TASK += " \
# required dependencies for Chromium build inside SDK (SPEC-942)
TOOLCHAIN_TARGET_TASK += " \
pciutils-dev \
- pulseaudio-dev \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-dev' , '', d)} \
cairo-dev \
nss-dev \
cups-dev \
diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb
index 2ab462b34..4ff779101 100755
--- a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb
+++ b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb
@@ -33,7 +33,7 @@ TOOLCHAIN_HOST_TASK += " \
# required dependencies for Chromium build inside SDK (SPEC-942)
TOOLCHAIN_TARGET_TASK += " \
pciutils-dev \
- pulseaudio-dev \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-dev' , '', d)} \
cairo-dev \
nss-dev \
cups-dev \