diff --git a/builder.sh b/builder.sh index 99be195c..1f243fd9 100644 --- a/builder.sh +++ b/builder.sh @@ -6,13 +6,12 @@ : ${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 \ @@ -66,9 +65,3 @@ 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" diff --git a/releases/specs/arm64/installcd-stage1.spec b/releases/specs/arm64/installcd-stage1.spec index d309fe80..1d4fcb00 100644 --- a/releases/specs/arm64/installcd-stage1.spec +++ b/releases/specs/arm64/installcd-stage1.spec @@ -8,7 +8,6 @@ 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 209a97bc..e7ee0d06 100644 --- a/releases/specs/arm64/installcd-stage2-minimal.spec +++ b/releases/specs/arm64/installcd-stage2-minimal.spec @@ -7,7 +7,6 @@ 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