]> code.ossystems Code Review - openembedded-core.git/commitdiff
recipetool: create: fix SRCBRANCH not being passed to params
authorTuomas Salokanto <tuomas.salokanto@gmail.com>
Tue, 14 Jan 2020 10:49:17 +0000 (12:49 +0200)
committerSteve Sakoman <steve@sakoman.com>
Tue, 23 Jun 2020 14:33:47 +0000 (04:33 -1000)
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.

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>
scripts/lib/recipetool/create.py

index 6cbf4de6748deb01f9ad4a02c519c13acee90c3a..8d78c5b6f9972f597670e6bd50a5a9c5a6116e82 100644 (file)
@@ -460,6 +460,7 @@ def create_recipe(args):
                 logger.error('branch= parameter and -B/--srcbranch option cannot both be specified - use one or the other')
                 sys.exit(1)
             srcbranch = args.srcbranch
+            params['branch'] = srcbranch
         nobranch = params.get('nobranch')
         if nobranch and srcbranch:
             logger.error('nobranch= cannot be used if you specify a branch')