From f22a3b232ce6126ff5155268f70e4aac66207a5c Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 13 2024 13:21:06 +0000 Subject: [PATCH 1/2] README: Update branching instructions for new branch --- diff --git a/README.md b/README.md index 62c3457..04970b1 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,8 @@ sed -i "s/40/41/g" README.md ``` rm fedora-rawhide.repo sed -i "/- fedora-rawhide/d" *.yaml -sed -i "/# - fedora-40/- fedora-40/" *.yaml +sed -i "s/# - fedora-40/- fedora-40/" *.yaml +sed -i "s/ref: fedora\/rawhide/ref: fedora\/40/" *.yaml ``` ## Historical references From 9474d0aece54bc598da885811c39292bc42a3bfe Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Feb 13 2024 15:35:56 +0000 Subject: [PATCH 2/2] Branch Fedora 40 from Rawhide Signed-off-by: Samyak Jain --- diff --git a/fedora-base.yaml b/fedora-base.yaml index c4c7479..41fd26b 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/40/${basearch}/base rojig: name: fedora-base summary: "Fedora base image for alternative DE" @@ -16,6 +16,5 @@ packages: - xdg-desktop-portal-gtk repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml index e3d8743..5c85b92 100644 --- a/fedora-cinnamon.yaml +++ b/fedora-cinnamon.yaml @@ -1,5 +1,5 @@ include: cinnamon-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/cinnamon +ref: fedora/40/${basearch}/cinnamon rojig: name: fedora-cinnamon summary: "Fedora Cinnamon base image" @@ -12,6 +12,5 @@ packages: - gnome-software repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 712a793..c94035e 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,4 +1,4 @@ -ref: fedora/rawhide/${basearch}/ostree-base +ref: fedora/40/${basearch}/ostree-base automatic_version_prefix: "40." mutate-os-release: "40" diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index c37b20d..71ca4f6 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/40/${basearch}/deepin rojig: name: fedora-deepin summary: "Fedora Deepin base image" @@ -13,6 +13,5 @@ packages: - gnome-software repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 1722e88..3961d88 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/40/${basearch}/kinoite rojig: name: fedora-kde summary: "Fedora Kinoite (KDE) base image" @@ -47,6 +47,5 @@ postprocess: echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml index 9ff3cec..66d03cd 100644 --- a/fedora-lazurite.yaml +++ b/fedora-lazurite.yaml @@ -1,5 +1,5 @@ include: lxqt-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/lazurite +ref: fedora/40/${basearch}/lazurite rojig: name: fedora-lxqt summary: "Fedora Lazurite (LXQt) base image" @@ -17,6 +17,5 @@ packages: - xdg-desktop-portal-kde repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml index b4a69b3..0b0b504 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/40/${basearch}/mate rojig: name: fedora-mate summary: "Fedora Mate base image" @@ -15,6 +15,5 @@ exclude-packages: - python3-unbound repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml index 6ec53be..f18e663 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -1,5 +1,5 @@ include: budgie-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/onyx +ref: fedora/40/${basearch}/onyx rojig: name: fedora-onyx summary: "Fedora Onyx (Budgie) base image" @@ -14,6 +14,5 @@ exclude-packages: - tracker-miners repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-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 index a68693f..e12a173 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -1,6 +1,6 @@ include: - sway-desktop-pkgs.yaml -ref: fedora/rawhide/${basearch}/sericea +ref: fedora/40/${basearch}/sericea rojig: name: fedora-sericea summary: "Fedora Sericea (Sway) base image" @@ -20,6 +20,5 @@ exclude-packages: - tracker-miners repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index de250c6..9de805d 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/40/${basearch}/silverblue rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" @@ -31,6 +31,5 @@ exclude-packages: - gnome-software-fedora-langpacks repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml index 2673e18..489b28f 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/40/${basearch}/vauxite rojig: name: fedora-vauxite summary: "Fedora Vauxite (XFCE) base image" @@ -13,6 +13,5 @@ packages: - xdg-desktop-portal-gtk repos: - - fedora-rawhide - # - fedora-40 - # - fedora-40-updates + - fedora-40 + - fedora-40-updates