From 5d4bfe6cf788ce971a2e9419bc13492153023681 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 31 Aug 2017 11:54:12 +1200 Subject: recipetool: create: make recently added branch/tag handling git specific The branch and tag handling code that was recently added in OE-Core revs ecca596b75cfda2f798a0bdde75f4f774e23a95b and 3afdcbdc9a3e65bc925ec61717784ffec67d529d is specific to git, so only apply it when we're fetching from a git URL. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/lib/recipetool/create.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 834633610a..4da745b732 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -518,7 +518,7 @@ def create_recipe(args): # We need this checking mechanism to improve the recipe created by recipetool and devtool # is able to parse and build by bitbake. # If there is no input for branch name, then check for branch name with SRCREV provided. - if not srcbranch and not nobranch and srcrev and (srcrev != '${AUTOREV}'): + if not srcbranch and not nobranch and srcrev and (srcrev != '${AUTOREV}') and scheme in ['git', 'gitsm']: try: cmd = 'git branch -r --contains' check_branch, check_branch_err = bb.process.run('%s %s' % (cmd, srcrev), cwd=srctree) @@ -549,7 +549,7 @@ def create_recipe(args): params['branch'] = srcbranch srcuri = bb.fetch2.encodeurl((scheme, network, path, user, passwd, params)) - if storeTagName: + if storeTagName and scheme in ['git', 'gitsm']: # Re-introduced tag variable from storeTagName # Check srcrev using tag and check validity of the tag cmd = ('git rev-parse --verify %s' % (storeTagName)) -- cgit 1.2.3-korg