From f4b3efccaef50e8d07cd3177b12b000957a7c0f5 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Feb 09 2021 13:55:45 +0000
Subject: [PATCH 1/2] Branching F34 from rawhide


Signed-off-by: Tomas Hrcka <thrcka@redhat.com>

---

diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo
new file mode 100644
index 0000000..e0e937d
--- /dev/null
+++ b/fedora-34-updates.repo
@@ -0,0 +1,6 @@
+[fedora-34-updates]
+name=Fedora 34 $basearch Updates
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f34&arch=$basearch
+enabled=0
+gpgcheck=1
+metadata_expire=1d
\ No newline at end of file
diff --git a/fedora-34.repo b/fedora-34.repo
new file mode 100644
index 0000000..0bb56db
--- /dev/null
+++ b/fedora-34.repo
@@ -0,0 +1,6 @@
+[fedora-f34]
+name=Fedora f34 $basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=f34&arch=$basearch
+enabled=0
+gpgcheck=0
+metadata_expire=1d
diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index a6470e4..11edbe0 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -1,5 +1,5 @@
 include: deepin-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/deepin
+ref: fedora/34/${basearch}/deepin
 rojig:
   name: fedora-deepin
   summary: "Fedora Deepin base image"
@@ -9,4 +9,4 @@ packages:
   - gnome-software
 
 repos:
-  - fedora-rawhide
+  - fedora-34
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 25099f1..94d4be2 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -1,5 +1,5 @@
 include: kde-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/kinoite
+ref: fedora/34/${basearch}/kinoite
 rojig:
   name: fedora-kde
   summary: "Fedora Kinoite (KDE) base image"
@@ -16,4 +16,4 @@ packages:
   - ark
 
 repos:
-  - fedora-rawhide
+  - fedora-34
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index 21ecf2b..eabd25e 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -1,5 +1,5 @@
 include: lxqt-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/lxqt
+ref: fedora/34/${basearch}/lxqt
 rojig:
   name: fedora-lxqt
   summary: "Fedora LXQt base image"
@@ -10,4 +10,4 @@ packages:
   - xdg-desktop-portal-kde
 
 repos:
-  - fedora-rawhide
+  - fedora-34
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index 6080915..beacb4c 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -1,5 +1,5 @@
 include: mate-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/mate
+ref: fedora/34/${basearch}/mate
 rojig:
   name: fedora-mate
   summary: "Fedora Mate base image"
@@ -13,4 +13,4 @@ exclude-packages:
   - python3-unbound
 
 repos:
-  - fedora-rawhide
+  - fedora-34
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index 31327f4..811d7f6 100644
--- a/fedora-pantheon.yaml
+++ b/fedora-pantheon.yaml
@@ -1,5 +1,5 @@
 include: pantheon-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/pantheon
+ref: fedora/34/${basearch}/pantheon
 rojig:
   name: fedora-pantheon
   summary: "Fedora Pantheon base image"
@@ -7,4 +7,4 @@ rojig:
 packages:
 
 repos:
-  - fedora-rawhide
+  - fedora-34
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
deleted file mode 100644
index 5881c94..0000000
--- a/fedora-rawhide.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[fedora-rawhide]
-name=Fedora rawhide $basearch
-#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/$basearch/os/
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-enabled=0
-gpgcheck=0
-metadata_expire=1d
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index f7f810a..f6db615 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -1,5 +1,5 @@
 include: gnome-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/silverblue
+ref: fedora/34/${basearch}/silverblue
 rojig:
   name: fedora-silverblue
   summary: "Fedora Silverblue base image"
@@ -16,4 +16,4 @@ packages:
   - evince-thumbnailer
 
 repos:
-  - fedora-rawhide
+  - fedora-34
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 4655808..088d1ea 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -1,5 +1,5 @@
 include: xfce-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/xfce
+ref: fedora/34/${basearch}/xfce
 rojig:
   name: fedora-xfce
   summary: "Fedora XFCE base image"
@@ -8,4 +8,4 @@ packages:
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 repos:
-  - fedora-rawhide
+  - fedora-34

From e9bafa89fe3e60eb4b10338eb1a3a866b360ef5a Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Feb 09 2021 17:33:57 +0000
Subject: [PATCH 2/2] Fix mirrorlist URL


Signed-off-by: Tomas Hrcka <thrcka@redhat.com>

---

diff --git a/fedora-34.repo b/fedora-34.repo
index 0bb56db..7e3d722 100644
--- a/fedora-34.repo
+++ b/fedora-34.repo
@@ -1,6 +1,6 @@
 [fedora-f34]
 name=Fedora f34 $basearch
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=f34&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch
 enabled=0
 gpgcheck=0
 metadata_expire=1d

