From: Frank Ch. Eigler <fche@redhat.com>
Date: Fri, 1 Nov 2024 14:00:43 +0000 (-0400)
Subject: make_common_builder: fix source-to-BUILD relative directory
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=HEAD;p=builder.git

make_common_builder: fix source-to-BUILD relative directory
---

diff --git a/builder/master.cfg b/builder/master.cfg
index 27ac7a9..4c0488f 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -5609,7 +5609,7 @@ c['builders'].append(glibc_snapshots_trunk_builder)
 
 
 def make_common_builder(project, gitrepo, branch, worker, tags,
-                        configure_opts, make_opts, check_opts,
+                        configure_opts, make_cmd, check_cmd,
                         bunsenpatterns):
         gitpoller = changes.GitPoller(repourl=gitrepo,
                                       branches=[branch],
@@ -5627,7 +5627,6 @@ def make_common_builder(project, gitrepo, branch, worker, tags,
         c['schedulers'].append(scheduler)
 
         f = util.BuildFactory()
-        f.addStep (steps.SetProperty(name="set package name",property="package_name", value=project))
         f.addStep (steps.Git(repourl=gitrepo,mode='full',method='fresh',retryFetch=True,
                                 retry=(30,3),getDescription={'tags':True,'always':True},
                                 name='git checkout',
@@ -5638,16 +5637,16 @@ def make_common_builder(project, gitrepo, branch, worker, tags,
                                          haltOnFailure=True))
         f.addStep (steps.Configure(name="configure",
                                       workdir="BUILD",
-                                      command=["../"+project+"/configure"] + configure_opts,
+                                      command=["../build/configure"] + configure_opts,
                                       haltOnFailure=True,
                                       logfiles={"config.log":"config.log"}))
         f.addStep (steps.Compile(name="compile",
                                 workdir="BUILD",
-                                command=make_opts,
+                                command=make_cmd,
                                 haltOnFailure=True))
         f.addStep (steps.Test(name="check",
                              workdir='BUILD',
-                             command=check_opts,
+                             command=check_cmd,
                              haltOnFailure=False, flunkOnFailure=False))
         f.addSteps (bunsen_logfile_upload_cpio_steps(bunsenpatterns, workdir="BUILD"))
 
@@ -5661,7 +5660,7 @@ def make_common_builder(project, gitrepo, branch, worker, tags,
 
 make_common_builder('gitsigur',
                     'https://sourceware.org/git/gitsigur.git', 'master', 'fedrawhide-x86_64', tags=["fedora", "x86_64"],
-                    configure_opts=[], make_opts=["make"], check_opts=["make", "check"],
+                    configure_opts=[], make_cmd=["make"], check_cmd=["make", "check"],
                     bunsenpatterns=["*.log", "*.trs"])