Skip to contentSkip to conversation

package/environment-setup: do not export GIT_DIR

PATCH Applied Peter Korsgaard 2 participants 2 messages Jan 26, 2024 – Jan 27, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/environment-setup: do not export GIT_DIR

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.

---
 package/environment-setup/environment-setup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/environment-setup/environment-setup.mk +1 -1
index 29ec5a9a95..069ee25f9f 100644
@@ -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)
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Peter, All,

On 2024-01-26 10:34 +0100, Peter Korsgaard spake thusly:

Quoted 8 lines

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:

Quoted 8 lines

git status
fatal: not a git repository: '.'

So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating environment-setup.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 package/environment-setup/environment-setup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/environment-setup/environment-setup.mk +1 -1
index 29ec5a9a95..069ee25f9f 100644
@@ -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)
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot