Merge c960407ffd into 0d8ef8a67c

Based on https://gitlab.archlinux.org/archlinux/archiso/-/blob/master/configs/releng/airootfs/etc/systemd/system/pacman-init.service

builder/build/filesystem.py

@@ -96,8 +96,8 @@ def add_file(ctx: ArchBuilderContext, file: dict):
 	# at least path content
 	if "path" not in file:
 		raise ArchBuilderConfigError("no path set in file")
-	if "content" not in file and "source" not in file and "url" not in file:
-		raise ArchBuilderConfigError(f"no content, source or url set in file")
+	if "content" not in file and "source" not in file:
+		raise ArchBuilderConfigError("no content or source set in file")
 	root = ctx.get_rootfs()
 	path: str = file["path"]
 	if path.startswith("/"): path = path[1:]
@@ -142,10 +142,6 @@ def add_file(ctx: ArchBuilderContext, file: dict):
 			shutil.copytree(src, real, symlinks=follow, dirs_exist_ok=True)
 		else:
 			shutil.copyfile(src, real, follow_symlinks=follow)
-	elif "url" in file:
-		cmds = ["wget", file["url"], "-O", real]
-		ret = ctx.run_external(cmds)
-		if ret != 0: raise OSError(f"wget failed with {ret}")
 	else:
 		assert False
 	log.debug(f"chmod file {real} to {mode:04o}")

builder/build/pacman.py

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

builder/component/pacman.py

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

configs/desktop/plasma.yaml

@@ -3,7 +3,6 @@ pacman:
   install:
   - plasma
   - konsole
-  - kate
   - dolphin
   - sddm
   - packagekit-qt6

configs/locale/en-US.yaml

@@ -4,10 +4,6 @@ locale:
   - "en_US.UTF-8 UTF-8"
   default: en_US.UTF-8
 
-systemd:
-  enable:
-  - systemd-timesyncd
-
 filesystem:
   files:
   # Wireless regulatory

configs/locale/ru-RU.yaml

@@ -5,10 +5,6 @@ locale:
   - "en_US.UTF-8 UTF-8"
   default: en_US.UTF-8
 
-systemd:
-  enable:
-  - systemd-timesyncd
-
 filesystem:
   files:
   # Wireless regulatory

configs/repo/endeavouros.yaml

@@ -1,12 +0,0 @@
-pacman:
-  repo:
-  - name: endeavouros
-    priority: 200
-    server: https://github.com/endeavouros-team/repo/raw/master/$$repo/$$arch/
-    mirrorlist: https://raw.githubusercontent.com/endeavouros-team/PKGBUILDS/master/endeavouros-mirrorlist/endeavouros-mirrorlist
-  trust:
-  - info@endeavouros.com
-  - manuel@endeavouros.com
-  install:
-  - endeavouros/endeavouros-keyring
-  - endeavouros/endeavouros-mirrorlist