aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2018-11-15 18:03:48 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-11-26 17:14:36 +0100
commit3f14fed1ded7a8b5a0bb6f3604f8390a87e4c7f1 (patch)
treefc9b6ff9e43bd042e0b1681f833b8790d2048d56
parent387a72cc169c664936b32fa4e3397224170cd525 (diff)
downloadbuildroot-3f14fed1ded7a8b5a0bb6f3604f8390a87e4c7f1.tar.gz
buildroot-3f14fed1ded7a8b5a0bb6f3604f8390a87e4c7f1.tar.bz2
core: ensure we use the realpath(3) of DL_DIR
When $(TOPDIR)/dl is a symlink, checking out git submodules can fail, as reported by Michael in #11086. To reproduce a similarly-related mis-behaviour: $ mkdir -p foo/bar foo/buz $ cd foo/bar $ ln -s ../buz meh $ cd meh $ cd ../../foo The last command should not succeed, because, relative to meh, there is no ../../foo directory; we would expect it to be ../../../foo, instead. But since meh is a symlink to a directory, then a relative path from that symlink is interpreted as relative to the derefrenced directory, i.e. from buz in this case. But where this gets even weirder, is that, if the last command is replaced by: $ cd ../../../foo then it still works, too. And that is the root of Michael's issue: the dl directory in Buildroot's TOPDIR is a symlink to a similarly-named directory one directory higher, which then confuses relative paths, which gets especially and noticeably bad for git submodules. Avoid this strangeness, and just use so-called "physical" path, i.e. a path where all symlinks to directories have been dereferenced. Fixes: #11086 Reported-by: Michael Nosthoff <posted@heine.so> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Michael Nosthoff <posted@heine.so> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 632e164a19fc3d1ce419c60eb85214d42a673b28) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pkg-download.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 6f15deba28..f398d16871 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -31,8 +31,8 @@ else
BR2_DL_DIR = $(DL_DIR)
endif
-# ensure it exists and a absolute path
-DL_DIR := $(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd)
+# ensure it exists and a absolute path, derefrecing symlinks
+DL_DIR := $(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd -P)
#
# URI scheme helper functions