Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

helpers: apk_static: move from pmb.chroot (MR 2463)

Browse source 
Move the apk_static module from pmb/chroot to pmb/helpers which is a
more suitable location.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-10-28 00:16:42 +01:00
parent c4a92c37a8
commit 26ec1631ca
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
9 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pmb/chroot/init.py
View file

@ -9,9 +9,9 @@ import os
import pmb.chroot
import pmb.chroot.binfmt
import pmb.chroot.apk
import pmb.chroot.apk_static
import pmb.config
import pmb.config.workdir
import pmb.helpers.apk_static
import pmb.helpers.apk
import pmb.helpers.repo
import pmb.helpers.run
@ -142,8 +142,8 @@ def init(chroot: Chroot, usr_merge: UsrMerge = UsrMerge.AUTO) -> None:
warn_if_chroots_outdated()
return
# Require apk-tools-static
pmb.chroot.apk_static.init()
# Fetch apk.static
pmb.helpers.apk_static.init()
logging.info(f"({chroot}) Creating chroot")