From 4e736cc6bb64ff24e9ea1d66c681526453ccf4ce Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 16 Sep 2024 09:16:50 -0400
Subject: [PATCH 1/2] tier-1: drop unused kdump-aarch64-aws-workaround.yaml

At least in this repo's history, this file doesn't appear to have ever
been used.
---
 tier-1/kdump-aarch64-aws-workaround.yaml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 tier-1/kdump-aarch64-aws-workaround.yaml

diff --git a/tier-1/kdump-aarch64-aws-workaround.yaml b/tier-1/kdump-aarch64-aws-workaround.yaml
deleted file mode 100644
index c198739..0000000
--- a/tier-1/kdump-aarch64-aws-workaround.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file includes a fixup for kdump on aarch64 AWS instances.
-# The issue seems specific to aarch64 AWS instances, but we'll go
-# ahead and apply it across the board for aarch64, since that's
-# the easiest thing to do. Hopefully the upstream issue will get
-# resolved soon.
-postprocess:
-  - |
-    #!/usr/bin/env bash
-    # Remove irqpoll from the list of KDUMP_COMMANDLINE_APPEND. This
-    # causes issues on aarch64 AWS instances.
-    # https://github.com/coreos/fedora-coreos-tracker/issues/1187
-    sed -i -e 's/irqpoll //' /etc/sysconfig/kdump

From 941019576032550ab67471d46eff6fca27a2fc01 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 16 Sep 2024 09:18:05 -0400
Subject: [PATCH 2/2] tier-1: drop redundant tier-0 symlinks

Instead of re-symlinking every tier-0 manifest, just include the tier-0
manifest directly. That way, rpm-ostree will already know to resolve its
manifests within the tier-0 directory.
---
 tier-1/autoupdates.yaml     | 1 -
 tier-1/basic-fixes.yaml     | 1 -
 tier-1/bootc-config.yaml    | 1 -
 tier-1/bootc.yaml           | 1 -
 tier-1/bootupd.yaml         | 1 -
 tier-1/group                | 1 -
 tier-1/grub2-removals.yaml  | 1 -
 tier-1/initramfs.yaml       | 1 -
 tier-1/manifest-tier-0.yaml | 1 -
 tier-1/manifest.yaml        | 2 +-
 tier-1/ostree.yaml          | 1 -
 tier-1/passwd               | 1 -
 12 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 120000 tier-1/autoupdates.yaml
 delete mode 120000 tier-1/basic-fixes.yaml
 delete mode 120000 tier-1/bootc-config.yaml
 delete mode 120000 tier-1/bootc.yaml
 delete mode 120000 tier-1/bootupd.yaml
 delete mode 120000 tier-1/group
 delete mode 120000 tier-1/grub2-removals.yaml
 delete mode 120000 tier-1/initramfs.yaml
 delete mode 120000 tier-1/manifest-tier-0.yaml
 delete mode 120000 tier-1/ostree.yaml
 delete mode 120000 tier-1/passwd

diff --git a/tier-1/autoupdates.yaml b/tier-1/autoupdates.yaml
deleted file mode 120000
index 9c9cbd1..0000000
--- a/tier-1/autoupdates.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/autoupdates.yaml
\ No newline at end of file
diff --git a/tier-1/basic-fixes.yaml b/tier-1/basic-fixes.yaml
deleted file mode 120000
index d3d038c..0000000
--- a/tier-1/basic-fixes.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/basic-fixes.yaml
\ No newline at end of file
diff --git a/tier-1/bootc-config.yaml b/tier-1/bootc-config.yaml
deleted file mode 120000
index 9f9c8ab..0000000
--- a/tier-1/bootc-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/bootc-config.yaml
\ No newline at end of file
diff --git a/tier-1/bootc.yaml b/tier-1/bootc.yaml
deleted file mode 120000
index e4ff72c..0000000
--- a/tier-1/bootc.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/bootc.yaml
\ No newline at end of file
diff --git a/tier-1/bootupd.yaml b/tier-1/bootupd.yaml
deleted file mode 120000
index 6b1db4e..0000000
--- a/tier-1/bootupd.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/bootupd.yaml
\ No newline at end of file
diff --git a/tier-1/group b/tier-1/group
deleted file mode 120000
index f4ca078..0000000
--- a/tier-1/group
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/group
\ No newline at end of file
diff --git a/tier-1/grub2-removals.yaml b/tier-1/grub2-removals.yaml
deleted file mode 120000
index 7fecbad..0000000
--- a/tier-1/grub2-removals.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/grub2-removals.yaml
\ No newline at end of file
diff --git a/tier-1/initramfs.yaml b/tier-1/initramfs.yaml
deleted file mode 120000
index c268845..0000000
--- a/tier-1/initramfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/initramfs.yaml
\ No newline at end of file
diff --git a/tier-1/manifest-tier-0.yaml b/tier-1/manifest-tier-0.yaml
deleted file mode 120000
index 8d5a3e1..0000000
--- a/tier-1/manifest-tier-0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/manifest.yaml
\ No newline at end of file
diff --git a/tier-1/manifest.yaml b/tier-1/manifest.yaml
index 2242b17..420ff54 100644
--- a/tier-1/manifest.yaml
+++ b/tier-1/manifest.yaml
@@ -2,7 +2,7 @@
 recommends: true
 
 include:
-  - manifest-tier-0.yaml
+  - ../tier-0/manifest.yaml
   - bootable-rpm-ostree.yaml
   - podman.yaml
   - firmware.yaml
diff --git a/tier-1/ostree.yaml b/tier-1/ostree.yaml
deleted file mode 120000
index 174954e..0000000
--- a/tier-1/ostree.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/ostree.yaml
\ No newline at end of file
diff --git a/tier-1/passwd b/tier-1/passwd
deleted file mode 120000
index dc62c0b..0000000
--- a/tier-1/passwd
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/passwd
\ No newline at end of file