From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/2] package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV
Date: Sat, 13 Jan 2024 21:30:59 +0100 [thread overview]
Message-ID: <874jfhrn5o.fsf@48ers.dk> (raw)
In-Reply-To: <20240111105621.2321957-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 11 Jan 2024 11:56:19 +0100")
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> A number of packages try to detect if they are running in a git repo and run
> git describe at build time instead of using the hard coded version number if
> it succeed, leading to odd version numbers as they end up picking up the
> Buildroot git version if building inside a Buildroot git checkout, E.G.:
> rauc --version
> rauc 2023.11-562-g9c954953b4+
> This is because rauc builds with meson and uses vcs_tag:
> https://github.com/rauc/rauc/blob/v1.11/meson.build#L168-L171
> https://mesonbuild.com/Reference-manual_functions.html#vcs_tag
> Another example is micropython, where we already work around it by passing
> GIT_DIR=.
> In the context of Buildroot the packages are never built in their own git
> checkout, so pass GIT_DIR=. to ensure git doesn't walk back up the
> directory tree and finds the Buildroot git repo, which fixes the rauc (and
> similar) issues.
>>>> rauc 1.11 Building
> ..
> ninja: Entering directory `/home/peko/source/buildroot/output-rauc/build/rauc-1.11//build'
> [1/29] Generating version.h with a custom command
> fatal: not a git repository: '.'
> cat output-rauc/build/rauc-1.11/build/version.h
> #define PACKAGE_STRING "rauc 1.11"
> #define PACKAGE_VERSION "1.11"
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Committed to 2023.02.x and 2023.11.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2024-01-13 20:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 10:56 [Buildroot] [PATCH 1/2] package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV Peter Korsgaard
2024-01-11 10:56 ` [Buildroot] [PATCH 2/2] package/micropython: drop GIT_DIR=. workaround Peter Korsgaard
2024-01-11 20:08 ` Yann E. MORIN
2024-01-13 20:31 ` Peter Korsgaard
2024-01-21 13:12 ` Yann E. MORIN
2024-01-21 19:29 ` Peter Korsgaard
2024-01-11 20:07 ` [Buildroot] [PATCH 1/2] package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV Yann E. MORIN
2024-01-11 21:10 ` Arnout Vandecappelle via buildroot
2024-01-12 7:14 ` Peter Korsgaard
2024-01-13 20:30 ` Peter Korsgaard [this message]
2024-01-16 15:32 ` Jan Kundrát via buildroot
2024-01-17 7:27 ` Peter Korsgaard
2024-01-18 1:56 ` Jan Kundrát via buildroot
2024-01-26 9:16 ` Mircea Gliga
2024-01-26 9:35 ` Peter Korsgaard
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=874jfhrn5o.fsf@48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@buildroot.org \
/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