From: Richard Purdie Date: Thu, 7 Sep 2023 22:25:50 +0000 (+0100) Subject: Revert "oeqa selftest context.py: fix git commands and set branch name" X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92db7fa462eb88e9fbc0cfe5c27fe9a928aac5f2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git Revert "oeqa selftest context.py: fix git commands and set branch name" We have autobuilder workers which don't have the -b option unfortunately. This reverts commit 5ec557467dda29309e25102b507bb919275bedbb. --- diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index bc3915a3aae..bd03e765b03 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -104,7 +104,7 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") oe.path.copytree(selftestdir, newselftestdir) - subprocess.check_output("git init -b main && git add * && git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True)