From b9dca1c1201da7b76295d7eb901f424f4e9c577f Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Aug 12 2024 10:03:03 +0000 Subject: Branch Fedora 41 from Rawhide Signed-off-by: Samyak Jain --- diff --git a/base-atomic.yaml b/base-atomic.yaml index 80df8b4..423f1a3 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -5,7 +5,7 @@ variables: include: - common.yaml -ref: fedora/rawhide/${basearch}/base +ref: fedora/41/${basearch}/base rojig: name: fedora-base summary: "Fedora Base Atomic" @@ -24,5 +24,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index fd4fe39..25de1a5 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/41/${basearch}/onyx rojig: name: fedora-onyx summary: "Fedora Budgie Atomic" diff --git a/budgie-atomic-ostree.yaml b/budgie-atomic-ostree.yaml index 6ca0f61..60ab9be 100644 --- a/budgie-atomic-ostree.yaml +++ b/budgie-atomic-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml index bb0d843..b82e427 100644 --- a/budgie-atomic.yaml +++ b/budgie-atomic.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index f93cc88..8aa4d51 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/41/${basearch}/cinnamon rojig: name: fedora-cinnamon summary: "Fedora Cinnamon Atomic" @@ -21,5 +21,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index e2ed9c4..bd908b5 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/41/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin Atomic" @@ -22,5 +22,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml deleted file mode 120000 index c2542a6..0000000 --- a/fedora-kinoite.yaml +++ /dev/null @@ -1 +0,0 @@ -kinoite-ostree.yaml \ No newline at end of file diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml new file mode 100644 index 0000000..8b043db --- /dev/null +++ b/fedora-kinoite.yaml @@ -0,0 +1,10 @@ +variables: + bootable_container: false + +include: + - kinoite-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-41 + - fedora-41-updates diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml deleted file mode 120000 index f9283ac..0000000 --- a/fedora-onyx.yaml +++ /dev/null @@ -1 +0,0 @@ -budgie-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml new file mode 100644 index 0000000..98d06d4 --- /dev/null +++ b/fedora-onyx.yaml @@ -0,0 +1,10 @@ +variables: + bootable_container: false + +include: + - budgie-atomic-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-41 + - fedora-41-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/fedora-sericea.yaml b/fedora-sericea.yaml deleted file mode 120000 index 0728c62..0000000 --- a/fedora-sericea.yaml +++ /dev/null @@ -1 +0,0 @@ -sway-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml new file mode 100644 index 0000000..59fde57 --- /dev/null +++ b/fedora-sericea.yaml @@ -0,0 +1,10 @@ +variables: + bootable_container: false + +include: + - sway-atomic-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-41 + - fedora-41-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml deleted file mode 120000 index 0c5ed77..0000000 --- a/fedora-silverblue.yaml +++ /dev/null @@ -1 +0,0 @@ -silverblue-ostree.yaml \ No newline at end of file diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml new file mode 100644 index 0000000..7131d3e --- /dev/null +++ b/fedora-silverblue.yaml @@ -0,0 +1,10 @@ +variables: + bootable_container: false + +include: + - silverblue-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-41 + - fedora-41-updates diff --git a/kinoite-common.yaml b/kinoite-common.yaml index de68447..de9e6a2 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -5,7 +5,7 @@ include: - common.yaml - kinoite-packages.yaml -ref: fedora/rawhide/${basearch}/kinoite +ref: fedora/41/${basearch}/kinoite rojig: name: fedora-kde summary: "Fedora Kinoite" diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 155d4d6..ed82feb 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -6,7 +6,7 @@ include: - common.yaml - kinoite-mobile-packages.yaml -ref: fedora/rawhide/${basearch}/kinoite-mobile +ref: fedora/41/${basearch}/kinoite-mobile rojig: name: fedora-kde summary: "Fedora Kinoite Mobile" @@ -46,5 +46,5 @@ exclude-packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml index 5951235..a856e2c 100644 --- a/kinoite-ostree.yaml +++ b/kinoite-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/kinoite.yaml b/kinoite.yaml index 3101586..c96ab7e 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index 8721e92..284f4f4 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/41/${basearch}/lazurite rojig: name: fedora-lxqt summary: "Fedora LXQt Atomic" @@ -26,5 +26,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/mate-atomic.yaml b/mate-atomic.yaml index eb36df4..3072784 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/41/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate Atomic" @@ -24,5 +24,5 @@ exclude-packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/silverblue-common.yaml b/silverblue-common.yaml index 915e44b..f95f841 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/41/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue" diff --git a/silverblue-ostree.yaml b/silverblue-ostree.yaml index ac1dd0c..4b77901 100644 --- a/silverblue-ostree.yaml +++ b/silverblue-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/silverblue.yaml b/silverblue.yaml index eaba398..52d1648 100644 --- a/silverblue.yaml +++ b/silverblue.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 16f3911..cc997d1 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/41/${basearch}/sericea rojig: name: fedora-sericea summary: "Fedora Sway Atomic" diff --git a/sway-atomic-ostree.yaml b/sway-atomic-ostree.yaml index b09226e..e5a65c4 100644 --- a/sway-atomic-ostree.yaml +++ b/sway-atomic-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/sway-atomic.yaml b/sway-atomic.yaml index 89c7c18..30ca2f8 100644 --- a/sway-atomic.yaml +++ b/sway-atomic.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index d05aa2f..2163765 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/41/${basearch}/vauxite rojig: name: fedora-vauxite summary: "Fedora XFCE Atomic" @@ -22,5 +22,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + - fedora-41 + - fedora-41-updates