[PATCH 1/4] yocto-bsp: include meta-intel.inc if emgd selected

[PATCH 1/4] yocto-bsp: include meta-intel.inc if emgd selected

[tom.zanussi]

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

With move of ia32-base to oe-core, the intel-specific variables were
split off into meta-intel.inc, which needs to be included when using
components present only in meta-intel.

In the case of i386, that's currently just emgd, so conditionally
include emgd if emgd is selected as the xserver choice.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
index 2a07889..1da2306 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
@@ -20,6 +20,8 @@ require conf/machine/include/tune-atom.inc
 require conf/machine/include/tune-core2.inc
 
 require conf/machine/include/ia32-base.inc
+{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
+require conf/machine/include/meta-intel.inc
 
 {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
 
-- 
1.7.11.4

[PATCH 0/4] yocto-bsp updates to reflect ia32-base move, v2

[tom.zanussi]

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

ia32-base was moved to oe-core, which resulted in some more changes
yo yocto-bsp.

v2: exactly the same as the previous version, but again adds 
'yocto-bsp: add new strip_base() function', which for some reason
keeps not getting pulled in.

The following changes since commit bb0aab79e488a99cb1b43f72f0e8ddbe39d97519:

  yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' cases (2012-08-29 14:23:36 -0700)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-ia32-base-updates.v2
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bsp-ia32-base-updates.v2

Tom Zanussi (4):
  yocto-bsp: include meta-intel.inc if emgd selected
  yocto-bsp: update the help regarding the meta-intel layer
  yocto-bsp: add a LICENSE_FLAGS_WHITELIST blurb for emgd to README
  yocto-bsp: add new strip_base() function

 scripts/lib/bsp/engine.py                                    | 10 ++++++++++
 scripts/lib/bsp/help.py                                      | 12 ++++++------
 scripts/lib/bsp/substrate/target/arch/common/README          |  8 ++++++++
 .../target/arch/i386/conf/machine/{{=machine}}.conf          |  2 ++
 4 files changed, 26 insertions(+), 6 deletions(-)

-- 
1.7.11.4

[PATCH 2/4] yocto-bsp: update the help regarding the meta-intel layer

[tom.zanussi]

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

With move of ia32-base to oe-core, the only case remaining where
meta-intel needs to be added to bblayers.conf for a new BSP is the
case of an x86 BSP that selects EMGD.

Update the documentation to note that fact.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 scripts/lib/bsp/help.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/lib/bsp/help.py b/scripts/lib/bsp/help.py
index 2d16d2e..3a1f52c 100644
--- a/scripts/lib/bsp/help.py
+++ b/scripts/lib/bsp/help.py
@@ -122,9 +122,9 @@ yocto_bsp_create_usage = """
 
  See 'yocto bsp help create' for more detailed instructions.
 
- NOTE: For x86- and x86_64-based BSPs, the generated BSP assumes the
- presence of the meta-intel layer. Ensure the meta-intel layer is
- present and added to bblayers.conf.
+ NOTE: For x86-based BSPs that select the EMGD xserver, the generated
+ BSP assumes the presence of the meta-intel layer. Ensure the
+ meta-intel layer is present and added to bblayers.conf.
 
  See 'yocto bsp help create' for more detailed instructions.
 """
@@ -183,9 +183,9 @@ DESCRIPTION
       /path/to/poky/meta-mybsp \\
       "
 
-    NOTE: For x86- and x86_64-based BSPs, the generated BSP assumes
-    the presence of the meta-intel layer. Ensure the meta-intel layer
-    is present and added to bblayers.conf.
+    NOTE: For x86-based BSPs that select the EMGD xserver, the
+    generated BSP assumes the presence of the meta-intel layer. Ensure
+    the meta-intel layer is present and added to bblayers.conf.
 
     For example, assuming your poky repo is at /path/to/poky, your new
     BSP layer is at /path/to/poky/meta-mybsp, and your build directory
-- 
1.7.11.4

[PATCH 3/4] yocto-bsp: add a LICENSE_FLAGS_WHITELIST blurb for emgd to README

[tom.zanussi]

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

Add a text snippet to the README to say that if emgd-driver-bin is
included in the BSP, LICENSE_FLAGS_WHITELIST needs to be set to for a
successful build.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 scripts/lib/bsp/substrate/target/arch/common/README | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/lib/bsp/substrate/target/arch/common/README b/scripts/lib/bsp/substrate/target/arch/common/README
index 928659f..228c0e2 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/README
+++ b/scripts/lib/bsp/substrate/target/arch/common/README
@@ -65,6 +65,14 @@ You should then be able to build a {{=machine}} image as such:
   $ source oe-init-build-env
   $ bitbake core-image-sato
 
+NOTE: if the '{{=machine}}' machine includes the emgd-driver-bin
+package (i.e. if the emgd version of the xserver is being used), it
+has a proprietary license that must be whitelisted by adding the
+string "license_emgd-driver-bin_1.14" to the LICENSE_FLAGS_WHITELIST
+variable in your local.conf.  For example:
+
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14"
+
 At the end of a successful build, you should have a live image that
 you can boot from a USB flash drive (see instructions on how to do
 that below, in the section 'Booting the images from /binary').
-- 
1.7.11.4

[PATCH 4/4] yocto-bsp: add new strip_base() function

[tom.zanussi]

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

Add a strip_base() function to remove '/base' from the branch names
presented to the user.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 scripts/lib/bsp/engine.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index 00ce863..ac5058c 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -449,6 +449,16 @@ def boolean(input_str, name):
         return name
 
 
+def strip_base(input_str):
+    """
+    strip '/base' off the end of input_str, so we can use 'base' in
+    the branch names we present to the user.
+    """
+    if input_str and input_str.endswith("/base"):
+        return input_str[:-len("/base")]
+    return input_str.strip()
+
+
 deferred_choices = {}
 
 def gen_choices_defer(input_line, context, checklist = False):
-- 
1.7.11.4

Re: [PATCH 0/4] yocto-bsp updates to reflect ia32-base move, v2

[Tom Zanussi]

On Wed, 2012-08-29 at 19:15 -0500, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
> 
> ia32-base was moved to oe-core, which resulted in some more changes
> yo yocto-bsp.
> 
> v2: exactly the same as the previous version, but again adds 
> 'yocto-bsp: add new strip_base() function', which for some reason
> keeps not getting pulled in.
> 

ping...

Tom

> The following changes since commit bb0aab79e488a99cb1b43f72f0e8ddbe39d97519:
> 
>   yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' cases (2012-08-29 14:23:36 -0700)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-ia32-base-updates.v2
>   http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bsp-ia32-base-updates.v2
> 
> Tom Zanussi (4):
>   yocto-bsp: include meta-intel.inc if emgd selected
>   yocto-bsp: update the help regarding the meta-intel layer
>   yocto-bsp: add a LICENSE_FLAGS_WHITELIST blurb for emgd to README
>   yocto-bsp: add new strip_base() function
> 
>  scripts/lib/bsp/engine.py                                    | 10 ++++++++++
>  scripts/lib/bsp/help.py                                      | 12 ++++++------
>  scripts/lib/bsp/substrate/target/arch/common/README          |  8 ++++++++
>  .../target/arch/i386/conf/machine/{{=machine}}.conf          |  2 ++
>  4 files changed, 26 insertions(+), 6 deletions(-)
>