From 71619f5ef05a3ca3a2a6b19764f6a8a93f011d67 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 22 Oct 2012 12:39:44 +0100 Subject: meta-intel: don't require commercial licenses for gstreamer-vaapi Now that gstreamer-vaapi doesn't depend on ffmpeg, it can always be recommended by the machine configuration. Signed-off-by: Ross Burton Signed-off-by: Tom Zanussi --- meta-cedartrail/conf/machine/cedartrail.conf | 3 +-- meta-chiefriver/conf/machine/chiefriver.conf | 3 +-- meta-crownbay/conf/machine/crownbay.conf | 3 +-- meta-fri2/conf/machine/fri2.conf | 3 +-- meta-sugarbay/conf/machine/sugarbay.conf | 3 +-- meta-sys940x/conf/machine/sys940x.conf | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf index ea50ea6f..d8b6bc0d 100644 --- a/meta-cedartrail/conf/machine/cedartrail.conf +++ b/meta-cedartrail/conf/machine/cedartrail.conf @@ -22,7 +22,6 @@ SYSLINUX_OPTS = "serial 0 115200" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "", d)}" +VA_FEATURES = "gst-va-intel va-intel" MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf index a9c8e5ac..b8b87540 100644 --- a/meta-chiefriver/conf/machine/chiefriver.conf +++ b/meta-chiefriver/conf/machine/chiefriver.conf @@ -15,7 +15,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_I965} \ " -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "", d)}" +VA_FEATURES = "gst-va-intel va-intel" MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 72431de7..d56ef641 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -23,7 +23,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" APPEND += "video=vesafb vga=0x318 vmalloc=256MB" -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "va-intel", d)}" +VA_FEATURES = "gst-va-intel va-intel" MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index dff11a88..587b976d 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -8,8 +8,7 @@ require conf/machine/include/tune-atom.inc require conf/machine/include/ia32-base.inc require conf/machine/include/meta-intel.inc -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "va-intel", d)}" +VA_FEATURES = "gst-va-intel va-intel" MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index 17cc15ca..1d0e68da 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf @@ -16,7 +16,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_I965} \ " -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "", d)}" +VA_FEATURES = "gst-va-intel va-intel" MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index bdd655fa..eefca59e 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf @@ -26,7 +26,6 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "va-intel", d)}" +VA_FEATURES = "gst-va-intel va-intel" MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" -- cgit v1.2.3-54-g00ecf