diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-12-31 13:51:54 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-24 11:54:16 +0000 |
commit | 7301b4c187045865f2452b90ec7de9fa2f5a8bc7 (patch) | |
tree | ae674dfdedcbda3aed94efbc4da1e92e030439e8 /meta/conf | |
parent | 2896b4a1c401005c2488b5aecdb4abfe25882ec2 (diff) | |
download | poky-7301b4c187045865f2452b90ec7de9fa2f5a8bc7.tar.gz |
default-distrovars.inc: remove COMMERCIAL_LICENSE et al
The global COMMERCIAL_LICENSE mechanism has been obsoleted by
per-recipe LICENSE_FLAGS, so remove the related variables.
(From OE-Core rev: a66fdbda548fab367cada035c49a32d9bf8ea528)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index e1594f3529..16b310800b 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
@@ -26,11 +26,6 @@ HOSTTOOLS_WHITELIST_GPLv3 ?= "" | |||
26 | WHITELIST_GPLv3 ?= "less" | 26 | WHITELIST_GPLv3 ?= "less" |
27 | LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" | 27 | LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" |
28 | 28 | ||
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 | ||
31 | # implications so they are disabled by default | ||
32 | COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp ${COMMERCIAL_LICENSE_DEPENDEES}" | ||
33 | COMMERCIAL_LICENSE_DEPENDEES ?= "gst-plugins-ugly libomxil gst-openmax" | ||
34 | COMMERCIAL_AUDIO_PLUGINS ?= "" | 29 | COMMERCIAL_AUDIO_PLUGINS ?= "" |
35 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" | 30 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" |
36 | COMMERCIAL_VIDEO_PLUGINS ?= "" | 31 | COMMERCIAL_VIDEO_PLUGINS ?= "" |