[Buildroot] [git commit] package/environment-setup: do not export GIT_DIR

[Buildroot] [git commit] package/environment-setup: do not export GIT_DIR

[Yann E. MORIN]

commit: https://git.buildroot.net/buildroot/commit/?id=48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 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)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [git commit] package/environment-setup: do not export GIT_DIR

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > commit: https://git.buildroot.net/buildroot/commit/?id=48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0
 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 > 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>
 > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

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