From 171686220c5c7042514f2abeaf832150e76a1bbe Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Feb 08 2023 10:12:57 +0000 Subject: Branch F38 from rawhide Signed-off-by: Samyak Jain --- diff --git a/config.ini b/config.ini index 35a9cc7..2fa8b56 100644 --- a/config.ini +++ b/config.ini @@ -10,7 +10,7 @@ os_pretty_name = Fedora ostree Workstation tree_name = workstation tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 -release = rawhide +release = 38 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/ diff --git a/fedora-base.yaml b/fedora-base.yaml index 8fa2ea7..78319e7 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/37/${basearch}/base rojig: name: fedora-base summary: "Fedora base image for alternative DE" @@ -15,6 +15,6 @@ packages: - xdg-desktop-portal-gtk repos: - - fedora-rawhide - # - fedora-38 - # - fedora-38-updates + # - fedora-rawhide + - fedora-38 + - fedora-38-updates diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 7cf1b9a..d473da1 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,4 +1,4 @@ -ref: fedora/rawhide/${basearch}/ostree-base +ref: fedora/38/${basearch}/ostree-base automatic_version_prefix: "38" mutate-os-release: "38" diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 85301ef..c24794e 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/38/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin base image" @@ -12,6 +12,6 @@ packages: - gnome-software repos: - - fedora-rawhide - # - fedora-38 - # - fedora-38-updates + # - fedora-rawhide + - fedora-38 + - fedora-38-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 0c51b54..f5df982 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/38/${basearch}/kinoite rojig: name: fedora-kde summary: "Fedora Kinoite (KDE) base image" @@ -44,6 +44,6 @@ exclude-packages: - tracker-miners repos: - - fedora-rawhide - # - fedora-38 - # - fedora-38-updates + # - fedora-rawhide + - fedora-38 + - fedora-38-updates diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 792f93c..7be6c05 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/38/${basearch}/lxqt rojig: name: fedora-lxqt summary: "Fedora LXQt base image" @@ -13,6 +13,6 @@ packages: - xdg-desktop-portal-kde repos: - - fedora-rawhide - # - fedora-38 - # - fedora-38-updates + # - fedora-rawhide + - fedora-38 + - fedora-38-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml index a461230..084a7f6 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/38/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate base image" @@ -14,6 +14,6 @@ exclude-packages: - python3-unbound repos: - - fedora-rawhide - # - fedora-38 - # - fedora-38-updates + # - fedora-rawhide + - fedora-38 + - fedora-38-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-silverblue.yaml b/fedora-silverblue.yaml index f045c43..b2c93a1 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/38/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" @@ -23,6 +23,6 @@ packages: - totem-video-thumbnailer repos: - - fedora-rawhide - # - fedora-38 - # - fedora-38-updates + # - fedora-rawhide + - fedora-38 + - fedora-38-updates diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml index 9305ee8..95d4a75 100644 --- a/fedora-vauxite.yaml +++ b/fedora-vauxite.yaml @@ -1,5 +1,5 @@ include: xfce-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/vauxite +ref: fedora/38/${basearch}/vauxite rojig: name: fedora-vauxite summary: "Fedora Vauxite (XFCE) base image" @@ -18,6 +18,6 @@ packages: - ristretto - xarchiver repos: - - fedora-rawhide - # - fedora-38 - # - fedora-38-updates + # - fedora-rawhide + - fedora-38 + - fedora-38-updates