chore: rebase to tier-x and dedupe packages

.github/workflows/build-40.yaml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     env:
       IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/${{ matrix.images }}-bootc
-      FEDORA_VERSION: 40
+      FEDORA_VERSION: 41
     strategy:
       fail-fast: false
       matrix:

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "base-images"]
 	path = base-images
 	url = https://gitlab.com/fedora/bootc/base-images
-	branch = f40
+	branch = f41

Containerfile

@@ -1,4 +1,4 @@
-FROM quay.io/fedora/fedora:40 as repos
+FROM quay.io/fedora/fedora:41 as repos
 
 FROM quay.io/centos-bootc/bootc-image-builder:latest as builder
 ARG MANIFEST=fedora-bootc-full.yaml

desktops/base/fedora-common-ostree.yaml

@@ -8,10 +8,6 @@ include:
   # - bootupd.yaml
 
 packages:
-  # Ensure that we have a kernel. Kernel packages are not in any comps group
-  - kernel
-  - kernel-modules
-  - kernel-modules-extra
   # Do not include "full" Git as it brings in Perl
   - git-core
   # Explicitely add Git docs

fedora-bootc-atomic-base.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Base
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/base/manifest.yaml

fedora-bootc-atomic-budgie.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Budgie
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/budgie/manifest.yaml

fedora-bootc-atomic-cinnamon.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Cinnamon
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/cinnamon/manifest.yaml

fedora-bootc-atomic-deepin.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Deepin
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/deepin/manifest.yaml

fedora-bootc-atomic-kinoite.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Kinoite
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/kinoite/manifest.yaml

fedora-bootc-atomic-lxqt.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic LXQt
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/lxqt/manifest.yaml

fedora-bootc-atomic-mate.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic MATE
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/mate/manifest.yaml

fedora-bootc-atomic-silverblue.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Silverblue
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/silverblue/manifest.yaml

fedora-bootc-atomic-sway.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Sway
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/sway/manifest.yaml

fedora-bootc-atomic-xfce.yaml

@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 41
 variables:
   distro: "fedora"
 
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic XFCE
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/xfce/manifest.yaml

fedora-bootc-config.json

@@ -3,7 +3,7 @@
         "containers.bootc": "1",
         "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder",
         "redhat.id": "fedora",
-        "redhat.version-id": "40"
+        "redhat.version-id": "41"
     },
     "StopSignal": "SIGRTMIN+3",
     "Env": [

scripts/comps-sync/Containerfile

@@ -1,6 +1,6 @@
 # FROM python:3.10
 
-FROM fedora:40
+FROM fedora:41
 
 RUN dnf install -y python3 python3-pip
 RUN dnf install -y rpm-ostree