Commit a77ee7fd authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

pkg-download: allow relative BR2_DL_DIR 



And move the BUILDROOT_DL_DIR override here as well for consistency.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 48a68499

Makefile

+3 −8
Original line number Diff line number Diff line
@@ -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):

package/pkg-download.mk

+10 −1
Original line number Diff line number Diff line
@@ -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: