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

image: cmd_build(): add --[no-]local-repos to build images from https repos only

Browse source
This commit is contained in:
InsanePrawn 2022-05-08 18:02:36 +02:00
parent cb95846fb5
commit 6000679817
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
image.py
View file

@ -355,10 +355,11 @@ def cmd_image():
@cmd_image.command(name='build') @cmd_image.command(name='build')
@click.argument('profile_name', required=False) @click.argument('profile_name', required=False)
@click.option('--build-pkgs/--no-build-pkgs', '-p/-P', default=True, help='Whether to build missing/outdated packages. Defaults to true.') @click.option('--local-repos/--no-local-repos', '-l/-L', default=True, help='Whether to use local packages. Defaults to true.')
@click.option('--build-pkgs/--no-build-pkgs', '-p/-P', default=True, help='Whether to build missing/outdated local packages. Defaults to true.')
@click.option('--block-target', default=None, help='Override the block device file to target') @click.option('--block-target', default=None, help='Override the block device file to target')
@click.option('--skip-part-images', default=False, help='Skip creating image files for the partitions and directly work on the target block device.') @click.option('--skip-part-images', default=False, help='Skip creating image files for the partitions and directly work on the target block device.')
def cmd_build(profile_name: str = None, build_pkgs: bool = True, block_target: str = None, skip_part_images: bool = False): def cmd_build(profile_name: str = None, local_repos: bool = True, build_pkgs: bool = True, block_target: str = None, skip_part_images: bool = False):
"""Build a device image""" """Build a device image"""
enforce_wrap() enforce_wrap()
profile: Profile = config.get_profile(profile_name) profile: Profile = config.get_profile(profile_name)
@ -370,13 +371,13 @@ def cmd_build(profile_name: str = None, build_pkgs: bool = True, block_target: s
sector_size = 4096 sector_size = 4096
rootfs_size_mb = FLAVOURS[flavour].get('size', 2) * 1000 rootfs_size_mb = FLAVOURS[flavour].get('size', 2) * 1000
build_enable_qemu_binfmt(arch)
packages_dir = config.get_package_dir(arch)
use_local_repos = os.path.exists(os.path.join(packages_dir, 'main'))
packages = BASE_PACKAGES + DEVICES[device] + FLAVOURS[flavour]['packages'] + profile['pkgs_include'] packages = BASE_PACKAGES + DEVICES[device] + FLAVOURS[flavour]['packages'] + profile['pkgs_include']
if build_pkgs: if arch != config.runtime['native']:
build_enable_qemu_binfmt(arch)
if local_repos and build_pkgs:
logging.info("Making sure all packages are built")
repo = discover_packages() repo = discover_packages()
build_packages(repo, [p for name, p in repo.items() if name in packages], arch) build_packages(repo, [p for name, p in repo.items() if name in packages], arch)
@ -414,7 +415,7 @@ def cmd_build(profile_name: str = None, build_pkgs: bool = True, block_target: s
flavour, flavour,
arch, arch,
packages, packages,
use_local_repos, local_repos,
profile, profile,
) )

2
packages/__init__.py
View file

@ -553,13 +553,13 @@ def build_packages_by_paths(
def build_enable_qemu_binfmt(arch: Arch, repo: dict[str, Pkgbuild] = None): def build_enable_qemu_binfmt(arch: Arch, repo: dict[str, Pkgbuild] = None):
if arch not in ARCHES: if arch not in ARCHES:
raise Exception(f'Unknown architecture "{arch}". Choices: {", ".join(ARCHES)}') raise Exception(f'Unknown architecture "{arch}". Choices: {", ".join(ARCHES)}')
logging.info('Installing qemu-user (building if necessary)')
enforce_wrap() enforce_wrap()
if not repo: if not repo:
repo = discover_packages() repo = discover_packages()
native = config.runtime['arch'] native = config.runtime['arch']
# build qemu-user, binfmt, crossdirect # build qemu-user, binfmt, crossdirect
chroot = setup_build_chroot(native) chroot = setup_build_chroot(native)
logging.info('Installing qemu-user (building if necessary)')
build_packages_by_paths( build_packages_by_paths(
['cross/' + pkg for pkg in CROSSDIRECT_PKGS], ['cross/' + pkg for pkg in CROSSDIRECT_PKGS],
native, native,