From 340844f9600de69147b7b22e6bc99cebd08abf38 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fedoraproject.org>
Date: Thu, 20 Jul 2023 08:31:18 -0700
Subject: [PATCH] Package the json manifest too

---
 .gitignore                      |  2 +
 builder.py                      |  2 +
 make-asahi-installer-package.sh | 74 +++++++++++++++++----------------
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index b6e8979..820feb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ fedora.icns
 installer_data.json
 merged_installer_data.json
 fedora-*.zip
+fedora-*.raw.zst
+fedora-*.json
diff --git a/builder.py b/builder.py
index 250e8ab..9ed3dd1 100755
--- a/builder.py
+++ b/builder.py
@@ -149,10 +149,12 @@ def packageUpload(target):
     package = f"{base}.zip"
     logs_package = f"{base}-logs.zip"
     image = f"{base}.raw.zstd"
+    manifest = f"{base}.json"
 
     uploadToS3(package, f"os/{package}")
     uploadToS3(logs_package, f"os/{logs_package}")
     uploadToS3(image, f"os/{image}")
+    uploadToS3(manifest, f"os/{manifest}")
 
 
 def getManifest():
diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh
index 2da4ffd..ded74f2 100755
--- a/make-asahi-installer-package.sh
+++ b/make-asahi-installer-package.sh
@@ -65,44 +65,48 @@ pushd "${workdir}/package" > /dev/null
 7z a -tzip -r "${basedir}/${package}" .
 popd > /dev/null
 
+cat > "${package}.json" <<EOF
+{
+    "name": "Fedora Linux ${pretty_release}",
+    "default_os_name": "Fedora Linux ${pretty_release}",
+    "boot_object": "m1n1.bin",
+    "next_object": "m1n1/boot.bin",
+    "package": "${package}.zip",
+    "icon": "fedora.icns",
+    "supported_fw": ["12.3", "12.3.1", "12.4"],
+    "partitions": [
+        {
+            "name": "EFI",
+            "type": "EFI",
+            "size": "${esp_size}B",
+            "format": "fat",
+            "volume_id": "${esp_volume_id}",
+            "copy_firmware": true,
+            "copy_installer_data": true,
+            "source": "esp"
+        },
+        {
+            "name": "Boot",
+            "type": "Linux",
+            "size": "${boot_size}B",
+            "image": "boot.img"
+        },
+        {
+            "name": "Root",
+            "type": "Linux",
+            "size": "${root_size}B",
+            "expand": true,
+            "image": "root.img"
+        }
+    ]
+}
+EOF
+
 cat > installer_data.json <<EOF
 {
     "os_list": [
-        {
-            "name": "Fedora Linux ${pretty_release}",
-            "default_os_name": "Fedora Linux ${pretty_release}",
-            "boot_object": "m1n1.bin",
-            "next_object": "m1n1/boot.bin",
-            "package": "${package}.zip",
-            "icon": "fedora.icns",
-            "supported_fw": ["12.3", "12.3.1", "12.4"],
-            "partitions": [
-                {
-                    "name": "EFI",
-                    "type": "EFI",
-                    "size": "${esp_size}B",
-                    "format": "fat",
-                    "volume_id": "${esp_volume_id}",
-                    "copy_firmware": true,
-                    "copy_installer_data": true,
-                    "source": "esp"
-                },
-                {
-                    "name": "Boot",
-                    "type": "Linux",
-                    "size": "${boot_size}B",
-                    "image": "boot.img"
-                },
-                {
-                    "name": "Root",
-                    "type": "Linux",
-                    "size": "${root_size}B",
-                    "expand": true,
-                    "image": "root.img"
-                }
-            ]
-        }
-    ]
+        $(cat "${package}.json")
+     ]
 }
 EOF