bitbake.conf: Use the new variable override syntax in a comment
PATCH 1/2 bitbake.conf: Use the new variable override syntax in a comment
It is probably a good idea if the comment that describes how variable overrides work use the new override syntax...
--- meta/conf/bitbake.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/conf/bitbake.conf +5 -5
@@ -743,11 +743,11 @@ DISTRO_NAME ??= "OpenEmbedded" # Overrides are processed left to right, so the ones that are named later take precedence. # You generally want them to go from least to most specific. This means that: -# A variable '<foo>_arm' overrides a variable '<foo>' when ${TARGET_ARCH} is arm. -# A variable '<foo>_qemuarm' overrides '<foo>' and overrides '<foo>_arm' when ${MACHINE} is 'qemuarm'. -# If you use combination ie '<foo>_qemuarm_arm', then '<foo>_qemuarm_arm' will override -# '<foo>_qemuarm' and then '<foo>' will be overriden with that value from '<foo>_qemuarm'. -# And finally '<foo>_forcevariable' overrides any standard variable, with the highest priority. +# A variable '<foo>:arm' overrides a variable '<foo>' when ${TARGET_ARCH} is arm. +# A variable '<foo>:qemuarm' overrides '<foo>' and overrides '<foo>:arm' when ${MACHINE} is 'qemuarm'. +# If you use combination ie '<foo>:qemuarm:arm', then '<foo>:qemuarm:arm' will override +# '<foo>:qemuarm' and then '<foo>' will be overriden with that value from '<foo>:qemuarm'. +# And finally '<foo>:forcevariable' overrides any standard variable, with the highest priority. # This works for functions as well, they are really just variables. # OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
PATCH 2/2 buildhistory-collect-srcrevs: Adapt to the new variable override syntax
--- scripts/buildhistory-collect-srcrevs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
scripts/buildhistory-collect-srcrevs +6 -6
@@ -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))
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.
Quoted 55 lines · Peter Kjellerstedt
Signed-off-by Peter Kjellerstedt <[email protected]>--- scripts/buildhistory-collect-srcrevs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)scripts/buildhistory-collect-srcrevs +5
-5@@ -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))scripts/buildhistory-collect-srcrevs +1
-1@@ -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))
Re: [OE-core] [PATCH 2/2] buildhistory-collect-srcrevs: Adapt to the new variable override syntax
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:
--- scripts/buildhistory-collect-srcrevs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
scripts/buildhistory-collect-srcrevs +6 -6
@@ -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))