parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-06-26 18:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify generation of pacman.conf

Browse source
This commit is contained in:
jld3103 2021-10-16 10:45:43 +02:00
parent 37b5ecb34b
commit 90366e0a85
2 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
chroot.py
View file

@ -3,7 +3,7 @@ import logging
import subprocess import subprocess
import os import os
from config import config from config import config
from distro import get_base_distros, RepoInfo from distro import get_base_distro, RepoInfo
from shlex import quote as shell_quote from shlex import quote as shell_quote
from utils import mount from utils import mount
from distro import get_kupfer_local from distro import get_kupfer_local
@ -28,7 +28,7 @@ def create_chroot(chroot_name: str,
bind_mounts: dict[str, str] = BIND_BUILD_DIRS): bind_mounts: dict[str, str] = BIND_BUILD_DIRS):
base_chroot = f'base_{arch}' base_chroot = f'base_{arch}'
chroot_path = get_chroot_path(chroot_name, override_basepath=chroot_base_path) chroot_path = get_chroot_path(chroot_name, override_basepath=chroot_base_path)
base_distro = get_base_distros()[arch] base_distro = get_base_distro(arch)
pacman_conf_target = chroot_path + '/etc/pacman.conf' pacman_conf_target = chroot_path + '/etc/pacman.conf'
# copy base_chroot instead of creating from scratch every time # copy base_chroot instead of creating from scratch every time

33
distro.py
View file

@ -95,9 +95,9 @@ class Distro:
def _repos_config_snippet(self, extra_repos: dict[str, RepoInfo] = {}) -> str: def _repos_config_snippet(self, extra_repos: dict[str, RepoInfo] = {}) -> str:
extras = [Repo(name, url_template=info.url_template, arch=self.arch, options=info.options, scan=False) for name, info in extra_repos.items()] extras = [Repo(name, url_template=info.url_template, arch=self.arch, options=info.options, scan=False) for name, info in extra_repos.items()]
return '\n'.join(repo.config_snippet() for repo in (list(self.repos.values()) + extras)) return '\n\n'.join(repo.config_snippet() for repo in (list(self.repos.values()) + extras))
def get_pacman_conf(self, extra_repos: dict[str, RepoInfo] = [], check_space=False): def get_pacman_conf(self, extra_repos: dict[str, RepoInfo] = {}, check_space=False):
header = f''' header = f'''
# #
# /etc/pacman.conf # /etc/pacman.conf
@ -170,30 +170,17 @@ LocalFileSigLevel = Optional
return header + self._repos_config_snippet(extra_repos) return header + self._repos_config_snippet(extra_repos)
_base_distros: dict[str, Distro] = None def get_base_distro(arch: str) -> Distro:
_kupfer_distros: dict[str, Distro] = {} repos = {name: RepoInfo(url_template=url) for name, url in BASE_DISTROS[arch]['repos'].items()}
return Distro(arch=arch, repo_infos=repos, scan=False)
def get_base_distros() -> dict[str, Distro]:
global _base_distros
if not _base_distros:
_distros: dict[str, Distro] = {}
for arch, distro_conf in BASE_DISTROS.items():
repos = {name: RepoInfo(url_template=url) for name, url in distro_conf['repos'].items()}
_distros[arch] = Distro(arch=arch, repo_infos=repos, scan=False)
_base_distros = _distros
return _base_distros
def get_kupfer(arch: str, url_template: str) -> Distro: def get_kupfer(arch: str, url_template: str) -> Distro:
global _kupfer_distros repos = {name: RepoInfo(url_template=url_template, options={'SigLevel': 'Never'}) for name in REPOSITORIES}
if arch not in _kupfer_distros: return Distro(
repos = {name: RepoInfo(url_template=url_template, options={'SigLevel': 'Never'}) for name in REPOSITORIES} arch=arch,
_kupfer_distros[arch] = Distro( repo_infos=repos,
arch=arch, )
repo_infos=repos,
)
return _kupfer_distros[arch]
def get_kupfer_https(arch: str) -> Distro: def get_kupfer_https(arch: str) -> Distro: