summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTuomas Salokanto <tuomas.salokanto@gmail.com>2020-01-14 12:49:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-17 16:31:52 +0100
commit72148cb9bf3bf259f01ef3555ec5e56aaa440cb1 (patch)
tree17f51025f0c076ffc12d8bde57baabe87af3c8f4 /scripts
parentcc912a18b6674c5d336fcd42a788e8c35165b087 (diff)
downloadpoky-72148cb9bf3bf259f01ef3555ec5e56aaa440cb1.tar.gz
poky-72148cb9bf3bf259f01ef3555ec5e56aaa440cb1.tar.bz2
poky-72148cb9bf3bf259f01ef3555ec5e56aaa440cb1.zip
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: 0424df825f1e509faf6cd44403c0736bb91b57c3) 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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/recipetool/create.py1
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):
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')