Skip to contentSkip to conversation

Config: default BR2_PACKAGE_OVERRIDE_FILE to $(CONFIG_DIR)/local.mk

PATCH New Yann E. MORIN 3 participants 4 messages Jan 29, 2014 – Feb 21, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Config: default BR2_PACKAGE_OVERRIDE_FILE to $(CONFIG_DIR)/local.mk

From: "Yann E. MORIN" <[email protected]>

The current default for BR2_PACKAGE_OVERRIDE_FILE points to:

    $(TOPDIR)/local.mk

This works well for in-tree builds, but is not very useful for out-of-tree builds, when the Buildroot source tree may be shared for different concurrent builds.

Also, it seems to be more sensible to have local.mk alognside the .config file.

Hence, change the default for BR2_PACKAGE_OVERRIDE_FILE to point to:

    $(CONFIG_DIR)/local.mk

Note that this does not change the current behaviour for in-tree builds, since in that case $(CONFIG_DIR) == $(TOPDIR).

Cc Thomas De Schampheleire <[email protected]>
---
 Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Config.in +1 -1
index 7ec7c2a..f8d6e23 100644
@@ -488,7 +488,7 @@ config BR2_HAVE_DOCUMENTATION
 
 config BR2_PACKAGE_OVERRIDE_FILE
 	string "location of a package override file"
-	default "$(TOPDIR)/local.mk"
+	default "$(CONFIG_DIR)/local.mk"
 	help
 	  A package override file is a short makefile that contains
 	  variable definitions of the form <pkg>_OVERRIDE_SRCDIR,
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 Config: default BR2_PACKAGE_OVERRIDE_FILE to $(CONFIG_DIR)/local.mk

Quoted 12 lines · Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

The current default for BR2_PACKAGE_OVERRIDE_FILE points to:

     $(TOPDIR)/local.mk

This works well for in-tree builds, but is not very useful for out-of-tree builds, when the Buildroot source tree may be shared for different concurrent builds.

Also, it seems to be more sensible to have local.mk alognside the .config file.

Quoted 8 lines

Hence, change the default for BR2_PACKAGE_OVERRIDE_FILE to point to:

     $(CONFIG_DIR)/local.mk

Note that this does not change the current behaviour for in-tree builds, since in that case $(CONFIG_DIR) == $(TOPDIR).

Cc Thomas De Schampheleire <[email protected]>

I was doubtful about this one at first, because the output directory is
something that should be easily thrown away. But then, so is the override file - especially now we have BR2_EXTERNAL for overrides that are persistent. Therefore:

Regards,
Arnout

Quoted 18 lines
---
  Config.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Config.in +1 -1
index 7ec7c2a..f8d6e23 100644
@@ -488,7 +488,7 @@ config BR2_HAVE_DOCUMENTATION
 
  config BR2_PACKAGE_OVERRIDE_FILE
  	string "location of a package override file"
-	default "$(TOPDIR)/local.mk"
+	default "$(CONFIG_DIR)/local.mk"
  	help
  	  A package override file is a short makefile that contains
  	  variable definitions of the form <pkg>_OVERRIDE_SRCDIR,
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 Config: default BR2_PACKAGE_OVERRIDE_FILE to $(CONFIG_DIR)/local.mk

In reply to Yann E. MORIN

All,

On 2014-01-29 22:48 +0100, Yann E. MORIN spake thusly:

Quoted 12 lines

From: "Yann E. MORIN" <[email protected]>

The current default for BR2_PACKAGE_OVERRIDE_FILE points to:

    $(TOPDIR)/local.mk

This works well for in-tree builds, but is not very useful for out-of-tree builds, when the Buildroot source tree may be shared for different concurrent builds.

Also, it seems to be more sensible to have local.mk alognside the .config file.

Quoted 8 lines

Hence, change the default for BR2_PACKAGE_OVERRIDE_FILE to point to:

    $(CONFIG_DIR)/local.mk

Note that this does not change the current behaviour for in-tree builds, since in that case $(CONFIG_DIR) == $(TOPDIR).

Cc Thomas De Schampheleire <[email protected]>

Ping? For -next?

Note that it was acked by Arnout.

Quoted 9 lines
---
 Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Config.in +0 -0
index 7ec7c2a..f8d6e23 100644

Config.in config BR2_HAVE_DOCUMENTATION · line 494

Quoted 8 lines
Config.in +1 -1
@@ -488,7 +488,7 @@ config BR2_HAVE_DOCUMENTATION
 
 config BR2_PACKAGE_OVERRIDE_FILE
 	string "location of a package override file"
-	default "$(TOPDIR)/local.mk"
+	default "$(CONFIG_DIR)/local.mk"
 	help
 	  A package override file is a short makefile that contains
 	  variable definitions of the form <pkg>_OVERRIDE_SRCDIR,

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 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 Config: default BR2_PACKAGE_OVERRIDE_FILE to $(CONFIG_DIR)/local.mk

Quoted 19 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

All,
On 2014-01-29 22:48 +0100, Yann E. MORIN spake thusly:

Quoted 15 lines

From: "Yann E. MORIN" <[email protected]>

The current default for BR2_PACKAGE_OVERRIDE_FILE points to:
$(TOPDIR)/local.mk

This works well for in-tree builds, but is not very useful for out-of-tree builds, when the Buildroot source tree may be shared for different concurrent builds.

Also, it seems to be more sensible to have local.mk alognside the .config file.

Hence, change the default for BR2_PACKAGE_OVERRIDE_FILE to point to:
$(CONFIG_DIR)/local.mk

Quoted 7 lines
Quoted 5 lines

Note that this does not change the current behaviour for in-tree builds, since in that case $(CONFIG_DIR) == $(TOPDIR).

Cc Thomas De Schampheleire <[email protected]>

Ping? For -next?

Sorry, I must have missed it.

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard