mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
recipetool: create: replacing PV in SRCURI
During recipe creation, it seems that the automation for replacing ${PV} at the SRCURI for tag, (e.g mbed-tls-${PV}) is causing some issue due to PV assuming it's a git source. A fix is implemented in this patch to resolve this issue. (From OE-Core rev: 9d3ec76c1b7dd75d904f5ff47297de0fb65b21c2) Signed-off-by: Stanley Phoong <stanley.cheong.kwan.phoong@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fe62cedd4b
commit
439a6f1d68
|
@ -424,6 +424,7 @@ def create_recipe(args):
|
|||
srcrev = '${AUTOREV}'
|
||||
srcbranch = ''
|
||||
storeTagName = ''
|
||||
pv_srcpv = False
|
||||
|
||||
if os.path.isfile(source):
|
||||
source = 'file://%s' % os.path.abspath(source)
|
||||
|
@ -671,6 +672,7 @@ def create_recipe(args):
|
|||
lines_before.append('')
|
||||
lines_before.append('# Modify these as desired')
|
||||
lines_before.append('PV = "%s+git${SRCPV}"' % (realpv or '1.0'))
|
||||
pv_srcpv = True
|
||||
if not args.autorev and srcrev == '${AUTOREV}':
|
||||
if os.path.exists(os.path.join(srctree, '.git')):
|
||||
(stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree)
|
||||
|
@ -797,7 +799,7 @@ def create_recipe(args):
|
|||
skipblank = True
|
||||
continue
|
||||
elif line.startswith('SRC_URI = '):
|
||||
if realpv:
|
||||
if realpv and not pv_srcpv:
|
||||
line = line.replace(realpv, '${PV}')
|
||||
elif line.startswith('PV = '):
|
||||
if realpv:
|
||||
|
|
Loading…
Reference in New Issue
Block a user