Package workstation tools, reuse emulator sessions, and derive build versions

tools/build-base-packages

@@ -3,6 +3,7 @@
 source "$(dirname -- "${BASH_SOURCE[0]}")/lib.sh"
 [[ $# == 0 ]] || die 'Usage: tools/build-base-packages'
 cd "$FDS_ROOT"
+fds_version=$(tools/version)
 use_xbps
 check_void_pin
 mkdir -p out/logs out/packages out/manifests
@@ -12,7 +13,7 @@ flock -n 8 || die 'Another base package build is already running'
 tools/build-fds-package
 tools/build-kernel
 tools/build-dasungd
-input="$FDS_VOID/hostdir/sources/fds-init-0.1.0"
+input="$FDS_VOID/hostdir/sources/fds-init-${fds_version}"
 if [[ -d $input ]]; then
     previous=$(mktemp -d "$FDS_ROOT/out/init-source.XXXXXX")
     mv "$input" "$previous/"
@@ -35,7 +36,9 @@ for package in fds-dhcpcd fds-eink fds-base-files fds-init fds-base; do
         xbps_src -a aarch64 clean "$package"
         xbps_src -f -a aarch64 pkg "$package"
     ) 2>&1 | tee "out/logs/xbps-$package.log"
-    cp "$FDS_VOID/hostdir/binpkgs/$package-"*.aarch64.xbps out/packages/
+    package_version=$fds_version
+    [[ $package != fds-dhcpcd ]] || package_version=10.3.2
+    tools/export-package "$FDS_VOID/hostdir/binpkgs/${package}-${package_version}_1.aarch64.xbps"
 done
 XBPS_ARCH=aarch64 xbps-rindex -fa out/packages/fds-*.aarch64.xbps
 printf 'PASS: all FDS base packages exported to out/packages/\n'