diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-10 12:38:29 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-10 16:00:50 +0200 |
| commit | a77ee7fd40a78d6fe05657b4f4be63926c04e523 (patch) | |
| tree | 1ec14259217096e944b77a11b3f17eb4a8b788fd | |
| parent | 48a68499d17a730fdf83934f5e9032eb373c596d (diff) | |
| download | buildroot-novena-a77ee7fd40a78d6fe05657b4f4be63926c04e523.tar.gz buildroot-novena-a77ee7fd40a78d6fe05657b4f4be63926c04e523.zip | |
pkg-download: allow relative BR2_DL_DIR
And move the BUILDROOT_DL_DIR override here as well for consistency.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | package/pkg-download.mk | 11 |
2 files changed, 13 insertions, 9 deletions
@@ -96,11 +96,6 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) -include $(CONFIG_DIR)/.config endif -# Override BR2_DL_DIR if shell variable defined -ifneq ($(BUILDROOT_DL_DIR),) -BR2_DL_DIR:=$(BUILDROOT_DL_DIR) -endif - # To put more focus on warnings, be less verbose as default # Use 'make V=1' to see the full commands ifdef V @@ -363,7 +358,7 @@ TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\ # all targets depend on the crosscompiler and it's prerequisites $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) % -dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ +dirs: $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake @@ -379,7 +374,7 @@ world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL) legal-info legal-info-prepare legal-info-clean \ $(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \ $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \ - $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ + $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) ############################################################# @@ -388,7 +383,7 @@ world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL) # dependencies anywhere else # ############################################################# -$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR): +$(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR): @mkdir -p $@ $(STAGING_DIR): diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 9e9858100..fa9a3e883 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -22,11 +22,20 @@ LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES)) # external-deps target. DL_MODE=DOWNLOAD -DL_DIR=$(call qstrip,$(BR2_DL_DIR)) +# Override BR2_DL_DIR if shell variable defined +ifneq ($(BUILDROOT_DL_DIR),) +DL_DIR:=$(BUILDROOT_DL_DIR) +else +DL_DIR:=$(call qstrip,$(BR2_DL_DIR)) +endif + ifeq ($(DL_DIR),) DL_DIR:=$(TOPDIR)/dl endif +# ensure it exists and a absolute path +DL_DIR:=$(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd) + # # URI scheme helper functions # Example URIs: |