From d5a0efd3ee6e73ee313bc2aaaea30260949a1d28 Mon Sep 17 00:00:00 2001 From: sharpenedblade Date: Mon, 6 Nov 2023 17:51:44 -0800 Subject: [PATCH] Add KDE and server ISOs --- .github/workflows/build-iso.yml | 4 ++-- README.md | 2 ++ build.sh | 36 +++++++++++++++++++-------------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml index 38aeaf5..6bbc300 100644 --- a/.github/workflows/build-iso.yml +++ b/.github/workflows/build-iso.yml @@ -44,11 +44,11 @@ jobs: uses: actions/upload-artifact@v3 with: name: fedora-iso - path: ./_output/* + path: builddir/iso/ - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: files: | - _output/*.iso + builddir/iso/*.iso diff --git a/README.md b/README.md index 873d1f5..3e26c89 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # t2linux-fedora-iso A instalation ISO for Fedora on T2 macs. It uses the kernel patches from the [t2linux](https://t2linux.org) project. Read the [kernel README](https://github.com/t2linux/fedora-kernel/) for more information. Make sure to download the `.iso` or `.iso.0x` file. +Combine the split ISOs with `cat name_of_iso_here.iso.* > full.iso`. + ## Disclaimer This project is not officially provided or supported by the Fedora Project. The official Fedora software is available at [https://fedoraproject.org/](https://fedoraproject.org/). This project is not related to Fedora in any way. diff --git a/build.sh b/build.sh index 59e0091..d1cf5c4 100755 --- a/build.sh +++ b/build.sh @@ -1,19 +1,25 @@ #!/usr/bin/bash -cd /repo/fedora-kickstarts -cp -rfv /repo/*.ks . -echo '%include t2linux-fedora-common.ks' >> fedora-live-workstation.ks -sudo ksflatten -c fedora-live-workstation.ks -o flat.ks +kickstarts=( "fedora-live-workstation" "fedora-live-kde" "fedora-disk-server") -livemedia-creator \ - --ks flat.ks \ - --no-virt \ - --resultdir /var/lmc \ - --project Fedora-Workstation-Live-t2linux \ - --make-iso \ - --volid Fedora-WS-Live-t2-39-0.1.5 \ - --iso-only \ - --iso-name Fedora-Workstation-Live-t2linux-x86_64-39-0.1.5.iso \ - --releasever 39 +cp -rfv /repo/*.ks /repo/fedora-kickstarts -mkdir -p _output && mv /var/lmc/*.iso _output/ +for ks in "${kickstarts[@]}"; do + cd /repo/fedora-kickstarts + echo '%include t2linux-fedora-common.ks' >> "$ks.ks" + sudo ksflatten -c "$ks.ks" -o "$ks-flat.ks" + livemedia-creator \ + --make-iso \ + --iso-only \ + --no-virt \ + --resultdir /var/lmc \ + --releasever 39 \ + --ks "$ks-flat.ks" \ + --project $ks-t2linux \ + --volid $ks-t2-39-0.1.5 \ + --iso-name $ks-t2linux-x86_64-39-0.1.5.iso +done + +mkdir -p /repo/builddir/iso && cd /repo/builddir/iso +mv /var/lmc/*.iso . +find ./*.iso -size +2G -exec split -b 1999M -x {} {}. \; -delete