parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 05:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

image.py: bring back enforce_wrap()

Browse source
This commit is contained in:
InsanePrawn 2022-09-21 15:34:30 +02:00
parent 99cc0c9845
commit f016eccc6e
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
image.py
View file

@ -19,7 +19,7 @@ from packages.build import build_enable_qemu_binfmt, build_packages, filter_pkgb
from packages.device import Device, get_profile_device from packages.device import Device, get_profile_device
from packages.flavour import Flavour, get_profile_flavour from packages.flavour import Flavour, get_profile_flavour
from ssh import copy_ssh_keys from ssh import copy_ssh_keys
from wrapper import check_programs_wrap, wrap_if_foreign_arch from wrapper import enforce_wrap
# image files need to be slightly smaller than partitions to fit # image files need to be slightly smaller than partitions to fit
IMG_FILE_ROOT_DEFAULT_SIZE = "1800M" IMG_FILE_ROOT_DEFAULT_SIZE = "1800M"
@ -387,9 +387,13 @@ def cmd_build(profile_name: str = None,
Unless overriden, required packages will be built or preferably downloaded from HTTPS repos. Unless overriden, required packages will be built or preferably downloaded from HTTPS repos.
""" """
config.enforce_profile_device_set()
config.enforce_profile_flavour_set()
enforce_wrap()
device = get_profile_device(profile_name) device = get_profile_device(profile_name)
arch = device.arch arch = device.arch
check_programs_wrap(['makepkg', 'pacman', 'pacstrap']) # check_programs_wrap(['makepkg', 'pacman', 'pacstrap'])
profile: Profile = config.get_profile(profile_name) profile: Profile = config.get_profile(profile_name)
flavour = get_profile_flavour(profile_name) flavour = get_profile_flavour(profile_name)
rootfs_size_mb = flavour.parse_flavourinfo().rootfs_size * 1000 + int(profile.size_extra_mb) rootfs_size_mb = flavour.parse_flavourinfo().rootfs_size * 1000 + int(profile.size_extra_mb)
@ -466,9 +470,11 @@ def cmd_build(profile_name: str = None,
@click.argument('profile', required=False) @click.argument('profile', required=False)
def cmd_inspect(profile: str = None, shell: bool = False): def cmd_inspect(profile: str = None, shell: bool = False):
"""Open a shell in a device image""" """Open a shell in a device image"""
config.enforce_profile_device_set()
config.enforce_profile_flavour_set()
enforce_wrap()
device = get_profile_device(profile) device = get_profile_device(profile)
arch = device.arch arch = device.arch
wrap_if_foreign_arch(arch)
flavour = get_profile_flavour(profile).name flavour = get_profile_flavour(profile).name
deviceinfo = device.parse_deviceinfo() deviceinfo = device.parse_deviceinfo()
sector_size = deviceinfo.flash_pagesize sector_size = deviceinfo.flash_pagesize