From 47344e68b412014b814379608e554b5ceaf8cc65 Mon Sep 17 00:00:00 2001
From: Viktor <35473052+viktorxda@users.noreply.github.com>
Date: Tue, 4 Jul 2023 16:46:51 +0200
Subject: [PATCH] Makefile: set download method based on BR2_DL_DIR

---
 .github/workflows/build.yml                   |  6 ++++-
 Makefile                                      |  7 +++---
 general/external.mk                           | 10 ++++++--
 general/package/atbm603x/atbm603x.mk          |  7 +++++-
 general/package/aura-httpd/aura-httpd.mk      |  7 +++++-
 general/package/aws-producer/aws-producer.mk  |  7 +++++-
 general/package/aws-webrtc/aws-webrtc.mk      |  7 +++++-
 .../package/exfat-openipc/exfat-openipc.mk    |  7 +++++-
 .../fdk-aac-openipc/fdk-aac-openipc.mk        |  7 +++++-
 .../package/gdbserver-lite/gdbserver-lite.mk  |  7 +++++-
 .../hisilicon-opensdk/hisilicon-opensdk.mk    |  7 +++++-
 .../ingenic-opensdk/ingenic-opensdk.mk        |  7 +++++-
 general/package/ipctool/ipctool.mk            |  7 +++++-
 .../package/json-c-openipc/json-c-openipc.mk  |  7 +++++-
 general/package/jsonfilter/jsonfilter.mk      |  7 +++++-
 .../libsrtp-openipc/libsrtp-openipc.mk        |  7 +++++-
 .../linux-firmware-openipc.mk                 | 24 ++++++++++++++-----
 general/package/microbe-web/microbe-web.mk    |  7 +++++-
 general/package/microsnander/microsnander.mk  |  7 +++++-
 general/package/mini/mini.mk                  |  2 +-
 general/package/motors/motors.mk              |  7 +++++-
 .../mt7601u-ap-openipc/mt7601u-ap-openipc.mk  |  7 +++++-
 .../onvif-simple-server.mk                    |  3 +--
 .../package/quirc-openipc/quirc-openipc.mk    |  7 +++++-
 general/package/rtl8188fu/rtl8188fu.mk        |  7 +++++-
 .../rtl8189fs-openipc/rtl8189fs-openipc.mk    |  9 +++++--
 .../rtl8192eu-openipc/rtl8192eu-openipc.mk    |  7 +++++-
 general/package/rtl8733bu/rtl8733bu.mk        |  7 +++++-
 .../rtl8812au-openipc/rtl8812au-openipc.mk    |  7 +++++-
 general/package/ssw101b/ssw101b.mk            |  7 +++++-
 general/package/usrsctp/usrsctp.mk            |  5 ++--
 general/package/yaml-cli/yaml-cli.mk          |  7 +++++-
 32 files changed, 190 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a48ec5bd..f740679c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -206,11 +206,15 @@ jobs:
           path: /tmp/ccache
           key: ${{matrix.platform}}_${{matrix.release}}
 
-      - name: Build firmware
+      - name: Download source
         run: |
           echo "8.8.8.8 invisible-mirror.net" | sudo tee -a /etc/hosts
           echo "8.8.8.8 distfiles.dereferenced.org" | sudo tee -a /etc/hosts
+          make BOARD=${{matrix.platform}}_${{matrix.release}} br-source
+          echo - Download time: $(date -d @${SECONDS} +%M:%S)
 
+      - name: Build firmware
+        run: |
           export GIT_HASH=$(git rev-parse --short ${GITHUB_SHA})
           export GIT_BRANCH=${GITHUB_REF_NAME}
           echo GIT_HASH=${GIT_HASH} >> ${GITHUB_ENV}
diff --git a/Makefile b/Makefile
index 9c8fc448..a9367a10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-BR_VER = 2023.02.1
+BR_VER = 2023.02.2
 BR_MAKE = $(MAKE) -C $(TARGET)/buildroot-$(BR_VER) BR2_EXTERNAL=$(PWD)/general O=$(TARGET)
 BR_LINK = https://github.com/buildroot/buildroot/archive/refs/tags
 BR_FILE = /tmp/buildroot-$(BR_VER).tar.gz
@@ -46,10 +46,10 @@ br-%: defconfig
 	@$(BR_MAKE) $(subst br-,,$@)
 
 defconfig:
+	@echo --- $(or $(CONFIG),$(error variable BOARD is not found))
 	@if test ! -e $(TARGET)/buildroot-$(BR_VER); then \
 		wget -c -q $(BR_LINK)/$(BR_VER).tar.gz -O $(BR_FILE); \
 		mkdir -p $(TARGET); tar -xf $(BR_FILE) -C $(TARGET); fi
-	@echo --- $(or $(CONFIG),$(error variable CONFIG is not defined))
 	@$(BR_MAKE) BR2_DEFCONFIG=$(PWD)/$(CONFIG) defconfig
 
 toolname:
@@ -103,8 +103,7 @@ define REPACK_FIRMWARE
 	cd $(TARGET)/images/$(3) && cp -f ../$(2) $(2).$(BR2_OPENIPC_SOC_MODEL)
 	cd $(TARGET)/images/$(3) && md5sum $(1).$(BR2_OPENIPC_SOC_MODEL) > $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum
 	cd $(TARGET)/images/$(3) && md5sum $(2).$(BR2_OPENIPC_SOC_MODEL) > $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum
-	cd $(TARGET)/images/$(3) && tar -czf \
-		$(TARGET)/images/openipc.$(BR2_OPENIPC_SOC_MODEL)-$(3)-$(BR2_OPENIPC_FLAVOR).tgz \
+	cd $(TARGET)/images/$(3) && tar -czf ../openipc.$(BR2_OPENIPC_SOC_MODEL)-$(3)-$(BR2_OPENIPC_FLAVOR).tgz \
 		$(1).$(BR2_OPENIPC_SOC_MODEL) $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum \
 		$(2).$(BR2_OPENIPC_SOC_MODEL) $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum
 	rm -rf $(TARGET)/images/$(3)
diff --git a/general/external.mk b/general/external.mk
index c5e878d6..1722b223 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -3,9 +3,15 @@ export OPENIPC_SOC_MODEL := $(call qstrip,$(BR2_OPENIPC_SOC_MODEL))
 export OPENIPC_SOC_FAMILY := $(call qstrip,$(BR2_OPENIPC_SOC_FAMILY))
 export OPENIPC_FLAVOR := $(call qstrip,$(BR2_OPENIPC_FLAVOR))
 
-EXTERNAL_SHA = $(shell git ls-remote $(1) $(2) | head -1 | cut -f1)
 EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
-OPENIPC_KERNEL := $(call EXTERNAL_SHA,https://github.com/openipc/linux,$(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY))
 OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG))
 
+ifeq ($(call qstrip,$(BR2_DL_DIR)),$(TOPDIR)/dl)
+OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
+else
+OPENIPC_KERNEL := $(shell git ls-remote https://github.com/openipc/linux \
+	$(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY) | head -1 | cut -f1)
+LOCAL_DOWNLOAD = y
+endif
+
 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
diff --git a/general/package/atbm603x/atbm603x.mk b/general/package/atbm603x/atbm603x.mk
index 90bd9773..d48c0c82 100644
--- a/general/package/atbm603x/atbm603x.mk
+++ b/general/package/atbm603x/atbm603x.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 ATBM603X_SITE_METHOD = git
 ATBM603X_SITE = https://github.com/openipc/atbm_60xx
-ATBM603X_VERSION = $(call EXTERNAL_SHA,$(ATBM603X_SITE),HEAD)
+ATBM603X_VERSION = $(shell git ls-remote $(ATBM603X_SITE) HEAD | head -1 | cut -f1)
+else
+ATBM603X_SITE = https://github.com/openipc/atbm_60xx/archive
+ATBM603X_SOURCE = master.tar.gz
+endif
 
 ATBM603X_LICENSE = GPL-2.0
 
diff --git a/general/package/aura-httpd/aura-httpd.mk b/general/package/aura-httpd/aura-httpd.mk
index d155db58..56c670a2 100644
--- a/general/package/aura-httpd/aura-httpd.mk
+++ b/general/package/aura-httpd/aura-httpd.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 AURA_HTTPD_SITE_METHOD = git
 AURA_HTTPD_SITE = https://github.com/nekromant/aura-httpd
-AURA_HTTPD_VERSION = $(call EXTERNAL_SHA,$(AURA_HTTPD_SITE),HEAD)
+AURA_HTTPD_VERSION = $(shell git ls-remote $(AURA_HTTPD_SITE) HEAD | head -1 | cut -f1)
+else
+AURA_HTTPD_SITE = https://github.com/nekromant/aura-httpd/archive
+AURA_HTTPD_SOURCE = master.tar.gz
+endif
 
 AURA_HTTPD_LICENSE = MIT
 AURA_HTTPD_LICENSE_FILES = LICENSE
diff --git a/general/package/aws-producer/aws-producer.mk b/general/package/aws-producer/aws-producer.mk
index d53b16c2..f78aea2d 100644
--- a/general/package/aws-producer/aws-producer.mk
+++ b/general/package/aws-producer/aws-producer.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 AWS_PRODUCER_SITE_METHOD = git
 AWS_PRODUCER_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-producer-c
-AWS_PRODUCER_VERSION = $(call EXTERNAL_SHA,$(AWS_PRODUCER_SITE),HEAD)
+AWS_PRODUCER_VERSION = $(shell git ls-remote $(AWS_PRODUCER_SITE) HEAD | head -1 | cut -f1)
+else
+AWS_PRODUCER_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/archive
+AWS_PRODUCER_SOURCE = master.tar.gz
+endif
 
 AWS_PRODUCER_INSTALL_STAGING = YES
 AWS_PRODUCER_LICENSE = Apache-2.0
diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk
index ea0545a4..4b0eb73d 100644
--- a/general/package/aws-webrtc/aws-webrtc.mk
+++ b/general/package/aws-webrtc/aws-webrtc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 AWS_WEBRTC_SITE_METHOD = git
 AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c
-AWS_WEBRTC_VERSION = $(call EXTERNAL_SHA,$(AWS_WEBRTC_SITE),develop)
+AWS_WEBRTC_VERSION = $(shell git ls-remote $(AWS_WEBRTC_SITE) develop | head -1 | cut -f1)
+else
+AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c/archive
+AWS_WEBRTC_SOURCE = develop.tar.gz
+endif
 
 AWS_WEBRTC_INSTALL_STAGING = YES
 AWS_WEBRTC_LICENSE = Apache-2.0
diff --git a/general/package/exfat-openipc/exfat-openipc.mk b/general/package/exfat-openipc/exfat-openipc.mk
index 98bc6f0e..5b663992 100644
--- a/general/package/exfat-openipc/exfat-openipc.mk
+++ b/general/package/exfat-openipc/exfat-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 EXFAT_OPENIPC_SITE_METHOD = git
 EXFAT_OPENIPC_SITE = https://github.com/namjaejeon/linux-exfat-oot
-EXFAT_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(EXFAT_OPENIPC_SITE),HEAD)
+EXFAT_OPENIPC_VERSION = $(shell git ls-remote $(EXFAT_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+else
+EXFAT_OPENIPC_SITE = https://github.com/namjaejeon/linux-exfat-oot/archive
+EXFAT_OPENIPC_SOURCE = master.tar.gz
+endif
 
 EXFAT_OPENIPC_LICENSE = GPL-2.0
 EXFAT_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
index 88f390ce..e0941022 100644
--- a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
+++ b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 FDK_AAC_OPENIPC_SITE_METHOD = git
 FDK_AAC_OPENIPC_SITE = https://github.com/widgetii/fdk-aac
-FDK_AAC_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(FDK_AAC_OPENIPC_SITE),tinification)
+FDK_AAC_OPENIPC_VERSION = $(shell git ls-remote $(FDK_AAC_OPENIPC_SITE) tinification | head -1 | cut -f1)
+else
+FDK_AAC_OPENIPC_SITE = https://github.com/widgetii/fdk-aac/archive
+FDK_AAC_OPENIPC_SOURCE = tinification.tar.gz
+endif
 
 FDK_AAC_OPENIPC_LICENSE = fdk-aac license
 FDK_AAC_OPENIPC_LICENSE_FILES = NOTICE
diff --git a/general/package/gdbserver-lite/gdbserver-lite.mk b/general/package/gdbserver-lite/gdbserver-lite.mk
index d7f7ab16..3343d25d 100644
--- a/general/package/gdbserver-lite/gdbserver-lite.mk
+++ b/general/package/gdbserver-lite/gdbserver-lite.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 GDBSERVER_LITE_SITE_METHOD = git
 GDBSERVER_LITE_SITE = https://github.com/bet4it/gdbserver
-GDBSERVER_LITE_VERSION = $(call EXTERNAL_SHA,$(GDBSERVER_LITE_SITE),HEAD)
+GDBSERVER_LITE_VERSION = $(shell git ls-remote $(GDBSERVER_LITE_SITE) HEAD | head -1 | cut -f1)
+else
+GDBSERVER_LITE_SITE = https://github.com/bet4it/gdbserver/archive
+GDBSERVER_LITE_SOURCE = master.tar.gz
+endif
 
 GDBSERVER_LITE_LICENSE = GNU General Public License v3.0
 GDBSERVER_LITE_LICENSE_FILES = LICENSE
diff --git a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
index 0ed69d65..ce5120af 100644
--- a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
+++ b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 HISILICON_OPENSDK_SITE_METHOD = git
 HISILICON_OPENSDK_SITE = https://github.com/openipc/openhisilicon
-HISILICON_OPENSDK_VERSION = $(call EXTERNAL_SHA,$(HISILICON_OPENSDK_SITE),HEAD)
+HISILICON_OPENSDK_VERSION = $(shell git ls-remote $(HISILICON_OPENSDK_SITE) HEAD | head -1 | cut -f1)
+else
+HISILICON_OPENSDK_SITE = https://github.com/openipc/openhisilicon/archive
+HISILICON_OPENSDK_SOURCE = master.tar.gz
+endif
 
 HISILICON_OPENSDK_LICENSE = GPL-3.0
 HISILICON_OPENSDK_LICENSE_FILES = LICENSE
diff --git a/general/package/ingenic-opensdk/ingenic-opensdk.mk b/general/package/ingenic-opensdk/ingenic-opensdk.mk
index 0a7110ad..4c792e40 100644
--- a/general/package/ingenic-opensdk/ingenic-opensdk.mk
+++ b/general/package/ingenic-opensdk/ingenic-opensdk.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 INGENIC_OPENSDK_SITE_METHOD = git
 INGENIC_OPENSDK_SITE = https://github.com/openipc/openingenic
-INGENIC_OPENSDK_VERSION = $(call EXTERNAL_SHA,$(INGENIC_OPENSDK_SITE),HEAD)
+INGENIC_OPENSDK_VERSION = $(shell git ls-remote $(INGENIC_OPENSDK_SITE) HEAD | head -1 | cut -f1)
+else
+INGENIC_OPENSDK_SITE = https://github.com/openipc/openingenic/archive
+INGENIC_OPENSDK_SOURCE = master.tar.gz
+endif
 
 INGENIC_OPENSDK_LICENSE = GPL-3.0
 INGENIC_OPENSDK_LICENSE_FILES = LICENSE
diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk
index 53bb7ac9..5b5d5e5b 100644
--- a/general/package/ipctool/ipctool.mk
+++ b/general/package/ipctool/ipctool.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 IPCTOOL_SITE_METHOD = git
 IPCTOOL_SITE = https://github.com/openipc/ipctool
-IPCTOOL_VERSION = $(call EXTERNAL_SHA,$(IPCTOOL_SITE),HEAD)
+IPCTOOL_VERSION = $(shell git ls-remote $(IPCTOOL_SITE) HEAD | head -1 | cut -f1)
+else
+IPCTOOL_SITE = https://github.com/openipc/ipctool/archive
+IPCTOOL_SOURCE = master.tar.gz
+endif
 
 IPCTOOL_LICENSE = MIT
 IPCTOOL_LICENSE_FILES = LICENSE
diff --git a/general/package/json-c-openipc/json-c-openipc.mk b/general/package/json-c-openipc/json-c-openipc.mk
index 1628d35f..20d95dce 100644
--- a/general/package/json-c-openipc/json-c-openipc.mk
+++ b/general/package/json-c-openipc/json-c-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 JSON_C_OPENIPC_SITE_METHOD = git
 JSON_C_OPENIPC_SITE = https://github.com/json-c/json-c
-JSON_C_OPENIPC_VERSION = 9021cdcdd01fc9dbcbe1f06391848c2ac915212f
+JSON_C_OPENIPC_VERSION = $(shell git ls-remote $(JSON_C_OPENIPC_SITE) json-c-0.15-20200726 | head -1 | cut -f1)
+else
+JSON_C_OPENIPC_SITE = https://github.com/json-c/json-c/archive
+JSON_C_OPENIPC_SOURCE = json-c-0.15-20200726.tar.gz
+endif
 
 JSON_C_OPENIPC_INSTALL_STAGING = YES
 JSON_C_OPENIPC_LICENSE = MIT
diff --git a/general/package/jsonfilter/jsonfilter.mk b/general/package/jsonfilter/jsonfilter.mk
index 9ae65a9c..386e7e81 100644
--- a/general/package/jsonfilter/jsonfilter.mk
+++ b/general/package/jsonfilter/jsonfilter.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 JSONFILTER_SITE_METHOD = git
 JSONFILTER_SITE = https://github.com/openwrt/jsonpath
-JSONFILTER_VERSION = $(call EXTERNAL_SHA,$(JSONFILTER_SITE),HEAD)
+JSONFILTER_VERSION = $(shell git ls-remote $(JSONFILTER_SITE) HEAD | head -1 | cut -f1)
+else
+JSONFILTER_SITE = https://github.com/openwrt/jsonpath/archive
+JSONFILTER_SOURCE = master.tar.gz
+endif
 
 JSONFILTER_LICENSE = ISC, BSD-3-Clause
 
diff --git a/general/package/libsrtp-openipc/libsrtp-openipc.mk b/general/package/libsrtp-openipc/libsrtp-openipc.mk
index fd9be4db..81e561af 100644
--- a/general/package/libsrtp-openipc/libsrtp-openipc.mk
+++ b/general/package/libsrtp-openipc/libsrtp-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 LIBSRTP_OPENIPC_SITE_METHOD = git
 LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp
-LIBSRTP_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(LIBSRTP_OPENIPC_SITE),HEAD)
+LIBSRTP_OPENIPC_VERSION = $(shell git ls-remote $(LIBSRTP_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+else
+LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp/archive
+LIBSRTP_OPENIPC_SOURCE = master.tar.gz
+endif
 
 LIBSRTP_OPENIPC_INSTALL_STAGING = YES
 LIBSRTP_OPENIPC_LICENSE = BSD-3-Clause
diff --git a/general/package/linux-firmware-openipc/linux-firmware-openipc.mk b/general/package/linux-firmware-openipc/linux-firmware-openipc.mk
index 7767cb14..95691038 100644
--- a/general/package/linux-firmware-openipc/linux-firmware-openipc.mk
+++ b/general/package/linux-firmware-openipc/linux-firmware-openipc.mk
@@ -4,23 +4,26 @@
 #
 ################################################################################
 
-LINUX_FIRMWARE_OPENIPC_SITE_METHOD = git
-LINUX_FIRMWARE_OPENIPC_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware
-LINUX_FIRMWARE_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(LINUX_FIRMWARE_OPENIPC_SITE),HEAD)
+LINUX_FIRMWARE_OPENIPC_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 
-# WiFi RTL8188EU
+ifeq ($(LOCAL_DOWNLOAD),y)
+LINUX_FIRMWARE_OPENIPC_SITE_METHOD = git
+LINUX_FIRMWARE_OPENIPC_VERSION = $(shell git ls-remote $(LINUX_FIRMWARE_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+endif
+
+# RTL8188EU
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL_8188EU),y)
 LINUX_FIRMWARE_OPENIPC_FILES += rtlwifi/rtl8188eufw.bin
 LINUX_FIRMWARE_OPENIPC_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
 endif
 
-# ar9271
+# AR9271
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271),y)
 LINUX_FIRMWARE_OPENIPC_FILES += ath9k_htc/htc_9271-1.4.0.fw
 LINUX_FIRMWARE_OPENIPC_ALL_LICENSE_FILES += LICENCE.atheros_firmware
 endif
 
-# MT7601
+# MT7601U
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U),y)
 LINUX_FIRMWARE_OPENIPC_FILES += mediatek/mt7601u.bin
 LINUX_FIRMWARE_OPENIPC_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware
@@ -28,6 +31,15 @@ endif
 
 ifneq ($(LINUX_FIRMWARE_OPENIPC_FILES)$(LINUX_FIRMWARE_OPENIPC_DIRS),)
 
+ifeq ($(LOCAL_DOWNLOAD),)
+define LINUX_FIRMWARE_OPENIPC_EXTRACT_CMDS
+	$(WGET) $(LINUX_FIRMWARE_OPENIPC_SITE)/plain/WHENCE -O $(@D)/WHENCE
+	$(foreach mk,$(LINUX_FIRMWARE_OPENIPC_FILES),mkdir -p $(dir $(@D)/$(mk))$(sep))
+	$(foreach dl,$(LINUX_FIRMWARE_OPENIPC_FILES), \
+		$(WGET) $(LINUX_FIRMWARE_OPENIPC_SITE)/plain/$(dl) -O $(@D)/$(dl)$(sep))
+endef
+endif
+
 define LINUX_FIRMWARE_OPENIPC_BUILD_CMDS
 	cd $(@D) && \
 	$(TAR) cf br-firmware.tar $(sort $(LINUX_FIRMWARE_OPENIPC_FILES) $(LINUX_FIRMWARE_OPENIPC_DIRS))
diff --git a/general/package/microbe-web/microbe-web.mk b/general/package/microbe-web/microbe-web.mk
index 31550138..e162366e 100644
--- a/general/package/microbe-web/microbe-web.mk
+++ b/general/package/microbe-web/microbe-web.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 MICROBE_WEB_SITE_METHOD = git
 MICROBE_WEB_SITE = https://github.com/openipc/microbe-web
-MICROBE_WEB_VERSION = $(call EXTERNAL_SHA,$(MICROBE_WEB_SITE),HEAD)
+MICROBE_WEB_VERSION = $(shell git ls-remote $(MICROBE_WEB_SITE) HEAD | head -1 | cut -f1)
+else
+MICROBE_WEB_SITE = https://github.com/openipc/microbe-web/archive
+MICROBE_WEB_SOURCE = master.tar.gz
+endif
 
 MICROBE_WEB_LICENSE = MIT
 MICROBE_WEB_LICENSE_FILES = LICENSE
diff --git a/general/package/microsnander/microsnander.mk b/general/package/microsnander/microsnander.mk
index 0aef9018..a63ca786 100644
--- a/general/package/microsnander/microsnander.mk
+++ b/general/package/microsnander/microsnander.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 MICROSNANDER_SITE_METHOD = git
 MICROSNANDER_SITE = https://github.com/openipc/microsnander
-MICROSNANDER_VERSION = $(call EXTERNAL_SHA,$(MICROSNANDER_SITE),HEAD)
+MICROSNANDER_VERSION = $(shell git ls-remote $(MICROSNANDER_SITE) HEAD | head -1 | cut -f1)
+else
+MICROSNANDER_SITE = https://github.com/openipc/microsnander/archive
+MICROSNANDER_SOURCE = master.tar.gz
+endif
 
 MICROSNANDER_LICENSE = MIT
 MICROSNANDER_LICENSE_FILES = LICENSE
diff --git a/general/package/mini/mini.mk b/general/package/mini/mini.mk
index c5f7a306..7d4d6593 100644
--- a/general/package/mini/mini.mk
+++ b/general/package/mini/mini.mk
@@ -6,7 +6,7 @@
 
 MINI_SITE_METHOD = git
 MINI_SITE = https://github.com/openipc/mini
-MINI_VERSION = $(call EXTERNAL_SHA,$(MINI_SITE),HEAD)
+MINI_VERSION = $(shell git ls-remote $(MINI_SITE) HEAD | head -1 | cut -f1)
 
 MINI_GIT_SUBMODULES = YES
 MINI_LICENSE = GPL-3.0
diff --git a/general/package/motors/motors.mk b/general/package/motors/motors.mk
index 8c339f9d..8cadc9dd 100644
--- a/general/package/motors/motors.mk
+++ b/general/package/motors/motors.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 MOTORS_SITE_METHOD = git
 MOTORS_SITE = https://github.com/openipc/motors
-MOTORS_VERSION = $(call EXTERNAL_SHA,$(MOTORS_SITE),HEAD)
+MOTORS_VERSION = $(shell git ls-remote $(MOTORS_SITE) HEAD | head -1 | cut -f1)
+else
+MOTORS_SITE = https://github.com/openipc/motors/archive
+MOTORS_SOURCE = master.tar.gz
+endif
 
 MOTORS_LICENSE = MIT
 MOTORS_LICENSE_FILES = LICENSE
diff --git a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
index 2dcf5aee..5fa51f5b 100644
--- a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
+++ b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 MT7601U_AP_OPENIPC_SITE_METHOD = git
 MT7601U_AP_OPENIPC_SITE = https://github.com/openipc/mt7601u
-MT7601U_AP_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(MT7601U_AP_OPENIPC_SITE),HEAD)
+MT7601U_AP_OPENIPC_VERSION = $(shell git ls-remote $(MT7601U_AP_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+else
+MT7601U_AP_OPENIPC_SITE = https://github.com/openipc/mt7601u/archive
+MT7601U_AP_OPENIPC_SOURCE = master.tar.gz
+endif
 
 MT7601U_AP_OPENIPC_LICENSE = GPL-2.0
 
diff --git a/general/package/onvif-simple-server/onvif-simple-server.mk b/general/package/onvif-simple-server/onvif-simple-server.mk
index 8ad2cac3..2d0d97f5 100644
--- a/general/package/onvif-simple-server/onvif-simple-server.mk
+++ b/general/package/onvif-simple-server/onvif-simple-server.mk
@@ -7,12 +7,11 @@
 ONVIF_SIMPLE_SERVER_SITE_METHOD = git
 ONVIF_SIMPLE_SERVER_SITE = https://github.com/roleoroleo/onvif_simple_server
 ONVIF_SIMPLE_SERVER_VERSION = 8a19b6662af3ab123bb000a09710728cc355359c
-ONVIF_SIMPLE_SERVER_DEPENDENCIES = libtomcrypt
 
+ONVIF_SIMPLE_SERVER_DEPENDENCIES = libtomcrypt
 ONVIF_SIMPLE_SERVER_LICENSE = MIT
 ONVIF_SIMPLE_SERVER_LICENSE_FILES = LICENSE
 
-
 define ONVIF_SIMPLE_SERVER_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef
diff --git a/general/package/quirc-openipc/quirc-openipc.mk b/general/package/quirc-openipc/quirc-openipc.mk
index d41aba8c..f0c35f86 100644
--- a/general/package/quirc-openipc/quirc-openipc.mk
+++ b/general/package/quirc-openipc/quirc-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 QUIRC_OPENIPC_SITE_METHOD = git
 QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc
-QUIRC_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(QUIRC_OPENIPC_SITE),HEAD)
+QUIRC_OPENIPC_VERSION = $(shell git ls-remote $(QUIRC_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+else
+QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc/archive
+QUIRC_OPENIPC_SOURCE = master.tar.gz
+endif
 
 QUIRC_OPENIPC_DEPENDENCIES += libjpeg
 QUIRC_OPENIPC_LICENSE = ISC
diff --git a/general/package/rtl8188fu/rtl8188fu.mk b/general/package/rtl8188fu/rtl8188fu.mk
index b3b2f183..a4530539 100644
--- a/general/package/rtl8188fu/rtl8188fu.mk
+++ b/general/package/rtl8188fu/rtl8188fu.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 RTL8188FU_SITE_METHOD = git
 RTL8188FU_SITE = https://github.com/viktorxda/realtek_wlan
-RTL8188FU_VERSION = $(call EXTERNAL_SHA,$(RTL8188FU_SITE),rtl8188fu)
+RTL8188FU_VERSION = $(shell git ls-remote $(RTL8188FU_SITE) rtl8188fu | head -1 | cut -f1)
+else
+RTL8188FU_SITE = https://github.com/viktorxda/realtek_wlan/archive
+RTL8188FU_SOURCE = rtl8188fu.tar.gz
+endif
 
 RTL8188FU_LICENSE = GPL-2.0
 RTL8188FU_LICENSE_FILES = COPYING
diff --git a/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk b/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
index f6c77ddc..74b3a67c 100644
--- a/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
+++ b/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 RTL8189FS_OPENIPC_SITE_METHOD = git
-RTL8189FS_OPENIPC_SITE = https://github.com/jwrdegoede/rtl8189ES_linux
-RTL8189FS_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(RTL8189FS_OPENIPC_SITE),rtl8189fs)
+RTL8189FS_OPENIPC_SITE = https://github.com/jwrdegoede/rtl8189es_linux
+RTL8189FS_OPENIPC_VERSION = $(shell git ls-remote $(RTL8189FS_OPENIPC_SITE) rtl8189fs | head -1 | cut -f1)
+else
+RTL8189FS_OPENIPC_SITE = https://github.com/jwrdegoede/rtl8189es_linux/archive
+RTL8189FS_OPENIPC_SOURCE = rtl8189fs.tar.gz
+endif
 
 RTL8189FS_OPENIPC_LICENSE = GPL-2.0
 RTL8189FS_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk b/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk
index 92d5be2a..d0ba6222 100644
--- a/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk
+++ b/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 RTL8192EU_OPENIPC_SITE_METHOD = git
 RTL8192EU_OPENIPC_SITE = https://github.com/mange/rtl8192eu-linux-driver
-RTL8192EU_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(RTL8192EU_OPENIPC_SITE),HEAD)
+RTL8192EU_OPENIPC_VERSION = $(shell git ls-remote $(RTL8192EU_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+else
+RTL8192EU_OPENIPC_SITE = https://github.com/mange/rtl8192eu-linux-driver/archive
+RTL8192EU_OPENIPC_SOURCE = master.tar.gz
+endif
 
 RTL8192EU_OPENIPC_LICENSE = GPL-2.0
 RTL8192EU_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/rtl8733bu/rtl8733bu.mk b/general/package/rtl8733bu/rtl8733bu.mk
index ba147410..d118c806 100644
--- a/general/package/rtl8733bu/rtl8733bu.mk
+++ b/general/package/rtl8733bu/rtl8733bu.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 RTL8733BU_SITE_METHOD = git
 RTL8733BU_SITE = https://github.com/viktorxda/realtek_wlan
-RTL8733BU_VERSION = $(call EXTERNAL_SHA,$(RTL8733BU_SITE),rtl8733bu)
+RTL8733BU_VERSION = $(shell git ls-remote $(RTL8733BU_SITE) rtl8733bu | head -1 | cut -f1)
+else
+RTL8733BU_SITE = https://github.com/viktorxda/realtek_wlan/archive
+RTL8733BU_SOURCE = rtl8733bu.tar.gz
+endif
 
 RTL8733BU_LICENSE = GPL-2.0
 RTL8733BU_LICENSE_FILES = COPYING
diff --git a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk
index 99f3347d..28afb147 100644
--- a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk
+++ b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 RTL8812AU_OPENIPC_SITE_METHOD = git
 RTL8812AU_OPENIPC_SITE = https://github.com/svpcom/rtl8812au
-RTL8812AU_OPENIPC_VERSION = $(call EXTERNAL_SHA,$(RTL8812AU_OPENIPC_SITE),HEAD)
+RTL8812AU_OPENIPC_VERSION = $(shell git ls-remote $(RTL8812AU_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+else
+RTL8812AU_OPENIPC_SITE = https://github.com/svpcom/rtl8812au/archive
+RTL8812AU_OPENIPC_SOURCE = master.tar.gz
+endif
 
 RTL8812AU_OPENIPC_LICENSE = GPL-2.0
 RTL8812AU_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/ssw101b/ssw101b.mk b/general/package/ssw101b/ssw101b.mk
index 57d28687..813a3c44 100644
--- a/general/package/ssw101b/ssw101b.mk
+++ b/general/package/ssw101b/ssw101b.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 SSW101B_SITE_METHOD = git
 SSW101B_SITE = https://github.com/openipc/ssw101b
-SSW101B_VERSION = $(call EXTERNAL_SHA,$(SSW101B_SITE),HEAD)
+SSW101B_VERSION = $(shell git ls-remote $(SSW101B_SITE) HEAD | head -1 | cut -f1)
+else
+SSW101B_SITE = https://github.com/openipc/ssw101b/archive
+SSW101B_SOURCE = master.tar.gz
+endif
 
 SSW101B_LICENSE = GPL-2.0
 
diff --git a/general/package/usrsctp/usrsctp.mk b/general/package/usrsctp/usrsctp.mk
index 288c1461..b69e2b9f 100644
--- a/general/package/usrsctp/usrsctp.mk
+++ b/general/package/usrsctp/usrsctp.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-USRSCTP_VERSION = 1ade45cbadfd19298d2c47dc538962d4425ad2dd
-USRSCTP_SITE = https://github.com/sctplab/usrsctp.git
 USRSCTP_SITE_METHOD = git
+USRSCTP_SITE = https://github.com/sctplab/usrsctp
+USRSCTP_VERSION = 1ade45cbadfd19298d2c47dc538962d4425ad2dd
+
 USRSCTP_INSTALL_STAGING = YES
 USRSCTP_LICENSE = Apache-2.0
 USRSCTP_LICENSE_FILES = BSD
diff --git a/general/package/yaml-cli/yaml-cli.mk b/general/package/yaml-cli/yaml-cli.mk
index a2249ddb..25041fad 100644
--- a/general/package/yaml-cli/yaml-cli.mk
+++ b/general/package/yaml-cli/yaml-cli.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
+ifeq ($(LOCAL_DOWNLOAD),y)
 YAML_CLI_SITE_METHOD = git
 YAML_CLI_SITE = https://github.com/openipc/yaml-cli
-YAML_CLI_VERSION = $(call EXTERNAL_SHA,$(YAML_CLI_SITE),HEAD)
+YAML_CLI_VERSION = $(shell git ls-remote $(YAML_CLI_SITE) HEAD | head -1 | cut -f1)
+else
+YAML_CLI_SITE = https://github.com/openipc/yaml-cli/archive
+YAML_CLI_SOURCE = master.tar.gz
+endif
 
 YAML_CLI_LICENSE = MIT
 YAML_CLI_LICENSE_FILES = LICENSE