mirror of
https://gitlab.com/kupfer/kupferbootstrap.git
synced 2025-02-23 05:35:44 -05:00
fix imports with sed
This commit is contained in:
parent
adeec7a6e3
commit
d3b8452146
44 changed files with 157 additions and 158 deletions
|
@ -5,10 +5,10 @@ import logging
|
|||
|
||||
from typing import Optional
|
||||
|
||||
from chroot.abstract import Chroot
|
||||
from constants import Arch, QEMU_ARCHES
|
||||
from exec.cmd import run_root_cmd, CompletedProcess
|
||||
from utils import mount
|
||||
from kupferbootstrap.chroot.abstract import Chroot
|
||||
from kupferbootstrap.constants import Arch, QEMU_ARCHES
|
||||
from kupferbootstrap.exec.cmd import run_root_cmd, CompletedProcess
|
||||
from kupferbootstrap.utils import mount
|
||||
|
||||
|
||||
def binfmt_info(chroot: Optional[Chroot] = None):
|
||||
|
|
|
@ -3,7 +3,7 @@ import os
|
|||
|
||||
from typing import Optional
|
||||
|
||||
from constants import Arch, ARCHES
|
||||
from kupferbootstrap.constants import Arch, ARCHES
|
||||
|
||||
from .binfmt import binfmt_unregister, binfmt_is_registered
|
||||
|
||||
|
|
10
src/kupferbootstrap/cache/cli.py
vendored
10
src/kupferbootstrap/cache/cli.py
vendored
|
@ -2,11 +2,11 @@ import click
|
|||
import os
|
||||
import logging
|
||||
|
||||
from config.state import config
|
||||
from constants import CHROOT_PATHS
|
||||
from exec.file import remove_file
|
||||
from packages.cli import cmd_clean as cmd_clean_pkgbuilds
|
||||
from wrapper import enforce_wrap
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import CHROOT_PATHS
|
||||
from kupferbootstrap.exec.file import remove_file
|
||||
from kupferbootstrap.packages.cli import cmd_clean as cmd_clean_pkgbuilds
|
||||
from kupferbootstrap.wrapper import enforce_wrap
|
||||
|
||||
PATHS = list(CHROOT_PATHS.keys())
|
||||
|
||||
|
|
|
@ -9,13 +9,13 @@ from shlex import quote as shell_quote
|
|||
from typing import ClassVar, Iterable, Protocol, Union, Optional, Mapping
|
||||
from uuid import uuid4
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch, CHROOT_PATHS, GCC_HOSTSPECS
|
||||
from distro.distro import get_base_distro, get_kupfer_local, RepoInfo
|
||||
from exec.cmd import FileDescriptor, run_root_cmd, generate_env_cmd, flatten_shell_script, wrap_in_bash, generate_cmd_su
|
||||
from exec.file import makedir, root_makedir, root_write_file, write_file
|
||||
from generator import generate_makepkg_conf
|
||||
from utils import mount, umount, check_findmnt, log_or_exception
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch, CHROOT_PATHS, GCC_HOSTSPECS
|
||||
from kupferbootstrap.distro.distro import get_base_distro, get_kupfer_local, RepoInfo
|
||||
from kupferbootstrap.exec.cmd import FileDescriptor, run_root_cmd, generate_env_cmd, flatten_shell_script, wrap_in_bash, generate_cmd_su
|
||||
from kupferbootstrap.exec.file import makedir, root_makedir, root_write_file, write_file
|
||||
from kupferbootstrap.generator import generate_makepkg_conf
|
||||
from kupferbootstrap.utils import mount, umount, check_findmnt, log_or_exception
|
||||
|
||||
from .helpers import BASE_CHROOT_PREFIX, BASIC_MOUNTS, base_chroot_name, make_abs_path
|
||||
|
||||
|
|
|
@ -6,10 +6,10 @@ from glob import glob
|
|||
from shutil import rmtree
|
||||
from typing import ClassVar
|
||||
|
||||
from constants import Arch
|
||||
from exec.cmd import run_root_cmd
|
||||
from exec.file import makedir, root_makedir
|
||||
from config.state import config
|
||||
from kupferbootstrap.constants import Arch
|
||||
from kupferbootstrap.exec.cmd import run_root_cmd
|
||||
from kupferbootstrap.exec.file import makedir, root_makedir
|
||||
from kupferbootstrap.config.state import config
|
||||
|
||||
from .abstract import Chroot, get_chroot
|
||||
from .helpers import base_chroot_name
|
||||
|
|
|
@ -4,11 +4,11 @@ import subprocess
|
|||
from glob import glob
|
||||
from typing import ClassVar, Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch, GCC_HOSTSPECS, CROSSDIRECT_PKGS, CHROOT_PATHS
|
||||
from distro.distro import get_kupfer_local
|
||||
from exec.cmd import run_root_cmd
|
||||
from exec.file import makedir, remove_file, root_makedir, root_write_file, symlink
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch, GCC_HOSTSPECS, CROSSDIRECT_PKGS, CHROOT_PATHS
|
||||
from kupferbootstrap.distro.distro import get_kupfer_local
|
||||
from kupferbootstrap.exec.cmd import run_root_cmd
|
||||
from kupferbootstrap.exec.file import makedir, remove_file, root_makedir, root_write_file, symlink
|
||||
|
||||
from .abstract import Chroot, get_chroot
|
||||
from .helpers import build_chroot_name
|
||||
|
|
|
@ -4,9 +4,9 @@ import os
|
|||
|
||||
from typing import Optional
|
||||
|
||||
from config.state import config
|
||||
from wrapper import enforce_wrap
|
||||
from devices.device import get_profile_device
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.wrapper import enforce_wrap
|
||||
from kupferbootstrap.devices.device import get_profile_device
|
||||
|
||||
from .abstract import Chroot
|
||||
from .base import get_base_chroot
|
||||
|
|
|
@ -3,12 +3,12 @@ import os
|
|||
|
||||
from typing import ClassVar, Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch, BASE_PACKAGES
|
||||
from distro.repo import RepoInfo
|
||||
from distro.distro import get_kupfer_local, get_kupfer_https
|
||||
from exec.file import get_temp_dir, makedir, root_makedir
|
||||
from utils import check_findmnt
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch, BASE_PACKAGES
|
||||
from kupferbootstrap.distro.repo import RepoInfo
|
||||
from kupferbootstrap.distro.distro import get_kupfer_local, get_kupfer_https
|
||||
from kupferbootstrap.exec.file import get_temp_dir, makedir, root_makedir
|
||||
from kupferbootstrap.utils import check_findmnt
|
||||
|
||||
from .base import BaseChroot
|
||||
from .build import BuildChroot
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import os
|
||||
from typing import Optional, TypedDict
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch
|
||||
|
||||
BIND_BUILD_DIRS = 'BINDBUILDDIRS'
|
||||
BASE_CHROOT_PREFIX = 'base_'
|
||||
|
|
|
@ -4,10 +4,10 @@ import logging
|
|||
from copy import deepcopy
|
||||
from typing import Any, Callable, Iterable, Mapping, Optional, Union
|
||||
|
||||
from devices.device import get_devices, sanitize_device_name
|
||||
from flavours.flavour import get_flavours
|
||||
from utils import color_bold, colors_supported, color_mark_selected
|
||||
from wrapper import execute_without_exit
|
||||
from kupferbootstrap.devices.device import get_devices, sanitize_device_name
|
||||
from kupferbootstrap.flavours.flavour import get_flavours
|
||||
from kupferbootstrap.utils import color_bold, colors_supported, color_mark_selected
|
||||
from kupferbootstrap.wrapper import execute_without_exit
|
||||
|
||||
from .scheme import Profile
|
||||
from .profile import PROFILE_EMPTY, PROFILE_DEFAULTS, resolve_profile_attr, SparseProfile
|
||||
|
|
|
@ -3,8 +3,8 @@ from __future__ import annotations
|
|||
from munch import Munch
|
||||
from typing import Any, Optional, Mapping, Union
|
||||
|
||||
from dictscheme import DictScheme
|
||||
from constants import Arch
|
||||
from kupferbootstrap.dictscheme import DictScheme
|
||||
from kupferbootstrap.constants import Arch
|
||||
|
||||
|
||||
class SparseProfile(DictScheme):
|
||||
|
|
|
@ -5,7 +5,7 @@ import toml
|
|||
from copy import deepcopy
|
||||
from typing import Mapping, Optional
|
||||
|
||||
from constants import DEFAULT_PACKAGE_BRANCH
|
||||
from kupferbootstrap.constants import DEFAULT_PACKAGE_BRANCH
|
||||
|
||||
from .scheme import Config, ConfigLoadState, DictScheme, Profile, RuntimeConfiguration
|
||||
from .profile import PROFILE_DEFAULTS, PROFILE_DEFAULTS_DICT, resolve_profile
|
||||
|
|
|
@ -7,9 +7,9 @@ import toml
|
|||
from tempfile import mktemp, gettempdir as get_system_tempdir
|
||||
from typing import Any, Optional
|
||||
|
||||
from config.profile import PROFILE_DEFAULTS
|
||||
from config.scheme import Config, Profile
|
||||
from config.state import CONFIG_DEFAULTS, ConfigStateHolder
|
||||
from kupferbootstrap.config.profile import PROFILE_DEFAULTS
|
||||
from kupferbootstrap.config.scheme import Config, Profile
|
||||
from kupferbootstrap.config.state import CONFIG_DEFAULTS, ConfigStateHolder
|
||||
|
||||
|
||||
def get_filename():
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from typehelpers import TypeAlias
|
||||
from .typehelpers import TypeAlias
|
||||
|
||||
FASTBOOT = 'fastboot'
|
||||
FLASH_PARTS = {
|
||||
|
|
|
@ -4,9 +4,9 @@ import logging
|
|||
from json import dumps as json_dump
|
||||
from typing import Optional
|
||||
|
||||
from config.state import config
|
||||
from config.cli import resolve_profile_field
|
||||
from utils import color_mark_selected, colors_supported
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.config.cli import resolve_profile_field
|
||||
from kupferbootstrap.utils import color_mark_selected, colors_supported
|
||||
|
||||
from .device import get_devices, get_device
|
||||
|
||||
|
|
|
@ -3,13 +3,13 @@ import os
|
|||
|
||||
from typing import Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch, ARCHES
|
||||
from dictscheme import DictScheme
|
||||
from distro.distro import get_kupfer_local
|
||||
from distro.package import LocalPackage
|
||||
from packages.pkgbuild import Pkgbuild, _pkgbuilds_cache, discover_pkgbuilds, get_pkgbuild_by_path, init_pkgbuilds
|
||||
from utils import read_files_from_tar, color_str
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch, ARCHES
|
||||
from kupferbootstrap.dictscheme import DictScheme
|
||||
from kupferbootstrap.distro.distro import get_kupfer_local
|
||||
from kupferbootstrap.distro.package import LocalPackage
|
||||
from kupferbootstrap.packages.pkgbuild import Pkgbuild, _pkgbuilds_cache, discover_pkgbuilds, get_pkgbuild_by_path, init_pkgbuilds
|
||||
from kupferbootstrap.utils import read_files_from_tar, color_str
|
||||
|
||||
from .deviceinfo import DEFAULT_IMAGE_SECTOR_SIZE, DeviceInfo, parse_deviceinfo
|
||||
|
||||
|
@ -72,7 +72,7 @@ class Device(DictScheme):
|
|||
def parse_deviceinfo(self, try_download: bool = True, lazy: bool = True) -> DeviceInfo:
|
||||
if not lazy or 'deviceinfo' not in self or self.deviceinfo is None:
|
||||
# avoid import loop
|
||||
from packages.build import check_package_version_built
|
||||
from kupferbootstrap.packages.build import check_package_version_built
|
||||
is_built = check_package_version_built(self.package, self.arch, try_download=try_download)
|
||||
if not is_built:
|
||||
raise Exception(f"device package {self.package.name} for device {self.name} couldn't be acquired!")
|
||||
|
|
|
@ -7,9 +7,9 @@ import os
|
|||
|
||||
from typing import Mapping, Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch
|
||||
from dictscheme import DictScheme
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch
|
||||
from kupferbootstrap.dictscheme import DictScheme
|
||||
|
||||
PMOS_ARCHES_OVERRIDES: dict[str, Arch] = {
|
||||
"armv7": 'armv7h',
|
||||
|
|
|
@ -4,8 +4,8 @@ import os
|
|||
|
||||
from copy import copy
|
||||
|
||||
from config.state import ConfigStateHolder, config
|
||||
from packages.pkgbuild import init_pkgbuilds, discover_pkgbuilds, Pkgbuild, parse_pkgbuild
|
||||
from kupferbootstrap.config.state import ConfigStateHolder, config
|
||||
from kupferbootstrap.packages.pkgbuild import init_pkgbuilds, discover_pkgbuilds, Pkgbuild, parse_pkgbuild
|
||||
from .device import Device, DEVICE_DEPRECATIONS, get_device, get_devices, parse_device_pkg, check_devicepkg_name
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from config.state import config
|
||||
from kupferbootstrap.config.state import config
|
||||
|
||||
from .deviceinfo import DeviceInfo, parse_deviceinfo
|
||||
from .device import get_device
|
||||
|
|
|
@ -7,7 +7,7 @@ from munch import Munch
|
|||
from toml.encoder import TomlEncoder, TomlPreserveInlineDictEncoder
|
||||
from typing import ClassVar, Generator, Optional, Union, Mapping, Any, get_type_hints, get_origin, get_args, Iterable
|
||||
|
||||
from typehelpers import UnionType, NoneType
|
||||
from .typehelpers import UnionType, NoneType
|
||||
|
||||
|
||||
def resolve_type_hint(hint: type, ignore_origins: list[type] = []) -> Iterable[type]:
|
||||
|
|
|
@ -3,9 +3,9 @@ import logging
|
|||
from enum import IntFlag
|
||||
from typing import Generic, Mapping, Optional, TypeVar
|
||||
|
||||
from constants import Arch, ARCHES, REPOSITORIES, KUPFER_BRANCH_MARKER, KUPFER_HTTPS, CHROOT_PATHS
|
||||
from generator import generate_pacman_conf_body
|
||||
from config.state import config
|
||||
from kupferbootstrap.constants import Arch, ARCHES, REPOSITORIES, KUPFER_BRANCH_MARKER, KUPFER_HTTPS, CHROOT_PATHS
|
||||
from kupferbootstrap.generator import generate_pacman_conf_body
|
||||
from kupferbootstrap.config.state import config
|
||||
|
||||
from .repo import BinaryPackageType, RepoInfo, Repo, LocalRepo, RemoteRepo
|
||||
from .repo_config import AbstrRepoConfig, BaseDistro, ReposConfigFile, REPOS_CONFIG_DEFAULT, get_repo_config as _get_repo_config
|
||||
|
|
|
@ -5,7 +5,7 @@ from shutil import copyfileobj
|
|||
from typing import Optional, Union
|
||||
from urllib.request import urlopen
|
||||
|
||||
from exec.file import get_temp_dir, makedir
|
||||
from kupferbootstrap.exec.file import get_temp_dir, makedir
|
||||
|
||||
|
||||
class PackageInfo:
|
||||
|
|
|
@ -5,9 +5,9 @@ import tarfile
|
|||
|
||||
from typing import Generic, TypeVar
|
||||
|
||||
from config.state import config
|
||||
from exec.file import get_temp_dir
|
||||
from utils import download_file
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.exec.file import get_temp_dir
|
||||
from kupferbootstrap.utils import download_file
|
||||
|
||||
from .package import BinaryPackage, LocalPackage, RemotePackage
|
||||
|
||||
|
|
|
@ -8,10 +8,10 @@ import yaml
|
|||
from copy import deepcopy
|
||||
from typing import ClassVar, Optional, Mapping, Union
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch, BASE_DISTROS, KUPFER_HTTPS, REPOS_CONFIG_FILE, REPOSITORIES
|
||||
from dictscheme import DictScheme, toml_inline_dicts, TomlPreserveInlineDictEncoder
|
||||
from utils import sha256sum
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch, BASE_DISTROS, KUPFER_HTTPS, REPOS_CONFIG_FILE, REPOSITORIES
|
||||
from kupferbootstrap.dictscheme import DictScheme, toml_inline_dicts, TomlPreserveInlineDictEncoder
|
||||
from kupferbootstrap.utils import sha256sum
|
||||
|
||||
REPOS_KEY = 'repos'
|
||||
REMOTEURL_KEY = 'remote_url'
|
||||
|
|
|
@ -7,7 +7,7 @@ from subprocess import CompletedProcess # make it easy for users of this module
|
|||
from shlex import quote as shell_quote
|
||||
from typing import IO, Optional, Union
|
||||
|
||||
from typehelpers import TypeAlias
|
||||
from kupferbootstrap.typehelpers import TypeAlias
|
||||
|
||||
ElevationMethod: TypeAlias = str
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ from tempfile import mkdtemp
|
|||
from typing import Optional, Union
|
||||
|
||||
from .cmd import run_cmd, run_root_cmd, elevation_noop, generate_cmd_su, wrap_in_bash, shell_quote
|
||||
from utils import get_user_name, get_group_name
|
||||
from kupferbootstrap.utils import get_user_name, get_group_name
|
||||
|
||||
|
||||
def try_native_filewrite(path: str, content: Union[str, bytes], chmod: Optional[str] = None) -> Optional[Exception]:
|
||||
|
|
|
@ -8,7 +8,7 @@ from dataclasses import dataclass
|
|||
|
||||
from .cmd import run_root_cmd
|
||||
from .file import chmod, chown, get_temp_dir, write_file
|
||||
from utils import get_gid, get_uid
|
||||
from kupferbootstrap.utils import get_gid, get_uid
|
||||
|
||||
TEMPDIR_MODE = 0o755
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@ import logging
|
|||
from json import dumps as json_dump
|
||||
from typing import Optional
|
||||
|
||||
from config.cli import resolve_profile_field
|
||||
from config.state import config
|
||||
from utils import color_mark_selected, colors_supported
|
||||
from kupferbootstrap.config.cli import resolve_profile_field
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.utils import color_mark_selected, colors_supported
|
||||
|
||||
from .flavour import get_flavours, get_flavour
|
||||
|
||||
|
|
|
@ -6,11 +6,11 @@ import os
|
|||
|
||||
from typing import Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import FLAVOUR_DESCRIPTION_PREFIX, FLAVOUR_INFO_FILE
|
||||
from dictscheme import DictScheme
|
||||
from packages.pkgbuild import discover_pkgbuilds, get_pkgbuild_by_name, init_pkgbuilds, Pkgbuild
|
||||
from utils import color_str
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import FLAVOUR_DESCRIPTION_PREFIX, FLAVOUR_INFO_FILE
|
||||
from kupferbootstrap.dictscheme import DictScheme
|
||||
from kupferbootstrap.packages.pkgbuild import discover_pkgbuilds, get_pkgbuild_by_name, init_pkgbuilds, Pkgbuild
|
||||
from kupferbootstrap.utils import color_str
|
||||
|
||||
|
||||
class FlavourInfo(DictScheme):
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
from typing import Optional
|
||||
|
||||
from constants import Arch, CFLAGS_ARCHES, CFLAGS_GENERAL, COMPILE_ARCHES, GCC_HOSTSPECS
|
||||
from config.state import config
|
||||
from .constants import Arch, CFLAGS_ARCHES, CFLAGS_GENERAL, COMPILE_ARCHES, GCC_HOSTSPECS
|
||||
from .config.state import config
|
||||
|
||||
|
||||
def generate_makepkg_conf(arch: Arch, cross: bool = False, chroot: Optional[str] = None) -> str:
|
||||
|
|
|
@ -4,13 +4,13 @@ import click
|
|||
|
||||
from typing import Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import FLASH_PARTS, FASTBOOT, JUMPDRIVE, JUMPDRIVE_VERSION
|
||||
from exec.file import makedir
|
||||
from devices.device import get_profile_device
|
||||
from flavours.flavour import get_profile_flavour
|
||||
from flavours.cli import profile_option
|
||||
from wrapper import enforce_wrap
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import FLASH_PARTS, FASTBOOT, JUMPDRIVE, JUMPDRIVE_VERSION
|
||||
from kupferbootstrap.exec.file import makedir
|
||||
from kupferbootstrap.devices.device import get_profile_device
|
||||
from kupferbootstrap.flavours.flavour import get_profile_flavour
|
||||
from kupferbootstrap.flavours.cli import profile_option
|
||||
from kupferbootstrap.wrapper import enforce_wrap
|
||||
|
||||
from .fastboot import fastboot_boot, fastboot_erase
|
||||
from .image import get_device_name, losetup_rootfs_image, get_image_path, dump_aboot, dump_lk2nd
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import click
|
||||
import logging
|
||||
|
||||
from exec.cmd import run_cmd, CompletedProcess
|
||||
from kupferbootstrap.exec.cmd import run_cmd, CompletedProcess
|
||||
from typing import Optional
|
||||
|
||||
|
||||
|
|
|
@ -5,13 +5,13 @@ import logging
|
|||
|
||||
from typing import Optional
|
||||
|
||||
from constants import FLASH_PARTS, LOCATIONS, FASTBOOT, JUMPDRIVE
|
||||
from exec.cmd import run_root_cmd
|
||||
from exec.file import get_temp_dir
|
||||
from devices.device import get_profile_device
|
||||
from flavours.flavour import get_profile_flavour
|
||||
from flavours.cli import profile_option
|
||||
from wrapper import enforce_wrap
|
||||
from kupferbootstrap.constants import FLASH_PARTS, LOCATIONS, FASTBOOT, JUMPDRIVE
|
||||
from kupferbootstrap.exec.cmd import run_root_cmd
|
||||
from kupferbootstrap.exec.file import get_temp_dir
|
||||
from kupferbootstrap.devices.device import get_profile_device
|
||||
from kupferbootstrap.flavours.flavour import get_profile_flavour
|
||||
from kupferbootstrap.flavours.cli import profile_option
|
||||
from kupferbootstrap.wrapper import enforce_wrap
|
||||
|
||||
from .fastboot import fastboot_flash
|
||||
from .image import dd_image, dump_aboot, dump_lk2nd, dump_qhypstub, get_image_path, losetup_destroy, losetup_rootfs_image, partprobe, shrink_fs
|
||||
|
|
|
@ -9,17 +9,17 @@ from signal import pause
|
|||
from subprocess import CompletedProcess
|
||||
from typing import Optional, Union
|
||||
|
||||
from config.state import config, Profile
|
||||
from chroot.device import DeviceChroot, get_device_chroot
|
||||
from constants import Arch, BASE_LOCAL_PACKAGES, BASE_PACKAGES, POST_INSTALL_CMDS
|
||||
from distro.distro import get_base_distro, get_kupfer_https
|
||||
from devices.device import Device, get_profile_device
|
||||
from exec.cmd import run_root_cmd, generate_cmd_su
|
||||
from exec.file import get_temp_dir, root_write_file, root_makedir, makedir
|
||||
from flavours.flavour import Flavour, get_profile_flavour
|
||||
from net.ssh import copy_ssh_keys
|
||||
from packages.build import build_enable_qemu_binfmt, build_packages, filter_pkgbuilds
|
||||
from wrapper import enforce_wrap
|
||||
from kupferbootstrap.config.state import config, Profile
|
||||
from kupferbootstrap.chroot.device import DeviceChroot, get_device_chroot
|
||||
from kupferbootstrap.constants import Arch, BASE_LOCAL_PACKAGES, BASE_PACKAGES, POST_INSTALL_CMDS
|
||||
from kupferbootstrap.distro.distro import get_base_distro, get_kupfer_https
|
||||
from kupferbootstrap.devices.device import Device, get_profile_device
|
||||
from kupferbootstrap.exec.cmd import run_root_cmd, generate_cmd_su
|
||||
from kupferbootstrap.exec.file import get_temp_dir, root_write_file, root_makedir, makedir
|
||||
from kupferbootstrap.flavours.flavour import Flavour, get_profile_flavour
|
||||
from kupferbootstrap.net.ssh import copy_ssh_keys
|
||||
from kupferbootstrap.packages.build import build_enable_qemu_binfmt, build_packages, filter_pkgbuilds
|
||||
from kupferbootstrap.wrapper import enforce_wrap
|
||||
|
||||
# image files need to be slightly smaller than partitions to fit
|
||||
IMG_FILE_ROOT_DEFAULT_SIZE = "1800M"
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import click
|
||||
import logging
|
||||
|
||||
from exec.cmd import run_root_cmd
|
||||
from wrapper import check_programs_wrap
|
||||
from kupferbootstrap.exec.cmd import run_root_cmd
|
||||
from kupferbootstrap.wrapper import check_programs_wrap
|
||||
|
||||
from .ssh import run_ssh_command
|
||||
|
||||
|
|
|
@ -4,12 +4,11 @@ import os
|
|||
import pathlib
|
||||
import click
|
||||
|
||||
from config.state import config
|
||||
from constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT
|
||||
from chroot.abstract import Chroot
|
||||
from exec.cmd import run_cmd
|
||||
from exec.file import write_file
|
||||
from wrapper import check_programs_wrap
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT
|
||||
from kupferbootstrap.exec.cmd import run_cmd
|
||||
from kupferbootstrap.exec.file import write_file
|
||||
from kupferbootstrap.wrapper import check_programs_wrap
|
||||
|
||||
|
||||
@click.command(name='ssh')
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import subprocess
|
||||
import click
|
||||
from wrapper import check_programs_wrap
|
||||
from kupferbootstrap.wrapper import check_programs_wrap
|
||||
|
||||
|
||||
@click.command(name='telnet')
|
||||
|
|
|
@ -6,16 +6,16 @@ import os
|
|||
from glob import glob
|
||||
from typing import Iterable, Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch, ARCHES, SRCINFO_FILE, SRCINFO_INITIALISED_FILE, SRCINFO_METADATA_FILE, SRCINFO_TARBALL_FILE, SRCINFO_TARBALL_URL
|
||||
from exec.cmd import run_cmd, shell_quote, CompletedProcess
|
||||
from exec.file import get_temp_dir, makedir, remove_file
|
||||
from devices.device import get_profile_device
|
||||
from distro.distro import get_kupfer_local, get_kupfer_url, get_kupfer_repo_names
|
||||
from distro.package import LocalPackage
|
||||
from net.ssh import run_ssh_command, scp_put_files
|
||||
from utils import download_file, git, sha256sum
|
||||
from wrapper import check_programs_wrap, enforce_wrap
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch, ARCHES, SRCINFO_FILE, SRCINFO_INITIALISED_FILE, SRCINFO_METADATA_FILE, SRCINFO_TARBALL_FILE, SRCINFO_TARBALL_URL
|
||||
from kupferbootstrap.exec.cmd import run_cmd, shell_quote, CompletedProcess
|
||||
from kupferbootstrap.exec.file import get_temp_dir, makedir, remove_file
|
||||
from kupferbootstrap.devices.device import get_profile_device
|
||||
from kupferbootstrap.distro.distro import get_kupfer_local, get_kupfer_url, get_kupfer_repo_names
|
||||
from kupferbootstrap.distro.package import LocalPackage
|
||||
from kupferbootstrap.net.ssh import run_ssh_command, scp_put_files
|
||||
from kupferbootstrap.utils import download_file, git, sha256sum
|
||||
from kupferbootstrap.wrapper import check_programs_wrap, enforce_wrap
|
||||
|
||||
from .build import build_packages_by_paths, init_prebuilts
|
||||
from .pkgbuild import discover_pkgbuilds, filter_pkgbuilds, get_pkgbuild_dirs, init_pkgbuilds
|
||||
|
|
|
@ -8,15 +8,15 @@ import os
|
|||
from joblib import Parallel, delayed
|
||||
from typing import Iterable, Optional
|
||||
|
||||
from config.state import config, ConfigStateHolder
|
||||
from constants import Arch
|
||||
from distro.distro import get_kupfer_repo_names
|
||||
from distro.package import PackageInfo
|
||||
from exec.file import remove_file
|
||||
from logger import setup_logging
|
||||
from utils import git, git_get_branch
|
||||
from wrapper import check_programs_wrap
|
||||
from typehelpers import TypeAlias
|
||||
from kupferbootstrap.config.state import config, ConfigStateHolder
|
||||
from kupferbootstrap.constants import Arch
|
||||
from kupferbootstrap.distro.distro import get_kupfer_repo_names
|
||||
from kupferbootstrap.distro.package import PackageInfo
|
||||
from kupferbootstrap.exec.file import remove_file
|
||||
from kupferbootstrap.logger import setup_logging
|
||||
from kupferbootstrap.utils import git, git_get_branch
|
||||
from kupferbootstrap.wrapper import check_programs_wrap
|
||||
from kupferbootstrap.typehelpers import TypeAlias
|
||||
|
||||
from .srcinfo_cache import SrcinfoMetaFile
|
||||
|
||||
|
|
|
@ -7,11 +7,11 @@ import subprocess
|
|||
|
||||
from typing import Any, ClassVar, Optional
|
||||
|
||||
from config.state import config
|
||||
from constants import MAKEPKG_CMD, SRCINFO_FILE, SRCINFO_METADATA_FILE, SRCINFO_INITIALISED_FILE
|
||||
from dictscheme import DictScheme
|
||||
from exec.cmd import run_cmd
|
||||
from utils import sha256sum
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import MAKEPKG_CMD, SRCINFO_FILE, SRCINFO_METADATA_FILE, SRCINFO_INITIALISED_FILE
|
||||
from kupferbootstrap.dictscheme import DictScheme
|
||||
from kupferbootstrap.exec.cmd import run_cmd
|
||||
from kupferbootstrap.utils import sha256sum
|
||||
|
||||
SRCINFO_CHECKSUM_FILES = ['PKGBUILD', SRCINFO_FILE]
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ from dateutil.parser import parse as parsedate
|
|||
from shutil import which
|
||||
from typing import Any, Generator, IO, Optional, Union, Sequence
|
||||
|
||||
from exec.cmd import run_cmd, run_root_cmd
|
||||
from .exec.cmd import run_cmd, run_root_cmd
|
||||
|
||||
_programs_available = dict[str, bool]()
|
||||
|
||||
|
|
|
@ -3,9 +3,9 @@ import logging
|
|||
|
||||
from typing import Optional, Sequence, Union
|
||||
|
||||
from config.state import config
|
||||
from constants import Arch
|
||||
from utils import programs_available
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.constants import Arch
|
||||
from kupferbootstrap.utils import programs_available
|
||||
from .docker import DockerWrapper
|
||||
from .wrapper import Wrapper
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import pathlib
|
|||
import subprocess
|
||||
import sys
|
||||
|
||||
from config.state import config
|
||||
from exec.file import makedir
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.exec.file import makedir
|
||||
|
||||
from .wrapper import Wrapper, WRAPPER_PATHS
|
||||
|
||||
|
|
|
@ -5,9 +5,9 @@ import pathlib
|
|||
|
||||
from typing import Optional, Protocol
|
||||
|
||||
from config.state import config
|
||||
from config.state import dump_file as dump_config_file
|
||||
from constants import CHROOT_PATHS, WRAPPER_ENV_VAR
|
||||
from kupferbootstrap.config.state import config
|
||||
from kupferbootstrap.config.state import dump_file as dump_config_file
|
||||
from kupferbootstrap.constants import CHROOT_PATHS, WRAPPER_ENV_VAR
|
||||
|
||||
WRAPPER_PATHS = CHROOT_PATHS | {
|
||||
'ccache': '/ccache',
|
||||
|
|
Loading…
Add table
Reference in a new issue