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

builder: component: pacman.py: Add publickey and keyid repo properties

Browse Source
This commit is contained in:
anonymix007 2024-08-21 17:06:38 +03:00
parent a22e4bef4f
commit 7b1e8f7dd9
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builder/component/pacman.py
View File

@ -52,17 +52,23 @@ class PacmanRepo(SerializableDict):
name: str = None name: str = None
priority: int = 10000 priority: int = 10000
servers: list[PacmanRepoServer] = None servers: list[PacmanRepoServer] = None
publickey: str = None
keyid: str = None
def __init__( def __init__(
self, self,
name: str = None, name: str = None,
priority: int = None, priority: int = None,
servers: list[PacmanRepoServer] = None servers: list[PacmanRepoServer] = None,
publickey: str = None,
keyid: str = None
): ):
if name is not None: self.name = name if name is not None: self.name = name
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 publickey is not None: self.publickey = publickey
if keyid is not None: self.keyid = keyid
def add_server( def add_server(
self, self,
@ -136,6 +142,16 @@ 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
for repo in self.repos:
if repo.publickey is not None:
keypath = os.path.join(self.ctx.work, f"{repo.name}.pub")
cmds = ["wget", repo.publickey, "-O", keypath]
ret = self.ctx.run_external(cmds)
if ret != 0: raise OSError(f"wget failed with {ret}")
self.pacman_key(["--add", keypath])
self.lsign_key(repo.keyid)
def init_config(self): def init_config(self):
""" """
Create host pacman.conf Create host pacman.conf
@ -282,6 +298,19 @@ class Pacman:
if "priority" in repo: if "priority" in repo:
pacman_repo.priority = repo["priority"] pacman_repo.priority = repo["priority"]
# add public key url and id
if "publickey" in repo and "keyid" not in repo:
raise ArchBuilderConfigError("publickey is provided without keyid")
if "keyid" in repo and "publickey" not in repo:
raise ArchBuilderConfigError("keyid is provided without publickey")
if "publickey" in repo:
pacman_repo.publickey = repo["publickey"]
if "keyid" in repo:
pacman_repo.keyid = repo["keyid"]
originals: list[str] = [] originals: list[str] = []
servers: list[str] = [] servers: list[str] = []