> -----Original Message----- > From: openembedded-core@lists.openembedded.org > <openembedded-core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > Sent: den 23 september 2023 06:06 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] oeqa/selftest/context: Rely on bitbake-getvar > --value to only return value > > Before, "bitbake-getvar --value <var>" would include log output together > with the value. This was handled by piping the output to "tail -1". > Now, "bitbake-getvar --value" will no longer output any logs so the > piping to "tail" is no longer needed. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com> > --- > > This of course relies on the corresponding patch for bitbake-getvar to > have been applied first. > > meta/lib/oeqa/selftest/context.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/lib/oeqa/selftest/context.py > b/meta/lib/oeqa/selftest/context.py > index 5a09aeedff..c148aa5aab 100644 > --- a/meta/lib/oeqa/selftest/context.py > +++ b/meta/lib/oeqa/selftest/context.py > @@ -111,7 +111,7 @@ class OESelftestTestContext(OETestContext): > > # Relative paths in BBLAYERS only works when the new build dir share > the same ascending node > if self.newbuilddir: > - bblayers = subprocess.check_output("bitbake-getvar --value > BBLAYERS | tail -1", cwd=builddir, shell=True, text=True) > + bblayers = subprocess.check_output("bitbake-getvar --value > BBLAYERS", cwd=builddir, shell=True, text=True) > if '..' in bblayers: > bblayers_abspath = [os.path.abspath(path) for path in > bblayers.split()] > with open("%s/conf/bblayers.conf" % newbuilddir, "a") as f:
Since the fixes to bitbake-getvalue have merged, it should be possible to merge this now. //Peter
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188776): https://lists.openembedded.org/g/openembedded-core/message/188776 Mute This Topic: https://lists.openembedded.org/mt/101535023/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-