Merge nucleic/gentle-river-seal-pfoj into dev

This commit is contained in:
2026-07-21 02:31:12 -07:00
parent c66662aa80
commit 27d085a449
3 changed files with 17 additions and 1 deletions
+6
View File
@@ -45,6 +45,12 @@ build_one() { # <pkgdir> <arch>
trap 'rm -rf "$stage"' RETURN
[ -d "$d/files" ] && cp -a "$d/files/." "$stage/"
# The runtime apt source's suite must mirror the channel it was published under
# (dists/<channel>; NAROS.md §3.2 "Suites mirror channels"), so @CHANNEL@ is templated
# here the same way @VERSION@/@ARCH@ are templated into control. Targeted rather than a
# blanket sed so binary payloads in files/ (e.g. the keyring .gpg) are never rewritten.
[ -f "$stage/etc/apt/sources.list.d/naros.sources" ] && \
sed -i "s/@CHANNEL@/$CHANNEL/g" "$stage/etc/apt/sources.list.d/naros.sources"
if [ -f "$d/stage.sh" ]; then
# shellcheck source=/dev/null
( set -euo pipefail; OS_DIR="$OS_DIR" . "$d/stage.sh"; stage "$stage" "$arch" ) || {