Package the json manifest too

.gitignore

@@ -3,3 +3,5 @@ fedora.icns
 installer_data.json
 merged_installer_data.json
 fedora-*.zip
+fedora-*.raw.zst
+fedora-*.json

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():

make-asahi-installer-package.sh

@@ -65,10 +65,8 @@ pushd "${workdir}/package" > /dev/null
 7z a -tzip -r "${basedir}/${package}" .
 popd > /dev/null
 
-cat > installer_data.json <<EOF
+cat > "${package}.json" <<EOF
 {
-    "os_list": [
-        {
     "name": "Fedora Linux ${pretty_release}",
     "default_os_name": "Fedora Linux ${pretty_release}",
     "boot_object": "m1n1.bin",
@@ -101,7 +99,13 @@ cat > installer_data.json <<EOF
             "image": "root.img"
         }
     ]
-        }
+}
+EOF
+
+cat > installer_data.json <<EOF
+{
+    "os_list": [
+        $(cat "${package}.json")
      ]
 }
 EOF