From 2558d82edbb45f660157402626a46e17e248be49 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 19 Nov 2024 09:13:24 -0500
Subject: [PATCH] common: inherit from tier-x on c9s/el9.6+

Inherit from FCOS inheriting from tier-x starting from c9s and el9.6+.

The only major delta here for RHCOS is that FCOS and tier-x turn off
weak deps, but RHCOS historically has enabled them. Would be nice to
also turn them off in RHCOS as well but let's do that move separately
from this one since it additionally requires careful analysis e.g. of
what packages get dropped.
---
 common.yaml            | 8 +++++++-
 manifest-c9s.yaml      | 1 +
 manifest-rhel-9.4.yaml | 1 +
 manifest-rhel-9.6.yaml | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common.yaml b/common.yaml
index d9c9c3fa..4aaae34b 100644
--- a/common.yaml
+++ b/common.yaml
@@ -7,7 +7,6 @@ include:
   - fedora-coreos-config/manifests/networking-tools.yaml
   - fedora-coreos-config/manifests/user-experience.yaml
   - fedora-coreos-config/manifests/shared-workarounds.yaml
-  - fedora-coreos-config/manifests/bootupd.yaml
   # RHCOS owned packages
   - packages-rhcos.yaml
 
@@ -47,10 +46,17 @@ conditional-include:
     include: fedora-coreos-config/manifests/shared-el9.yaml
   - if: osversion == "rhel-9.6"
     include: fedora-coreos-config/manifests/shared-el9.yaml
+  - if: inherit_tier_x == true
+    include: fedora-coreos-config/manifests/tier-x.yaml
+  - if: inherit_tier_x == false
+    include: fedora-coreos-config/manifests/bootupd.yaml
 
 
 documentation: false
 
+# historical default
+recommends: true
+
 postprocess:
   # Mark the OS as of the CoreOS variant.
   # XXX: should be part of a centos/redhat-release subpackage instead
diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml
index 1cc708b9..29f17364 100644
--- a/manifest-c9s.yaml
+++ b/manifest-c9s.yaml
@@ -7,6 +7,7 @@ metadata:
 
 variables:
   osversion: "c9s"
+  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:
diff --git a/manifest-rhel-9.4.yaml b/manifest-rhel-9.4.yaml
index d6276bfd..805b54ca 100644
--- a/manifest-rhel-9.4.yaml
+++ b/manifest-rhel-9.4.yaml
@@ -7,6 +7,7 @@ metadata:
 
 variables:
   osversion: "rhel-9.4"
+  inherit_tier_x: false
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:
diff --git a/manifest-rhel-9.6.yaml b/manifest-rhel-9.6.yaml
index ca2d6350..0184c0cf 100644
--- a/manifest-rhel-9.6.yaml
+++ b/manifest-rhel-9.6.yaml
@@ -7,6 +7,7 @@ metadata:
 
 variables:
   osversion: "rhel-9.6"
+  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include: