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

packages: fix up cmd_sideload(), use get_kupfer_local() to find packages.

Browse source
This commit is contained in:
InsanePrawn 2022-08-11 06:26:04 +02:00
parent bb3a7d4881
commit 7a074d1c11
1 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
packages/__init__.py
View file

@ -15,7 +15,7 @@ from typing import Iterable, Iterator, Any, Optional
from constants import REPOSITORIES, CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD from constants import REPOSITORIES, CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD
from config import config from config import config
from chroot.build import get_build_chroot, BuildChroot from chroot.build import get_build_chroot, BuildChroot
from distro.distro import Distro, PackageInfo, get_kupfer_https as _get_kupfer_https from distro.distro import PackageInfo, get_kupfer_https, get_kupfer_local
from ssh import run_ssh_command, scp_put_files from ssh import run_ssh_command, scp_put_files
from wrapper import enforce_wrap from wrapper import enforce_wrap
from utils import git from utils import git
@ -347,22 +347,12 @@ def add_package_to_repo(package: Pkgbuild, arch: Arch):
return files return files
_kupfer_https = dict[Arch, Distro]()
def get_kupfer_https_distro(arch: Arch, scan: bool = True) -> Distro:
global _kupfer_https
if arch not in _kupfer_https or not _kupfer_https[arch]:
_kupfer_https[arch] = _get_kupfer_https(arch, scan=scan)
return _kupfer_https[arch]
def try_download_package(dest_file_path: str, package: Pkgbuild, arch: Arch) -> bool: def try_download_package(dest_file_path: str, package: Pkgbuild, arch: Arch) -> bool:
logging.debug(f"checking if we can download {package.name}") logging.debug(f"checking if we can download {package.name}")
filename = os.path.basename(dest_file_path) filename = os.path.basename(dest_file_path)
pkgname = package.name pkgname = package.name
repo_name = package.repo repo_name = package.repo
repos = get_kupfer_https_distro(arch, scan=True).repos repos = get_kupfer_https(arch, scan=True).repos
if repo_name not in repos: if repo_name not in repos:
logging.warning(f"Repository {repo_name} is not a known HTTPS repo") logging.warning(f"Repository {repo_name} is not a known HTTPS repo")
return False return False
@ -787,19 +777,28 @@ def build(
@cmd_packages.command(name='sideload') @cmd_packages.command(name='sideload')
@click.argument('paths', nargs=-1) @click.argument('paths', nargs=-1)
def cmd_sideload(paths: Iterable[str]): @click.option('--arch', default='aarch64', required=False, type=click.Choice(ARCHES), help="The CPU architecture to build for")
@click.option('-B', '--no-build', is_flag=True, default=False, help="Don't try to build packages, just copy and install")
def cmd_sideload(paths: Iterable[str], arch: Optional[Arch] = None, no_build: bool = False):
"""Build packages, copy to the device via SSH and install them""" """Build packages, copy to the device via SSH and install them"""
files = build(paths, True, None) if not no_build:
scp_put_files(files, '/tmp') files = build(paths, False, arch=arch, try_download=True)
else:
files = [pkg.resolved_url.split('file://')[1] for pkg in get_kupfer_local(arch=arch, scan=True, in_chroot=False).get_packages().values() if pkg.name in paths]
logging.debug(f"Sideload: Found package files: {files}")
if not files:
logging.fatal("No packages matched")
return
scp_put_files(files, '/tmp').check_returncode()
run_ssh_command([ run_ssh_command([
'sudo', 'sudo',
'-S',
'pacman', 'pacman',
'-U', '-U',
] + [os.path.join('/tmp', os.path.basename(file)) for file in files] + [ ] + [os.path.join('/tmp', os.path.basename(file)) for file in files] + [
'--noconfirm', '--noconfirm',
'--overwrite=*', '--overwrite=\*',
]) ],
alloc_tty=True).check_returncode()
@cmd_packages.command(name='clean') @cmd_packages.command(name='clean')