A couple yocto-bsp fixes, v3

From: Tom Zanussi <[email protected]>

The current yocto-bsp help assumes knowledge that the meta-intel layer needs to be cloned before it's put into the BBLAYERS. Avoid the guesswork and state the details explicitly in the help.

Also, the shorter 'usage' string doesn't mention it at all; it would help to at minimum mention it and refer the user to the detailed help.

Fixes [YOCTO #2330].

Signed-off-by Tom Zanussi <[email protected]>

---
 scripts/lib/bsp/help.py |   48 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 44 insertions(+), 4 deletions(-)

scripts/lib/bsp/help.py +44 -4

index f78b09b..2d16d2e 100644
@@ -115,6 +115,18 @@ yocto_bsp_create_usage = """
  'properties' that will be used to fill out the BSP-specific portions
  of the BSP.  The possible values for the 'karch' paramter can be
  listed via 'yocto-bsp list karch'.
+
+ NOTE: Once created, you should add your new layer to your
+ bblayers.conf file in order for it to be subsequently seen and
+ modified by the yocto-kernel tool.
+
+ 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.
+
+ See 'yocto bsp help create' for more detailed instructions.
 """
 
 yocto_bsp_create_help = """

@@ -156,12 +168,40 @@ DESCRIPTION
     current directory, and is useful for debugging.
 
     NOTE: Once created, you should add your new layer to your
-    bblayers.conf file in order for it to be subsquently seen and
+    bblayers.conf file in order for it to be subsequently seen and
     modified by the yocto-kernel tool.
 
-    NOTE for x86- and x86_64-based BSPs: The generated BSP assumes the
-    presence of the of the meta-intel layer, so you should also have a
-    meta-intel layer present and added to your bblayers.conf as well.
+    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
+    is /path/to/build:
+
+    $ gedit /path/to/build/conf/bblayers.conf
+
+    BBLAYERS ?= " \\
+      /path/to/poky/meta \\
+      /path/to/poky/meta-yocto \\
+      /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.
+
+    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
+    is /path/to/build:
+
+    $ cd /path/to/poky
+    $ git clone git://git.yoctoproject.org/meta-intel.git
+
+    $ gedit /path/to/build/conf/bblayers.conf
+
+    BBLAYERS ?= " \\
+      /path/to/poky/meta \\
+      /path/to/poky/meta-yocto \\
+      /path/to/poky/meta-intel \\
+      /path/to/poky/meta-mybsp \\
+      "
 """
 
 yocto_bsp_list_usage = """

From: Tom Zanussi <[email protected]>

The current code assumes that builddir == srcdir/build, which it obviously isn't sometimes. Use BUILDDIR to get the actual builddir being used.

Fixes [YOCTO #2219].

Signed-off-by Tom Zanussi <[email protected]>

---
 scripts/lib/bsp/kernel.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

scripts/lib/bsp/kernel.py +6 -1

index 360851b..8b3aa72 100644
@@ -37,7 +37,12 @@ def find_bblayers(scripts_path):
     """
     Find and return a sanitized list of the layers found in BBLAYERS.
     """
-    bblayers_conf = os.path.join(scripts_path, "../build/conf/bblayers.conf")
+    try:
+        builddir = os.environ["BUILDDIR"]
+    except KeyError:
+        print "BUILDDIR not found, exiting. (Did you forget to source oe-init-build-env?)"
+        sys.exit(1)
+    bblayers_conf = os.path.join(builddir, "conf/bblayers.conf")
 
     layers = []
 

From: Tom Zanussi<[email protected]>

The current code assumes that builddir == srcdir/build, which it obviously isn't sometimes. Use BUILDDIR to get the actual builddir being used.

Fixes [YOCTO #2219].

Signed-off-by Tom Zanussi<[email protected]>

Quoted 6 lines · On 04/30/2012 12:12 PM, [email protected] wrote:

From: Tom Zanussi<[email protected]>

The current code assumes that builddir == srcdir/build, which it obviously isn't sometimes. Use BUILDDIR to get the actual builddir being used.

Quoted 3 lines

Fixes [YOCTO #2219].

Signed-off-by Tom Zanussi<[email protected]>

Merged to denzil-next, thanks!

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next

Scott

Quoted 11 lines · Scott Garman

Quoted 9 lines · On 04/30/2012 12:12 PM, [email protected] wrote:

From: Tom Zanussi<[email protected]>

The current code assumes that builddir == srcdir/build, which it obviously isn't sometimes. Use BUILDDIR to get the actual builddir being used.

Fixes [YOCTO #2219].

Signed-off-by Tom Zanussi<[email protected]>

Quoted 2 lines

Merged to denzil-next, thanks!

Thanks, Scott!

Could you also merge the other patch that was part of this patchset? (yocto-bsp: clarify help with reference to meta-intel)

From: Tom Zanussi<[email protected]>

Fixes for a couple yocto-bsp bugs.

v2: fixed up the yocto-bsp help text as suggested by Darren Hart.
v3: fixed more of the yocto-bsp help text as suggested by William Mills.

The following changes since commit f39ba520d6f2477c99839a92049b1bb279f092cf:
Richard Purdie (1):
qt-4.8.1: Fix compile failures on qemux86

are available in the git repository at:

   git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-fixes-2219-2330
   http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bsp-fixes-2219-2330

Tom Zanussi (2):
yocto-kernel: use BUILDDIR to find bblayers.conf
yocto-bsp: clarify help with reference to meta-intel

  scripts/lib/bsp/help.py   |   48 +++++++++++++++++++++++++++++++++++++++++---
  scripts/lib/bsp/kernel.py |    7 +++++-
  2 files changed, 50 insertions(+), 5 deletions(-)

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto