[openwrt/openwrt] rules.mk: add option to download files into a subdirectory

LEDE Commits lede-commits at lists.infradead.org
Thu Sep 22 13:50:45 PDT 2022


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/59db286814be3ebc1fb9d9ec580945920c2d68e7

commit 59db286814be3ebc1fb9d9ec580945920c2d68e7
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Wed Aug 3 13:01:51 2022 -0400

    rules.mk: add option to download files into a subdirectory
    
    Some packages download a single raw file or set of raw files
    instead of an archive.
    
    The filenames of these download files have names and version numbers
    that do not directly correspond to the name and version of the package
    as it is defined in its Makefile.
    
    To better organize downloaded files, this adds the option of
    creating a subdirectory in the download directory for these files
    that can be named with package specific variables.
    
    DL_DIR is now a recursively expanded variable
    since the value now depends on whether DL_SUBDIR is defined.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules.mk b/rules.mk
index c893f61b0f..2072658e78 100644
--- a/rules.mk
+++ b/rules.mk
@@ -109,7 +109,7 @@ $(foreach t,$(DEFAULT_SUBDIR_TARGETS) $(1),
 )
 endef
 
-DL_DIR:=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl)
+DL_DIR=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl)$(if $(DL_SUBDIR),/$(DL_SUBDIR))
 OUTPUT_DIR:=$(if $(call qstrip,$(CONFIG_BINARY_FOLDER)),$(call qstrip,$(CONFIG_BINARY_FOLDER)),$(TOPDIR)/bin)
 BIN_DIR:=$(OUTPUT_DIR)/targets/$(BOARD)/$(SUBTARGET)
 INCLUDE_DIR:=$(TOPDIR)/include




More information about the lede-commits mailing list