From 6315275af75673c9f8d4f6c431bcad370355174d Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 23 Oct 2024 15:14:06 -0400
Subject: [PATCH] Remove releasever from manifests; add pungi treefile stubs

As agreed in https://gitlab.com/fedora/bootc/tracker/-/issues/39, we're
going to be maintaining the treefile for all Fedora versions in the
`main` branch. Accordingly stop hardcoding releasevers and repos in
the treefiles.

But for now, we're still building the official image in pungi using the
non-container-native path, so add compatibility stubs to not break it.

Coincidentally, this doubles down on the proposed API to build the base
images for different Fedora versions using the `--from` switch. Document
this in the README. But note this doesn't work yet because nothing is
telling rpm-ostree which repos to use or what the releasever should be.
---
 README.md           | 12 ++++++++++++
 fedora-40.yaml      |  7 +++++++
 fedora-41.yaml      |  7 +++++++
 fedora-bootc.yaml   |  4 ----
 fedora-rawhide.yaml |  6 ++++++
 fedora-tier-0.yaml  |  4 ----
 fedora-tier-x.yaml  |  4 ----
 7 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 fedora-40.yaml
 create mode 100644 fedora-41.yaml
 create mode 100644 fedora-rawhide.yaml

diff --git a/README.md b/README.md
index 557e94f..a409473 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,18 @@ podman build --security-opt=label=disable --cap-add=all \
 
 See the `Containerfile` for more details. This builds the default `tier-1` image.
 
+## Fedora versions
+
+By default, the base images are built for Fedora rawhide. To build against a
+different Fedora version, you can override the `FROM` image used to obtain the
+Fedora repos and dnf variables. E.g.:
+
+```
+podman build --from quay.io/fedora/fedora:41 ...
+```
+
+WIP: THIS DOESN'T WORK YET.
+
 ### Deriving
 
 You are of course also free to fork, customize, and build base images yourself.
diff --git a/fedora-40.yaml b/fedora-40.yaml
new file mode 100644
index 0000000..647be5a
--- /dev/null
+++ b/fedora-40.yaml
@@ -0,0 +1,7 @@
+# NB: This treefile is used by the legacy pungi path only to build tier-1. It
+# will be removed in the future.
+releasever: 40
+repos:
+  - fedora
+  - fedora-updates
+include: fedora-bootc.yaml
diff --git a/fedora-41.yaml b/fedora-41.yaml
new file mode 100644
index 0000000..51026d4
--- /dev/null
+++ b/fedora-41.yaml
@@ -0,0 +1,7 @@
+# NB: This treefile is used by the legacy pungi path only to build tier-1. It
+# will be removed in the future.
+releasever: 41
+repos:
+  - fedora
+  - fedora-updates
+include: fedora-bootc.yaml
diff --git a/fedora-bootc.yaml b/fedora-bootc.yaml
index 9b61e19..68dc692 100644
--- a/fedora-bootc.yaml
+++ b/fedora-bootc.yaml
@@ -1,7 +1,3 @@
-releasever: rawhide
-repos:
-  - rawhide
-
 metadata:
   name: fedora-boot-tier1
   summary: Fedora Bootable Tier 1
diff --git a/fedora-rawhide.yaml b/fedora-rawhide.yaml
new file mode 100644
index 0000000..5eec79c
--- /dev/null
+++ b/fedora-rawhide.yaml
@@ -0,0 +1,6 @@
+# NB: This treefile is used by the legacy pungi path only to build tier-1. It
+# will be removed in the future.
+releasever: rawhide
+repos:
+  - fedora-rawhide
+include: fedora-bootc.yaml
diff --git a/fedora-tier-0.yaml b/fedora-tier-0.yaml
index c24d5c4..6cef2a1 100644
--- a/fedora-tier-0.yaml
+++ b/fedora-tier-0.yaml
@@ -1,7 +1,3 @@
-releasever: rawhide
-repos:
-  - rawhide
-
 metadata:
   name: fedora-boot-tier0
   summary: Fedora Bootable Tier 0
diff --git a/fedora-tier-x.yaml b/fedora-tier-x.yaml
index 19e08c8..90a96fd 100644
--- a/fedora-tier-x.yaml
+++ b/fedora-tier-x.yaml
@@ -1,7 +1,3 @@
-releasever: rawhide
-repos:
-  - rawhide
-
 metadata:
   name: fedora-boot-tier-x
   summary: Fedora Bootable Tier X