From 5dc3439ffa5e1d34a84938a93ddb1237b9de5b14 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 13 Nov 2024 17:38:41 -0500
Subject: [PATCH 1/2] cmd-build: skip-compression on manifest json

I noticed this when running some build tests:

```
+ cosa compress
Targeting build: 41.20241112.20.0
Compressing: builds/41.20241112.20.0/x86_64
INFO - Running command: ['xz', '-c9', '-T6', 'builds/41.20241112.20.0/x86_64/fedora-coreos-41.20241112.20.0-ostree.x86_64-manifest.json']
Compressed: fedora-coreos-41.20241112.20.0-ostree.x86_64-manifest.json.xz
```

Which I don't think we really want.

Also let's make the spacing the same as the previous entry in the JSON.
---
 src/cmd-build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cmd-build b/src/cmd-build
index 3099ac6be3..33769498ca 100755
--- a/src/cmd-build
+++ b/src/cmd-build
@@ -571,9 +571,10 @@ cat > tmp/images.json <<EOF
         "skip-compression": true
     },
     "oci-manifest": {
-      "path": "${ostree_oci_manifest_path}",
-      "sha256": "${ostree_oci_manifest_sha256}",
-      "size": ${ostree_oci_manifest_size}
+        "path": "${ostree_oci_manifest_path}",
+        "sha256": "${ostree_oci_manifest_sha256}",
+        "size": ${ostree_oci_manifest_size},
+        "skip-compression": true
     }
   }
 }

From 6f74c7106fd12e1f0e11f217b1e92e90857df3db Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 13 Nov 2024 17:38:57 -0500
Subject: [PATCH 2/2] cmdlib: bump cache size to 30G

With us now building more in OSBuild in a single run [1] we need
a larger cache2.qcow2 to hold more pipeline outputs concurrently.

[1] https://github.com/coreos/fedora-coreos-pipeline/pull/1055
---
 src/cmdlib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cmdlib.sh b/src/cmdlib.sh
index e1d037d3e7..2466be8470 100755
--- a/src/cmdlib.sh
+++ b/src/cmdlib.sh
@@ -602,7 +602,7 @@ runcompose_extensions() {
 # the cache disk. `runvm_with_cache_snapshot on` will set snapshotting to on.
 runvm_with_cache_snapshot() {
     local snapshot=$1; shift
-    local cache_size=${RUNVM_CACHE_SIZE:-20G}
+    local cache_size=${RUNVM_CACHE_SIZE:-30G}
     # "cache2" has an explicit label so we can find it in qemu easily
     if [ ! -f "${workdir}"/cache/cache2.qcow2 ]; then
         qemu-img create -f qcow2 cache2.qcow2.tmp "$cache_size"