From 0ecc149dfa5d7b48b1557ed6865458b484f097fd Mon Sep 17 00:00:00 2001 From: Patrik Polakovič Date: Feb 04 2025 14:16:45 +0000 Subject: Branch Fedora 42 from Rawhide Signed-off-by: Patrik Polakovič --- diff --git a/base-atomic.yaml b/base-atomic.yaml index 1d6d22a..e266c7c 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -5,7 +5,7 @@ variables: include: - common.yaml -ref: fedora/rawhide/${basearch}/base +ref: fedora/42/${basearch}/base rojig: name: fedora-base summary: "Fedora Base Atomic" @@ -23,6 +23,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index fd4fe39..f1dca65 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -5,7 +5,7 @@ include: - common.yaml - budgie-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/onyx +ref: fedora/42/${basearch}/onyx rojig: name: fedora-onyx summary: "Fedora Budgie Atomic" diff --git a/budgie-atomic-ostree.yaml b/budgie-atomic-ostree.yaml index c1daffc..4b8893c 100644 --- a/budgie-atomic-ostree.yaml +++ b/budgie-atomic-ostree.yaml @@ -6,6 +6,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml index 5ea7ebe..557b77f 100644 --- a/budgie-atomic.yaml +++ b/budgie-atomic.yaml @@ -6,6 +6,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index f0898c4..9fc6611 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -6,7 +6,7 @@ include: - common.yaml - cinnamon-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/cinnamon +ref: fedora/42/${basearch}/cinnamon rojig: name: fedora-cinnamon summary: "Fedora Cinnamon Atomic" @@ -20,6 +20,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/cosmic-atomic.yaml b/cosmic-atomic.yaml index b3ac9be..cabde69 100644 --- a/cosmic-atomic.yaml +++ b/cosmic-atomic.yaml @@ -6,7 +6,7 @@ include: - common.yaml - cosmic-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/cosmic-atomic +ref: fedora/42/${basearch}/cosmic-atomic rojig: name: fedora-cosmic summary: "Fedora COSMIC Atomic" @@ -25,6 +25,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index f903617..72bdd9b 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -6,7 +6,7 @@ include: - common.yaml - deepin-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/deepin +ref: fedora/42/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin Atomic" @@ -21,6 +21,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo deleted file mode 100644 index 30b51c9..0000000 --- a/fedora-rawhide.repo +++ /dev/null @@ -1,6 +0,0 @@ -[fedora-rawhide] -name=Fedora rawhide $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -enabled=1 -gpgcheck=1 -metadata_expire=1d diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 5e6238f..5477fce 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -10,7 +10,7 @@ conditional-include: - kinoite-mobile-packages.yaml # Default to Kinoite (Desktop). Overriden in the Kinoite Mobile manifest -ref: fedora/rawhide/${basearch}/kinoite +ref: fedora/42/${basearch}/kinoite rojig: name: fedora-kde summary: "Fedora Kinoite" diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index da8a731..1c77053 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -6,7 +6,7 @@ include: - kinoite-common.yaml # Override the default Kinoite ref from the kinoite-common.yaml manifest -ref: fedora/rawhide/${basearch}/kinoite-mobile +ref: fedora/42/${basearch}/kinoite-mobile rojig: name: fedora-kde summary: "Fedora Kinoite Mobile" @@ -14,6 +14,5 @@ rojig: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml index 40d94f6..5472a77 100644 --- a/kinoite-ostree.yaml +++ b/kinoite-ostree.yaml @@ -7,6 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/kinoite.yaml b/kinoite.yaml index 74a782b..5faa660 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -7,6 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index 3e6b8ec..3516cc2 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -6,7 +6,7 @@ include: - common.yaml - lxqt-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/lazurite +ref: fedora/42/${basearch}/lazurite rojig: name: fedora-lxqt summary: "Fedora LXQt Atomic" @@ -25,6 +25,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/mate-atomic.yaml b/mate-atomic.yaml index bc5e11f..4f62a9b 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -6,7 +6,7 @@ include: - common.yaml - mate-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/mate +ref: fedora/42/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate Atomic" @@ -23,6 +23,5 @@ exclude-packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/silverblue-common.yaml b/silverblue-common.yaml index 915e44b..92eb7fe 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -5,7 +5,7 @@ include: - common.yaml - silverblue-packages.yaml -ref: fedora/rawhide/${basearch}/silverblue +ref: fedora/42/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue" diff --git a/silverblue-ostree.yaml b/silverblue-ostree.yaml index fcf059a..cbfa27b 100644 --- a/silverblue-ostree.yaml +++ b/silverblue-ostree.yaml @@ -6,6 +6,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/silverblue.yaml b/silverblue.yaml index c3a7fe2..6d03c23 100644 --- a/silverblue.yaml +++ b/silverblue.yaml @@ -6,6 +6,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 16f3911..5044f23 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -5,7 +5,7 @@ include: - common.yaml - sway-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/sericea +ref: fedora/42/${basearch}/sericea rojig: name: fedora-sericea summary: "Fedora Sway Atomic" diff --git a/sway-atomic-ostree.yaml b/sway-atomic-ostree.yaml index cb2d108..8d1f615 100644 --- a/sway-atomic-ostree.yaml +++ b/sway-atomic-ostree.yaml @@ -6,6 +6,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/sway-atomic.yaml b/sway-atomic.yaml index f03d0e4..5f4a507 100644 --- a/sway-atomic.yaml +++ b/sway-atomic.yaml @@ -6,6 +6,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index 241b8a0..4f9b782 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -6,7 +6,7 @@ include: - common.yaml - xfce-atomic-packages.yaml -ref: fedora/rawhide/${basearch}/vauxite +ref: fedora/42/${basearch}/vauxite rojig: name: fedora-vauxite summary: "Fedora XFCE Atomic" @@ -21,6 +21,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + - fedora-42 + - fedora-42-updates