README.md

@@ -23,21 +23,20 @@ pacman -S qemu-user-static-binfmt
 ## Example
 
 ```commandline
-python build.py -c target/ayn-odin2-sdcard,locale/zh-cn,desktop/gnome -m bfsu,tuna
+python build.py -c target/ayn-odin2-sdcard,locale/zh-cn,desktop/gnome
 ```
 
 ## Options
 
-| Option                              | Description                        |
+| Option                              | Description                      |
-|-------------------------------------|------------------------------------|
+|-------------------------------------|----------------------------------|
-| -C, --clean                         | Clean workspace before build       |
+| -C, --clean                         | Clean workspace before build     |
-| -m MIRROR, --mirror MIRROR          | Select mirror to download package  |
+| -p PRESET, --preset PRESET          | Select preset to create package  |
-| -p PRESET, --preset PRESET          | Select preset to create package    |
+| -c CONFIG, --config CONFIG          | Select configs to build          |
-| -c CONFIG, --config CONFIG          | Select configs to build            |
+| -o WORKSPACE, --workspace WORKSPACE | Set workspace for builder        |
-| -o WORKSPACE, --workspace WORKSPACE | Set workspace for builder          |
+| -d, --debug                         | Enable debug logging             |
-| -d, --debug                         | Enable debug logging               |
+| -G, --no-gpgcheck                   | Disable GPG check                |
-| -G, --no-gpgcheck                   | Disable GPG check                  |
+| -r, --repack                        | Repack rootfs only               |
-| -r, --repack                        | Repack rootfs only                 |
 
 ## License
 

builder/component/pacman.py

@@ -4,10 +4,8 @@ import logging
 import shutil
 import libarchive
 from logging import getLogger
-from builder.lib.serializable import SerializableDict
 from builder.lib.context import ArchBuilderContext
 from builder.lib.config import ArchBuilderConfigError
-from builder.lib.subscript import resolve_simple_values
 log = getLogger(__name__)
 
 
@@ -32,51 +30,6 @@ def progress_cb(target, percent, n, i):
 	log.info(f"processing {target} ({i}/{n})")
 
 
-class PacmanRepoServer(SerializableDict):
-	url: str = None
-	name: str = None
-	mirror: bool = False
-
-	def __init__(
-		self,
-		name: str = None,
-		url: str = None,
-		mirror: bool = None
-	):
-		if url is not None: self.url = url
-		if name is not None: self.name = name
-		if mirror is not None: self.mirror = mirror
-
-
-class PacmanRepo(SerializableDict):
-	name: str = None
-	priority: int = 10000
-	servers: list[PacmanRepoServer] = None
-
-	def __init__(
-		self,
-		name: str = None,
-		priority: int = None,
-		servers: list[PacmanRepoServer] = None
-	):
-		if name is not None: self.name = name
-		if priority is not None: self.priority = priority
-		if servers is not None: self.servers = servers
-		else: self.servers = []
-
-	def add_server(
-		self,
-		name: str = None,
-		url: str = None,
-		mirror: bool = None
-	):
-		self.servers.append(PacmanRepoServer(
-			name=name,
-			url=url,
-			mirror=mirror,
-		))
-
-
 class Pacman:
 	handle: pyalpm.Handle
 	ctx: ArchBuilderContext
@@ -84,22 +37,17 @@ class Pacman:
 	databases: dict[str: pyalpm.DB]
 	config: dict
 	caches: list[str]
-	repos: list[PacmanRepo]
 
 	def append_repos(self, lines: list[str]):
 		"""
 		Add all databases into config
 		"""
-		for repo in self.repos:
+		for repo in self.databases:
-			lines.append(f"[{repo.name}]\n")
+			db = self.databases[repo]
-			for server in repo.servers:
+			lines.append(f"[{repo}]\n")
-				if server.mirror:
+			for server in db.servers:
-					lines.append(f"# Mirror {server.name}\n")
+				log.debug(f"server {server}")
-					log.debug(f"use mirror {server.name} url {server.url}")
+				lines.append(f"Server = {server}\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]):
 		"""
@@ -179,27 +127,54 @@ class Pacman:
 		ret = self.ctx.run_external(cmds)
 		if ret != 0: raise OSError(f"pacman failed with {ret}")
 
+	def add_database(self, repo: dict):
+		"""
+		Add a database and update it
+		"""
+		def resolve(url: str) -> str:
+			"""
+			Replace pacman.conf variables
+			"""
+			return (url
+				.replace("$arch", self.ctx.tgt_arch)
+				.replace("$repo", name))
+		if "name" not in repo:
+			raise ArchBuilderConfigError("repo name not set")
+		name = repo["name"]
+
+		# never add local into database
+		if name == "local" or "/" in name:
+			raise ArchBuilderConfigError("bad repo name")
+
+		# register database
+		if name not in self.databases:
+			self.databases[name] = self.handle.register_syncdb(
+				name, pyalpm.SIG_DATABASE_MARGINAL_OK
+			)
+		db = self.databases[name]
+
+		# add databases servers
+		servers: list[str] = []
+		if "server" in repo:
+			servers.append(resolve(repo["server"]))
+		if "servers" in repo:
+			for server in repo["servers"]:
+				servers.append(resolve(server))
+		db.servers = servers
+
+		# update database now via pyalpm
+		log.info(f"updating database {name}")
+		db.update(False)
+
 	def load_databases(self):
 		"""
 		Add all databases and load them
 		"""
-		for mirror in self.repos:
+		cfg = self.config
-			# register database
+		if "repo" not in cfg:
-			if mirror.name not in self.databases:
+			raise ArchBuilderConfigError("no repos found in config")
-				self.databases[mirror.name] = self.handle.register_syncdb(
+		for repo in cfg["repo"]:
-					mirror.name, pyalpm.SIG_DATABASE_MARGINAL_OK
+			self.add_database(repo)
-				)
-			db = self.databases[mirror.name]
-
-			# add databases servers
-			servers: list[str] = []
-			for server in mirror.servers:
-				servers.append(server.url)
-			db.servers = servers
-
-			# update database now via pyalpm
-			log.info(f"updating database {mirror.name}")
-			db.update(False)
 		self.init_config()
 		self.refresh()
 
@@ -256,78 +231,6 @@ class Pacman:
 		os.makedirs(work_cache, mode=0o0755, exist_ok=True)
 		os.makedirs(root_cache, mode=0o0755, exist_ok=True)
 
-	def add_repo(self, repo: PacmanRepo):
-		if not repo or not repo.name or len(repo.servers) <= 0:
-			raise ArchBuilderConfigError("bad repo")
-		self.repos.append(repo)
-		self.repos.sort(key=lambda r: r.priority)
-
-	def init_repos(self):
-		"""
-		Initialize mirrors
-		"""
-		if "repo" not in self.config:
-			raise ArchBuilderConfigError("no repos found in config")
-		mirrors = self.ctx.get("mirrors", [])
-		for repo in self.config["repo"]:
-			if "name" not in repo:
-				raise ArchBuilderConfigError("repo name not set")
-
-			# never add local into database
-			if repo["name"] == "local" or "/" in repo["name"]:
-				raise ArchBuilderConfigError("bad repo name")
-
-			# create pacman repo instance
-			pacman_repo = PacmanRepo(name=repo["name"])
-			if "priority" in repo:
-				pacman_repo.priority = repo["priority"]
-
-			originals: list[str] = []
-			servers: list[str] = []
-
-			# add all original repo url
-			if "server" in repo: servers.append(repo["server"])
-			if "servers" in repo: servers.extend(repo["server"])
-			if len(servers) <= 0:
-				raise ArchBuilderConfigError("no any original repo url found")
-
-			# resolve original repo url
-			for server in servers:
-				originals.append(resolve_simple_values(server, {
-					"arch": self.ctx.tgt_arch,
-					"repo": repo["name"],
-				}))
-
-			# add repo mirror url
-			for mirror in mirrors:
-				if "name" not in mirror:
-					raise ArchBuilderConfigError("mirror name not set")
-				if "repos" not in mirror:
-					raise ArchBuilderConfigError("repos list not set")
-				for repo in mirror["repos"]:
-					if "original" not in repo:
-						raise ArchBuilderConfigError("original url not set")
-					if "mirror" not in repo:
-						raise ArchBuilderConfigError("mirror url not set")
-					for original in originals:
-						if original.startswith(repo["original"]):
-							path = original[len(repo["original"]):]
-							real_url = repo["mirror"] + path
-							pacman_repo.add_server(
-								name=mirror["name"],
-								url=real_url,
-								mirror=True,
-							)
-
-			# add original url
-			for original in originals:
-				pacman_repo.add_server(
-					url=original,
-					mirror=False
-				)
-
-			self.add_repo(pacman_repo)
-
 	def __init__(self, ctx: ArchBuilderContext):
 		"""
 		Initialize pacman context
@@ -347,9 +250,7 @@ class Pacman:
 		self.handle.progresscb = progress_cb
 		self.databases = {}
 		self.caches = []
-		self.repos = []
 		self.init_cache()
-		self.init_repos()
 		for cache in self.caches:
 			self.handle.add_cachedir(cache)
 		self.init_config()

builder/disk/file.py

@@ -1,27 +0,0 @@
-import os
-from logging import getLogger
-from builder.disk.content import ImageContentBuilder
-from builder.lib.config import ArchBuilderConfigError
-log = getLogger(__name__)
-
-
-class ImageFileBuilder(ImageContentBuilder):
-	def build(self):
-		cmds = ["dd"]
-		ctx = self.builder.ctx
-		cfg = self.builder.config
-		if "file" not in cfg:
-			raise ArchBuilderConfigError("file not set")
-		file: str = cfg["file"]
-		if file.startswith("/"): file = file[1:]
-		path = os.path.join(ctx.get_rootfs(), file)
-		if not os.path.exists(path):
-			raise FileNotFoundError(f"image file {path} not found")
-		cmds.append("status=progress")
-		cmds.append(f"if={path}")
-		cmds.append(f"of={self.builder.device}")
-		cmds.append(f"bs={self.builder.sector}")
-		log.info(f"start writing image file {path}")
-		ret = ctx.run_external(cmds)
-		if ret != 0: raise OSError("dd failed")
-		log.info(f"write image file {path} done")

builder/disk/filesystem/build.py

@@ -19,11 +19,6 @@ class FileSystemBuilder(ImageContentBuilder):
 
 	def proc_cmdline_root(self, cfg: dict, mnt: MountPoint):
 		ccfg = self.builder.ctx.config_orig
-		mnt.remove_option("ro")
-		mnt.remove_option("rw")
-		for opt in mnt.option:
-			if opt.startswith("x-"):
-				mnt.option.remove(opt)
 		if "kernel" not in ccfg: ccfg["kernel"] = {}
 		kern = ccfg["kernel"]
 		if "cmdline" not in kern: kern["cmdline"] = []
@@ -32,16 +27,12 @@ class FileSystemBuilder(ImageContentBuilder):
 			raise ArchBuilderConfigError("root already set in cmdline")
 		if mnt.target != "/":
 			log.warning(f"root target is not / ({mnt.target})")
-		if not mnt.source.startswith("/") and "=" not in mnt.source:
-			log.warning(f"bad root source ({mnt.source})")
 		ecmds = [
 			"ro", "rootwait",
 			f"root={mnt.source}",
+			f"rootfstype={mnt.fstype}",
+			f"rootflags={mnt.options}",
 		]
-		if mnt.fstype != "none":
-			ecmds.append(f"rootfstype={mnt.fstype}")
-		if len(mnt.option) > 0:
-			ecmds.append(f"rootflags={mnt.options}")
 		scmds = " ".join(ecmds)
 		log.debug(f"add root cmdline {scmds}")
 		cmds.extend(ecmds)
@@ -62,10 +53,7 @@ class FileSystemBuilder(ImageContentBuilder):
 
 	def proc_grow(self, cfg: dict, mnt: MountPoint):
 		root = self.builder.ctx.get_rootfs()
-		if "ptype" not in cfg:
+		if "ptype" not in cfg: raise ArchBuilderConfigError("no ptype set for grow")
-			log.warning("no partition type set, grow filesystem only")
-			mnt.option.append("x-systemd.growfs")
-			return
 		ptype = DiskTypesGPT.lookup_one_uuid(cfg["ptype"])
 		if ptype is None: raise ArchBuilderConfigError(f"unknown type {cfg['ptype']}")
 		mnt.option.append("x-systemd.growfs")
@@ -122,7 +110,7 @@ class FileSystemBuilder(ImageContentBuilder):
 		self.builder.ctx.fstab.append(mnt)
 		self.builder.ctx.fsmap[mnt.source] = self.builder.device
 		if "boot" in fstab and fstab["boot"]:
-			self.proc_cmdline_root(cfg, mnt.clone())
+			self.proc_cmdline_root(cfg, mnt)
 
 	def format(self, fstype: str):
 		from builder.disk.filesystem.creator import FileSystemCreators

builder/disk/types.py

@@ -2,7 +2,6 @@ from builder.disk.content import ImageContentBuilder
 from builder.disk.layout.build import DiskLayoutBuilder
 from builder.disk.filesystem.build import FileSystemBuilder
 from builder.disk.abootimg import AndroidBootBuilder
-from builder.disk.file import ImageFileBuilder
 
 
 types: list[tuple[str, type[ImageContentBuilder]]] = [
@@ -10,5 +9,4 @@ types: list[tuple[str, type[ImageContentBuilder]]] = [
 	("filesystem", FileSystemBuilder),
 	("aboot",      AndroidBootBuilder),
 	("avndboot",   AndroidBootBuilder),
-	("image",      ImageFileBuilder),
 ]

builder/lib/mount.py

@@ -262,7 +262,7 @@ class MountPoint(SerializableDict):
 		mnt.source = self.source
 		mnt.target = self.target
 		mnt.fstype = self.fstype
-		mnt.options = self.options
+		mnt.option = self.option
 		mnt.fs_freq = self.fs_freq
 		mnt.fs_passno = self.fs_passno
 		return mnt

builder/lib/subscript.py

@@ -39,13 +39,6 @@ def dict_get(key: str, root: dict):
 	return node
 
 
-def resolve_simple_values(original: str, values: dict) -> str:
-	value = str(original)
-	for key in values:
-		value = value.replace(f"${key}", values[key])
-	return value
-
-
 class SubScript:
 	root: dict
 	resolved: list[str]
@@ -81,9 +74,8 @@ class SubScript:
 		while last < len(content):
 			last = content.find("$", last)
 			if last < 0: break
-			if content[last:last + 2] == "$$":
+			if content[last:last+2] == "$$":
-				content = content[:last] + content[last + 1:]
+				last += 2
-				last += 1
 				continue
 			if len(content) <= last + 2 or content[last + 1] != "{":
 				raise ValueError(f"unexpected token in subscript at {lvl}")

builder/main.py

@@ -18,7 +18,6 @@ def parse_arguments(ctx: ArchBuilderContext):
 	parser.add_argument("-C", "--clean",       help="Clean workspace before build", default=False, action='store_true')
 	parser.add_argument("-p", "--preset",      help="Select preset to create package")
 	parser.add_argument("-c", "--config",      help="Select config to build", action='append')
-	parser.add_argument("-m", "--mirror",      help="Select mirror to download package", action='append')
 	parser.add_argument("-o", "--workspace",   help="Set workspace for builder", default=ctx.work)
 	parser.add_argument("-d", "--debug",       help="Enable debug logging", default=False, action='store_true')
 	parser.add_argument("-G", "--no-gpgcheck", help="Disable GPG check", default=False, action='store_true')
@@ -46,10 +45,6 @@ def parse_arguments(ctx: ArchBuilderContext):
 		pcfgs = ctx.get("package.configs", [])
 		configs.extend(pcfgs)
 
-	if args.mirror:
-		for mirror in args.mirror:
-			configs.extend([f"mirrors/{name}" for name in mirror.split(",")])
-
 	# load and populate configs
 	config.load_configs(ctx, configs)
 	config.populate_config(ctx)

configs/common/persistent-mac.yaml

@@ -1,52 +0,0 @@
-filesystem:
-  files:
-  - path: /etc/systemd/scripts/generate-mac.sh
-    content: |
-      #!/bin/bash
-      mac="$$((cat /etc/machine-id; echo "$$@"; ) | sha256sum -)"
-      echo "42:$${mac:0:2}:$${mac:4:2}:$${mac:8:2}:$${mac:12:2}:$${mac:16:2}"
-  - path: /etc/systemd/scripts/net-update-mac.sh
-    content: |
-      #!/bin/bash
-      MAC="$$(bash /etc/systemd/scripts/generate-mac.sh "$$@")"
-      ip link set dev "$$@" down &> /dev/null || true
-      ip link set dev "$$@" address "$$MAC"
-  - path: /etc/systemd/scripts/bt-update-mac.sh
-    content: |
-      #!/bin/bash
-      MAC="$$(bash /etc/systemd/scripts/generate-mac.sh bluetooth)"
-      for i in {0..5}; do
-        sleep "$$i"
-        if bluetoothctl mgmt.public-addr "$$MAC"; then
-          break
-        fi
-      done
-      exit "$$?"
-  - path: /etc/systemd/system/bt-update-mac.service
-    content: |
-      [Unit]
-      Description=Update Bluetooth Persistent MAC Address
-      After=bluetooth.service systemd-machine-id-commit.service
-      Wants=bluetooth.service
-      [Service]
-      Type=oneshot
-      ExecStart=bash /etc/systemd/scripts/bt-update-mac.sh
-      SyslogIdentifier=bt-update-mac
-      [Install]
-      WantedBy=bluetooth.target
-  - path: /etc/systemd/system/net-update-mac@.service
-    content: |
-      [Unit]
-      Description=Update Persistent MAC Address for %i
-      Before=network.target
-      After=wait-interface@%i.service systemd-machine-id-commit.service
-      Wants=wait-interface@%i.service
-      [Service]
-      Type=oneshot
-      ExecStart=bash /etc/systemd/scripts/net-update-mac.sh %i
-      SyslogIdentifier=wlan-update-mac
-      [Install]
-      WantedBy=sysinit.target
-+also:
-- packages/bluez
-- common/systemd-wait-for

configs/common/systemd-wait-for.yaml

@@ -1,80 +0,0 @@
-filesystem:
-  files:
-  - path: /etc/systemd/system/wait-addresses@.service
-    content: |
-      [Unit]
-      Description=Wait for addresses %i
-      [Service]
-      Type=oneshot
-      ExecStart=bash /etc/systemd/scripts/wait-addresses.sh %i 60
-      SyslogIdentifier=wait-addresses
-      [Install]
-      WantedBy=network-online.target
-  - path: /etc/systemd/system/wait-interface@.service
-    content: |
-      [Unit]
-      Description=Wait for interface %i
-      [Service]
-      Type=oneshot
-      ExecStart=bash /etc/systemd/scripts/wait-interface.sh %i 60
-      SyslogIdentifier=wait-interface
-      [Install]
-      WantedBy=network-online.target
-  - path: /etc/systemd/system/wait-reached@.service
-    content: |
-      [Unit]
-      Description=Wait for reached %i
-      After=network-online.target
-      [Service]
-      Type=oneshot
-      ExecStart=bash /etc/systemd/scripts/wait-reached.sh %i 60
-      SyslogIdentifier=wait-reached
-      [Install]
-      WantedBy=network-online.target
-  - path: /etc/systemd/scripts/wait-addresses.sh 
-    content: |
-      #!/usr/bin/bash
-      address="$${1}"
-      timeout="$${2}"
-      [ -z "$${address}" ]&&exit 2
-      [ -z "$${timeout}" ]&&timeout=10
-      [[ "$${timeout}" -lt 0 ]]&&exit 2
-      int=0
-      timeout=$$((timeout*5))
-      while ! ip address show | grep -w "$${address}" &>/dev/null; do
-        int=$$((int+1))
-        [[ "$${int}" -gt "$${timeout}" ]]&&exit 1
-        sleep 0.2
-      done
-      true
-  - path: /etc/systemd/scripts/wait-interface.sh
-    content: |
-      #!/usr/bin/bash
-      interface="$${1}"
-      timeout="$${2}"
-      [ -z "$${interface}" ]&&exit 2
-      [ -z "$${timeout}" ]&&timeout=10
-      [[ "$${timeout}" -lt 0 ]]&&exit 2
-      int=0
-      timeout=$$((timeout*5))
-      while ! [ -h "/sys/class/net/$${interface}" ]; do
-        int=$$((int+1))
-        [[ "$${int}" -gt "$${timeout}" ]]&&exit 1
-        sleep 0.2
-      done
-      true
-  - path: /etc/systemd/scripts/wait-reached.sh
-    content: |
-      #!/usr/bin/bash
-      address="$${1}"
-      stimeout="$${2}"
-      [ -z "$${address}" ]&&exit 2
-      [ -z "$${stimeout}" ]&&stimeout=10
-      [[ "$${stimeout}" -lt 0 ]]&&exit 2
-      int=0
-      while ! timeout 1s ping -c 1 -W 1 "$${address}" &>/dev/null; do
-      int=$$((int+1))
-        [[ "$${int}" -gt "$${stimeout}" ]]&&exit 1
-        sleep 0.5
-      done
-      true

configs/desktop/gnome.yaml

@@ -2,7 +2,6 @@
 pacman:
   install:
   - gnome
-  - gnome-packagekit
 systemd:
   default: graphical.target
   enable:

configs/device/ayn-odin2.yaml

@@ -25,16 +25,10 @@ pacman:
 
   # Vulkan dependency
   - xcb-util-keysyms
-
-  # AYN Odin2 RGB LED Tuner
-  - rgb-led
 systemd:
   disable:
   # No modem in this device
   - rmtfs.service
-  enable:
-  - bt-update-mac.service
-  - net-update-mac@wlp1s0.service
 filesystem:
   files:
   # GamePAD workaround
@@ -60,10 +54,6 @@ filesystem:
       [Resolve]
       MulticastDNS=no
       LLMNR=no
-  - path: /etc/NetworkManager/conf.d/80-no-wifi-powersave.conf
-    content: |
-      [connection]
-      wifi.powersave = 2
 sysconf:
   chassis: handset
   environments:
@@ -112,9 +102,6 @@ mkinitcpio:
 # USB Gadget tools
 - packages/systemd-gadget
 
-# Android Debug Bridge Daemon via USB Gadget
-- packages/adbd
-
 # OpenSSH Server
 - packages/openssh
 
@@ -123,9 +110,3 @@ mkinitcpio:
 
 # Bluetooth related services
 - packages/bluez
-
-# Persistent MAC Address
-- common/persistent-mac
-
-# Root without password
-- common/wheel-nopasswd

configs/mirrors/bfsu.yaml

@@ -1,26 +0,0 @@
-mirrors:
-- name: bfsu
-  repos:
-  # ArchLinux
-  - original: https://geo.mirror.pkgbuild.com/
-    mirror: https://mirrors.bfsu.edu.cn/archlinux/
-
-  # ArchLinux ARM
-  - name: archlinuxarm
-    original: http://mirror.archlinuxarm.org/
-    mirror: https://mirrors.bfsu.edu.cn/archlinuxarm/
-
-  # Arch4Edu
-  - name: arch4edu
-    original: https://repository.arch4edu.org/
-    mirror: https://mirrors.bfsu.edu.cn/arch4edu/
-
-  # ArchLinux CN
-  - name: archlinuxcn
-    original: https://repo.archlinuxcn.org/
-    mirror: https://mirrors.bfsu.edu.cn/archlinuxcn/
-
-  # BlackArch
-  - name: blackarch
-    original: https://www.blackarch.org/blackarch/
-    mirror: https://mirrors.bfsu.edu.cn/blackarch/

configs/mirrors/tuna.yaml

@@ -1,26 +0,0 @@
-mirrors:
-- name: tuna
-  repos:
-  # ArchLinux
-  - original: https://geo.mirror.pkgbuild.com/
-    mirror: https://mirrors.tuna.tsinghua.edu.cn/archlinux/
-
-  # ArchLinux ARM
-  - name: archlinuxarm
-    original: http://mirror.archlinuxarm.org/
-    mirror: https://mirrors.tuna.tsinghua.edu.cn/archlinuxarm/
-
-  # Arch4Edu
-  - name: arch4edu
-    original: https://repository.arch4edu.org/
-    mirror: https://mirrors.tuna.tsinghua.edu.cn/arch4edu/
-
-  # ArchLinux CN
-  - name: archlinuxcn
-    original: https://repo.archlinuxcn.org/
-    mirror: https://mirrors.tuna.tsinghua.edu.cn/archlinuxcn/
-
-  # BlackArch
-  - name: blackarch
-    original: https://www.blackarch.org/blackarch/
-    mirror: https://mirrors.tuna.tsinghua.edu.cn/blackarch/

configs/mirrors/ustc.yaml

@@ -1,21 +0,0 @@
-mirrors:
-- name: ustc
-  repos:
-  # ArchLinux
-  - original: https://geo.mirror.pkgbuild.com/
-    mirror: https://mirrors.ustc.edu.cn/archlinux/
-
-  # ArchLinux ARM
-  - name: archlinuxarm
-    original: http://mirror.archlinuxarm.org/
-    mirror: https://mirrors.ustc.edu.cn/archlinuxarm/
-
-  # ArchLinux CN
-  - name: archlinuxcn
-    original: https://repo.archlinuxcn.org/
-    mirror: https://mirrors.ustc.edu.cn/archlinuxcn/
-
-  # BlackArch
-  - name: blackarch
-    original: https://www.blackarch.org/blackarch/
-    mirror: https://mirrors.ustc.edu.cn/blackarch/

configs/packages/adbd.yaml

@@ -1,9 +0,0 @@
-# Android Debug Bridge Daemon via USB Gadget
-pacman:
-  install:
-  - adbd
-systemd:
-  enable:
-  - adbd-usb.service
-+also:
-- packages/systemd-gadget

configs/packages/bluez.yaml

@@ -2,8 +2,6 @@
 pacman:
   install:
   - bluez
-  - bluez-tools
-  - bluez-utils
 systemd:
   enable:
   - bluetooth.service

configs/packages/systemd-gadget.yaml

@@ -9,15 +9,5 @@ systemd:
   - getty@ttyGS0.service
   - usbgadget-func-acm.service
   enable:
-  - gadget-init.service
-  - gadget-start.service
-  - usbgadget-func-rndis.service
   # Enable systemd-networkd for RNDIS
   - systemd-networkd.service
-filesystem:
-  files:
-  - path: /etc/systemd/network/sharenet.network.d/override.conf
-    content: |
-      [DHCPServer]
-      EmitRouter=no
-      EmitDNS=no

configs/repo/arch4edu.yaml

@@ -2,6 +2,6 @@ pacman:
   repo:
   - name: arch4edu
     priority: 800
-    server: https://repository.arch4edu.org/$$arch
+    server: https://mirrors.bfsu.edu.cn/arch4edu/${arch}
   install:
   - arch4edu/arch4edu-keyring

configs/repo/archlinux.yaml

@@ -2,13 +2,13 @@ pacman:
   repo:
   - name: core
     priority: 100
-    server: https://geo.mirror.pkgbuild.com/$$repo/os/$$arch
+    server: https://mirrors.bfsu.edu.cn/archlinux/core/os/${arch}
   - name: extra
     priority: 110
-    server: https://geo.mirror.pkgbuild.com/$$repo/os/$$arch
+    server: https://mirrors.bfsu.edu.cn/archlinux/extra/os/${arch}
   - name: multilib
     priority: 120
-    server: https://geo.mirror.pkgbuild.com/$$repo/os/$$arch
+    server: https://mirrors.bfsu.edu.cn/archlinux/multilib/os/${arch}
   trust:
   - eworm@archlinux.org
   - dvzrv@archlinux.org

configs/repo/archlinuxarm.yaml

@@ -2,16 +2,16 @@ pacman:
   repo:
   - name: core
     priority: 100
-    server: http://mirror.archlinuxarm.org/$$arch/$$repo
+    server: http://mirrors.bfsu.edu.cn/archlinuxarm/${arch}/core
   - name: extra
     priority: 110
-    server: http://mirror.archlinuxarm.org/$$arch/$$repo
+    server: https://mirrors.bfsu.edu.cn/archlinuxarm/${arch}/extra
   - name: alarm
     priority: 120
-    server: http://mirror.archlinuxarm.org/$$arch/$$repo
+    server: https://mirrors.bfsu.edu.cn/archlinuxarm/${arch}/alarm
   - name: aur
     priority: 130
-    server: http://mirror.archlinuxarm.org/$$arch/$$repo
+    server: https://mirrors.bfsu.edu.cn/archlinuxarm/${arch}/aur
   trust:
   - builder@archlinuxarm.org
   install:

configs/repo/archlinuxcn.yaml

@@ -2,7 +2,7 @@ pacman:
   repo:
   - name: archlinuxcn
     priority: 500
-    server: https://repo.archlinuxcn.org/$$arch
+    server: https://mirrors.bfsu.edu.cn/archlinuxcn/${arch}
   trust:
   - farseerfc@archlinux.org
   install:

configs/repo/blackarch.yaml

@@ -2,7 +2,7 @@ pacman:
   repo:
   - name: blackarch
     priority: 1000
-    server: https://www.blackarch.org/$$repo/os/$$arch
+    server: https://mirrors.bfsu.edu.cn/blackarch/blackarch/os/${arch}
   trust:
   - noptrix@nullsecurity.net
   install:

configs/repo/renegade-project.yaml

@@ -2,7 +2,7 @@ pacman:
   repo:
   - name: renegade-project
     priority: 200
-    server: https://mirror.renegade-project.tech/arch/$$arch
+    server: https://mirror.renegade-project.tech/arch/${arch}
   trust:
   - renegade-project@classfun.cn
   install:

configs/target/ayn-odin2-ufs.yaml

@@ -9,7 +9,6 @@ image:
   size: 8GiB
   sector: 4096
   mount: /
-  grow: yes
   fstab:
     boot: yes
     flags: rw,noatime,discard