Makefile: exclude DL_DIR from savedefconfig
PATCH 1/1 Makefile: exclude DL_DIR from savedefconfig
Running "make savedefconfig" with DL_DIR set also saves that variable, which is only useful in local context.
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -1027,7 +1027,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) - @$(SED) '/BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) + @$(SED) '/BR2_DEFCONFIG=/d' -e '/BR2_DL_DIR=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) .PHONY: defconfig savedefconfig update-defconfig
Signature · 1 line
2.20.1
Yann E. MORIN
AppliedPATCH 1/1 Makefile: exclude DL_DIR from savedefconfig
Sven, All,
On 2020-10-21 12:34 +0200, Sven Oliver Moll spake thusly:
Quoted 4 lines
Running "make savedefconfig" with
DL_DIRset also saves that variable, which is only useful in local context.Signed-off-by Sven Oliver Moll <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 23 lines
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Makefile +1
-1@@ -1027,7 +1027,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) - @$(SED) '/BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) + @$(SED) '/BR2_DEFCONFIG=/d' -e '/BR2_DL_DIR=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) .PHONY: defconfig savedefconfig update-defconfigSignature · 5 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 Makefile: exclude DL_DIR from savedefconfig
Sven, All,
On 2020-10-21 22:01 +0200, Yann E. MORIN spake thusly:
Quoted 5 lines
On 2020-10-21 12:34 +0200, Sven Oliver Moll spake thusly:
Quoted 3 lines
Running "make savedefconfig" with
DL_DIRset also saves that variable, which is only useful in local context.Signed-off-by Sven Oliver Moll <[email protected]>Applied to master, thanks.
Unfortunately, I had to revert it. Some people were quick to complain on IRC the very moment I applied it, and we also recently got a bug report about it, see https://bugs.busybox.net/show_bug.cgi?id=13291
After discussing the subject between the maintainers, we've come to the conclusion that indeed, such site-local settings should not end up in the saved defconfig files.
However, the discussion also highlighted that there were quite a few other such configuration options that really are site-local settings:BR2_CCACHE_DIR, BR2_PACKAGE_OVERRIDE_FILE (which defaults to, guess
what: 'local.mk'!), but also some less obvious ones, like BR2_WGET, BR2_SVN, BR2_GIT et al.
Getting rid of those as configuration options, and converting them to site-local settings will require that we first get a means for easily handling such site-local settings.
In the meantime, we've concluded that reverting was the best course of actions.
Sorry that we had to revert your change.
Regards,
Yann E. MORIN.
Signature · 6 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. | '------------------------------^-------^------------------^--------------------'