From b9152eb6d9ad58cecf50a19a70c298dc2a12a5b3 Mon Sep 17 00:00:00 2001 From: sharpenedblade Date: Mon, 24 Apr 2023 23:05:47 -0700 Subject: [PATCH] feat: Update to Fedora 38 This removes the patched python3-blivet package because it was upstreamed with Fedora 38. --- .github/workflows/build-iso.yml | 2 +- build.sh | 6 +++--- t2linux-fedora-common.ks | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml index 7198deb..7539b00 100644 --- a/.github/workflows/build-iso.yml +++ b/.github/workflows/build-iso.yml @@ -27,7 +27,7 @@ jobs: --rm \ -t \ -v "$(pwd)":/repo \ - fedora:37 \ + fedora:38 \ /bin/bash -c 'cd /repo && ./build.sh' - name: Artifacts diff --git a/build.sh b/build.sh index b04003c..c422ebb 100755 --- a/build.sh +++ b/build.sh @@ -4,12 +4,12 @@ set -eu -o pipefail dnf install -y --quiet git pykickstart lorax anaconda lorax-lmc-novirt -git clone --quiet --single-branch --depth 1 --branch f37 https://pagure.io/fedora-kickstarts.git /var/fedora-kickstarts +git clone --quiet --single-branch --depth 1 --branch f38 https://pagure.io/fedora-kickstarts.git /var/fedora-kickstarts cd /var/fedora-kickstarts cp -rfv "/repo"/*.ks ./ sudo ksflatten -c t2linux-fedora-workstation-live.ks -o flat.ks -livemedia-creator --ks flat.ks --no-virt --resultdir /var/lmc --project Fedora-Workstation-Live-t2linux --make-iso --volid Fedora-WS-Live-t2-37-2.0.0 --iso-only --iso-name Fedora-Workstation-Live-t2linux-x86_64-37-2.0.0.iso --releasever 37 +livemedia-creator --ks flat.ks --no-virt --resultdir /var/lmc --project Fedora-Workstation-Live-t2linux --make-iso --volid Fedora-WS-Live-t2-38-3.0.0 --iso-only --iso-name Fedora-Workstation-Live-t2linux-x86_64-38-3.0.0.iso --releasever 38 cp -rfv /var/lmc/*.iso "/repo"/ cd "/repo" @@ -18,5 +18,5 @@ mkdir -p ./output if (( $(stat -c%s *.iso) > 199999999 )); then mv *.iso ./output/ else - split -b 2000M -x ./*.iso ./output/Fedora-Workstation-Live-t2linux-x86_64-37-2.0.0.iso. + split -b 2000M -x ./*.iso ./output/Fedora-Workstation-Live-t2linux-x86_64-38-2.0.0.iso. fi diff --git a/t2linux-fedora-common.ks b/t2linux-fedora-common.ks index ad852de..17231e4 100644 --- a/t2linux-fedora-common.ks +++ b/t2linux-fedora-common.ks @@ -7,6 +7,5 @@ bootloader --append="intel_iommu=on iommu=pt pcie_ports=compat" kernel-core*.t2.* t2linux-config t2linux-repo -python3-blivet-3.5.0 %end