From 358756b1c7b8cdd2f7fb528648a4242017560a48 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 4 Dec 2024 15:49:42 -0500
Subject: [PATCH] Update to work with COSA a13cf77

In COSA we dropped the compression of hyperv and applehv
in the OSBuild invocation [1] so we update here for that.

In COSA upstream we also merged in patches for Live ISO
building but that hasn't landed in RPMS yet so we surgically
remove it here until those new stages land.

[1] https://github.com/coreos/coreos-assembler/pull/3982
---
 README.md                    |  2 +-
 custom-coreos-disk-images.sh | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 91ed2ea..56fdb14 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ mode and some software installed:
 sudo dnf update -y
 sudo setenforce 0
 sudo sed -i -e 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
-sudo dnf install -y osbuild osbuild-tools osbuild-ostree podman jq xfsprogs e2fsprogs zip
+sudo dnf install -y osbuild osbuild-tools osbuild-ostree podman jq xfsprogs e2fsprogs
 ```
 
 Now you should be able to generate an image with something like:
diff --git a/custom-coreos-disk-images.sh b/custom-coreos-disk-images.sh
index 03ea3bb..9c85c4e 100755
--- a/custom-coreos-disk-images.sh
+++ b/custom-coreos-disk-images.sh
@@ -26,9 +26,9 @@ ARCH=$(arch)
 # A list of supported platforms and the filename suffix of the main
 # artifact that platform produces.
 declare -A SUPPORTED_PLATFORMS=(
-    ['applehv']='raw.gz'
+    ['applehv']='raw'
     ['gcp']='tar.gz'
-    ['hyperv']='vhdx.zip'
+    ['hyperv']='vhdx'
     ['metal4k']='raw'
     ['metal']='raw'
     ['qemu']='qcow2'
@@ -43,7 +43,7 @@ check_rpm() {
 }
 
 check_rpms() {
-    reqs=(osbuild osbuild-tools osbuild-ostree jq xfsprogs e2fsprogs zip)
+    reqs=(osbuild osbuild-tools osbuild-ostree jq xfsprogs e2fsprogs)
     for req in "${reqs[@]}"; do
         check_rpm "$req"
     done
@@ -156,14 +156,21 @@ main() {
 
     # Freeze on specific version for now to increase stability.
     #gitreporef="main"
-    gitreporef="10e397bfd966a60e5e43ec3ad49443c0c9323d74"
+    gitreporef="a13cf77d37aa4c57922e83f3706630ae7e33ac4e"
     gitrepotld="https://raw.githubusercontent.com/coreos/coreos-assembler/${gitreporef}/"
     pushd "${tmpdir}"
     curl -LO --fail "${gitrepotld}/src/runvm-osbuild"
     chmod +x runvm-osbuild
-    for manifest in "coreos.osbuild.${ARCH}.mpp.yaml" platform.{applehv,gcp,hyperv,metal,qemu,qemu-secex}.ipp.yaml; do
+    for manifest in "coreos.osbuild.${ARCH}.mpp.yaml" platform.{applehv,gcp,hyperv,live,metal,qemu,qemu-secex}.ipp.yaml; do
         curl -LO --fail "${gitrepotld}/src/osbuild-manifests/${manifest}"
     done
+    # Temporarily chop off the last two lines from "coreos.osbuild.${ARCH}.mpp.yaml"
+    # that performs inclusion of the `live` platform added in [1]. The stages
+    # haven't been merged upstream yet and won't be in the installed OSBuild
+    # RPMs yet.
+    # [1] https://github.com/coreos/coreos-assembler/pull/3976
+    mv "coreos.osbuild.${ARCH}.mpp.yaml"{,.orig}
+    head -n -2 "coreos.osbuild.${ARCH}.mpp.yaml.orig" > "coreos.osbuild.${ARCH}.mpp.yaml"
     popd