diff --git a/pmb/flasher/__init__.py b/pmb/flasher/__init__.py index 9691c4a7..4d788c4c 100644 --- a/pmb/flasher/__init__.py +++ b/pmb/flasher/__init__.py @@ -1,6 +1,7 @@ # Copyright 2022 Oliver Smith # SPDX-License-Identifier: GPL-3.0-or-later from pmb.flasher.init import init +from pmb.flasher.init import install_depends from pmb.flasher.run import run from pmb.flasher.run import check_partition_blacklist from pmb.flasher.variables import variables diff --git a/pmb/flasher/frontend.py b/pmb/flasher/frontend.py index a76b424f..8ba3011d 100644 --- a/pmb/flasher/frontend.py +++ b/pmb/flasher/frontend.py @@ -88,11 +88,8 @@ def list_devices(args): def sideload(args): - method = args.flash_method or args.deviceinfo["flash_method"] - cfg = pmb.config.flashers[method] - # Install depends - pmb.chroot.apk.install(args, cfg["depends"]) + pmb.flasher.install_depends(args) # Mount the buildroot suffix = "buildroot_" + args.deviceinfo["arch"] diff --git a/pmb/flasher/init.py b/pmb/flasher/init.py index 48dccca6..8204b93f 100644 --- a/pmb/flasher/init.py +++ b/pmb/flasher/init.py @@ -5,8 +5,7 @@ import pmb.chroot.apk import pmb.helpers.mount -def init(args): - # Validate method +def install_depends(args): if hasattr(args, 'flash_method'): method = args.flash_method or args.deviceinfo["flash_method"] else: @@ -21,10 +20,12 @@ def init(args): " package it yourself, and then add it to" " pmb/config/__init__.py.") cfg = pmb.config.flashers[method] - - # Install depends pmb.chroot.apk.install(args, cfg["depends"]) + +def init(args): + install_depends(args) + # Mount folders from host system for folder in pmb.config.flash_mount_bind: pmb.helpers.mount.bind(args, folder, args.work +