[oe-commits] [openembedded-core] 04/25: recipetool: create: replacing PV in SRCURI

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 9d3ec76c1b7dd75d904f5ff47297de0fb65b21c2
Author: Stanley Phoong <stanley.cheong.kwan.phoong at intel.com>
AuthorDate: Mon Aug 21 17:39:43 2017 +1200

    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.
    
    Signed-off-by: Stanley Phoong <stanley.cheong.kwan.phoong at intel.com>
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/recipetool/create.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index e48e418..3abdad0 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.