BigfootACA/arch-image-builder
1
0
Fork 0
mirror of https://github.com/BigfootACA/arch-image-builder.git synced 2024-09-21 15:20:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

builder: component: pacman.py: Add mirrorlist repo property

Browse Source
This commit is contained in:
anonymix007 2024-08-25 16:00:51 +03:00
parent 480fbeff44
commit 53d8df4154
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/build/pacman.py
View File

@ -64,7 +64,7 @@ def gen_config(ctx: ArchBuilderContext, pacman: Pacman):
conf = os.path.join(ctx.get_rootfs(), "etc/pacman.conf") conf = os.path.join(ctx.get_rootfs(), "etc/pacman.conf")
lines: list[str] = [] lines: list[str] = []
append_config(ctx, lines) append_config(ctx, lines)
pacman.append_repos(lines) pacman.append_repos(lines, True)
with open_config(conf) as f: with open_config(conf) as f:
f.writelines(lines) f.writelines(lines)
log.info(f"generated pacman config {conf}") log.info(f"generated pacman config {conf}")

34
builder/component/pacman.py
View File

@ -52,6 +52,7 @@ class PacmanRepo(SerializableDict):
name: str = None name: str = None
priority: int = 10000 priority: int = 10000
servers: list[PacmanRepoServer] = None servers: list[PacmanRepoServer] = None
mirrorlist: str = None
publickey: str = None publickey: str = None
keyid: str = None keyid: str = None
@ -60,6 +61,7 @@ class PacmanRepo(SerializableDict):
name: str = None, name: str = None,
priority: int = None, priority: int = None,
servers: list[PacmanRepoServer] = None, servers: list[PacmanRepoServer] = None,
mirrorlist: str = None,
publickey: str = None, publickey: str = None,
keyid: str = None keyid: str = None
): ):
@ -67,6 +69,7 @@ class PacmanRepo(SerializableDict):
if priority is not None: self.priority = priority if priority is not None: self.priority = priority
if servers is not None: self.servers = servers if servers is not None: self.servers = servers
else: self.servers = [] else: self.servers = []
if mirrorlist is not None: self.mirrorlist = mirrorlist
if publickey is not None: self.publickey = publickey if publickey is not None: self.publickey = publickey
if keyid is not None: self.keyid = keyid if keyid is not None: self.keyid = keyid
@ -92,20 +95,23 @@ class Pacman:
caches: list[str] caches: list[str]
repos: list[PacmanRepo] repos: list[PacmanRepo]
def append_repos(self, lines: list[str]): def append_repos(self, lines: list[str], rootfs: bool = False):
""" """
Add all databases into config Add all databases into config
""" """
for repo in self.repos: for repo in self.repos:
lines.append(f"[{repo.name}]\n") lines.append(f"[{repo.name}]\n")
for server in repo.servers: if rootfs and repo.mirrorlist is not None:
if server.mirror: lines.append(f"Include = /etc/pacman.d/{repo.name}-mirrorlist\n")
lines.append(f"# Mirror {server.name}\n") else:
log.debug(f"use mirror {server.name} url {server.url}") for server in repo.servers:
else: if server.mirror:
lines.append("# Original Repo\n") lines.append(f"# Mirror {server.name}\n")
log.debug(f"use original repo url {server.url}") log.debug(f"use mirror {server.name} url {server.url}")
lines.append(f"Server = {server.url}\n") else:
lines.append("# Original Repo\n")
log.debug(f"use original repo url {server.url}")
lines.append(f"Server = {server.url}\n")
def append_config(self, lines: list[str]): def append_config(self, lines: list[str]):
""" """
@ -142,8 +148,13 @@ class Pacman:
log.info("initializing pacman keyring") log.info("initializing pacman keyring")
self.pacman_key(["--init"]) self.pacman_key(["--init"])
# Download and add public keys # Download and add public keys and mirrorlist
for repo in self.repos: for repo in self.repos:
if repo.mirrorlist is not None:
mirrorlist = os.path.join(self.ctx.work, f"etc/pacman.d/{repo.name}-mirrorlist")
cmds = ["wget", repo.mirrorlist, "-O", keypath]
ret = self.ctx.run_external(cmds)
if ret != 0: raise OSError(f"wget failed with {ret}")
if repo.publickey is not None: if repo.publickey is not None:
keypath = os.path.join(self.ctx.work, f"{repo.name}.pub") keypath = os.path.join(self.ctx.work, f"{repo.name}.pub")
cmds = ["wget", repo.publickey, "-O", keypath] cmds = ["wget", repo.publickey, "-O", keypath]
@ -301,6 +312,9 @@ class Pacman:
if "priority" in repo: if "priority" in repo:
pacman_repo.priority = repo["priority"] pacman_repo.priority = repo["priority"]
if "mirrorlist" in repo:
pacman_repo.mirrorlist = repo["mirrorlist"]
# add public key url and id # add public key url and id
if "publickey" in repo and "keyid" not in repo: if "publickey" in repo and "keyid" not in repo:
raise ArchBuilderConfigError("publickey is provided without keyid") raise ArchBuilderConfigError("publickey is provided without keyid")