Hmm, you are of course correct. New patch coming. //Peter
From: Martin Jansa <[email protected]> Sent: den 26 augusti 2021 19:45 To: Peter Kjellerstedt <[email protected]> Cc: Patches and discussions about the oe-core layer <[email protected]> Subject: Re: [OE-core] [PATCH 2/2] buildhistory-collect-srcrevs: Adapt to the new variable override syntax Is this one correct? The '_' in SRCREV_%s should IMHO stay and only the '_' in _pn should be replaced with ':'. As the first case in the SRC_URI element name, not an override. On Thu, Aug 26, 2021 at 7:28 PM Peter Kjellerstedt <[email protected]<mailto:[email protected]>> wrote: Signed-off-by: Peter Kjellerstedt <[email protected]<mailto:[email protected]>> --- scripts/buildhistory-collect-srcrevs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/buildhistory-collect-srcrevs b/scripts/buildhistory-collect-srcrevs index bca01a922b..6c919299a6 100755 --- a/scripts/buildhistory-collect-srcrevs +++ b/scripts/buildhistory-collect-srcrevs @@ -53,7 +53,7 @@ def main(): sys.exit(1) if options.forcevariable: - forcevariable = '_forcevariable' + forcevariable = ':forcevariable' else: forcevariable = '' @@ -78,14 +78,14 @@ def main(): value = splitval[1].strip('" \t\n\r') if line.startswith('# SRCREV = '): orig_srcrev = value - elif line.startswith('# SRCREV_'): + elif line.startswith('# SRCREV:'): splitval = line.split('=') - name = splitval[0].split('_')[1].strip() + name = splitval[0].split(':')[1].strip() orig_srcrevs[name] = value elif line.startswith('SRCREV ='): srcrev = value - elif line.startswith('SRCREV_'): - name = splitval[0].split('_')[1].strip() + elif line.startswith('SRCREV:'): + name = splitval[0].split(':')[1].strip() srcrevs[name] = value if srcrev and (options.reportall or srcrev != orig_srcrev): all_srcrevs[curdir].append((pn, None, srcrev)) @@ -99,7 +99,7 @@ def main(): print('# %s' % curdir) for pn, name, srcrev in srcrevs: if name: - print('SRCREV_%s_pn-%s%s = "%s"' % (name, pn, forcevariable, srcrev)) + print('SRCREV:%s:pn-%s%s = "%s"' % (name, pn, forcevariable, srcrev)) else: print('SRCREV:pn-%s%s = "%s"' % (pn, forcevariable, srcrev))
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155375): https://lists.openembedded.org/g/openembedded-core/message/155375 Mute This Topic: https://lists.openembedded.org/mt/85166884/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
