From fe52671e062e56cf361e912a679f3b033a9c36df Mon Sep 17 00:00:00 2001
From: jld3103 <jld3103yt@gmail.com>
Date: Sun, 17 Oct 2021 13:48:37 +0200
Subject: [PATCH] Fix package building

---
 Dockerfile  |  2 +-
 packages.py | 26 ++++++++++++++++----------
 wrapper.py  |  3 ++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2ae60bf..4b6ef46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,4 +30,4 @@ COPY . .
 
 RUN python -c "import constants; repos='\n'.join(['\n'.join(['', f'[{repo}]', f'Server = file:///prebuilts/\$arch/\$repo']) for repo in constants.REPOSITORIES]); print(repos)" | tee -a /etc/pacman.conf
 
-WORKDIR /src
+WORKDIR /
diff --git a/packages.py b/packages.py
index 4ad4718..5b26745 100644
--- a/packages.py
+++ b/packages.py
@@ -160,7 +160,7 @@ def discover_packages(dir: str = None) -> dict[str, Package]:
     init_pkgbuilds(interactive=False)
     for repo in REPOSITORIES:
         for _dir in os.listdir(os.path.join(dir, repo)):
-            paths.append(os.path.join(repo, _dir))
+            paths.append(os.path.join(dir, repo, _dir))
 
     results = Parallel(n_jobs=multiprocessing.cpu_count() * 4)(delayed(Package)(path, dir) for path in paths)
     for package in results:
@@ -191,7 +191,7 @@ def filter_packages_by_paths(repo: dict[str, Package], paths: list[str]) -> list
         return repo.values()
     result = []
     for pkg in repo.values():
-        if pkg.path in paths:
+        if pkg.path.replace('/pkgbuilds/', '') in paths:
             result += [pkg]
     return result
 
@@ -498,17 +498,17 @@ def build_package(
                 env['PATH'] = f"/usr/lib/ccache:{env['PATH']}"
             logging.debug(('Building for native arch. ' if not foreign_arch else '') + 'Skipping crossdirect.')
 
-    src_dir = os.path.join(build_root, 'src')
+    src_dir = os.path.join(build_root, 'pkgbuilds')
     os.makedirs(src_dir, exist_ok=True)
     #setup_sources(package, build_root, enable_crosscompile=enable_crosscompile)
 
     result = mount(config.get_path('pkgbuilds'), src_dir)
     if result.returncode != 0:
-        raise Exception(f'Failed to bind mount pkgbuilds to {build_root}/src')
+        raise Exception(f'Failed to bind mount pkgbuilds to {src_dir}')
     umount_dirs += [src_dir]
 
     makepkg_conf_absolute = os.path.join('/', makepkg_conf_path)
-    build_cmd = f'cd /src/{package.path} && makepkg --config {makepkg_conf_absolute} --needed --noconfirm --ignorearch {" ".join(makepkg_compile_opts)}'
+    build_cmd = f'cd {package.path} && makepkg --config {makepkg_conf_absolute} --needed --noconfirm --ignorearch {" ".join(makepkg_compile_opts)}'
     logging.debug(f'Building: Running {build_cmd}')
     result = run_chroot_cmd(build_cmd, chroot_path=build_root, inner_env=env)
 
@@ -571,6 +571,7 @@ def build_packages(
 def build_packages_by_paths(
     paths: list[str],
     arch: str,
+    repo: dict[str, Package],
     force=False,
     enable_crosscompile: bool = True,
     enable_crossdirect: bool = True,
@@ -581,7 +582,6 @@ def build_packages_by_paths(
 
     for _arch in set([arch, config.runtime['arch']]):
         init_prebuilts(_arch)
-    repo: dict[str, Package] = discover_packages()
     packages = filter_packages_by_paths(repo, paths)
     build_packages(
         repo,
@@ -618,12 +618,14 @@ def cmd_build(paths: list[str], force=False, arch=None):
     if arch not in ARCHES:
         raise Exception(f'Unknown architecture "{arch}". Choices: {", ".join(ARCHES)}')
     enforce_wrap()
+    repo: dict[str, Package] = discover_packages()
     native = config.runtime['arch']
     if arch != native:
         # build qemu-user, binfmt, crossdirect
         build_packages_by_paths(
             ['cross/' + pkg for pkg in CROSSDIRECT_PKGS],
             native,
+            repo,
             enable_crosscompile=False,
             enable_crossdirect=False,
             enable_ccache=False,
@@ -635,6 +637,7 @@ def cmd_build(paths: list[str], force=False, arch=None):
     build_packages_by_paths(
         paths,
         arch,
+        repo,
         force=force,
         enable_crosscompile=config.file['build']['crosscompile'],
         enable_crossdirect=config.file['build']['crossdirect'],
@@ -645,10 +648,13 @@ def cmd_build(paths: list[str], force=False, arch=None):
 @cmd_packages.command(name='clean')
 def cmd_clean():
     enforce_wrap()
-    result = git([
-        'clean',
-        '-dffX',
-    ] + REPOSITORIES)
+    result = git(
+        [
+            'clean',
+            '-dffX',
+        ] + REPOSITORIES,
+        dir='/pkgbuilds',
+    )
     if result.returncode != 0:
         logging.fatal('Failed to git clean')
         exit(1)
diff --git a/wrapper.py b/wrapper.py
index 51df81a..9f259ae 100644
--- a/wrapper.py
+++ b/wrapper.py
@@ -13,7 +13,7 @@ DOCKER_PATHS = {
     'jumpdrive': '/var/cache/jumpdrive',
     'pacman': '/var/cache/pacman',
     'packages': '/prebuilts',
-    'pkgbuilds': '/src',
+    'pkgbuilds': '/pkgbuilds',
 }
 
 
@@ -104,6 +104,7 @@ def wrap_docker():
         dump_config_file(file_path=wrapped_config, config=(config.file | {'paths': DOCKER_PATHS}))
         volumes = {
             '/dev': '/dev',
+            os.getcwd(): '/src',
             wrapped_config: '/root/.config/kupfer/kupferbootstrap.toml',
         }
         volumes |= dict({config.get_path(vol_name): vol_dest for vol_name, vol_dest in DOCKER_PATHS.items()})