From 53d2a6b48edbb7a24305d4ae99e052aa14354b9f Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 15:37:39 +0000 Subject: [PATCH 1/5] Re-add Fedora 40 repo configs Those repos are not used in Rawhide builds but they make branching easier. Fixes: 43fa429 correct reponames Fixes: a79ee9b rawhide moves on toward f40 --- diff --git a/fedora-40-updates.repo b/fedora-40-updates.repo new file mode 100644 index 0000000..8dde6e1 --- /dev/null +++ b/fedora-40-updates.repo @@ -0,0 +1,6 @@ +[fedora-40-updates] +name=Fedora 40 $basearch Updates +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f40&arch=$basearch +enabled=1 +gpgcheck=1 +metadata_expire=1d diff --git a/fedora-40.repo b/fedora-40.repo new file mode 100644 index 0000000..c3377d8 --- /dev/null +++ b/fedora-40.repo @@ -0,0 +1,6 @@ +[fedora-40] +name=Fedora 40 $basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-40&arch=$basearch +enabled=1 +gpgcheck=1 +metadata_expire=1d From c043a9dde2ba5937b06fb935ee428e5f000831fa Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 15:37:39 +0000 Subject: [PATCH 2/5] Remove unused config.ini Not used to build Silverblue anymore. --- diff --git a/config.ini b/config.ini deleted file mode 100644 index 35a9cc7..0000000 --- a/config.ini +++ /dev/null @@ -1,19 +0,0 @@ -[DEFAULT] - -outputdir = /home/fedora/workstation-ostree-config -# workdir = os.getcwd() -# srcdir = os.path.join(os.path.dirname(sys.argv[0], '..') -# rpmostree_cache_dir = %(workdir)s/%(release)s/cache -ostree_repo = %(outputdir)s/repo -os_name = fedora-ostree -os_pretty_name = Fedora ostree Workstation -tree_name = workstation -tree_file = %(os_name)s-%(tree_name)s.json -arch = x86_64 -release = rawhide -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/ -# lorax_additional_repos = http://127.0.0.1/fedora-atomic/local-overrides -# lorax_include_packages = fedora-productimg-atomic -docker_os_name = fedora From a74d30a4321793b04c3312d3b6face4334781230 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 15:37:39 +0000 Subject: [PATCH 3/5] Unify manifest whitespace --- diff --git a/fedora-base.yaml b/fedora-base.yaml index f3d57f0..c4c7479 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-base summary: "Fedora base image for alternative DE" license: MIT + packages: # Generic release package for desktop variants - fedora-release diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 9e73373..c37b20d 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-deepin summary: "Fedora Deepin base image" license: MIT + packages: # Generic release package for desktop variants - fedora-release diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 9c8a112..5ff6d13 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-kde summary: "Fedora Kinoite (KDE) base image" license: MIT + packages: - fedora-release-kinoite # Wayland support diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml index d607da5..a75ab05 100644 --- a/fedora-lazurite.yaml +++ b/fedora-lazurite.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-lxqt summary: "Fedora Lazurite (LXQt) base image" license: MIT + packages: # Generic release package for desktop variants - fedora-release diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 926d7c0..b4a69b3 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-mate summary: "Fedora Mate base image" license: MIT + packages: # Generic release sub package for desktop variants - fedora-release-ostree-desktop diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml index 08666bd..e45b48a 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -4,11 +4,14 @@ rojig: name: fedora-onyx summary: "Fedora Onyx (Budgie) base image" license: MIT + packages: - fedora-release-onyx + exclude-packages: # Not needed in Budgie Desktop - tracker - tracker-miners + repos: - fedora-rawhide diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml index 5a82104..a68693f 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -5,10 +5,12 @@ rojig: name: fedora-sericea summary: "Fedora Sericea (Sway) base image" license: MIT + packages: - fedora-release-sericea # explicitly list some defaults - firefox + exclude-packages: # already excluded in comps-sync-exclude-list - PackageKit-glib @@ -16,6 +18,7 @@ exclude-packages: # nothing in the tree would use these - tracker - tracker-miners + repos: - fedora-rawhide # - fedora-40 diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 0a8b08b..1a6994d 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" license: MIT + packages: - fedora-release-silverblue - desktop-backgrounds-gnome diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml index 77f7925..14092fc 100644 --- a/fedora-vauxite.yaml +++ b/fedora-vauxite.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-vauxite summary: "Fedora Vauxite (XFCE) base image" license: MIT + packages: - fedora-release-xfce # Generic release sub package for desktop variants @@ -17,6 +18,7 @@ packages: - mousepad - ristretto - xarchiver + repos: - fedora-rawhide # - fedora-40 From d53a07e22702ad353b94e53b619f56e5b8ae6f82 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 15:37:39 +0000 Subject: [PATCH 4/5] fedora-onyx: Add commented repos for easier branching --- diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml index e45b48a..6ec53be 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -15,3 +15,5 @@ exclude-packages: repos: - fedora-rawhide + # - fedora-40 + # - fedora-40-updates From 49288f89f32a2841c24044cc3d72b55f0461e6bb Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 15:37:39 +0000 Subject: [PATCH 5/5] README: Add instructions for branching --- diff --git a/README.md b/README.md index f36953b..62c3457 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,34 @@ sudo rpm-ostree rebase testremote:fedora/rawhide/x86_64/silverblue # Reboot and test! ``` +## Branching instructions for new Fedora releases + +Follow those steps during the Fedora branch process in Fedora: + +### Fedora Ansible + +Make a PR similar to +[ansible#1318](https://pagure.io/fedora-infra/ansible/pull-request/1318) in +[fedora-infra/ansible](https://pagure.io/fedora-infra/ansible). + +### On Rawhide / main branch + +``` +sed -i "s/40/41/g" *.repo *.yaml comps-sync.py +mv fedora-40.repo fedora-41.repo +mv fedora-40-updates.repo fedora-41-updates.repo +sed -i "s/41/42/g" README.md +sed -i "s/40/41/g" README.md +``` + +### On the new branch (f40) + +``` +rm fedora-rawhide.repo +sed -i "/- fedora-rawhide/d" *.yaml +sed -i "/# - fedora-40/- fedora-40/" *.yaml +``` + ## Historical references Building and testing instructions: