diff options
| author | Stanley Phoong <stanley.cheong.kwan.phoong@intel.com> | 2017-08-21 17:39:43 +1200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-21 08:30:32 +0100 |
| commit | 9d3ec76c1b7dd75d904f5ff47297de0fb65b21c2 (patch) | |
| tree | 4b8ee39c57f41211b974dbf62a8bd18b52571da4 | |
| parent | 3afdcbdc9a3e65bc925ec61717784ffec67d529d (diff) | |
| download | openembedded-core-9d3ec76c1b7dd75d904f5ff47297de0fb65b21c2.tar.gz openembedded-core-9d3ec76c1b7dd75d904f5ff47297de0fb65b21c2.tar.bz2 openembedded-core-9d3ec76c1b7dd75d904f5ff47297de0fb65b21c2.zip | |
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@intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/recipetool/create.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index e48e418df5..3abdad0fbc 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: |