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

chroot.py: cleanups

Browse source
This commit is contained in:
InsanePrawn 2021-10-22 03:28:45 +02:00
parent 91cec7fabd
commit d84e82ec64
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
chroot.py
View file

@ -229,6 +229,7 @@ class Chroot:
options=['bind'], options=['bind'],
fs_type: str = None, fs_type: str = None,
fail_if_mounted: bool = True, fail_if_mounted: bool = True,
makedir: bool = True,
): ):
"""returns the absolute path `relative_target` was mounted at""" """returns the absolute path `relative_target` was mounted at"""
relative_destination = relative_destination.lstrip('/') relative_destination = relative_destination.lstrip('/')
@ -238,6 +239,8 @@ class Chroot:
raise Exception(f'{self.name}: {relative_destination} is already mounted') raise Exception(f'{self.name}: {relative_destination} is already mounted')
logging.warning(f'{self.name}: {relative_destination} already mounted. Skipping.') logging.warning(f'{self.name}: {relative_destination} already mounted. Skipping.')
else: else:
if makedir and os.path.isdir(absolute_source):
os.makedirs(absolute_destination, exist_ok=True)
result = mount(absolute_source, absolute_destination, options=options, fs_type=fs_type, register_unmount=False) result = mount(absolute_source, absolute_destination, options=options, fs_type=fs_type, register_unmount=False)
if result.returncode != 0: if result.returncode != 0:
raise Exception(f'{self.name}: failed to mount {absolute_source} to {relative_destination}') raise Exception(f'{self.name}: failed to mount {absolute_source} to {relative_destination}')
@ -263,12 +266,7 @@ class Chroot:
if not self.initialised: if not self.initialised:
self.init(fail_if_active=False) self.init(fail_if_active=False)
for dst, opts in BASIC_MOUNTS.items(): for dst, opts in BASIC_MOUNTS.items():
self.mount( self.mount(opts['src'], dst, fs_type=opts['type'], options=opts['options'])
opts['src'],
dst,
fs_type=opts['type'],
options=opts['options']
)
self.active = True self.active = True
def deactivate(self, fail_if_inactive: bool = False): def deactivate(self, fail_if_inactive: bool = False):
@ -282,9 +280,6 @@ class Chroot:
self.umount('proc') self.umount('proc')
self.active = False self.active = False
def install_packages(packages: list[str]):
pass
def run_cmd(self, def run_cmd(self,
script: str, script: str,
inner_env: dict[str, str] = {}, inner_env: dict[str, str] = {},
@ -395,16 +390,23 @@ class Chroot:
return self.mount(config.get_path('pacman'), '/var/cache/pacman') return self.mount(config.get_path('pacman'), '/var/cache/pacman')
def mount_packages(self) -> str: def mount_packages(self) -> str:
packages = config.get_package_dir(self.arch) packages = config.get_path('packages')
return self.mount(absolute_source=packages, relative_destination=packages.lstrip('/')) return self.mount(absolute_source=packages, relative_destination=packages.lstrip('/'))
def write_cross_makepkg_conf(self, target_arch: str, target_chroot_relative: str, cross: bool = True) -> str: def mount_crosscompile(self, foreign_chroot: Chroot):
mount_dest = os.path.join('chroot', os.path.basename(foreign_chroot.path))
os.makedirs(os.path.join(self.path, mount_dest), exist_ok=True)
return self.mount(absolute_source=foreign_chroot.path, relative_destination=mount_dest)
def write_makepkg_conf(self, target_arch: Arch, cross_chroot_relative: str, cross: bool = True) -> str:
""" """
Generate a makepkg_cross_$arch.conf file in /etc, building for `target_chroot_relative` Generate a `makepkg.conf` or `makepkg_cross_$arch.conf` file in /etc.
Returns the relative (to `self.path`) path to written file, e.g. `etc/makepkg_cross_aarch64.conf`. If `cross` is set makepkg will be configured to crosscompile for the foreign chroot at `cross_chroot_relative`
Returns the relative (to `self.path`) path to the written file, e.g. `etc/makepkg_cross_aarch64.conf`.
""" """
makepkg_cross_conf = generate_makepkg_conf(target_arch, cross=cross, chroot=target_chroot_relative) makepkg_cross_conf = generate_makepkg_conf(target_arch, cross=cross, chroot=cross_chroot_relative)
makepkg_conf_path_relative = os.path.join('etc', f'makepkg_cross_{target_arch}.conf') filename = 'makepkg' + (f'_cross_{target_arch}' if cross else '') + '.conf'
makepkg_conf_path_relative = os.path.join('etc', filename)
makepkg_conf_path = os.path.join(self.path, makepkg_conf_path_relative) makepkg_conf_path = os.path.join(self.path, makepkg_conf_path_relative)
with open(makepkg_conf_path, 'w') as f: with open(makepkg_conf_path, 'w') as f:
f.write(makepkg_cross_conf) f.write(makepkg_cross_conf)