From 291ddb85ca8cdd3590de0711a87b9cf3e78737fe Mon Sep 17 00:00:00 2001 From: jld3103 Date: Wed, 6 Oct 2021 21:25:44 +0200 Subject: [PATCH] Always install base, base-devel and git inside of the base chroots --- chroot.py | 5 ++--- packages.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/chroot.py b/chroot.py index a312672..6c090d4 100644 --- a/chroot.py +++ b/chroot.py @@ -22,7 +22,7 @@ def get_chroot_path(chroot_name, override_basepath: str = None) -> str: def create_chroot(chroot_name: str, arch: str, - packages: list[str] = ['base'], + packages: list[str] = ['base', 'base-devel', 'git'], extra_repos: dict[str, RepoInfo] = {}, chroot_base_path: str = None, bind_mounts: dict[str, str] = BIND_BUILD_DIRS): @@ -261,7 +261,6 @@ def cmd_chroot(type: str = 'build', arch: str = None, enable_crossdirect=True): create_chroot( chroot_name, arch=arch, - packages=['base-devel', 'git'], extra_repos=get_kupfer_local(arch).repos, ) if type == 'build' and config.file['build']['crossdirect']: @@ -269,7 +268,7 @@ def cmd_chroot(type: str = 'build', arch: str = None, enable_crossdirect=True): native_chroot = create_chroot( 'build_' + native_arch, native_arch, - packages=['base-devel'] + (CROSSDIRECT_PKGS if enable_crossdirect else []), + packages=['base', 'base-devel', 'git'] + (CROSSDIRECT_PKGS if enable_crossdirect else []), extra_repos=get_kupfer_local(native_arch).repos, ) mount_crossdirect(native_chroot=native_chroot, target_chroot=chroot_path, target_arch=arch) diff --git a/packages.py b/packages.py index 607d53c..a38ab81 100644 --- a/packages.py +++ b/packages.py @@ -358,7 +358,7 @@ def setup_build_chroot(arch: str, extra_packages=[]) -> str: chroot_path = create_chroot( chroot_name, arch=arch, - packages=list(set(['base-devel', 'git'] + extra_packages)), + packages=list(set(['base', 'base-devel', 'git'] + extra_packages)), extra_repos=get_kupfer_local(arch).repos, ) pacman_cache = mount_pacman_cache(chroot_path, arch)