From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@buildroot.org
Cc: Sergey Matyukevich <geomatsi@gmail.com>
Subject: Re: [Buildroot] [PATCH] boot/arm-trusted-firmware: set BUILD_STRING to package version
Date: Wed, 08 Nov 2023 14:38:29 +0100 [thread overview]
Message-ID: <87fs1gs6ui.fsf@48ers.dk> (raw)
In-Reply-To: <20231102111447.2163334-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 2 Nov 2023 12:14:46 +0100")
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> TF-A prints a version string at boot which includes the version number as
> specified in the Makefile and additional "build" information, specified by
> the BUILD_STRING parameter:
> https://trustedfirmware-a.readthedocs.io/en/v2.9/getting_started/build-options.html
> BUILD_STRING: Input string for VERSION_STRING, which allows the TF-A build
> to be uniquely identified. Defaults to the current git commit id.
> This is implemented as:
> # Default build string (git branch and commit)
> ifeq (${BUILD_STRING},)
> BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null)
> endif
> https://github.com/ARM-software/arm-trusted-firmware/blob/master/Makefile#L225-L228
> Which is never correct in the context of Buildroot, as the TF-A build
> directory is never a git repo, and git will move up the directory tree and
> possibly and (possibly) pick up the git version of Buildroot instead.
> To fix that, explicitly set BUILD_STRING to the version of the package.
> Pass it before BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES so it
> can still be overridden by the user if needed.
> strings images/tf-a-* | egrep '^v2\.'
> v2.9(debug):2023.08-859-g99d78b52a0
> v2.9(debug):v2.9
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Committed to 2023.02.x and 2023.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2023-11-08 13:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 11:14 [Buildroot] [PATCH] boot/arm-trusted-firmware: set BUILD_STRING to package version Peter Korsgaard
2023-11-08 13:38 ` Peter Korsgaard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fs1gs6ui.fsf@48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@buildroot.org \
--cc=geomatsi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox