Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 6/7] Makefile: add check that $(HOST_DIR)/usr is not a directory
Date: Mon, 10 Jul 2017 01:21:22 +0200	[thread overview]
Message-ID: <20170709232123.30120-7-arnout@mind.be> (raw)
In-Reply-To: <20170709232123.30120-1-arnout@mind.be>

We create a compatibility symlink for $(HOST_DIR)/usr. However, if
that exists already as a directory, the link can't be created. Make
will not even try since it exists already and has no dependencies. If
it exists as a directory, any post-build script that is still using
$(HOST_DIR)/usr will fail to find what it needs. Therefore, add a
check that it is not a directory.

This check has to be made as part of some PHONY target. We can reuse
the dirs target, on which all packages depend.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
Personally I don't think it's important enough to add such a check.
If someone ends up in this situation, they'll be motivated to fix
their post-build scripts :-)
---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 188ce9adc7..a94555d130 100644
--- a/Makefile
+++ b/Makefile
@@ -542,6 +542,11 @@ endif
 .PHONY: dirs
 dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(HOST_DIR)/usr $(BINARIES_DIR)
+	@if [ -d "$(HOST_DIR)/usr" -a ! -L "$(HOST_DIR)/usr" ]; then \
+		printf '%s is not allowed to be a directory\n' "$(HOST_DIR)/usr" 1>&2; \
+		printf 'Please remove this directory and rebuild\n' 1>&2; \
+		exit 1; \
+	fi
 
 $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
 	$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
-- 
2.13.2

  parent reply	other threads:[~2017-07-09 23:21 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-09 23:21 [Buildroot] [PATCH 0/7] More HOST_DIR/usr fixes Arnout Vandecappelle
2017-07-09 23:21 ` [Buildroot] [PATCH 1/7] Makefile: properly create $(HOST_DIR)/usr compatibility symlink Arnout Vandecappelle
2017-07-10 15:59   ` Thomas Petazzoni
2017-07-09 23:21 ` [Buildroot] [PATCH 2/7] toolchain-wrapper: remove remaining references to HOST_DIR/usr Arnout Vandecappelle
2017-07-10 15:59   ` Thomas Petazzoni
2017-07-09 23:21 ` [Buildroot] [PATCH 3/7] support/testing: strip /usr/ part from HOST_DIR Arnout Vandecappelle
2017-07-10 15:59   ` Thomas Petazzoni
2017-07-09 23:21 ` [Buildroot] [PATCH 4/7] support/testing: move BRTest initialisation to __init__ Arnout Vandecappelle
2017-07-10 15:59   ` Thomas Petazzoni
2017-07-09 23:21 ` [Buildroot] [PATCH 5/7] support/testing: add test of BR2_CCACHE with an external toolchain Arnout Vandecappelle
2017-07-10 16:01   ` Thomas Petazzoni
2017-07-10 20:10     ` Arnout Vandecappelle
2017-07-09 23:21 ` Arnout Vandecappelle [this message]
2017-07-10 16:02   ` [Buildroot] [PATCH 6/7] Makefile: add check that $(HOST_DIR)/usr is not a directory Thomas Petazzoni
2017-07-10 16:12     ` Yann E. MORIN
2017-07-10 19:51       ` Arnout Vandecappelle
2017-07-10 20:09         ` Arnout Vandecappelle
2017-07-10 21:27         ` Thomas Petazzoni
2017-07-10 21:36           ` Arnout Vandecappelle
2017-07-10 21:43             ` Yann E. MORIN
2017-07-09 23:21 ` [Buildroot] [PATCH 7/7] toolchain-external: default BR2_TOOLCHAIN_EXTERNAL_PATH to empty Arnout Vandecappelle
2017-07-10 16:03   ` Thomas Petazzoni

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=20170709232123.30120-7-arnout@mind.be \
    --to=arnout@mind.be \
    --cc=buildroot@busybox.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