* [PATCHv2 0/3] Fix a couple populate_sdk_ext issues
@ 2015-07-31 15:18 Christopher Larson
2015-07-31 15:19 ` [PATCHv2 1/3] populate_sdk_ext: use lnr, not ln -sr, for portability Christopher Larson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Christopher Larson @ 2015-07-31 15:18 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
- Explicitly pass BBPATH to devtool as Paul Eggleton suggests, to avoid
needing to acquire the bitbake lock, to resolve the issue in
populate_sdk_ext.
- Use the oe-core lnr script rather than ln -sr to improve host portability
(not all hosts have recent coreutils).
[v2 changes]: rebased on Paul's commit to use tinfoil.shutdown() which while
not yet on master, is pending on master-next.
The following changes since commit dd5c87900b73bf44cf96735706d7d06e56b4d20e:
oeqa/commands: Increase qemu boot timeout to match testimage.bbclass (2015-07-31 15:58:55 +0100)
are available in the git repository at:
git@github.com:kergoth/openembedded-core populate_sdk_ext-fixes
for you to fetch changes up to ccf0ba3cb9507e1d0057bd55eeed8275711e1c0d:
populate_sdk_ext: pass BBPATH to devtool --bbpath (2015-07-31 08:15:01 -0700)
----------------------------------------------------------------
Christopher Larson (3):
populate_sdk_ext: use lnr, not ln -sr, for portability
devtool: add --bbpath argument
populate_sdk_ext: pass BBPATH to devtool --bbpath
meta/classes/populate_sdk_ext.bbclass | 7 ++++---
scripts/devtool | 15 +++++++++++----
2 files changed, 15 insertions(+), 7 deletions(-)
--
2.2.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCHv2 1/3] populate_sdk_ext: use lnr, not ln -sr, for portability
2015-07-31 15:18 [PATCHv2 0/3] Fix a couple populate_sdk_ext issues Christopher Larson
@ 2015-07-31 15:19 ` Christopher Larson
2015-07-31 15:19 ` [PATCHv2 2/3] devtool: add --bbpath argument Christopher Larson
2015-07-31 15:19 ` [PATCHv2 3/3] populate_sdk_ext: pass BBPATH to devtool --bbpath Christopher Larson
2 siblings, 0 replies; 4+ messages in thread
From: Christopher Larson @ 2015-07-31 15:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Not all hosts are running sufficiently new coreutils.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/populate_sdk_ext.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index b28413b..0151468 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -164,8 +164,8 @@ python copy_buildsystem () {
install_tools() {
install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}
- ln -sr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/devtool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/devtool
- ln -sr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/recipetool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/recipetool
+ lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/devtool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/devtool
+ lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/recipetool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/recipetool
touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
install ${SDK_DEPLOY}/${DISTRO}-${TCLIBC}-${SDK_ARCH}-buildtools-tarball-${TUNE_PKGARCH}-buildtools-nativesdk-standalone-${DISTRO_VERSION}.sh ${SDK_OUTPUT}/${SDKPATH}
--
2.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCHv2 2/3] devtool: add --bbpath argument
2015-07-31 15:18 [PATCHv2 0/3] Fix a couple populate_sdk_ext issues Christopher Larson
2015-07-31 15:19 ` [PATCHv2 1/3] populate_sdk_ext: use lnr, not ln -sr, for portability Christopher Larson
@ 2015-07-31 15:19 ` Christopher Larson
2015-07-31 15:19 ` [PATCHv2 3/3] populate_sdk_ext: pass BBPATH to devtool --bbpath Christopher Larson
2 siblings, 0 replies; 4+ messages in thread
From: Christopher Larson @ 2015-07-31 15:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
scripts/devtool | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/scripts/devtool b/scripts/devtool
index 5d37d3b..1c22438 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -189,6 +189,7 @@ def main():
add_help=False,
epilog="Use %(prog)s <subcommand> --help to get help on a specific command")
parser.add_argument('--basepath', help='Base directory of SDK / build directory')
+ parser.add_argument('--bbpath', help='Explicitly specify the BBPATH, rather than getting it from the metadata')
parser.add_argument('-d', '--debug', help='Enable debug output', action='store_true')
parser.add_argument('-q', '--quiet', help='Print only errors', action='store_true')
parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR')
@@ -239,12 +240,18 @@ def main():
scriptutils.logger_setup_color(logger, global_args.color)
- tinfoil = setup_tinfoil(config_only=True)
- for path in ([scripts_path] +
- tinfoil.config_data.getVar('BBPATH', True).split(':')):
+ if global_args.bbpath is None:
+ tinfoil = setup_tinfoil(config_only=True)
+ global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True)
+ else:
+ tinfoil = None
+
+ for path in [scripts_path] + global_args.bbpath.split(':'):
pluginpath = os.path.join(path, 'lib', 'devtool')
scriptutils.load_plugins(logger, plugins, pluginpath)
- tinfoil.shutdown()
+
+ if tinfoil:
+ tinfoil.shutdown()
subparsers = parser.add_subparsers(dest="subparser_name", title='subcommands', metavar='<subcommand>')
--
2.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCHv2 3/3] populate_sdk_ext: pass BBPATH to devtool --bbpath
2015-07-31 15:18 [PATCHv2 0/3] Fix a couple populate_sdk_ext issues Christopher Larson
2015-07-31 15:19 ` [PATCHv2 1/3] populate_sdk_ext: use lnr, not ln -sr, for portability Christopher Larson
2015-07-31 15:19 ` [PATCHv2 2/3] devtool: add --bbpath argument Christopher Larson
@ 2015-07-31 15:19 ` Christopher Larson
2 siblings, 0 replies; 4+ messages in thread
From: Christopher Larson @ 2015-07-31 15:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/populate_sdk_ext.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 0151468..a36bf16 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -88,7 +88,8 @@ python copy_buildsystem () {
config.write(f)
# Create a layer for new recipes / appends
- bb.process.run("devtool --basepath %s create-workspace --create-only %s" % (baseoutpath, os.path.join(baseoutpath, 'workspace')))
+ bbpath = d.getVar('BBPATH', True)
+ bb.process.run(['devtool', '--bbpath', bbpath, '--basepath', baseoutpath, 'create-workspace', '--create-only', os.path.join(baseoutpath, 'workspace')])
# Create bblayers.conf
bb.utils.mkdirhier(baseoutpath + '/conf')
--
2.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-31 15:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-31 15:18 [PATCHv2 0/3] Fix a couple populate_sdk_ext issues Christopher Larson
2015-07-31 15:19 ` [PATCHv2 1/3] populate_sdk_ext: use lnr, not ln -sr, for portability Christopher Larson
2015-07-31 15:19 ` [PATCHv2 2/3] devtool: add --bbpath argument Christopher Larson
2015-07-31 15:19 ` [PATCHv2 3/3] populate_sdk_ext: pass BBPATH to devtool --bbpath Christopher Larson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.