* [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk
@ 2019-05-13 10:37 Charlie Turner
2019-05-13 18:53 ` Thomas Petazzoni
2019-05-26 9:21 ` Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Charlie Turner @ 2019-05-13 10:37 UTC (permalink / raw)
To: buildroot
In particular, the manual was incorrect when the user had selected an
out-of-tree build.
Signed-off-by: Charlie Turner <cturner@igalia.com>
---
docs/manual/using-buildroot-development.txt | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/docs/manual/using-buildroot-development.txt b/docs/manual/using-buildroot-development.txt
index 3389a37b39..65a9f1a3f7 100644
--- a/docs/manual/using-buildroot-development.txt
+++ b/docs/manual/using-buildroot-development.txt
@@ -28,10 +28,22 @@ clean+.
Therefore, Buildroot provides a specific mechanism for this use case:
the +<pkg>_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_
file, which allows the user to tell Buildroot the location of the
-source for certain packages. By default this _override_ file is named
-+local.mk+ and located in the top directory of the Buildroot source
-tree, but a different location can be specified through the
-+BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
+source for certain packages.
+
+The default location of the override file is +$(CONFIG_DIR)/local.mk+,
+as defined by the +BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
++$(CONFIG_DIR)+ is the location of the Buildroot +.config+ file, so
++local.mk+ by default lives side-by-side with the +.config+ file,
+which means:
+
+* In the top-level Buildroot source directory for in-tree builds
+ (i.e., when +O=+ is not used)
+* In the out-of-tree directory for out-of-tree builds (i.e., when
+ +O=+ is used)
+
+If a different location than these defaults is required, it can be
+specified through the +BR2_PACKAGE_OVERRIDE_FILE+ configuration
+option.
In this _override_ file, Buildroot expects to find lines of the form:
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk
2019-05-13 10:37 [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk Charlie Turner
@ 2019-05-13 18:53 ` Thomas Petazzoni
2019-05-26 9:21 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-05-13 18:53 UTC (permalink / raw)
To: buildroot
On Mon, 13 May 2019 11:37:42 +0100
Charlie Turner <cturner@igalia.com> wrote:
> In particular, the manual was incorrect when the user had selected an
> out-of-tree build.
>
> Signed-off-by: Charlie Turner <cturner@igalia.com>
> ---
> docs/manual/using-buildroot-development.txt | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk
2019-05-13 10:37 [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk Charlie Turner
2019-05-13 18:53 ` Thomas Petazzoni
@ 2019-05-26 9:21 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2019-05-26 9:21 UTC (permalink / raw)
To: buildroot
>>>>> "Charlie" == Charlie Turner <cturner@igalia.com> writes:
> In particular, the manual was incorrect when the user had selected an
> out-of-tree build.
> Signed-off-by: Charlie Turner <cturner@igalia.com>
Committed to 2019.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk
@ 2019-05-13 9:44 Charlie Turner
2019-05-13 9:51 ` Thomas Petazzoni
0 siblings, 1 reply; 5+ messages in thread
From: Charlie Turner @ 2019-05-13 9:44 UTC (permalink / raw)
To: buildroot
In particular, the manual was incorrect when the user had selected an
out-of-tree build.
Signed-off-by: Charlie Turner <cturner@igalia.com>
---
docs/manual/using-buildroot-development.txt | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/docs/manual/using-buildroot-development.txt b/docs/manual/using-buildroot-development.txt
index 3389a37b39..3e0f4be287 100644
--- a/docs/manual/using-buildroot-development.txt
+++ b/docs/manual/using-buildroot-development.txt
@@ -29,9 +29,18 @@ Therefore, Buildroot provides a specific mechanism for this use case:
the +<pkg>_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_
file, which allows the user to tell Buildroot the location of the
source for certain packages. By default this _override_ file is named
-+local.mk+ and located in the top directory of the Buildroot source
-tree, but a different location can be specified through the
-+BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
++local.mk+ and is located where your Buildroot configuration file is.
+By default this location is in the top-level directory of the
+buildroot source tree.
+
+However, if the user has selected an out-of-tree build (using the
++O=path/to/my_output_dir+ make option) then you should place +local.mk+ in
++path/to/my_output_dir+, since that is where this out-of-tree build's
++.config+ file is located.
+
+If a different location than these defaults is required, it can be
+specified through the +BR2_PACKAGE_OVERRIDE_FILE+ configuration
+option.
In this _override_ file, Buildroot expects to find lines of the form:
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk
2019-05-13 9:44 Charlie Turner
@ 2019-05-13 9:51 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-05-13 9:51 UTC (permalink / raw)
To: buildroot
Hello Charlie,
On Mon, 13 May 2019 10:44:40 +0100
Charlie Turner <cturner@igalia.com> wrote:
> In particular, the manual was incorrect when the user had selected an
> out-of-tree build.
>
> Signed-off-by: Charlie Turner <cturner@igalia.com>
> ---
> docs/manual/using-buildroot-development.txt | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/docs/manual/using-buildroot-development.txt b/docs/manual/using-buildroot-development.txt
> index 3389a37b39..3e0f4be287 100644
> --- a/docs/manual/using-buildroot-development.txt
> +++ b/docs/manual/using-buildroot-development.txt
> @@ -29,9 +29,18 @@ Therefore, Buildroot provides a specific mechanism for this use case:
> the +<pkg>_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_
> file, which allows the user to tell Buildroot the location of the
> source for certain packages. By default this _override_ file is named
> -+local.mk+ and located in the top directory of the Buildroot source
> -tree, but a different location can be specified through the
> -+BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
> ++local.mk+ and is located where your Buildroot configuration file is.
> +By default this location is in the top-level directory of the
> +buildroot source tree.
> +
> +However, if the user has selected an out-of-tree build (using the
> ++O=path/to/my_output_dir+ make option) then you should place +local.mk+ in
> ++path/to/my_output_dir+, since that is where this out-of-tree build's
> ++.config+ file is located.
> +
> +If a different location than these defaults is required, it can be
> +specified through the +BR2_PACKAGE_OVERRIDE_FILE+ configuration
> +option.
Thanks for following up our conversation on IRC with an actual patch. I
would actually prefer a wording along the lines of:
"""
The default location of the override file is +$(CONFIG_DIR)/local.mk+, as
defined by the +BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
+$(CONFIG_DIR)+ is the location of the Buildroot +.config+ file, so
+local.mk+ by default lives side-by-side with the +.config+ file, which
means:
* In the top-level Buildroot source directory for in-tree builds (i.E
when +O=+ is not used)
* In the out of tree directory for out-of-tree builds (i.e when +O=+ is
used)
If a different location than these defaults is required, it can be
specified through the +BR2_PACKAGE_OVERRIDE_FILE+ configuration
option.
"""
What do you think ?
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-26 9:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-13 10:37 [Buildroot] [PATCH 1/1] docs/manual: Clarify location of local.mk Charlie Turner
2019-05-13 18:53 ` Thomas Petazzoni
2019-05-26 9:21 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2019-05-13 9:44 Charlie Turner
2019-05-13 9:51 ` Thomas Petazzoni
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.