[Buildroot] [git commit branch/2021.02.x] core/show-info: report build_dir relative to CONFIG_DIR
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2021-12-12 22:23:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=abf7c453d828f4bd187ad09347d422db715c8a65 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Currently, the build_dir field is reported relative to $(BASE_DIR), to avoid leaking local paths. However, BASE_DIR is not a directory that is very convenient: for in-tree builds, it is $(CONFIG_DIR)/output/, while for out-of-tree builds, it is $(CONFIG_DIR). This difference is purely an idiosyncracy of how out-of-tree builds have been implemented in Buildroot, and is not under the control of the user. What the user is in control of, however, is where the .config file is located. This, really, is the directory we should base relative paths on. Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Yann E. MORIN <redacted> (cherry picked from commit 76c4df324d3eb2af9dde3ffdbb79ee54ffbaa73e) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index d0fcdd4e1d..5f9a5739e4 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk@@ -113,7 +113,7 @@ define _json-info-pkg "virtual": false$(comma) $(call _json-info-pkg-details,$(1)) \ ) - "build_dir": "$(patsubst $(BASE_DIR)/%,%,$($(1)_BUILDDIR))", + "build_dir": "$(patsubst $(CONFIG_DIR)/%,%,$($(1)_BUILDDIR))", $(if $(filter target,$($(1)_TYPE)), \ "install_target": $(call yesno-to-bool,$($(1)_INSTALL_TARGET))$(comma) \ "install_staging": $(call yesno-to-bool,$($(1)_INSTALL_STAGING))$(comma) \
_______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot