summaryrefslogtreecommitdiff
path: root/meta/conf/distro/include
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-09 12:01:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-09 16:46:38 +0100
commitc69453fe94a649c518b0e6d79616f05579b864ce (patch)
treec8244a5202c774fd90d1ee08ca641db531f1ad3d /meta/conf/distro/include
parent391286cfae94f979bc60ecca2e73501781abdd37 (diff)
downloadopenembedded-core-c69453fe94a649c518b0e6d79616f05579b864ce.tar.gz
openembedded-core-c69453fe94a649c518b0e6d79616f05579b864ce.tar.bz2
openembedded-core-c69453fe94a649c518b0e6d79616f05579b864ce.tar.xz
openembedded-core-c69453fe94a649c518b0e6d79616f05579b864ce.zip
default-distrovars.inc: Allow world builds to be successful
Currently we exclude some packages with license issues from world builds but we don't exclude packages that depend on them leading to errors when trying a "bitbake world". This patch also blacklists the dependees so that a world build doesn't show horrible errors and requires the -k option. [YOCTO #1262] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include')
-rw-r--r--meta/conf/distro/include/default-distrovars.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 6135642a7..2ef25e412 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -29,7 +29,8 @@ LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime"
# This is a list of packages that require a commercial license to ship
# product. If shipped as part of an image these packages may have
# implications so they are disabled by default
-COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
+COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp ${COMMERCIAL_LICENSE_DEPENDEES}"
+COMMERCIAL_LICENSE_DEPENDEES ?= "gst-plugins-ugly libomxil gst-openmax"
COMMERCIAL_AUDIO_PLUGINS ?= ""
# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
COMMERCIAL_VIDEO_PLUGINS ?= ""