Patchwork default-distrovars.inc: Allow world builds to be successful

login
mail settings
Submitter Richard Purdie
Date Aug. 9, 2011, 1:44 p.m.
Message ID <1312897455.14274.296.camel@rex>
Download mbox | patch
Permalink /patch/9537/
State New, archived
Headers show

Comments

Richard Purdie - Aug. 9, 2011, 1:44 p.m.
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>
---

Patch

diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 6135642..2ef25e4 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 ?= ""