From c46984fefab8f56ef3f73300d5cc5df6e2d75d8f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 27 Jun 2022 23:04:44 +0100 Subject: [PATCH] builders: Rather than use a central shared repo dir, use the local build directory Signed-off-by: Richard Purdie --- builders.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builders.py b/builders.py index 835b168..d942346 100644 --- a/builders.py +++ b/builders.py @@ -113,12 +113,12 @@ def create_builder_factory(): haltOnFailure=True, name="Unpack shared repositories")) - f.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:sharedrepolocation:~%(prop:builddir)s)s/poky; git rev-parse HEAD"), + f.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse HEAD"), property="yp_build_revision", haltOnFailure=True, name='Set build revision')) - f.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:sharedrepolocation:~%(prop:builddir)s)s/poky; git rev-parse --abbrev-ref HEAD"), + f.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse --abbrev-ref HEAD"), property="yp_build_branch", haltOnFailure=True, name='Set build branch')) @@ -274,12 +274,12 @@ def create_parent_builder_factory(buildername, waitname): haltOnFailure=True, name="Unpack shared repositories")) - factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:sharedrepolocation:~%(prop:builddir)s)s/poky; git rev-parse HEAD"), + factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse HEAD"), property="yp_build_revision", haltOnFailure=True, name='Set build revision')) - factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:sharedrepolocation:~%(prop:builddir)s)s/poky; git rev-parse --abbrev-ref HEAD"), + factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse --abbrev-ref HEAD"), property="yp_build_branch", haltOnFailure=True, name='Set build branch'))