From 8ead5c9542c099cbcdebcaf8d0794fe31a9e0cb5 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Wed, 26 Jan 2022 15:56:38 +0100 Subject: [PATCH] Remove all static references to /prebuilts --- Dockerfile | 2 +- chroot.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86c3ca8..8821ece 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,6 @@ RUN pip install -r requirements.txt 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 +RUN python -c "import constants; repos='\n'.join(['\n'.join(['', f'[{repo}]', f'Server = file://{constants.CHROOT_PATHS['packages']}/\$arch/\$repo']) for repo in constants.REPOSITORIES]); print(repos)" | tee -a /etc/pacman.conf WORKDIR / diff --git a/chroot.py b/chroot.py index d9a3bc3..3b3a035 100644 --- a/chroot.py +++ b/chroot.py @@ -204,9 +204,9 @@ class Chroot: '-W', '-x', '--exclude', - 'pkgbuilds', + CHROOT_PATHS['pkgbuilds'].strip('/'), '--exclude', - 'prebuilts', + CHROOT_PATHS['packages'].strip('/'), f'{base_chroot.path}/', f'{self.path}/', ])