aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-04-18 06:48:32 -0700
committerGitHub <noreply@github.com>2019-04-18 06:48:32 -0700
commit17fa1a21f896d29dd0ea9c64a8107b4167b57982 (patch)
tree671ee8b969812443bd279955bdb07bb025f5f5ce
parent7cd44764c60a53371c1d845d3393fb03e075e29f (diff)
parentbdd6122a26fa3cb1a3cf4fcc5ff535a05cd86686 (diff)
downloadmeta-amd-17fa1a21f896d29dd0ea9c64a8107b4167b57982.tar.gz
meta-amd-17fa1a21f896d29dd0ea9c64a8107b4167b57982.tar.bz2
meta-amd-17fa1a21f896d29dd0ea9c64a8107b4167b57982.zip
Merge pull request #630 from abelal/sumo
local.conf.append.v1000: whitelist x264 for commercial multimedia
-rw-r--r--meta-v1000/conf/local.conf.append.v10003
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-v1000/conf/local.conf.append.v1000 b/meta-v1000/conf/local.conf.append.v1000
index 34518aa6..7593cdf9 100644
--- a/meta-v1000/conf/local.conf.append.v1000
+++ b/meta-v1000/conf/local.conf.append.v1000
@@ -36,7 +36,8 @@ COMMERCIAL_LIC_FLAGS_MULTIMEDIA = "commercial_gstreamer1.0-plugins-ugly \
commercial_mpeg2dec \
commercial_gstreamer1.0-libav \
commercial_mpg123 \
- commercial_ffmpeg"
+ commercial_ffmpeg \
+ commercial_x264"
LICENSE_FLAGS_WHITELIST_append = "${@' ${COMMERCIAL_LIC_FLAGS_MULTIMEDIA}' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"
CORE_IMAGE_EXTRA_INSTALL_append = "${@' packagegroup-multimedia-risky' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"