manifests: enable autoprune, re-add qcom dtbs on aarch64 in F39+

Now that we have autopruning ability we can re-add the qcom dtbs on aarch64 that were dropped in coreos/fedora-coreos-tracker#1464 Fixes coreos/fedora-coreos-tracker#1467
dustymabe · May 31, 2023 · 2ec0aa9 · 2ec0aa9
1 parent cea21b3
commit 2ec0aa9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/manifests/aarch64-drop-qcom-dtb-files.yaml b/manifests/aarch64-drop-qcom-dtb-files.yaml
@@ -0,0 +1,8 @@
+# Short term hack to avoid running out of space on aarch64. This should
+# save us about 14M. https://github.com/coreos/fedora-coreos-tracker/issues/1464
+# This can be removed once we are on F39+.
+postprocess:
+  - |
+    #!/usr/bin/env bash
+    set -xeuo pipefail
+    rm -vrf /usr/lib/modules/*aarch64/dtb/qcom/
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
@@ -77,13 +77,6 @@ postprocess:
     ln -sf /usr/sbin/iptables-nft-restore  /etc/alternatives/iptables-restore
     ln -sf /usr/sbin/iptables-nft-save     /etc/alternatives/iptables-save
 
-  # Short term hack to avoid running out of space on aarch64. This should
-  # save us about 14M. https://github.com/coreos/fedora-coreos-tracker/issues/1464
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-    rm -vrf /usr/lib/modules/*aarch64/dtb/qcom/
-
   # Force the ssh-host-keys-migration to happen on every boot
   # to handle cases where someone did a upgrade->rollback->upgrade
   # See https://github.com/coreos/fedora-coreos-tracker/issues/1473

diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
@@ -29,6 +29,18 @@ conditional-include:
     # https://github.com/coreos/fedora-coreos-tracker/issues/1247#issuecomment-1355314761
     # https://github.com/coreos/fedora-coreos-tracker/issues/1495#issuecomment-1561765705
     include: ostree-autoprune.yaml
+  - if:
+      - basearch == "aarch64"
+      - releasever >= 39
+    # In F39+ we will stop removing the qcom dtb files and thus we'll leverage OSTree autopruning
+    # so that we don't run into https://github.com/coreos/fedora-coreos-tracker/issues/1464
+    # again. OSTree autopruning is new so we're selectively enabling it before making it the default.
+    include: ostree-autoprune.yaml
+  - if:
+      - basearch == "aarch64"
+      - releasever == 38
+    # Remove qcom dtb on F38 files since autopruning isn't in place yet
+    include: aarch64-drop-qcom-dtb-files.yaml
 
 ostree-layers:
   - overlay/15fcos