diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-09 12:01:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-10 13:33:05 +0100 |
commit | 7239530a1383a7be7f6b49fb52ba4e2b9d387786 (patch) | |
tree | f9f740442bf6001b66759a06f0e2e8fef8d42f2c /meta/conf/distro/include/default-distrovars.inc | |
parent | 7898960c43004b1b5935fa1872c9fcee1982fc4c (diff) | |
download | poky-7239530a1383a7be7f6b49fb52ba4e2b9d387786.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include/default-distrovars.inc')
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 3 |
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 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" | |||
29 | # This is a list of packages that require a commercial license to ship | 29 | # This is a list of packages that require a commercial license to ship |
30 | # product. If shipped as part of an image these packages may have | 30 | # product. If shipped as part of an image these packages may have |
31 | # implications so they are disabled by default | 31 | # implications so they are disabled by default |
32 | COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp" | 32 | COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp ${COMMERCIAL_LICENSE_DEPENDEES}" |
33 | COMMERCIAL_LICENSE_DEPENDEES ?= "gst-plugins-ugly libomxil gst-openmax" | ||
33 | COMMERCIAL_AUDIO_PLUGINS ?= "" | 34 | COMMERCIAL_AUDIO_PLUGINS ?= "" |
34 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" | 35 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" |
35 | COMMERCIAL_VIDEO_PLUGINS ?= "" | 36 | COMMERCIAL_VIDEO_PLUGINS ?= "" |