From 2231d3800e94e39a6cc77473c6654cb221e7e55b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 14 Sep 2012 14:07:34 -0500 Subject: meta-intel: make video acceleration choice dependent on LICENSE_FLAGS The gst-ffmpeg recipe in oe-core had LICENSE_FLAGS added to make it "commercial", so to avoid build errors the BSPs that use it (via the gst-va-intel VA_FEATURE) should only include it if the user has added "commercial" to LICENSE_FLAGS_WHITELIST when building. This adds a conditional to detect that, along with a NOTE in the README to explain the need for the flag. Signed-off-by: Tom Zanussi --- meta-cedartrail/conf/machine/cedartrail.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-cedartrail/conf') diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf index cd9acd7c..33af0121 100644 --- a/meta-cedartrail/conf/machine/cedartrail.conf +++ b/meta-cedartrail/conf/machine/cedartrail.conf @@ -22,6 +22,7 @@ SYSLINUX_OPTS = "serial 0 115200" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -VA_FEATURES ?= "gst-va-intel va-intel" +VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ + "commercial", "gst-va-intel va-intel", "", d)}" MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" -- cgit v1.2.3-54-g00ecf