mirror of
https://github.com/theupriser/steamify-cachyos-dev.git
synced 2026-10-05 12:45:56 +02:00
docs: rename the local ISO checkout to steamify-cachyos-live-iso
- scripts and skills use ../steamify-cachyos-live-iso - TODO item 4: the ISO comes from the git.upriser.nl release
This commit is contained in:
1 parent
92bf3f0b19
commit
85657a3183
9 files changed
+32
-31
No files matched your search
@@ -9,7 +9,7 @@
|
||||
# --install first install the VM (scripts/vminstall.sh, from the Steamify ISO)
|
||||
# --window show the VM's window (default: headless, with a Konsole on the log when there is a desktop)
|
||||
# Env: VM_DIR (default ~/vms/bl-<loader>), VM_ISO (default: the newest ISO in
|
||||
# ../steammachine-cachyos-live-iso/out/desktop), REPO (steamify-cachyos, 9p `repo`).
|
||||
# ../steamify-cachyos-live-iso/out/desktop), REPO (steamify-cachyos, 9p `repo`).
|
||||
# Exit status: the number of failed checks. Only one VM runs at a time (port 2222).
|
||||
set -uo pipefail
|
||||
here="$(cd "$(dirname "$0")" && pwd)"
|
||||
@@ -54,7 +54,7 @@ printf '\n===== vmbootloadertest.sh %s (%s) =====\n' "$loader" "$(date +%T)"
|
||||
if $install; then
|
||||
step "install $loader VM in $VM_DIR"
|
||||
stop_vm
|
||||
iso="${VM_ISO:-$(ls -t "$repo"/../steammachine-cachyos-live-iso/out/desktop/*.iso 2>/dev/null | head -n 1)}"
|
||||
iso="${VM_ISO:-$(ls -t "$repo"/../steamify-cachyos-live-iso/out/desktop/*.iso 2>/dev/null | head -n 1)}"
|
||||
[[ -f "$iso" ]] || { echo "No ISO: set VM_ISO"; exit 2; }
|
||||
if [[ -f "$VM_DIR/disk.qcow2" ]]; then
|
||||
[[ -t 0 ]] || { echo "$VM_DIR has a disk; run this from a terminal to replace it"; exit 2; }
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
# --fresh a new, empty disk (else the existing one: e.g. boot the
|
||||
# installed system with `./run.sh` in $VM_DIR afterwards)
|
||||
# --iso <file> default: the newest out/desktop/*.iso of the host's
|
||||
# steammachine-cachyos-live-iso checkout
|
||||
# steamify-cachyos-live-iso checkout
|
||||
# Env: ISO_VM_DIR (~/vms/iso-vm), ISO_VM_PORT (2223: runs next to the test
|
||||
# VM on 2222).
|
||||
set -euo pipefail
|
||||
@@ -26,8 +26,8 @@ while [[ $# -gt 0 ]]; do
|
||||
esac
|
||||
done
|
||||
if [[ -z "$iso" ]]; then
|
||||
iso="$(ls -t "$(dirname "$repo")"/steammachine-cachyos-live-iso/out/desktop/*.iso 2>/dev/null | head -1)"
|
||||
[[ -n "$iso" ]] || { echo "No ISO in steammachine-cachyos-live-iso/out/desktop: build one (vmisobuild.sh) or pass --iso." >&2; exit 1; }
|
||||
iso="$(ls -t "$(dirname "$repo")"/steamify-cachyos-live-iso/out/desktop/*.iso 2>/dev/null | head -1)"
|
||||
[[ -n "$iso" ]] || { echo "No ISO in steamify-cachyos-live-iso/out/desktop: build one (vmisobuild.sh) or pass --iso." >&2; exit 1; }
|
||||
fi
|
||||
iso="$(cd "$(dirname "$iso")" && pwd)/$(basename "$iso")"
|
||||
mkdir -p "$dir"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Build the Steam Machine ISO (steammachine-cachyos-live-iso) in the test VM
|
||||
# Build the Steam Machine ISO (steamify-cachyos-live-iso) in the test VM
|
||||
# (directly, no container: build-live-modules.sh and build-calamares-modules.sh with sudo, buildiso.sh as
|
||||
# the user, it sudos itself),
|
||||
# visibly (a Konsole on the VM's desktop follows the log), with the package
|
||||
@@ -11,7 +11,7 @@
|
||||
# gets all host cores but 2 for the build: start it with
|
||||
# VM_CACHE=$VM_DIR/iso-cache VM_CPUS=$(( $(nproc) * 3 / 4 )) scripts/vmreset.sh --fremont
|
||||
# Env: VM_DIR (see common.sh), ISO_BRANCH (feat/steamify), ISO_OUT (the host's
|
||||
# steammachine-cachyos-live-iso/out/desktop).
|
||||
# steamify-cachyos-live-iso/out/desktop).
|
||||
set -euo pipefail
|
||||
here="$(cd "$(dirname "$0")" && pwd)"
|
||||
. "$here/common.sh"
|
||||
@@ -20,7 +20,7 @@ steamify=""
|
||||
branch="${ISO_BRANCH:-feat/steamify}"
|
||||
# Where the ISO lands: out/desktop of the host's live-ISO checkout (next to
|
||||
# this repo), where a local build would put it.
|
||||
out="${ISO_OUT:-$(dirname "$(cd "$here/.." && pwd)")/steammachine-cachyos-live-iso/out/desktop}"
|
||||
out="${ISO_OUT:-$(dirname "$(cd "$here/.." && pwd)")/steamify-cachyos-live-iso/out/desktop}"
|
||||
mkdir -p "$out"
|
||||
|
||||
{ printf 'branch=%q steamify=%q\n' "$branch" "$steamify"; cat << 'REMOTE'
|
||||
@@ -41,9 +41,9 @@ mountpoint -q /var/cache/pacman/pkg || sudo mount --bind /var/cache/steamify-iso
|
||||
# build fails. mkarchiso uses this mirrorlist, so skip it here.
|
||||
sudo sed -i '/archlinux\.cachyos\.org/s/^Server/#Server/' /etc/pacman.d/mirrorlist
|
||||
sudo pacman -Sy --needed --noconfirm archiso mkinitcpio-archiso git squashfs-tools grub >/dev/null
|
||||
iso=~/projects/steammachine-cachyos-live-iso
|
||||
iso=~/projects/steamify-cachyos-live-iso
|
||||
if [ -d "$iso/.git" ]; then git -C "$iso" fetch -q && git -C "$iso" checkout -q "$branch" && git -C "$iso" reset -q --hard "origin/$branch"
|
||||
else mkdir -p ~/projects && git clone -q -b "$branch" https://github.com/theupriser/steammachine-cachyos-live-iso "$iso"; fi
|
||||
else mkdir -p ~/projects && git clone -q -b "$branch" https://github.com/theupriser/steamify-cachyos-live-iso "$iso"; fi
|
||||
cd "$iso" && echo "ISO repo: $(git log --oneline -1)"
|
||||
./steamify-prepare.sh $steamify | tail -1
|
||||
sudo rm -rf build out
|
||||
@@ -61,7 +61,7 @@ REMOTE
|
||||
} | vm_ssh bash -s
|
||||
echo "Building in the VM (its Konsole shows the log)..."
|
||||
until vm_ssh 'grep -q "^== BUILD EXIT" ~/projects/iso-build.log'; do sleep 30; done
|
||||
iso="$(vm_ssh "bash -c 'ls -t ~/projects/steammachine-cachyos-live-iso/out/desktop/*.iso 2>/dev/null | head -1'")"
|
||||
iso="$(vm_ssh "bash -c 'ls -t ~/projects/steamify-cachyos-live-iso/out/desktop/*.iso 2>/dev/null | head -1'")"
|
||||
[[ -n "$iso" ]] || { echo "No ISO was built; see ~/projects/iso-build.log in the VM." >&2; exit 1; }
|
||||
vm_scp "$VM_USER@$VM_HOST:$iso" "$out/"
|
||||
echo "ISO: $out/$(basename "$iso") (cache: $VM_DIR/iso-cache)"
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
set -uo pipefail
|
||||
here="$(cd "$(dirname "$0")" && pwd)"
|
||||
repo="$(cd "$here/.." && pwd)"
|
||||
iso_repo="$repo/../steammachine-cachyos-live-iso"
|
||||
iso_repo="$repo/../steamify-cachyos-live-iso"
|
||||
args=("$@")
|
||||
install=""; window=""; screen=false; loaders=(); suites=(); want_boot=false
|
||||
for a in "$@"; do
|
||||
|
||||
Reference in new issue
Block a user