Remove the spider feature
In preparation for the re-work of the DOWNLOAD helper to support multiple download methods and protocols, the spider feature used with wget is removed for now until it is re-implemented on top of the new download methods. Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
3307052879
commit
07b2af1a45
7
Makefile
7
Makefile
|
@ -244,7 +244,7 @@ ifeq ($(ARCH),xtensa)
|
||||||
ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))
|
ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
WGET:=$(call qstrip,$(BR2_WGET)) $(SPIDER) $(QUIET)
|
WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
|
||||||
SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET)
|
SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET)
|
||||||
SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET)
|
SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET)
|
||||||
BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET)
|
BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET)
|
||||||
|
@ -437,11 +437,10 @@ endif
|
||||||
source: $(TARGETS_SOURCE) $(HOST_SOURCE)
|
source: $(TARGETS_SOURCE) $(HOST_SOURCE)
|
||||||
|
|
||||||
_source-check:
|
_source-check:
|
||||||
$(MAKE) $(EXTRAMAKEARGS) SPIDER=--spider source
|
@echo "TODO $@"
|
||||||
|
|
||||||
external-deps:
|
external-deps:
|
||||||
@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \
|
@echo "TODO $@"
|
||||||
$(EXTRAMAKEARGS) SPIDER=--spider source
|
|
||||||
|
|
||||||
show-targets:
|
show-targets:
|
||||||
@echo $(TARGETS)
|
@echo $(TARGETS)
|
||||||
|
|
|
@ -81,16 +81,11 @@ TERM_RESET := $(shell tput rmso)
|
||||||
# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
|
# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# support make source-check/external-deps
|
|
||||||
ifneq ($(SPIDER),)
|
|
||||||
DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2)
|
|
||||||
else
|
|
||||||
define DOWNLOAD
|
define DOWNLOAD
|
||||||
$(Q)test -e $(DL_DIR)/$(2) || \
|
$(Q)test -e $(DL_DIR)/$(2) || \
|
||||||
for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \
|
for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \
|
||||||
do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
|
do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
|
||||||
endef
|
endef
|
||||||
endif
|
|
||||||
|
|
||||||
# Utility programs used to build packages
|
# Utility programs used to build packages
|
||||||
TAR ?= tar
|
TAR ?= tar
|
||||||
|
@ -117,19 +112,14 @@ endef
|
||||||
|
|
||||||
# Retrieve the archive
|
# Retrieve the archive
|
||||||
$(BUILD_DIR)/%/.stamp_downloaded:
|
$(BUILD_DIR)/%/.stamp_downloaded:
|
||||||
# support make source-check/external-deps
|
|
||||||
ifeq ($(SPIDER),)
|
|
||||||
# Only show the download message if it isn't already downloaded
|
# Only show the download message if it isn't already downloaded
|
||||||
$(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \
|
$(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \
|
||||||
(test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \
|
(test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \
|
||||||
$(call MESSAGE,"Downloading")
|
$(call MESSAGE,"Downloading")
|
||||||
endif
|
|
||||||
$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE))
|
$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE))
|
||||||
$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
|
$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
|
||||||
ifeq ($(SPIDER),)
|
|
||||||
$(Q)mkdir -p $(@D)
|
$(Q)mkdir -p $(@D)
|
||||||
$(Q)touch $@
|
$(Q)touch $@
|
||||||
endif
|
|
||||||
|
|
||||||
# Unpack the archive
|
# Unpack the archive
|
||||||
$(BUILD_DIR)/%/.stamp_extracted:
|
$(BUILD_DIR)/%/.stamp_extracted:
|
||||||
|
|
|
@ -21,10 +21,8 @@ MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE)
|
||||||
|
|
||||||
$(MPFR_PATCH_SOURCE):
|
$(MPFR_PATCH_SOURCE):
|
||||||
$(call DOWNLOAD,$(MPFR_SITE),$(MPFR_PATCH))
|
$(call DOWNLOAD,$(MPFR_SITE),$(MPFR_PATCH))
|
||||||
ifeq ($(SPIDER),) # this breaks source-check/external-deps
|
|
||||||
mv $(DL_DIR)/$(MPFR_PATCH) $@
|
mv $(DL_DIR)/$(MPFR_PATCH) $@
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
$(DL_DIR)/$(MPFR_SOURCE):
|
$(DL_DIR)/$(MPFR_SOURCE):
|
||||||
$(call DOWNLOAD,$(MPFR_SITE),$(MPFR_SOURCE))
|
$(call DOWNLOAD,$(MPFR_SITE),$(MPFR_SOURCE))
|
||||||
|
|
Loading…
Reference in New Issue