Buildroot Archive mirror
 help / color / mirror / Atom feed
From: Peter Seiderer via buildroot <buildroot@buildroot.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 1/4] Config.in: do not expand TOPDIR, BASE_DIR and CONFIG_DIR
Date: Mon, 13 May 2024 11:19:45 +0200	[thread overview]
Message-ID: <20240513091950.30116-1-ps.report@gmx.net> (raw)

- escape TOPDIR, BASE_DIR and CONFIG_DIR usage to force to not exapnd at
  configure time (but at make time), needed for upcoming kconfig update
  (see upstream commit [1])

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=104daea149c45cc84842ce77a9bd6436d19f3dd8

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - new patch (moved escape fixes from 'support/kconfig: reference environment
    variables directly (remove 'option env=')' to this extra/preliminary patch)
---
 Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Config.in b/Config.in
index b5a94325c4..035900c971 100644
--- a/Config.in
+++ b/Config.in
@@ -197,7 +197,7 @@ config BR2_DEFCONFIG
 
 config BR2_DL_DIR
 	string "Download dir"
-	default "$(TOPDIR)/dl"
+	default "\$(TOPDIR)/dl"
 	help
 	  Directory to store all the source files that we need to fetch.
 	  If the Linux shell environment has defined the BR2_DL_DIR
@@ -211,7 +211,7 @@ config BR2_DL_DIR
 
 config BR2_HOST_DIR
 	string "Host dir"
-	default "$(BASE_DIR)/host"
+	default "\$(BASE_DIR)/host"
 	help
 	  Directory to store all the binary files that are built for the
 	  host. This includes the cross compilation toolchain when
@@ -669,7 +669,7 @@ endchoice
 
 config BR2_PACKAGE_OVERRIDE_FILE
 	string "location of a package override file"
-	default "$(CONFIG_DIR)/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, which
-- 
2.45.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2024-05-13  9:20 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-13  9:19 Peter Seiderer via buildroot [this message]
2024-05-13  9:19 ` [Buildroot] [PATCH v2 2/4] support/kconfig: bump to linux-v6.9-rc5 version Peter Seiderer via buildroot
2024-05-13  9:19 ` [Buildroot] [PATCH v2 3/4] support/kconfig: reference environment variables directly (remove 'option env=') Peter Seiderer via buildroot
2024-05-13  9:19 ` [Buildroot] [PATCH v2 4/4] package/openssl: move libopenssl/libressl/.br2-external.in.openssl source statements outside of the choice Peter Seiderer via buildroot
2024-05-13 22:11 ` [Buildroot] [PATCH v2 1/4] Config.in: do not expand TOPDIR, BASE_DIR and CONFIG_DIR Peter Seiderer via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240513091950.30116-1-ps.report@gmx.net \
    --to=buildroot@buildroot.org \
    --cc=buildroot@busybox.net \
    --cc=ps.report@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).