From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 16 Dec 2016 14:26:22 +0000 (+0100)
Subject: build: remove duplicate Download/default definition from include/host-build.mk
X-Git-Tag: v17.01.0-rc1~513
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=881c5b47ece3702ee9ea6fe450cded8635da5056;p=openwrt%2Fstaging%2Fxback.git

build: remove duplicate Download/default definition from include/host-build.mk

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/include/download.mk b/include/download.mk
index 0a12c69ebd..ec55777238 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -180,6 +180,19 @@ define Download/Defaults
   OPTS:=
 endef
 
+define Download/default
+  FILE:=$(PKG_SOURCE)
+  URL:=$(PKG_SOURCE_URL)
+  SUBDIR:=$(PKG_SOURCE_SUBDIR)
+  PROTO:=$(PKG_SOURCE_PROTO)
+  $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
+  $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
+  $(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH))
+  VERSION:=$(PKG_SOURCE_VERSION)
+  $(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM))
+  $(if $(PKG_HASH),HASH:=$(PKG_HASH))
+endef
+
 define Download
   $(eval $(Download/Defaults))
   $(eval $(Download/$(1)))
diff --git a/include/host-build.mk b/include/host-build.mk
index d353c88b5c..1ba849f88d 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -123,16 +123,6 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
   endef
 endif
 
-define Download/default
-  FILE:=$(PKG_SOURCE)
-  URL:=$(PKG_SOURCE_URL)
-  PROTO:=$(PKG_SOURCE_PROTO)
-  SUBDIR:=$(PKG_SOURCE_SUBDIR)
-  VERSION:=$(PKG_SOURCE_VERSION)
-  MD5SUM:=$(PKG_MD5SUM)
-  MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM)
-endef
-
 define Host/Exports/Default
   $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
   $(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
diff --git a/include/package.mk b/include/package.mk
index bc621a1787..87dc573088 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -118,19 +118,6 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   endif
 endif
 
-define Download/default
-  FILE:=$(PKG_SOURCE)
-  URL:=$(PKG_SOURCE_URL)
-  SUBDIR:=$(PKG_SOURCE_SUBDIR)
-  PROTO:=$(PKG_SOURCE_PROTO)
-  $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
-  $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
-  $(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH))
-  VERSION:=$(PKG_SOURCE_VERSION)
-  $(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM))
-  $(if $(PKG_HASH),HASH:=$(PKG_HASH))
-endef
-
 ifdef USE_GIT_TREE
   define Build/Prepare/Default
 	mkdir -p $(PKG_BUILD_DIR)