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

Fix formatting

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

1
chroot.py
View file

@ -5,7 +5,6 @@ import os
from config import config from config import config
from distro import get_base_distros, RepoInfo from distro import get_base_distros, RepoInfo
from shlex import quote as shell_quote from shlex import quote as shell_quote
from shutil import copy
from utils import mount from utils import mount
from distro import get_kupfer_local from distro import get_kupfer_local
from wrapper import enforce_wrap from wrapper import enforce_wrap

4
packages.py
View file

@ -11,7 +11,7 @@ from constants import REPOSITORIES, CROSSDIRECT_PKGS, GCC_HOSTSPECS, ARCHES
from config import config from config import config
from chroot import create_chroot, run_chroot_cmd, try_install_packages, mount_crossdirect, write_cross_makepkg_conf, mount_packages, mount_pacman_cache from chroot import create_chroot, run_chroot_cmd, try_install_packages, mount_crossdirect, write_cross_makepkg_conf, mount_packages, mount_pacman_cache
from distro import get_kupfer_local from distro import get_kupfer_local
from wrapper import enforce_wrap, check_programs_wrap from wrapper import enforce_wrap
from utils import mount, umount from utils import mount, umount
makepkg_env = os.environ.copy() | { makepkg_env = os.environ.copy() | {
@ -419,7 +419,7 @@ def build_package(
native_chroot = setup_build_chroot(arch=config.runtime['arch'], extra_packages=['base-devel']) if foreign_arch else target_chroot native_chroot = setup_build_chroot(arch=config.runtime['arch'], extra_packages=['base-devel']) if foreign_arch else target_chroot
cross = foreign_arch and package.mode == 'cross' and enable_crosscompile cross = foreign_arch and package.mode == 'cross' and enable_crosscompile
umount_dirs = [] umount_dirs = []
chroots = set([target_chroot, native_chroot]) set([target_chroot, native_chroot])
# eliminate target_chroot == native_chroot with set() # eliminate target_chroot == native_chroot with set()
for chroot, _arch in [(native_chroot, config.runtime['arch']), (target_chroot, arch)]: for chroot, _arch in [(native_chroot, config.runtime['arch']), (target_chroot, arch)]: