* [Buildroot] [PATCH] package/environment-setup: do not export GIT_DIR
@ 2024-01-26 9:34 Peter Korsgaard
2024-01-27 20:09 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Peter Korsgaard @ 2024-01-26 9:34 UTC (permalink / raw)
To: buildroot
Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST,
TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in
TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused
when building in a subdir of the Buildroot git repo.
This unfortunately also causes git commands to fail when
output/host/environment-setup is sourced:
git status
fatal: not a git repository: '.'
So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating
environment-setup.
Reported-by: Mircea Gliga <gliga.mircea@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/environment-setup/environment-setup.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk
index 29ec5a9a95..069ee25f9f 100644
--- a/package/environment-setup/environment-setup.mk
+++ b/package/environment-setup/environment-setup.mk
@@ -8,7 +8,7 @@ ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup
define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE)
- for var in $(TARGET_CONFIGURE_OPTS); do \
+ for var in $(filter-out GIT_DIR=%,$(TARGET_CONFIGURE_OPTS)); do \
printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \
done
printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
--
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] package/environment-setup: do not export GIT_DIR
2024-01-26 9:34 [Buildroot] [PATCH] package/environment-setup: do not export GIT_DIR Peter Korsgaard
@ 2024-01-27 20:09 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2024-01-27 20:09 UTC (permalink / raw)
To: Peter Korsgaard; +Cc: buildroot
Peter, All,
On 2024-01-26 10:34 +0100, Peter Korsgaard spake thusly:
> Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST,
> TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in
> TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused
> when building in a subdir of the Buildroot git repo.
>
> This unfortunately also causes git commands to fail when
> output/host/environment-setup is sourced:
>
> git status
> fatal: not a git repository: '.'
>
> So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating
> environment-setup.
>
> Reported-by: Mircea Gliga <gliga.mircea@gmail.com>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/environment-setup/environment-setup.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk
> index 29ec5a9a95..069ee25f9f 100644
> --- a/package/environment-setup/environment-setup.mk
> +++ b/package/environment-setup/environment-setup.mk
> @@ -8,7 +8,7 @@ ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup
>
> define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
> cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE)
> - for var in $(TARGET_CONFIGURE_OPTS); do \
> + for var in $(filter-out GIT_DIR=%,$(TARGET_CONFIGURE_OPTS)); do \
> printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \
> done
> printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
> --
> 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-01-27 20:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-26 9:34 [Buildroot] [PATCH] package/environment-setup: do not export GIT_DIR Peter Korsgaard
2024-01-27 20:09 ` 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.