diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-01-15 11:20:16 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-03-06 13:46:01 +0100 |
commit | 61f05b9df3626411a0ade950161cfa6577ed509c (patch) | |
tree | e07568c1a3aed0fb0f06d68dd783b2a4c230ab6d | |
parent | b8af4cae40e60a53b599f3eb754db53a8650f52c (diff) |
images: don't add gstreamer1.0-libav unconditionally
gstreamer1.0-libav needs commercial licenses to be whitelisted,
thus only install it when this is allowed through configuration.
E.g. add
LICENSE_FLAGS_WHITELIST = "commercial_gstreamer1.0-libav" to local.conf
to allow installing libav.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r-- | recipes-images/images/lxde-image.bb | 2 | ||||
-rw-r--r-- | recipes-images/images/lxqt-image.bb | 2 | ||||
-rw-r--r-- | recipes-images/images/qt-x11-image.bb | 2 | ||||
-rw-r--r-- | recipes-images/images/qt5-x11-image.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes-images/images/lxde-image.bb b/recipes-images/images/lxde-image.bb index 5118749..6f987a0 100644 --- a/recipes-images/images/lxde-image.bb +++ b/recipes-images/images/lxde-image.bb @@ -97,7 +97,7 @@ GSTREAMER_append_mx7 = " \ # GSTREAMER_append_tegra124 = " \ - gstreamer1.0-libav \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ gstreamer1.0-plugins-bad-videoparsersbad \ gstreamer \ gst-plugins-base \ diff --git a/recipes-images/images/lxqt-image.bb b/recipes-images/images/lxqt-image.bb index 97cac18..869fb72 100644 --- a/recipes-images/images/lxqt-image.bb +++ b/recipes-images/images/lxqt-image.bb @@ -91,7 +91,7 @@ GSTREAMER_append_mx7 = " \ " GSTREAMER_append_tegra124 = " \ - gstreamer1.0-libav \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ gstreamer1.0-plugins-bad-videoparsersbad \ gstreamer \ gst-plugins-base \ diff --git a/recipes-images/images/qt-x11-image.bb b/recipes-images/images/qt-x11-image.bb index fcc3b5e..4567520 100644 --- a/recipes-images/images/qt-x11-image.bb +++ b/recipes-images/images/qt-x11-image.bb @@ -89,7 +89,7 @@ GSTREAMER_append_mx7 = " \ # GSTREAMER_append_tegra124 = " \ - gstreamer1.0-libav \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ gstreamer1.0-plugins-bad-videoparsersbad \ gstreamer \ gst-plugins-base \ diff --git a/recipes-images/images/qt5-x11-image.bb b/recipes-images/images/qt5-x11-image.bb index d1b1cde..2435ec3 100644 --- a/recipes-images/images/qt5-x11-image.bb +++ b/recipes-images/images/qt5-x11-image.bb @@ -96,7 +96,7 @@ GSTREAMER_append_mx7 = " \ # GSTREAMER_append_tegra124 = " \ - gstreamer1.0-libav \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ gstreamer1.0-plugins-bad-videoparsersbad \ gstreamer \ gst-plugins-base \ |