From: Stanley Phoong <stanley.cheong.kwan.pho...@intel.com>
If a git URL is passed to recipetool create with a tag=, recipetool
should handle it assuming that the tag is valid.
[YOCTO #11393]
Signed-off-by: Stanley Phoong <stanley.cheong.kwan.pho...@intel.com>
---
scripts/lib/recipetool/create.py | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 4016a54..f0bea66 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -455,6 +455,19 @@ def create_recipe(args):
# 3. Source revision is not '${AUTOREV}'
srcuri = srcuri + ';nobranch=1'
+ # Create an empty storeTagName to ensure the checkers do not point to
a null variable
+ storeTagName = ''
+ tag_re = re.compile(';tag=([^;]+)')
+ tag = tag_re.search(srcuri)
+ if tag:
+ scheme, host, path, user, pswd, parms = bb.fetch2.decodeurl(srcuri)
+ # Keep a copy of tag and append nobranch=1 then remove tag from
URL,
+ # Will re-introduce tag argument after bitbake fetcher process is
complete.
+ storeTagName = parms['tag']
+ parms.update({('nobranch', '1')})
+ del parms['tag']
+ srcuri = bb.fetch2.encodeurl((scheme, host, path, user, pswd,
parms))
+
tmpparent = tinfoil.config_data.getVar('BASE_WORKDIR')
bb.utils.mkdirhier(tmpparent)
tempsrc = tempfile.mkdtemp(prefix='recipetool-', dir=tmpparent)
@@ -511,6 +524,18 @@ def create_recipe(args):
logger.error('Revision %s was found on multiple branches:
%s\nPlease provide the correct branch in the source URL with ;branch=<branch>
(and ensure you use quotes around the URL to avoid the shell interpreting the
";")' % (srcrev, mbrch))
sys.exit(1)
+ if storeTagName:
+ # Re-introduced tag variable from storeTagName
+ # Check srcrev using tag and check validity of the tag
+ try:
+ cmd = ('git rev-list -n 1 %s' % (storeTagName))
+ check_tag, check_tag_err = bb.process.run('%s' % cmd,
cwd=srctree)
+ srcrev = check_tag.split()[0]
+ except bb.process.ExecutionError as err:
+ logger.error(str(err))
+ logger.error("Possibly wrong tag name is provided")
+ sys.exit(1)
+
if os.path.exists(os.path.join(srctree, '.gitmodules')) and
srcuri.startswith('git://'):
srcuri = 'gitsm://' + srcuri[6:]
logger.info('Fetching submodules...')
@@ -633,9 +658,11 @@ def create_recipe(args):
lines_before.append('# No information for SRC_URI yet (only an
external source tree was specified)')
# Check if users has provide a branch
append_branch = branch_re.search(srcuri)
- if branch and not append_branch:
- # Append the correct branch into SRC_URI
- srcuri = srcuri_copy + (';branch=%s' % str(branch))
+ if (branch and not append_branch) or storeTagName:
+ srcuri = srcuri_copy
+ if branch:
+ # Append the correct branch into SRC_URI
+ srcuri = srcuri + (';branch=%s' % str(branch))
lines_before.append('SRC_URI = "%s"' % srcuri)
for key, value in sorted(checksums.items()):
lines_before.append('SRC_URI[%s] = "%s"' % (key, value))
--
2.7.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
