core: don't re-export get_context (MR 2252)

This makes testing a lot more annoying.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

pmb/__init__.py

@@ -16,7 +16,8 @@ from .helpers import frontend
 from .helpers import logging
 from .helpers import mount
 from .helpers import other
-from .core import Chroot, get_context, Config
+from .core import Chroot, Config
+from .core.context import get_context
 from .commands import run_command
 
 # pmbootstrap version

pmb/aportgen/__init__.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import os
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.pkgrepo import pkgrepo_default_path
 from pmb.helpers import logging
 import pmb.aportgen.busybox_static

pmb/aportgen/busybox_static.py

@@ -7,7 +7,8 @@ import pmb.chroot.apk
 import pmb.chroot.apk_static
 import pmb.helpers.run
 import pmb.parse.apkindex
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def generate(pkgname: str):

pmb/aportgen/core.py

@@ -7,7 +7,7 @@ from pmb.types import PmbArgs
 import pmb.helpers.git
 import pmb.helpers.run
 import pmb.helpers.args
-from pmb.core import get_context
+from pmb.core.context import get_context
 
 
 def indent_size(line):

pmb/aportgen/device.py

@@ -1,6 +1,6 @@
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.arch import Arch
 from pmb.helpers import logging
 import os

pmb/aportgen/gcc.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import pmb.aportgen.core
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.pkgrepo import pkgrepo_default_path
 import pmb.helpers.git
 import pmb.helpers.run

pmb/aportgen/grub_efi.py

@@ -9,7 +9,8 @@ from pmb.core.arch import Arch
 from pmb.types import PmbArgs
 import pmb.helpers.run
 import pmb.parse.apkindex
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def generate(pkgname):

pmb/aportgen/linux.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 from typing import List
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.parse.deviceinfo import Deviceinfo
 import pmb.helpers.run
 import pmb.aportgen.core

pmb/aportgen/musl.py

@@ -7,7 +7,8 @@ import pmb.chroot.apk
 import pmb.chroot.apk_static
 import pmb.helpers.run
 import pmb.parse.apkindex
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def generate(pkgname):

pmb/build/_package.py

@@ -23,7 +23,8 @@ import pmb.parse
 import pmb.parse.apkindex
 from pmb.helpers.exceptions import BuildFailedError
 
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 class BootstrapStage(enum.IntEnum):
     """

pmb/build/autodetect.py

@@ -8,7 +8,8 @@ from typing import Any, Dict, Optional, Union
 import pmb.config
 import pmb.chroot.apk
 import pmb.helpers.pmaports
-from pmb.core import Chroot, ChrootType, get_context
+from pmb.core import Chroot, ChrootType
+from pmb.core.context import get_context
 from pmb.meta import Cache
 
 

pmb/build/envkernel.py

@@ -18,7 +18,8 @@ import pmb.helpers
 import pmb.helpers.mount
 import pmb.helpers.pmaports
 import pmb.parse
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def match_kbuild_out(word):

pmb/build/init.py

@@ -11,7 +11,8 @@ import pmb.config
 import pmb.chroot
 import pmb.chroot.apk
 import pmb.helpers.run
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def init_abuild_minimal(chroot: Chroot=Chroot.native()):

pmb/build/newapkbuild.py

@@ -10,7 +10,8 @@ import pmb.helpers.cli
 import pmb.parse
 import pmb.build
 
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def newapkbuild(folder, args_passed, force=False):

pmb/build/other.py

@@ -16,7 +16,8 @@ import pmb.helpers.pmaports
 import pmb.helpers.run
 import pmb.parse.apkindex
 import pmb.parse.version
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def copy_to_buildpath(package, chroot: Chroot=Chroot.native()):

pmb/chroot/apk.py

@@ -20,7 +20,8 @@ from pmb.meta import Cache
 import pmb.parse.apkindex
 import pmb.parse.depends
 import pmb.parse.version
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 from pmb.types import PathString
 
 

pmb/chroot/apk_static.py

@@ -16,7 +16,7 @@ import pmb.config.file
 import pmb.parse.apkindex
 import pmb.helpers.http
 import pmb.parse.version
-from pmb.core import get_context
+from pmb.core.context import get_context
 
 
 def read_signature_info(tar):

pmb/chroot/init.py

@@ -16,7 +16,8 @@ import pmb.config.workdir
 import pmb.helpers.repo
 import pmb.helpers.run
 import pmb.helpers.other
-from pmb.core import Chroot, ChrootType, get_context
+from pmb.core import Chroot, ChrootType
+from pmb.core.context import get_context
 
 cache_chroot_is_outdated: List[str] = []
 

pmb/chroot/initfs.py

@@ -8,7 +8,8 @@ import pmb.chroot.apk
 import pmb.config.pmaports
 from pmb.types import PmbArgs
 import pmb.helpers.cli
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def build(flavor, chroot: Chroot):

pmb/chroot/initfs_hooks.py

@@ -7,7 +7,8 @@ from pmb.helpers import logging
 
 import pmb.config
 import pmb.chroot.apk
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 from pmb.types import PmbArgs
 
 

pmb/chroot/mount.py

@@ -10,7 +10,8 @@ import pmb.config
 import pmb.helpers.run
 import pmb.parse
 import pmb.helpers.mount
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def create_device_nodes(chroot: Chroot):

pmb/chroot/shutdown.py

@@ -8,7 +8,8 @@ from contextlib import closing
 import pmb.chroot
 import pmb.helpers.mount
 import pmb.install.losetup
-from pmb.core import Chroot, ChrootType, get_context
+from pmb.core import Chroot, ChrootType
+from pmb.core.context import get_context
 
 
 def kill_adb():

pmb/chroot/zap.py

@@ -14,7 +14,8 @@ import pmb.helpers.pmaports
 import pmb.helpers.run
 from pmb.meta import Cache
 import pmb.parse.apkindex
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def zap(confirm=True, dry=False, pkgs_local=False, http=False,

pmb/commands/log.py

@@ -7,7 +7,7 @@ from pathlib import Path, PosixPath, PurePosixPath
 from pmb import commands
 from pmb.types import PathString
 from pmb.helpers import run
-from pmb.core import get_context
+from pmb.core.context import get_context
 
 class Log(commands.Command):
     clear_log: bool

pmb/commands/repo_bootstrap.py

@@ -13,7 +13,7 @@ import pmb.build
 import pmb.chroot
 import pmb.chroot.apk
 from pmb.build import BuildQueueItem
-from pmb.core import get_context
+from pmb.core.context import get_context
 
 from pmb import commands
 

pmb/config/init.py

@@ -1,6 +1,6 @@
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.chroot import Chroot
 from pmb.core.config import SystemdConfig
 from pmb.core.context import Context
@@ -457,7 +457,7 @@ def ask_for_device(context: Context):
 
 
 def ask_for_additional_options(config):
-    context = pmb.core.get_context()
+    context = pmb.core.context.get_context()
     # Allow to skip additional options
     logging.info("Additional options:"
                  f" extra free space: {config.extra_space} MB,"

pmb/config/workdir.py

@@ -11,7 +11,8 @@ from typing import Optional
 
 import pmb.config
 import pmb.config.pmaports
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 from pmb.core.pkgrepo import pkgrepo_default_path
 
 

pmb/core/__init__.py

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from .chroot import Chroot, ChrootType
-from .context import Context, get_context, set_context
+from .context import Context
 from .config import Config

pmb/core/chroot.py

@@ -23,6 +23,12 @@ class Chroot:
     __name: str
 
     def __init__(self, suffix_type: ChrootType, name: Optional[Union[str, Arch]] = ""):
+        # We use the native chroot as the buildroot when building for the host arch
+        if suffix_type == ChrootType.BUILDROOT and isinstance(name, Arch):
+            if name.is_native():
+                suffix_type = ChrootType.NATIVE
+                name = ""
+
         self.__type = suffix_type
         self.__name = str(name or "")
 
@@ -41,6 +47,9 @@ class Chroot:
             "riscv64",
         ]
         
+        if self.__type not in ChrootType:
+            raise ValueError(f"Invalid chroot type: '{self.__type}'")
+
         # A buildroot suffix must have a name matching one of alpines
         # architectures.
         if self.__type == ChrootType.BUILDROOT and self.__name not in valid_arches:
@@ -83,7 +92,7 @@ class Chroot:
         if self.type == ChrootType.NATIVE:
             return Arch.native()
         if self.type == ChrootType.BUILDROOT:
-            return Arch.from_str(self.name())
+            return Arch.from_str(self.name)
         # FIXME: this is quite delicate as it will only be valid
         # for certain pmbootstrap commands... It was like this
         # before but it should be fixed.
@@ -96,7 +105,7 @@ class Chroot:
 
     def __eq__(self, other: object) -> bool:
         if isinstance(other, str):
-            return str(self) == other or self.path == Path(other) or self.name() == other
+            return str(self) == other or self.path == Path(other) or self.name == other
 
         if isinstance(other, PosixPath):
             return self.path == other
@@ -104,7 +113,7 @@ class Chroot:
         if not isinstance(other, Chroot):
             return NotImplemented
 
-        return self.type == other.type and self.name() == other.name()
+        return self.type == other.type and self.name == other.name
 
 
     def __truediv__(self, other: object) -> Path:
@@ -138,6 +147,7 @@ class Chroot:
         return self.__type
 
 
+    @property
     def name(self) -> str:
         return self.__name
 

pmb/helpers/apk.py

@@ -12,7 +12,7 @@ import pmb.helpers.cli
 import pmb.helpers.run
 import pmb.helpers.run_core
 import pmb.parse.version
-from pmb.core import get_context
+from pmb.core.context import get_context
 
 def _prepare_fifo():
     """Prepare the progress fifo for reading / writing.

pmb/helpers/args.py

@@ -97,7 +97,7 @@ def init(args: PmbArgs) -> PmbArgs:
     context.force = getattr(args, "force", False)
 
     # Initialize context
-    pmb.core.set_context(context)
+    pmb.core.context.set_context(context)
 
     # Initialize logs (we could raise errors below)
     pmb.helpers.logging.init(args)

pmb/helpers/cli.py

@@ -9,7 +9,7 @@ import sys
 
 import pmb.config
 from pmb.types import PmbArgs
-from pmb.core import get_context
+from pmb.core.context import get_context
 
 
 class ReadlineTabCompleter:

pmb/helpers/devices.py

@@ -3,7 +3,7 @@
 import os
 from pathlib import Path
 from typing import Optional
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.pkgrepo import pkgrepo_glob_one, pkgrepo_iglob
 
 

pmb/helpers/frontend.py

@@ -38,7 +38,8 @@ import pmb.netboot
 import pmb.parse
 import pmb.qemu
 import pmb.sideload
-from pmb.core import ChrootType, Chroot, get_context
+from pmb.core import ChrootType, Chroot
+from pmb.core.context import get_context
 
 
 def _parse_flavor(device: str, autoinstall=True):

pmb/helpers/git.py

@@ -3,7 +3,7 @@
 import configparser
 from pathlib import Path
 from typing import Dict
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.context import Context
 from pmb.core.pkgrepo import pkgrepo_path
 from pmb.helpers import logging

pmb/helpers/http.py

@@ -8,7 +8,7 @@ from pathlib import Path
 import shutil
 import urllib.request
 
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.types import PmbArgs
 import pmb.helpers.run
 

pmb/helpers/logging.py

@@ -5,8 +5,7 @@ import os
 import sys
 from typing import TextIO
 import pmb.config
-from pmb.core import get_context
+from pmb.core.context import Context, get_context
-from pmb.core.context import Context
 from pmb.types import PmbArgs
 
 logfd: TextIO

pmb/helpers/other.py

@@ -1,6 +1,6 @@
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.arch import Arch
 from pmb.helpers import logging
 import os

pmb/helpers/pmaports.py

@@ -7,7 +7,7 @@ See also:
 - pmb/helpers/package.py (work with both)
 """
 import glob
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.arch import Arch
 from pmb.core.pkgrepo import pkgrepo_iter_package_dirs
 from pmb.helpers import logging

pmb/helpers/repo.py

@@ -9,7 +9,7 @@ See also:
 """
 import os
 import hashlib
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.arch import Arch
 from pmb.core.pkgrepo import pkgrepo_names
 from pmb.helpers import logging

pmb/helpers/run_core.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import fcntl
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.arch import Arch
 from pmb.types import PathString, Env
 from pmb.helpers import logging
@@ -180,7 +180,7 @@ def foreground_pipe(cmd, working_dir=None, output_to_stdout=False,
               * output: ""
               * output: full program output string (output_return is True)
     """
-    context = pmb.core.get_context()
+    context = pmb.core.context.get_context()
     # Start process in background (stdout and stderr combined)
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                stderr=subprocess.STDOUT, cwd=working_dir,
@@ -360,7 +360,7 @@ def core(log_message, cmd, working_dir=None, output="log",
               * the program's entire output (output_return is True)
     """
     sanity_checks(output, output_return, check)
-    context = pmb.core.get_context()
+    context = pmb.core.context.get_context()
 
     if context.sudo_timer and sudo:
         sudo_timer_start()

pmb/helpers/status.py

@@ -6,7 +6,7 @@ import pmb.config.workdir
 import pmb.helpers.git
 from pmb.core import Config
 from pmb.types import PmbArgs
-from pmb.core import get_context
+from pmb.core.context import get_context
 from typing import List, Tuple
 
 

pmb/helpers/ui.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 import os
 import glob
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.pkgrepo import pkgrepo_iglob
 import pmb.helpers.pmaports
 import pmb.helpers.package

pmb/install/_install.py

@@ -29,7 +29,8 @@ import pmb.install.blockdevice
 import pmb.install.recovery
 import pmb.install.ui
 import pmb.install
-from pmb.core import Chroot, ChrootType, get_context
+from pmb.core import Chroot, ChrootType
+from pmb.core.context import get_context
 
 # Keep track of the packages we already visited in get_recommends() to avoid
 # infinite recursion
@@ -812,7 +813,7 @@ def install_system_image(args: PmbArgs, size_reserve, chroot: Chroot, step, step
     :param disk: path to disk block device (e.g. /dev/mmcblk0) or None
     """
     config = get_context().config
-    device = chroot.name()
+    device = chroot.name
     # Partition and fill image file/disk block device
     logging.info(f"*** ({step}/{steps}) PREPARE INSTALL BLOCKDEVICE ***")
     pmb.helpers.mount.umount_all(chroot.path)

pmb/install/blockdevice.py

@@ -10,7 +10,8 @@ import pmb.helpers.mount
 import pmb.install.losetup
 import pmb.helpers.cli
 import pmb.config
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def previous_install(path: Path):

pmb/parse/depends.py

@@ -6,7 +6,8 @@ import pmb.chroot
 import pmb.chroot.apk
 import pmb.helpers.pmaports
 import pmb.parse.apkindex
-from pmb.core import Chroot, get_context
+from pmb.core import Chroot
+from pmb.core.context import get_context
 
 
 def package_from_aports(pkgname_depend):

pmb/parse/deviceinfo.py

@@ -3,7 +3,7 @@
 import copy
 from pathlib import Path
 from typing import Dict, Optional
-from pmb.core import get_context
+from pmb.core.context import get_context
 from pmb.core.arch import Arch
 from pmb.helpers import logging
 import os

pmb/sideload/__init__.py

@@ -12,7 +12,7 @@ import pmb.helpers.run_core
 import pmb.parse.apkindex
 import pmb.config.pmaports
 import pmb.build
-from pmb.core import get_context
+from pmb.core.context import get_context
 
 
 def scp_abuild_key(args: PmbArgs, user: str, host: str, port: str):