From 63be95433a4ea820af1fc2671855d41787160f52 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 21 2024 10:45:44 +0000 Subject: [PATCH 1/3] Move dnf exclusion to classic ostree variants only Prepare for DNF5 inclusion in Bootable Containers by moving the exclusion to a manifest that is included only for the classic ostree variants. See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora --- diff --git a/budgie-atomic-ostree.yaml b/budgie-atomic-ostree.yaml index c9bc965..eda47b9 100644 --- a/budgie-atomic-ostree.yaml +++ b/budgie-atomic-ostree.yaml @@ -1,5 +1,6 @@ include: - budgie-atomic-common.yaml + - common-ostree.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/common-ostree.yaml b/common-ostree.yaml new file mode 100644 index 0000000..05f641d --- /dev/null +++ b/common-ostree.yaml @@ -0,0 +1,7 @@ +# Manifest common to classic ostree varaints only and not Bootable Containers + +# We do not include any version of DNF in the classic ostree Atomic Desktops +# See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora +exclude-packages: + - dnf5 + - dnf5-plugins diff --git a/common.yaml b/common.yaml index 0a3a203..2b4d4e5 100644 --- a/common.yaml +++ b/common.yaml @@ -100,11 +100,9 @@ exclude-packages: - gstreamer1-plugin-openh264 - mozilla-openh264 - openh264 - # Always exclude dnf when pulled in as a dependency + # Do not include dnf4. Classic ostree also exclude dnf5 in another manifest - dnf - dnf-plugins-core - - dnf5 - - dnf5-plugins # https://github.com/fedora-silverblue/issue-tracker/issues/517 - grubby - sdubby diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 33fe3b3..ff44126 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -19,12 +19,13 @@ exclude_list_all_regexp: # Common exclude list for all ostree desktop versions exclude_list: core: - # We use rpm-ostree for the host + # Make sure we only pull-in dnf5 and not dnf4 or yum - dnf - dnf-plugins-core + - yum + # We include dnf5 in another manifest, only for bootable containers - dnf5 - dnf5-plugins - - yum # Not sure why this is there at all - dracut-config-rescue # Eh...you can install this in a priv container @@ -36,14 +37,15 @@ exclude_list: # Why? - ncurses workstation-product: - # We use rpm-ostree for the host + # Make sure we only pull-in dnf5 and not dnf4 or yum - dnf - dnf-plugins-core - - dnf5 - - dnf5-plugins - deltarpm - python3-dnf-plugin-system-upgrade - python3-dnf-plugins-core + # We include dnf5 in another manifest, only for bootable containers + - dnf5 + - dnf5-plugins # We use fedora-release-silverblue instead - fedora-release-workstation # Really not worth listing explicitly @@ -58,7 +60,7 @@ exclude_list: # We removed cronie a while ago, should nuke these too - crontabs - at - # This drags in a huge dependency set of dnf bits + # See: https://gitlab.com/fedora/ostree/sig/-/issues/30 - abrt-cli - abrt-desktop - abrt-java-connector diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml index a4ff11d..06b854c 100644 --- a/kinoite-ostree.yaml +++ b/kinoite-ostree.yaml @@ -1,5 +1,6 @@ include: - kinoite-common.yaml + - common-ostree.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/silverblue-ostree.yaml b/silverblue-ostree.yaml index cf98244..cd58c0f 100644 --- a/silverblue-ostree.yaml +++ b/silverblue-ostree.yaml @@ -1,5 +1,6 @@ include: - silverblue-common.yaml + - common-ostree.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/sway-atomic-ostree.yaml b/sway-atomic-ostree.yaml index 5f34982..d0e5eb7 100644 --- a/sway-atomic-ostree.yaml +++ b/sway-atomic-ostree.yaml @@ -1,5 +1,6 @@ include: - sway-atomic-common.yaml + - common-ostree.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: From c65a7a512e1173f11b667d931cdabd5e4bf70c8a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 21 2024 10:49:48 +0000 Subject: [PATCH 2/3] Bootable Containers: Include DNF5 and bootc Add DNF5 and bootc to all Atomic Desktops Bootable Containers. See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora See: https://fedoraproject.org/wiki/Changes/SwitchToDnf5 See: https://pagure.io/fedora-comps/pull-request/960 Kinoite variants are temporarily excluded from this change until the debuginfo plugin is available with DNF5 for DrKonqi. See: https://pagure.io/fedora-kde/SIG/issue/519 --- diff --git a/base-atomic.yaml b/base-atomic.yaml index 5c058c3..d0d3ac7 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -1,5 +1,6 @@ include: - common.yaml + - common-bootable-containers.yaml ref: fedora/rawhide/${basearch}/base rojig: diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml index c9bc965..9dd3d46 100644 --- a/budgie-atomic.yaml +++ b/budgie-atomic.yaml @@ -1,5 +1,6 @@ include: - budgie-atomic-common.yaml + - common-bootable-containers.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index 05ef3de..c3b1f8a 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -1,6 +1,7 @@ include: - common.yaml - cinnamon-atomic-packages.yaml + - common-bootable-containers.yaml ref: fedora/rawhide/${basearch}/cinnamon rojig: diff --git a/common-bootable-containers-kinoite.yaml b/common-bootable-containers-kinoite.yaml new file mode 100644 index 0000000..059db10 --- /dev/null +++ b/common-bootable-containers-kinoite.yaml @@ -0,0 +1,14 @@ +# Manifests includes that are common only to Bootable Containers + +# Temporary Kinoite only manifest +# See https://pagure.io/fedora-kde/SIG/issue/519 + +# Add DNF5 and bootc for Bootable Container images +# See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora +packages: + # - dnf5 + # - dnf5-plugins + - bootc + +# include: +# - dnf5-bootc.yaml diff --git a/common-bootable-containers.yaml b/common-bootable-containers.yaml new file mode 100644 index 0000000..665359f --- /dev/null +++ b/common-bootable-containers.yaml @@ -0,0 +1,3 @@ +# Manifests includes that are common only to Bootable Containers +include: + - dnf5-bootc.yaml diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index 0498455..970456e 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -1,6 +1,7 @@ include: - common.yaml - deepin-atomic-packages.yaml + - common-bootable-containers.yaml ref: fedora/rawhide/${basearch}/deepin rojig: diff --git a/dnf5-bootc.yaml b/dnf5-bootc.yaml new file mode 100644 index 0000000..71fc36a --- /dev/null +++ b/dnf5-bootc.yaml @@ -0,0 +1,6 @@ +# Add DNF5 and bootc for Bootable Container images +# See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora +packages: + - dnf5 + - dnf5-plugins + - bootc diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index f449b87..404309e 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -1,6 +1,7 @@ include: - common.yaml - kinoite-mobile-packages.yaml + - common-bootable-containers-kinoite.yaml ref: fedora/rawhide/${basearch}/kinoite-mobile rojig: diff --git a/kinoite.yaml b/kinoite.yaml index a4ff11d..e77cbc7 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -1,5 +1,6 @@ include: - kinoite-common.yaml + - common-bootable-containers-kinoite.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index cc9bf41..69a405f 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -1,6 +1,7 @@ include: - common.yaml - lxqt-atomic-packages.yaml + - common-bootable-containers.yaml ref: fedora/rawhide/${basearch}/lazurite rojig: diff --git a/mate-atomic.yaml b/mate-atomic.yaml index 4fd935b..667defd 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -1,6 +1,7 @@ include: - common.yaml - mate-atomic-packages.yaml + - common-bootable-containers.yaml ref: fedora/rawhide/${basearch}/mate rojig: diff --git a/silverblue.yaml b/silverblue.yaml index cf98244..6ec63a5 100644 --- a/silverblue.yaml +++ b/silverblue.yaml @@ -1,5 +1,6 @@ include: - silverblue-common.yaml + - common-bootable-containers.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/sway-atomic.yaml b/sway-atomic.yaml index 5f34982..c17b6c3 100644 --- a/sway-atomic.yaml +++ b/sway-atomic.yaml @@ -1,5 +1,6 @@ include: - sway-atomic-common.yaml + - common-bootable-containers.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index 1219e66..64e8898 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -1,6 +1,7 @@ include: - common.yaml - xfce-atomic-packages.yaml + - common-bootable-containers.yaml ref: fedora/rawhide/${basearch}/vauxite rojig: From a08685176f17a08471ac5d2cbc84749e2fd6036c Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 21 2024 10:51:29 +0000 Subject: [PATCH 3/3] Bootable Containers: Enable bootupd With the following issues now fixed: - https://github.com/coreos/bootupd/issues/630 - https://github.com/coreos/bootupd/issues/658 - https://github.com/coreos/bootupd/issues/551 And corresponding support in Anaconda: - https://github.com/rhinstaller/anaconda/pull/5508 We can now (re-)enable bootupd for the bootable containers. After a bit of testing, we will enable it for the classic ostree ones. See: https://gitlab.com/fedora/ostree/sig/-/issues/1 --- diff --git a/common-bootable-containers-kinoite.yaml b/common-bootable-containers-kinoite.yaml index 059db10..c053ccc 100644 --- a/common-bootable-containers-kinoite.yaml +++ b/common-bootable-containers-kinoite.yaml @@ -10,5 +10,6 @@ packages: # - dnf5-plugins - bootc -# include: -# - dnf5-bootc.yaml +include: + # - dnf5-bootc.yaml + - bootupd.yaml diff --git a/common-bootable-containers.yaml b/common-bootable-containers.yaml index 665359f..5237abf 100644 --- a/common-bootable-containers.yaml +++ b/common-bootable-containers.yaml @@ -1,3 +1,4 @@ # Manifests includes that are common only to Bootable Containers include: - dnf5-bootc.yaml + - bootupd.yaml