A couple yocto-bsp fixes, v2
cover A couple yocto-bsp fixes, v2
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.
The following changes since commit c47a869308cb0cccde0b1aee9a001352c99a8395:
Richard Purdie (1):
netbase: Correctly set FILESEXTRAPATHS to include the version
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 | 46 ++++++++++++++++++++++++++++++++++++++++++-- scripts/lib/bsp/kernel.py | 7 +++++- 2 files changed, 49 insertions(+), 4 deletions(-)
PATCH 1/2 yocto-kernel: use BUILDDIR to find bblayers.conf
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].
--- scripts/lib/bsp/kernel.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
scripts/lib/bsp/kernel.py +6 -1
@@ -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 = []
Signature · 1 line
1.7.0.4
PATCH 2/2 yocto-bsp: clarify help with reference to meta-intel
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].
--- scripts/lib/bsp/help.py | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-)
scripts/lib/bsp/help.py +43 -3
@@ -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 subsquently 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 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 = """
@@ -159,9 +171,37 @@ DESCRIPTION bblayers.conf file in order for it to be subsquently 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 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 = """
Signature · 1 line
1.7.0.4
Re: [PATCH 2/2] yocto-bsp: clarify help with reference to meta-intel
Quoted 21 lines · On 04/27/2012 05:25 PM, [email protected] wrote:
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 | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-)scripts/lib/bsp/help.py +0
-0
scripts/lib/bsp/help.py yocto_bsp_create_usage = """ · line 120
Quoted 6 lines
scripts/lib/bsp/help.py +3
-0@@ -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 subsquently seen and
Gah, I didn't catch this the first time. Typo in "subsequently" above. Maybe just fix in the branch? No need to resend.
Quoted 13 lines
scripts/lib/bsp/help.py +9
-0+ 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 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 = """
scripts/lib/bsp/help.py DESCRIPTION · line 171
Quoted 1 line
scripts/lib/bsp/help.py +0
-0@@ -159,9 +171,37 @@ DESCRIPTION bblayers.conf file in order for it to be subsquently seen and
Here too.
Otherwise looks good,
Quoted 39 lines
scripts/lib/bsp/help.py +31
-3modified 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 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 = """
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCH 2/2] yocto-bsp: clarify help with reference to meta-intel
Quoted 18 lines · Darren Hart
Quoted 16 lines · On 04/27/2012 05:25 PM, [email protected] wrote:
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 | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-)
Quoted 15 lines
scripts/lib/bsp/help.py yocto_bsp_create_usage = """ · line 120
Quoted 11 lines
scripts/lib/bsp/help.py +3
-0@@ -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 subsquently seen andGah, I didn't catch this the first time. Typo in "subsequently" above. Maybe just fix in the branch? No need to resend.
Good catch again, thanks. Updated in the branch...
Tom
Quoted 61 lines
Quoted 13 lines
scripts/lib/bsp/help.py +9
-0+ 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 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 = """scripts/lib/bsp/help.py DESCRIPTION · line 171
Quoted 1 line
scripts/lib/bsp/help.py +0
-0@@ -159,9 +171,37 @@ DESCRIPTION bblayers.conf file in order for it to be subsquently seen andHere too.
Otherwise looks good,
Acked-by Darren Hart <[email protected]>Quoted 39 lines
scripts/lib/bsp/help.py +31
-3modified 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 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 = """
Re: [PATCH 1/2] yocto-kernel: use BUILDDIR to find bblayers.conf
In reply to [email protected]Quoted 9 lines · On 04/27/2012 05:25 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 22 lines
--- scripts/lib/bsp/kernel.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)scripts/lib/bsp/kernel.py +6
-1@@ -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 = []
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel