From b550a02c83d36faeea3c9f9ccacd0497b4b718df Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 8 Feb 2022 13:53:53 +0100
Subject: [PATCH] Branch F36 from rawhide

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 config.ini                | 4 ++--
 fedora-36-updates.repo    | 7 +++++++
 fedora-36.repo            | 7 +++++++
 fedora-base.yaml          | 4 ++--
 fedora-common-ostree.yaml | 2 +-
 fedora-deepin.yaml        | 4 ++--
 fedora-kinoite.yaml       | 4 ++--
 fedora-lxqt.yaml          | 4 ++--
 fedora-mate.yaml          | 4 ++--
 fedora-pantheon.yaml      | 4 ++--
 fedora-rawhide.repo       | 7 -------
 fedora-silverblue.yaml    | 4 ++--
 fedora-xfce.yaml          | 4 ++--
 13 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 fedora-36-updates.repo
 create mode 100644 fedora-36.repo
 delete mode 100644 fedora-rawhide.repo

diff --git a/config.ini b/config.ini
index 35a9cc7..4a7200f 100644
--- a/config.ini
+++ b/config.ini
@@ -10,10 +10,10 @@ os_pretty_name = Fedora ostree Workstation
 tree_name   = workstation
 tree_file   = %(os_name)s-%(tree_name)s.json
 arch        = x86_64
-release     = rawhide
+release     = 36
 ref         = %(os_name)s/%(release)s/%(arch)s/%(tree_name)s
 # Force use of a closeish and fastish HTTP mirror, so that the HTTP proxy works
-yum_baseurl = https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/
+yum_baseurl = https://download.fedoraproject.org/pub/fedora/linux/development/36/Everything/%(arch)s/os/
 # lorax_additional_repos = http://127.0.0.1/fedora-atomic/local-overrides
 # lorax_include_packages = fedora-productimg-atomic
 docker_os_name = fedora
diff --git a/fedora-36-updates.repo b/fedora-36-updates.repo
new file mode 100644
index 0000000..65430f6
--- /dev/null
+++ b/fedora-36-updates.repo
@@ -0,0 +1,7 @@
+[fedora-36-updates]
+name=Fedora 36 $basearch Updates
+#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/36/$basearch/os/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f36&arch=$basearch
+enabled=1
+gpgcheck=1
+metadata_expire=1d
diff --git a/fedora-36.repo b/fedora-36.repo
new file mode 100644
index 0000000..ff715d3
--- /dev/null
+++ b/fedora-36.repo
@@ -0,0 +1,7 @@
+[fedora-36]
+name=Fedora 36 $basearch
+#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/36/$basearch/os/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=$basearch
+enabled=1
+gpgcheck=1
+metadata_expire=1d
diff --git a/fedora-base.yaml b/fedora-base.yaml
index 9c7f93e..a64da3b 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -1,5 +1,5 @@
 include: fedora-common-ostree.yaml
-ref: fedora/rawhide/${basearch}/base
+ref: fedora/36/${basearch}/base
 rojig:
   name: fedora-base
   summary: "Fedora base image for alternative DE"
@@ -15,4 +15,4 @@ packages:
   - xdg-desktop-portal-gtk
 
 repos:
-  - fedora-rawhide
+  - fedora-36
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 3699e5d..628ced3 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -1,4 +1,4 @@
-ref: fedora/rawhide/${basearch}/ostree-base
+ref: fedora/36/${basearch}/ostree-base
 
 automatic_version_prefix: "36"
 mutate-os-release: "36"
diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index f59a315..438df5d 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/36/${basearch}/deepin
 rojig:
   name: fedora-deepin
   summary: "Fedora Deepin base image"
@@ -12,4 +12,4 @@ packages:
   - gnome-software
 
 repos:
-  - fedora-rawhide
+  - fedora-36
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 895390c..21cd401 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/36/${basearch}/kinoite
 rojig:
   name: fedora-kde
   summary: "Fedora Kinoite (KDE) base image"
@@ -23,4 +23,4 @@ exclude-packages:
   - plasma-pk-updates
 
 repos:
-  - fedora-rawhide
+  - fedora-36
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index e9affc8..54e39f4 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/36/${basearch}/lxqt
 rojig:
   name: fedora-lxqt
   summary: "Fedora LXQt base image"
@@ -13,4 +13,4 @@ packages:
   - xdg-desktop-portal-kde
 
 repos:
-  - fedora-rawhide
+  - fedora-36
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index a3ae8f5..d3d5b3f 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/36/${basearch}/mate
 rojig:
   name: fedora-mate
   summary: "Fedora Mate base image"
@@ -14,4 +14,4 @@ exclude-packages:
   - python3-unbound
 
 repos:
-  - fedora-rawhide
+  - fedora-36
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index af4ab1b..04657e7 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/36/${basearch}/pantheon
 rojig:
   name: fedora-pantheon
   summary: "Fedora Pantheon base image"
@@ -10,4 +10,4 @@ packages:
   - fedora-release-ostree-desktop
 
 repos:
-  - fedora-rawhide
+  - fedora-36
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 0819c10..78315c7 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/36/${basearch}/silverblue
 rojig:
   name: fedora-silverblue
   summary: "Fedora Silverblue base image"
@@ -23,4 +23,4 @@ packages:
   - totem-video-thumbnailer
 
 repos:
-  - fedora-rawhide
+  - fedora-36
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 8a756a4..c22f7c2 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/36/${basearch}/xfce
 rojig:
   name: fedora-xfce
   summary: "Fedora XFCE base image"
@@ -11,4 +11,4 @@ packages:
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 repos:
-  - fedora-rawhide
+  - fedora-36