From 9c5e04561b45114eb04ab4df25c3aec32dfaf906 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 15 Sep 2024 17:26:32 +0200 Subject: [PATCH] docs/manual/manual.adoc: unbreak BR2_VERSION logic The behaviour of asciidoc on my laptop (Debian 10.2.0-1) changed at the end of last year, causing the BR2_VERSION logic to no longer work: grep 'manual generated' buildroot-2023.02.*/docs/manual/manual.text buildroot-2023.02.6/docs/manual/manual.text:Buildroot 2023.02.6 manual generated on 2023-10-16 08:41:26 UTC from buildroot-2023.02.7/docs/manual/manual.text:Buildroot ${BR2_VERSION%%-git*} manual generated on 2023-11-14 buildroot-2023.02.8/docs/manual/manual.text:Buildroot ${BR2_VERSION%%-git*} manual generated on 2023-12-04 We don't really NEED to strip the -git suffix; indeed, for a git tag, there would be not -git suffix, while for any other commit there will be one and we want to see it (e.g. in the nightly manual, or on a development branch locally). So just drop that to unbreak the version output. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: explain why wew don't want to drop it] Signed-off-by: Yann E. MORIN (cherry picked from commit ec270a08150980e37e36eeb43f4471ed8f7d662e) Signed-off-by: Peter Korsgaard --- docs/manual/manual.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/manual.adoc b/docs/manual/manual.adoc index 31d5f80bae..cfcc3e52a9 100644 --- a/docs/manual/manual.adoc +++ b/docs/manual/manual.adoc @@ -4,7 +4,7 @@ = The Buildroot user manual :toc: -Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate} +Buildroot {sys:echo $BR2_VERSION} manual generated on {localdate} {localtime} from git revision {sys:git rev-parse --short HEAD} The Buildroot manual is written by the Buildroot developers.