parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

Always install base, base-devel and git inside of the base chroots

Browse source
This commit is contained in:
jld3103 2021-10-06 21:25:44 +02:00
parent c4760bd99e
commit 291ddb85ca
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
chroot.py
View file

@ -22,7 +22,7 @@ def get_chroot_path(chroot_name, override_basepath: str = None) -> str:
def create_chroot(chroot_name: str, def create_chroot(chroot_name: str,
arch: str, arch: str,
packages: list[str] = ['base'], packages: list[str] = ['base', 'base-devel', 'git'],
extra_repos: dict[str, RepoInfo] = {}, extra_repos: dict[str, RepoInfo] = {},
chroot_base_path: str = None, chroot_base_path: str = None,
bind_mounts: dict[str, str] = BIND_BUILD_DIRS): 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( create_chroot(
chroot_name, chroot_name,
arch=arch, arch=arch,
packages=['base-devel', 'git'],
extra_repos=get_kupfer_local(arch).repos, extra_repos=get_kupfer_local(arch).repos,
) )
if type == 'build' and config.file['build']['crossdirect']: 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( native_chroot = create_chroot(
'build_' + native_arch, 'build_' + native_arch,
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, extra_repos=get_kupfer_local(native_arch).repos,
) )
mount_crossdirect(native_chroot=native_chroot, target_chroot=chroot_path, target_arch=arch) mount_crossdirect(native_chroot=native_chroot, target_chroot=chroot_path, target_arch=arch)

2
packages.py
View file

@ -358,7 +358,7 @@ def setup_build_chroot(arch: str, extra_packages=[]) -> str:
chroot_path = create_chroot( chroot_path = create_chroot(
chroot_name, chroot_name,
arch=arch, 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, extra_repos=get_kupfer_local(arch).repos,
) )
pacman_cache = mount_pacman_cache(chroot_path, arch) pacman_cache = mount_pacman_cache(chroot_path, arch)