From adbfd6c9126fd4fcf83e37bc315346d79deda32a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 15 2024 17:48:30 +0000 Subject: [PATCH 1/3] fedora-common-ostree: Use releasever treefile parameter --- diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 1b857f6..1fe0348 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,7 +1,8 @@ ref: fedora/rawhide/${basearch}/ostree-base -automatic_version_prefix: "41." -mutate-os-release: "41" +releasever: 41 +automatic_version_prefix: "${releasever}." +mutate-os-release: "${releasever}" # Default to `bash` in our container, the same as other containers we ship. container-cmd: From a32531bca9fd0af2943a93f2d02151b4000ac454 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 15 2024 17:48:30 +0000 Subject: [PATCH 2/3] README: Update branching instructions for new releasever --- diff --git a/README.md b/README.md index d4882d6..01d45db 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,8 @@ Make a PR similar to ### On Rawhide / main branch ``` -sed -i "s/41/42/g" *.repo fedora-common-ostree.yaml comps-sync.py +sed -i "s/41/42/g" *.repo comps-sync.py +sed -i "s/releasever: 41/releasever: 42/" fedora-common-ostree.yaml mv fedora-41.repo fedora-42.repo mv fedora-41-updates.repo fedora-42-updates.repo sed -i "s/42/42/g" README.md From 75c28076fc122d1df507b4ed071eefb4c54c7ce4 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 15 2024 17:50:19 +0000 Subject: [PATCH 3/3] fedora-common-ostree: Use new parameter name for automatic-version-prefix --- diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 1fe0348..efadd76 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,7 +1,7 @@ ref: fedora/rawhide/${basearch}/ostree-base releasever: 41 -automatic_version_prefix: "${releasever}." +automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" # Default to `bash` in our container, the same as other containers we ship.