mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

recipetool: create: extract SRC_URI from local git repositories

Browse Source 
If you specify a local directory which happens to be a git repository
with an origin remote (and it is in fact remote), we can use that for
SRC_URI rather than leaving it blank in the recipe.

(From OE-Core rev: b143d414846854dc8b3e0a47358daf5646eded38)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2016-01-23 00:59:59 +13:00
committed by Richard Purdie
parent 50e40fc91f
commit b307e0a604
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/lib/recipetool/create.py
View File

@@ -260,6 +260,14 @@ def supports_srcrev(uri):
return True return True
return False return False
def reformat_git_uri(uri):
'''Convert any http[s]://....git URI into git://...;protocol=http[s]'''
res = re.match('(https?)://([^;]+\.git)(;.*)?$', uri)
if res:
# Need to switch the URI around so that the git fetcher is used
return 'git://%s;protocol=%s%s' % (res.group(2), res.group(1), res.group(3) or '')
return uri
def create_recipe(args): def create_recipe(args):
import bb.process import bb.process
import tempfile import tempfile
@@ -275,16 +283,11 @@ def create_recipe(args):
srcrev = '${AUTOREV}' srcrev = '${AUTOREV}'
if '://' in args.source: if '://' in args.source:
# Fetch a URL # Fetch a URL
fetchuri = urlparse.urldefrag(args.source)[0] fetchuri = reformat_git_uri(urlparse.urldefrag(args.source)[0])
if args.binary: if args.binary:
# Assume the archive contains the directory structure verbatim # Assume the archive contains the directory structure verbatim
# so we need to extract to a subdirectory # so we need to extract to a subdirectory
fetchuri += ';subdir=%s' % os.path.splitext(os.path.basename(urlparse.urlsplit(fetchuri).path))[0] fetchuri += ';subdir=%s' % os.path.splitext(os.path.basename(urlparse.urlsplit(fetchuri).path))[0]
git_re = re.compile('(https?)://([^;]+\.git)(;.*)?$')
res = git_re.match(fetchuri)
if res:
# Need to switch the URI around so that the git fetcher is used
fetchuri = 'git://%s;protocol=%s%s' % (res.group(2), res.group(1), res.group(3) or '')
srcuri = fetchuri srcuri = fetchuri
rev_re = re.compile(';rev=([^;]+)') rev_re = re.compile(';rev=([^;]+)')
res = rev_re.search(srcuri) res = rev_re.search(srcuri)
@@ -321,8 +324,21 @@ def create_recipe(args):
if not os.path.isdir(args.source): if not os.path.isdir(args.source):
logger.error('Invalid source directory %s' % args.source) logger.error('Invalid source directory %s' % args.source)
sys.exit(1) sys.exit(1)
srcuri = ''
srctree = args.source srctree = args.source
srcuri = ''
if os.path.exists(os.path.join(srctree, '.git')):
# Try to get upstream repo location from origin remote
try:
stdout, _ = bb.process.run('git remote -v', cwd=srctree, shell=True)
except bb.process.ExecutionError as e:
stdout = None
if stdout:
for line in stdout.splitlines():
splitline = line.split()
if len(splitline) > 1:
if splitline[0] == 'origin' and '://' in splitline[1]:
srcuri = reformat_git_uri(splitline[1])
break
if args.src_subdir: if args.src_subdir:
srcsubdir = os.path.join(srcsubdir, args.src_subdir) srcsubdir = os.path.join(srcsubdir, args.src_subdir)