From 4ed92601666d707ecfc112b47b1892bca9e3b46a Mon Sep 17 00:00:00 2001 From: James Calligeros Date: Fri, 30 Aug 2024 03:09:59 +0000 Subject: [PATCH 1/2] builder: copy finalised build to destination Signed-off-by: James Calligeros --- builder.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/builder.sh b/builder.sh index 1f243fd9..99be195c 100644 --- a/builder.sh +++ b/builder.sh @@ -6,12 +6,13 @@ : ${BUILDDIR:="${BASEDIR}/builds"} : ${VER:=$(date +'%Y%m%d')} : ${GENTOO_MIRROR:="https://mirror.aarnet.edu.au/pub/gentoo/"} +: ${DESTDIR:="/path/to/dest"} echo "Trying to enter ${BASEDIR}..." cd "${BASEDIR}" echo "Cleaning out ${BASEDIR}..." -#rm -rf "${BASEDIR}"/* +rm -rf "${BASEDIR}"/* echo "Cloning Gentoo Asahi releng files..." git clone https://github.com/chadmed/gentoo-asahi-releng \ @@ -65,3 +66,9 @@ catalyst -f installcd-stage1.spec echo "Building stage2 ISO..." catalyst -f installcd-stage2-minimal.spec + +cp -r "${BASEDIR}"/builds/23.0-default/install-arm64-asahi-"${VER}".i* "${DESTDIR}"/. +ln -sf "${DESTDIR}/install-arm64-asahi-${VER}.iso" "${DESTDIR}/install-arm64-asahi-latest.iso" +ln -sf "${DESTDIR}/install-arm64-asahi-${VER}.iso.sha256" "${DESTDIR}/install-arm64-asahi-latest.iso.sha256" +ln -sf "${DESTDIR}/install-arm64-asahi-${VER}.iso.CONTENTS.gz" "${DESTDIR}/install-arm64-asahi-latest.iso.CONTENTS.gz" +ln -sf "${DESTDIR}/install-arm64-asahi-${VER}.iso.DIGESTS" "${DESTDIR}/install-arm64-asahi-latest.iso.DIGESTS" From 93e91b45da48a3358d3fb0097c112ebb5bae4dfe Mon Sep 17 00:00:00 2001 From: James Calligeros Date: Fri, 30 Aug 2024 03:11:26 +0000 Subject: [PATCH 2/2] specs: allow setting of distcc hosts Signed-off-by: James Calligeros --- releases/specs/arm64/installcd-stage1.spec | 1 + releases/specs/arm64/installcd-stage2-minimal.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/releases/specs/arm64/installcd-stage1.spec b/releases/specs/arm64/installcd-stage1.spec index 1d4fcb00..d309fe80 100644 --- a/releases/specs/arm64/installcd-stage1.spec +++ b/releases/specs/arm64/installcd-stage1.spec @@ -8,6 +8,7 @@ source_subpath: @STAGE3_PATH@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos repos: @ASAHIOVERLAY@ # Clone chadmed/asahi-overlay (GitHub) and point this to it +distcc_hosts: @DISTCC_HOSTS@ livecd/use: alsa diff --git a/releases/specs/arm64/installcd-stage2-minimal.spec b/releases/specs/arm64/installcd-stage2-minimal.spec index e7ee0d06..209a97bc 100644 --- a/releases/specs/arm64/installcd-stage2-minimal.spec +++ b/releases/specs/arm64/installcd-stage2-minimal.spec @@ -7,6 +7,7 @@ snapshot_treeish: @TREEISH@ source_subpath: 23.0-default/livecd-stage1-arm64-@TIMESTAMP@.tar.xz portage_confdir: @REPO_DIR@/releases/portage/isos repos: @ASAHIOVERLAY@ # Clone chadmed/asahi-overlay (GitHub) and point this to it +distcc_hosts: @DISTCC_HOSTS@ livecd/bootargs: dokeymap livecd/fstype: squashfs