All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] docs/manual/manual.adoc: unbreak BR2_VERSION logic
@ 2024-09-15 15:26 Peter Korsgaard
  2024-09-15 21:37 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Korsgaard @ 2024-09-15 15:26 UTC (permalink / raw)
  To: buildroot

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, so just drop that to unbreak
the version output.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 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.
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH] docs/manual/manual.adoc: unbreak BR2_VERSION logic
  2024-09-15 15:26 [Buildroot] [PATCH] docs/manual/manual.adoc: unbreak BR2_VERSION logic Peter Korsgaard
@ 2024-09-15 21:37 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2024-09-15 21:37 UTC (permalink / raw)
  To: Peter Korsgaard; +Cc: buildroot

Peter, All,

On 2024-09-15 17:26 +0200, Peter Korsgaard spake thusly:
> 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, so just drop that to unbreak
> the version output.

I've added a blurb to explain why we don't need to drop the suffix.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  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.
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-09-15 21:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-15 15:26 [Buildroot] [PATCH] docs/manual/manual.adoc: unbreak BR2_VERSION logic Peter Korsgaard
2024-09-15 21:37 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.