From 7239530a1383a7be7f6b49fb52ba4e2b9d387786 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 Aug 2011 12:01:04 +0100 Subject: 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] (From OE-Core rev: c69453fe94a649c518b0e6d79616f05579b864ce) Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-distrovars.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/conf') diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 6135642a73..2ef25e4122 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 ?= "" -- cgit v1.2.3-54-g00ecf