refactor packages.py code into chroot.generate_makepkg_conf(), use generated conf in check_package_version_built()
This commit is contained in:
parent
1c8fd7eccd
commit
1ba4dcfaec
2 changed files with 22 additions and 9 deletions
13
chroot.py
13
chroot.py
|
@ -11,6 +11,7 @@ from distro import get_kupfer_local
|
|||
from wrapper import enforce_wrap
|
||||
from constants import GCC_HOSTSPECS, CROSSDIRECT_PKGS
|
||||
from glob import glob
|
||||
from generator import generate_makepkg_conf
|
||||
|
||||
BIND_BUILD_DIRS = 'BINDBUILDDIRS'
|
||||
|
||||
|
@ -171,6 +172,18 @@ def mount_crossdirect(native_chroot: str, target_chroot: str, target_arch: str,
|
|||
raise Exception(f'Failed to mount native chroot {native_chroot} to {native_mount}')
|
||||
|
||||
|
||||
def write_cross_makepkg_conf(native_chroot: str, arch: str, target_chroot_relative: str, cross: bool = True) -> str:
|
||||
"""
|
||||
Generate a makepkg_cross_$arch.conf file in `native_chroot`/etc, building for `target_chroot_relative`
|
||||
Returns the absolute (host) path to the makepkg config file.
|
||||
"""
|
||||
makepkg_cross_conf = generate_makepkg_conf(arch, cross=cross, chroot=target_chroot_relative)
|
||||
makepkg_conf_path = os.path.join(native_chroot, 'etc', f'makepkg_cross_{arch}.conf')
|
||||
with open(makepkg_conf_path, 'w') as f:
|
||||
f.write(makepkg_cross_conf)
|
||||
return makepkg_conf_path
|
||||
|
||||
|
||||
@click.command('chroot')
|
||||
@click.argument('type', required=False, default='build')
|
||||
@click.argument('arch', required=False, default=None)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue