From 5226617e7cae2dc314922db77f63ab1b302b70ca Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 10:54:49 +0000 Subject: Fix Fedora 39 branching Ensure that both release & update repos are enabled. Only the release repo will be populated in the Fedora infra for now but this avoids downgrades once we enable updates for F39. Remove the now unused Rawhide repo. Keep the README as is. Fixes: fd05565 this is f39 branch, switch from rawhide --- diff --git a/README.md b/README.md index a064893..f36953b 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ sudo ostree admin pin 0 sudo ostree remote refs testremote # Switch to your variant -sudo rpm-ostree rebase testremote:fedora/39/x86_64/silverblue +sudo rpm-ostree rebase testremote:fedora/rawhide/x86_64/silverblue # Reboot and test! ``` diff --git a/fedora-base.yaml b/fedora-base.yaml index f3a6448..e6bc667 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -16,5 +16,4 @@ packages: repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml index a9fb1c2..169cd6d 100644 --- a/fedora-cinnamon.yaml +++ b/fedora-cinnamon.yaml @@ -13,5 +13,4 @@ packages: repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index aa45c8b..be269c9 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -13,5 +13,4 @@ packages: repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 2683460..9c2920a 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -42,5 +42,4 @@ exclude-packages: repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml index 72f9ff6..b2061d4 100644 --- a/fedora-lazurite.yaml +++ b/fedora-lazurite.yaml @@ -18,5 +18,4 @@ packages: repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml index addc52d..205ab51 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -15,5 +15,4 @@ exclude-packages: repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml index 39d386e..ce0b464 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -12,3 +12,4 @@ exclude-packages: - tracker-miners repos: - fedora-39 + - fedora-39-updates diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo deleted file mode 100644 index 697685b..0000000 --- a/fedora-rawhide.repo +++ /dev/null @@ -1,6 +0,0 @@ -[fedora-39] -name=Fedora 39 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=39&arch=$basearch -enabled=1 -gpgcheck=1 -metadata_expire=1d diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml index 30de977..727fb53 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -18,5 +18,4 @@ exclude-packages: - tracker-miners repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 1b74a14..bf9b51d 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -24,5 +24,4 @@ packages: repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml index a29faf7..09d1399 100644 --- a/fedora-vauxite.yaml +++ b/fedora-vauxite.yaml @@ -19,5 +19,4 @@ packages: - xarchiver repos: - fedora-39 - # - fedora-39 - # - fedora-39-updates + - fedora-39-updates