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

buildroot: don't expect signatures from kupfer repos, small error logging bugfix in chroot.py

Browse source
This commit is contained in:
InsanePrawn 2021-09-18 18:31:13 +02:00
parent 3b69c2235b
commit fef0f07297
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chroot.py
View file

@ -65,7 +65,7 @@ def create_chroot(
], ],
capture_output=True) capture_output=True)
if result.returncode != 0: if result.returncode != 0:
raise Exception('Failed to install chroot:' + result.stdout + '\n' + result.stderr) raise Exception('Failed to install chroot:' + result.stdout.decode() + '\n' + result.stderr.decode())
return chroot_path return chroot_path

7
packages.py
View file

@ -302,6 +302,7 @@ def setup_build_chroot(arch='aarch64', extra_packages=[]) -> str:
for repo in REPOSITORIES: for repo in REPOSITORIES:
extra_repos[repo] = { extra_repos[repo] = {
'Server': f"file://{config.file['paths']['packages']}/{repo}", 'Server': f"file://{config.file['paths']['packages']}/{repo}",
'SigLevel': 'Never',
} }
chroot_path = create_chroot( chroot_path = create_chroot(
chroot_name, chroot_name,
@ -353,11 +354,9 @@ def setup_dependencies_and_sources(package: Package, chroot: str, repo_dir: str
makepkg_setup_args = [ makepkg_setup_args = [
'--nobuild', '--nobuild',
'--holdver', '--holdver',
'--nodeps'
] ]
if not package.mode == 'cross' and enable_crosscompile: if (package.mode == 'cross' and enable_crosscompile):
makepkg_setup_args += ['--syncdeps']
else:
makepkg_setup_args += ['--nodeps']
logging.info('Setting up dependencies for cross-compilation') logging.info('Setting up dependencies for cross-compilation')
for p in package.depends: for p in package.depends:
# Don't check for errors here because there might be packages that are listed as dependencies but are not available on x86_64 # Don't check for errors here because there might be packages that are listed as dependencies but are not available on x86_64