diff options
author | Tuomas Salokanto <tuomas.salokanto@gmail.com> | 2020-01-14 12:49:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-26 18:26:49 +0100 |
commit | ea688fb506d413018a913ed481eeacbd68f13656 (patch) | |
tree | 03ee214e75dc6320700cc453487e2170e2ec1997 /scripts/lib | |
parent | 480b1ae6be782127d5af78d4b6cfc6254676c0b8 (diff) | |
download | poky-ea688fb506d413018a913ed481eeacbd68f13656.tar.gz |
recipetool: create: fix SRCBRANCH not being passed to params
When explicitly passing a branch using --srcbranch in 'devtool add' or
'recipetool create', the branch name is not included in the params of
bb.fetch2.encodeurl and default 'master' branch is used instead.
(From OE-Core rev: 50789b582908f78d9bb2b5a05418433ad8074825)
Signed-off-by: Tuomas Salokanto <tuomas.salokanto@gmail.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0424df825f1e509faf6cd44403c0736bb91b57c3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/recipetool/create.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 6cbf4de674..8d78c5b6f9 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -460,6 +460,7 @@ def create_recipe(args): | |||
460 | logger.error('branch= parameter and -B/--srcbranch option cannot both be specified - use one or the other') | 460 | logger.error('branch= parameter and -B/--srcbranch option cannot both be specified - use one or the other') |
461 | sys.exit(1) | 461 | sys.exit(1) |
462 | srcbranch = args.srcbranch | 462 | srcbranch = args.srcbranch |
463 | params['branch'] = srcbranch | ||
463 | nobranch = params.get('nobranch') | 464 | nobranch = params.get('nobranch') |
464 | if nobranch and srcbranch: | 465 | if nobranch and srcbranch: |
465 | logger.error('nobranch= cannot be used if you specify a branch') | 466 | logger.error('nobranch= cannot be used if you specify a branch') |