[PATCH 0/1] VA_FEATURES typo fix

[PATCH 0/1] VA_FEATURES typo fix

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This fixes a problem introduced by a recent commit and noticed by
Paul Eggleton.

The following changes since commit f502e7493694c487767f60df232055bc7b854e69:

  gstreamer-vaapi: add missing build dependencies (2012-10-23 07:43:46 -0500)

are available in the git repository at:

  git://git.yoctoproject.org/meta-intel-contrib.git tzanussi/va-features-assign-fix
  http://git.yoctoproject.org/cgit.cgi//log/?h=tzanussi/va-features-assign-fix

Tom Zanussi (1):
  meta-intel: fix VA_FEATURES assignment in machine configs

 meta-cedartrail/conf/machine/cedartrail.conf | 2 +-
 meta-chiefriver/conf/machine/chiefriver.conf | 2 +-
 meta-crownbay/conf/machine/crownbay.conf     | 2 +-
 meta-fri2/conf/machine/fri2.conf             | 2 +-
 meta-sugarbay/conf/machine/sugarbay.conf     | 2 +-
 meta-sys940x/conf/machine/sys940x.conf       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

-- 
1.7.11.4

[PATCH 1/1] meta-intel: fix VA_FEATURES assignment in machine configs

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

commit 2231d38 (meta-intel: make video acceleration choice dependent
on LICENSE_FLAGS) inadvertently also changed '?=' to a hard
assignment, making it hard to override as intended.  This changes it
back.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-cedartrail/conf/machine/cedartrail.conf | 2 +-
 meta-chiefriver/conf/machine/chiefriver.conf | 2 +-
 meta-crownbay/conf/machine/crownbay.conf     | 2 +-
 meta-fri2/conf/machine/fri2.conf             | 2 +-
 meta-sugarbay/conf/machine/sugarbay.conf     | 2 +-
 meta-sys940x/conf/machine/sys940x.conf       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
index d8b6bc0..1463ae2 100644
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -22,6 +22,6 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
-VA_FEATURES = "gst-va-intel va-intel"
+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 b8b8754..6d8d3a5 100644
--- a/meta-chiefriver/conf/machine/chiefriver.conf
+++ b/meta-chiefriver/conf/machine/chiefriver.conf
@@ -15,6 +15,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_I965} \
            "
 
-VA_FEATURES = "gst-va-intel va-intel"
+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 d56ef64..624ca56 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -23,6 +23,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 
 APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
 
-VA_FEATURES = "gst-va-intel va-intel"
+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 587b976..19f2fb0 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -8,7 +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 = "gst-va-intel va-intel"
+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 1d0e68d..616c2c5 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -16,6 +16,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_I965} \
            "
 
-VA_FEATURES = "gst-va-intel va-intel"
+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 eefca59..44de796 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -26,6 +26,6 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
-VA_FEATURES = "gst-va-intel va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
 
 MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
-- 
1.7.11.4

Re: [PATCH 1/1] meta-intel: fix VA_FEATURES assignment in machine configs

[Darren Hart]

On 10/24/2012 06:30 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
> 
> commit 2231d38 (meta-intel: make video acceleration choice dependent
> on LICENSE_FLAGS) inadvertently also changed '?=' to a hard
> assignment, making it hard to override as intended.  This changes it
> back.
> 
> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>


Acked-by: Darren Hart <dvhart@linux.intel.com>

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel