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

make packages build work again

Browse source
This commit is contained in:
InsanePrawn 2021-10-23 21:01:46 +02:00
parent 4cc0235329
commit 6be94271a2
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
constants.py
View file

@ -130,7 +130,8 @@ CFLAGS_ARCHES: dict[Arch, list[str]] = {
] ]
} }
CROSSDIRECT_PKGS = ['crossdirect', 'qemu-user-static-bin', 'binfmt-qemu-static'] QEMU_BINFMT_PKGS = ['qemu-user-static-bin', 'binfmt-qemu-static']
CROSSDIRECT_PKGS = ['crossdirect'] + QEMU_BINFMT_PKGS
SSH_DEFAULT_HOST = '172.16.42.1' SSH_DEFAULT_HOST = '172.16.42.1'
SSH_DEFAULT_PORT = 22 SSH_DEFAULT_PORT = 22

13
packages.py
View file

@ -7,7 +7,7 @@ import subprocess
from copy import deepcopy from copy import deepcopy
from joblib import Parallel, delayed from joblib import Parallel, delayed
from constants import REPOSITORIES, CROSSDIRECT_PKGS, GCC_HOSTSPECS, ARCHES, Arch from constants import REPOSITORIES, CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch
from config import config from config import config
from chroot import get_build_chroot, Chroot from chroot import get_build_chroot, Chroot
from distro import get_kupfer_local from distro import get_kupfer_local
@ -359,9 +359,7 @@ def add_package_to_repo(package: Package, arch: Arch):
def check_package_version_built(package: Package, arch: Arch) -> bool: def check_package_version_built(package: Package, arch: Arch) -> bool:
#chroot = Chroot(name='rootfs', arch=config.runtime['arch'], copy_base=False, initialize=False)
native_chroot = setup_build_chroot(config.runtime['arch']) native_chroot = setup_build_chroot(config.runtime['arch'])
#config_path = os.path.join(native_chroot.path,
config_path = '/' + native_chroot.write_makepkg_conf( config_path = '/' + native_chroot.write_makepkg_conf(
target_arch=arch, target_arch=arch,
cross_chroot_relative=os.path.join('chroot', arch), cross_chroot_relative=os.path.join('chroot', arch),
@ -493,11 +491,6 @@ def build_package(
logging.debug(('Building for native arch. ' if not foreign_arch else '') + 'Skipping crossdirect.') logging.debug(('Building for native arch. ' if not foreign_arch else '') + 'Skipping crossdirect.')
setup_sources(package, build_root) setup_sources(package, build_root)
for chroot in chroots:
chroot.activate()
chroot.mount_pacman_cache()
chroot.mount_pkgbuilds()
chroot.mount_packages()
makepkg_conf_absolute = os.path.join('/', makepkg_conf_path) makepkg_conf_absolute = os.path.join('/', makepkg_conf_path)
build_cmd = f'cd {package.path} && makepkg --config {makepkg_conf_absolute} --needed --noconfirm --ignorearch {" ".join(makepkg_compile_opts)}' build_cmd = f'cd {package.path} && makepkg --config {makepkg_conf_absolute} --needed --noconfirm --ignorearch {" ".join(makepkg_compile_opts)}'
@ -615,6 +608,7 @@ def build(paths: list[str], force: bool, arch: Arch):
native = config.runtime['arch'] native = config.runtime['arch']
if arch != native: if arch != native:
# build qemu-user, binfmt, crossdirect # build qemu-user, binfmt, crossdirect
chroot = setup_build_chroot(native)
build_packages_by_paths( build_packages_by_paths(
['cross/' + pkg for pkg in CROSSDIRECT_PKGS], ['cross/' + pkg for pkg in CROSSDIRECT_PKGS],
native, native,
@ -623,8 +617,7 @@ def build(paths: list[str], force: bool, arch: Arch):
enable_crossdirect=False, enable_crossdirect=False,
enable_ccache=False, enable_ccache=False,
) )
subprocess.run(['pacman', '-Syy', '--noconfirm', '--needed', '--config', os.path.join(chroot.path, 'etc/pacman.conf')] + QEMU_BINFMT_PKGS)
subprocess.run(['pacman', '-Syy', '--noconfirm', '--needed'] + CROSSDIRECT_PKGS)
binfmt_register(arch) binfmt_register(arch)
return build_packages_by_paths( return build_packages_by_paths(