From f07d8770ef57456df90e834bcaaf877634cafda2 Mon Sep 17 00:00:00 2001
From: Joey Riches <josephriches@gmail.com>
Date: Sun, 8 Sep 2024 16:46:46 +0100
Subject: [PATCH] ypkg: Allow a custom build directory

Allow packager's to override the default build output directory.

This in primarily intended for solbuild to invoke ypkg-build as root
but continue to use the 'build' user directories.
---
 ypkg                 |  2 ++
 ypkg2/main.py        | 12 ++++++++++--
 ypkg2/ypkgcontext.py |  4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ypkg b/ypkg
index de1674c..ec40952 100755
--- a/ypkg
+++ b/ypkg
@@ -29,6 +29,8 @@ def main():
                         "i.e. no prompt", action="store_true")
     parser.add_argument("-D", "--output-dir", type=str,
                         help="Set the output directory for resulting files")
+    parser.add_argument("-B", "--build-dir", type=str,
+                        help="Set the base directory for performing the build")
     # Main file
     parser.add_argument("filename", help="Path to the ypkg YAML file",
                         nargs='?')
diff --git a/ypkg2/main.py b/ypkg2/main.py
index 6abe669..bfdc2c0 100644
--- a/ypkg2/main.py
+++ b/ypkg2/main.py
@@ -60,6 +60,8 @@ def main():
                         type=int, default=-1)
     parser.add_argument("-D", "--output-dir", type=str,
                         help="Set the output directory for resulting files")
+    parser.add_argument("-B", "--build-dir", type=str,
+                        help="Set the base directory for performing the build")
     # Main file
     parser.add_argument("filename", help="Path to the ypkg YAML file to build",
                         nargs='?')
@@ -84,6 +86,11 @@ def main():
         outputDir = od
     outputDir = os.path.abspath(outputDir)
 
+    if args.build_dir:
+        buildDir = os.path.abspath(args.build_dir)
+    else:
+        buildDir = None
+
     # Grab filename
     if not args.filename:
         console_ui.emit_error("Error",
@@ -102,7 +109,7 @@ def main():
                               "or as the root user (not recommended)")
         sys.exit(1)
 
-    build_package(args.filename, outputDir)
+    build_package(args.filename, outputDir, buildDir)
 
 
 def clean_build_dirs(context):
@@ -184,7 +191,7 @@ def execute_step(context, step, step_n, work_dir):
     return True
 
 
-def build_package(filename, outputDir):
+def build_package(filename, outputDir, buildDir=None):
     """ Will in future be moved to a separate part of the module """
     spec = YpkgSpec()
     if not spec.load_from_path(filename):
@@ -225,6 +232,7 @@ def build_package(filename, outputDir):
 
     spec.packager_name = packager_name
     spec.packager_email = packager_email
+    spec.build_dir = buildDir
     # Try to load history
     dirn = os.path.dirname(filename)
     hist = os.path.join(dirn, "history.xml")
diff --git a/ypkg2/ypkgcontext.py b/ypkg2/ypkgcontext.py
index 3fe9de2..7770558 100644
--- a/ypkg2/ypkgcontext.py
+++ b/ypkg2/ypkgcontext.py
@@ -304,12 +304,14 @@ def get_path(self):
 
     def get_sources_directory(self):
         """ Get the configured source directory for fetching sources to """
-        if self.is_root:
+        if self.is_root and self.spec.build_dir is None:
             return self.global_archive_dir
         return os.path.join(self.get_build_prefix(), "sources")
 
     def get_build_prefix(self):
         """ Get the build prefix used by ypkg """
+        if self.spec.build_dir is not None:
+            return self.spec.build_dir
         if self.is_root:
             return "/var/ypkg-root"
         return "{}/YPKG".format(os.path.expanduser("~"))