David Runge pushed to branch main at Arch Linux / Packaging / Packages / linux-rt
Commits: 625275a3 by David Runge at 2026-05-18T15:14:24+02:00 Derive the upstream version from Makefile and localversion-rt upon tag When tagging a version of the rebased real-time patch set, we have to derive the preliminary tag from the `Makefile` _and_ the `localversion-rt` file. Only later on in the process, we remove the `localversion-rt` file, when generating our own `LOCALVERSION` string. Signed-off-by: David Runge <[email protected]> - - - - - 1 changed file: - .justfile Changes: ===================================== .justfile ===================================== @@ -105,9 +105,9 @@ derive-distribution-tag-from-makefile: derive-project-name: basename "$(just git rev-parse --show-toplevel)" -# Derives the current upstream tag (e.g. `v7.0.1-rt2`) from the current version of the source repository's Makefile. +# Derives the current upstream tag (e.g. `v7.0.1-rt2`) from the current version of the source repository's `Makefile` and `localversion-rt` file. [private] -derive-project-tag-from-makefile: +derive-project-tag-from-makefile-and-localversion: #!/usr/bin/env bash set -euo pipefail @@ -116,12 +116,23 @@ derive-project-tag-from-makefile: printf "No current tag found!\n" >&2 exit 1 fi - if [[ "$tag" == *rt*-* ]]; then - printf 'The preliminary tag %s contains a distribution version identifier after the "rt" identifier!\n' "$tag" >&2 + if [[ "$tag" == *rt* ]]; then + printf 'The Makefile already contains the "rt" identifier (preliminary tag "%s")!\n' "$tag" >&2 exit 1 fi - printf '%s\n' "$tag" + file="$(just get-source-dir)/localversion-rt" + if [[ ! -f "$file" ]]; then + printf 'The file "%s" does not exist!\n' "$file" >&2 + exit 1 + fi + rt_id="$(<"$file")" + if [[ "$rt_id" != *rt* ]]; then + printf 'The file "%s" does not contain an "rt" identifier, but "%s" instead!\n' "$file" "$rt_id" >&2 + exit 1 + fi + + printf '%s\n' "$tag$rt_id" # Derives the tag used by the upstream (kernel) project from a (full) distribution tag (e.g. `v7.0.0-rt2-arch1` or `v7.0.1-rt2-arch2`). [private] @@ -244,7 +255,7 @@ tag-rt: just ensure-command git - tag="$(just derive-project-tag-from-makefile)" + tag="$(just derive-project-tag-from-makefile-and-localversion)" just ensure-tag-does-not-exist "$tag" printf "Creating tag %s\n" "$tag" View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/linux-rt/-/commit/625275a34360071c522ac83dd58dbfc13f7a6e9e -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/linux-rt/-/commit/625275a34360071c522ac83dd58dbfc13f7a6e9e You're receiving this email because of your account on gitlab.archlinux.org. Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications | Help: https://gitlab.archlinux.org/help
