From 473b5fea5223527dcbe087fa97c8d87890a95209 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Fri, 27 Sep 2024 23:14:17 +0100 Subject: [PATCH 1/2] chore: rebase to tier-x and dedupe packages --- desktops/base/fedora-common-ostree.yaml | 4 ---- fedora-bootc-atomic-base.yaml | 4 ++-- fedora-bootc-atomic-budgie.yaml | 4 ++-- fedora-bootc-atomic-cinnamon.yaml | 4 ++-- fedora-bootc-atomic-deepin.yaml | 4 ++-- fedora-bootc-atomic-kinoite.yaml | 4 ++-- fedora-bootc-atomic-lxqt.yaml | 4 ++-- fedora-bootc-atomic-mate.yaml | 4 ++-- fedora-bootc-atomic-silverblue.yaml | 4 ++-- fedora-bootc-atomic-sway.yaml | 4 ++-- fedora-bootc-atomic-xfce.yaml | 4 ++-- 11 files changed, 20 insertions(+), 24 deletions(-) diff --git a/desktops/base/fedora-common-ostree.yaml b/desktops/base/fedora-common-ostree.yaml index 30597d8..c139500 100644 --- a/desktops/base/fedora-common-ostree.yaml +++ b/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 diff --git a/fedora-bootc-atomic-base.yaml b/fedora-bootc-atomic-base.yaml index f965658..132f93e 100644 --- a/fedora-bootc-atomic-base.yaml +++ b/fedora-bootc-atomic-base.yaml @@ -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 diff --git a/fedora-bootc-atomic-budgie.yaml b/fedora-bootc-atomic-budgie.yaml index 41b6d53..2c9a6a0 100644 --- a/fedora-bootc-atomic-budgie.yaml +++ b/fedora-bootc-atomic-budgie.yaml @@ -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 diff --git a/fedora-bootc-atomic-cinnamon.yaml b/fedora-bootc-atomic-cinnamon.yaml index 1c7758a..bcb4e39 100644 --- a/fedora-bootc-atomic-cinnamon.yaml +++ b/fedora-bootc-atomic-cinnamon.yaml @@ -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 diff --git a/fedora-bootc-atomic-deepin.yaml b/fedora-bootc-atomic-deepin.yaml index 00666c6..bd365aa 100644 --- a/fedora-bootc-atomic-deepin.yaml +++ b/fedora-bootc-atomic-deepin.yaml @@ -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 diff --git a/fedora-bootc-atomic-kinoite.yaml b/fedora-bootc-atomic-kinoite.yaml index d708230..c23e91b 100644 --- a/fedora-bootc-atomic-kinoite.yaml +++ b/fedora-bootc-atomic-kinoite.yaml @@ -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 diff --git a/fedora-bootc-atomic-lxqt.yaml b/fedora-bootc-atomic-lxqt.yaml index c2efa1c..ea0c06e 100644 --- a/fedora-bootc-atomic-lxqt.yaml +++ b/fedora-bootc-atomic-lxqt.yaml @@ -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 diff --git a/fedora-bootc-atomic-mate.yaml b/fedora-bootc-atomic-mate.yaml index 86ff49b..6edb43a 100644 --- a/fedora-bootc-atomic-mate.yaml +++ b/fedora-bootc-atomic-mate.yaml @@ -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 diff --git a/fedora-bootc-atomic-silverblue.yaml b/fedora-bootc-atomic-silverblue.yaml index 2c7ef08..a4738ca 100644 --- a/fedora-bootc-atomic-silverblue.yaml +++ b/fedora-bootc-atomic-silverblue.yaml @@ -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 diff --git a/fedora-bootc-atomic-sway.yaml b/fedora-bootc-atomic-sway.yaml index df9b673..9c9b42e 100644 --- a/fedora-bootc-atomic-sway.yaml +++ b/fedora-bootc-atomic-sway.yaml @@ -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 diff --git a/fedora-bootc-atomic-xfce.yaml b/fedora-bootc-atomic-xfce.yaml index 423b24d..036f906 100644 --- a/fedora-bootc-atomic-xfce.yaml +++ b/fedora-bootc-atomic-xfce.yaml @@ -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 From c1b9388bb8469190cf2f1dacaa5a5fee18dc7de3 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Fri, 27 Sep 2024 23:22:20 +0100 Subject: [PATCH 2/2] feat: update to fedora 41 --- .github/workflows/build-40.yaml | 2 +- .gitmodules | 2 +- Containerfile | 2 +- fedora-bootc-atomic-base.yaml | 2 +- fedora-bootc-atomic-budgie.yaml | 2 +- fedora-bootc-atomic-cinnamon.yaml | 2 +- fedora-bootc-atomic-deepin.yaml | 2 +- fedora-bootc-atomic-kinoite.yaml | 2 +- fedora-bootc-atomic-lxqt.yaml | 2 +- fedora-bootc-atomic-mate.yaml | 2 +- fedora-bootc-atomic-silverblue.yaml | 2 +- fedora-bootc-atomic-sway.yaml | 2 +- fedora-bootc-atomic-xfce.yaml | 2 +- fedora-bootc-config.json | 2 +- scripts/comps-sync/Containerfile | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-40.yaml b/.github/workflows/build-40.yaml index d6321d9..f197d67 100644 --- a/.github/workflows/build-40.yaml +++ b/.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: diff --git a/.gitmodules b/.gitmodules index 01db38f..37a9050 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "base-images"] path = base-images url = https://gitlab.com/fedora/bootc/base-images - branch = f40 + branch = f41 diff --git a/Containerfile b/Containerfile index 5a196ac..7545597 100644 --- a/Containerfile +++ b/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 diff --git a/fedora-bootc-atomic-base.yaml b/fedora-bootc-atomic-base.yaml index 132f93e..e43cc37 100644 --- a/fedora-bootc-atomic-base.yaml +++ b/fedora-bootc-atomic-base.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-budgie.yaml b/fedora-bootc-atomic-budgie.yaml index 2c9a6a0..3ecaa36 100644 --- a/fedora-bootc-atomic-budgie.yaml +++ b/fedora-bootc-atomic-budgie.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-cinnamon.yaml b/fedora-bootc-atomic-cinnamon.yaml index bcb4e39..d934c2f 100644 --- a/fedora-bootc-atomic-cinnamon.yaml +++ b/fedora-bootc-atomic-cinnamon.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-deepin.yaml b/fedora-bootc-atomic-deepin.yaml index bd365aa..fd4851a 100644 --- a/fedora-bootc-atomic-deepin.yaml +++ b/fedora-bootc-atomic-deepin.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-kinoite.yaml b/fedora-bootc-atomic-kinoite.yaml index c23e91b..23e3dd0 100644 --- a/fedora-bootc-atomic-kinoite.yaml +++ b/fedora-bootc-atomic-kinoite.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-lxqt.yaml b/fedora-bootc-atomic-lxqt.yaml index ea0c06e..ba7fb1b 100644 --- a/fedora-bootc-atomic-lxqt.yaml +++ b/fedora-bootc-atomic-lxqt.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-mate.yaml b/fedora-bootc-atomic-mate.yaml index 6edb43a..59d00ec 100644 --- a/fedora-bootc-atomic-mate.yaml +++ b/fedora-bootc-atomic-mate.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-silverblue.yaml b/fedora-bootc-atomic-silverblue.yaml index a4738ca..0a170f4 100644 --- a/fedora-bootc-atomic-silverblue.yaml +++ b/fedora-bootc-atomic-silverblue.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-sway.yaml b/fedora-bootc-atomic-sway.yaml index 9c9b42e..d597cdb 100644 --- a/fedora-bootc-atomic-sway.yaml +++ b/fedora-bootc-atomic-sway.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-atomic-xfce.yaml b/fedora-bootc-atomic-xfce.yaml index 036f906..d9e7e79 100644 --- a/fedora-bootc-atomic-xfce.yaml +++ b/fedora-bootc-atomic-xfce.yaml @@ -1,4 +1,4 @@ -releasever: 40 +releasever: 41 variables: distro: "fedora" diff --git a/fedora-bootc-config.json b/fedora-bootc-config.json index 6437ea1..04a990f 100644 --- a/fedora-bootc-config.json +++ b/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": [ diff --git a/scripts/comps-sync/Containerfile b/scripts/comps-sync/Containerfile index 2f3df2c..d7ca986 100644 --- a/scripts/comps-sync/Containerfile +++ b/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