diff --git a/general/package/Config.in b/general/package/Config.in
index d529cc0d..2ad4787b 100644
--- a/general/package/Config.in
+++ b/general/package/Config.in
@@ -11,7 +11,6 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/baresip-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/capjpeg/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/comgt/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/datalink/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/df_sdwan_edge/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/dropbear-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/exfat-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/f2fs-tools-openipc/Config.in"
@@ -37,14 +36,12 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/hisilicon-osdrv-hi3536dv100/Config.in
 source "$BR2_EXTERNAL_GENERAL_PATH/package/hisilicon-osdrv-serdes/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/hisilicon-osdrv1-sources/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/i2c-telemetry/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-libimp-control/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-opensdk/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t20/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t21/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t30/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t31/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t40/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-pwm/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ipctool/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/jsonfilter/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/lame-openipc/Config.in"
@@ -112,4 +109,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm530/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/xmdp/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/yaml-cli/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/zerotier-one/Config.in"
+
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-diag-tools/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-libimp-control/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-pwm/Config.in"
diff --git a/general/package/aic8800-openipc/aic8800-openipc.mk b/general/package/aic8800-openipc/aic8800-openipc.mk
index 182e7a0b..999386d1 100644
--- a/general/package/aic8800-openipc/aic8800-openipc.mk
+++ b/general/package/aic8800-openipc/aic8800-openipc.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-AIC8800_OPENIPC_SITE_METHOD = git
-AIC8800_OPENIPC_SITE = https://github.com/openipc/aic8800
-AIC8800_OPENIPC_VERSION = $(shell git ls-remote $(AIC8800_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+AIC8800_OPENIPC_SITE = $(call github,openipc,aic8800,$(AIC8800_OPENIPC_VERSION))
+AIC8800_OPENIPC_VERSION = master
 
 AIC8800_OPENIPC_LICENSE = GPL-2.0
 
diff --git a/general/package/atbm60xx/atbm60xx.mk b/general/package/atbm60xx/atbm60xx.mk
index a730ef33..c3b4cb16 100644
--- a/general/package/atbm60xx/atbm60xx.mk
+++ b/general/package/atbm60xx/atbm60xx.mk
@@ -1,17 +1,11 @@
 ################################################################################
 #
-# altobeam atbm60xx wifi driver
+# atbm60xx
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-ATBM60XX_SITE_METHOD = git
-ATBM60XX_SITE = https://github.com/openipc/atbm_60xx
-ATBM60XX_VERSION = $(shell git ls-remote $(ATBM60XX_SITE) HEAD | head -1 | cut -f1)
-else
-ATBM60XX_SITE = https://github.com/openipc/atbm_60xx/archive
-ATBM60XX_SOURCE = master.tar.gz
-endif
+ATBM60XX_SITE = $(call github,openipc,atbm_60xx,$(ATBM60XX_VERSION))
+ATBM60XX_VERSION = master
 
 define ATBM60XX_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/share/atbm60xx_conf
diff --git a/general/package/atbm6441/atbm6441.mk b/general/package/atbm6441/atbm6441.mk
index 6dc7104d..c43ae4e5 100644
--- a/general/package/atbm6441/atbm6441.mk
+++ b/general/package/atbm6441/atbm6441.mk
@@ -1,17 +1,11 @@
 ################################################################################
 #
-# altobeam ATBM6441 WiFi driver
+# atbm6441
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-ATBM6441_SITE_METHOD = git
-ATBM6441_SITE = https://github.com/gtxaspec/atbm6441
-ATBM6441_VERSION = $(shell git ls-remote $(ATBM6441_SITE) HEAD | head -1 | cut -f1)
-else
-ATBM6441_SITE = https://github.com/gtxaspec/atbm6441/archive
-ATBM6441_SOURCE = master.tar.gz
-endif
+ATBM6441_SITE = $(call github,gtxaspec,atbm6441,$(ATBM6441_VERSION))
+ATBM6441_VERSION = master
 
 ATBM6441_LICENSE = GPL-2.0
 ATBM6441_MODULE_MAKE_OPTS = \
diff --git a/general/package/aura-httpd/aura-httpd.mk b/general/package/aura-httpd/aura-httpd.mk
index 56c670a2..70fa8182 100644
--- a/general/package/aura-httpd/aura-httpd.mk
+++ b/general/package/aura-httpd/aura-httpd.mk
@@ -1,23 +1,14 @@
 ################################################################################
 #
-# aura-httpd | updated 2021.06.19
+# aura-httpd
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-AURA_HTTPD_SITE_METHOD = git
-AURA_HTTPD_SITE = https://github.com/nekromant/aura-httpd
-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_SITE = $(call github,nekromant,aura-httpd,$(AURA_HTTPD_VERSION))
+AURA_HTTPD_VERSION = master
 
 AURA_HTTPD_LICENSE = MIT
 AURA_HTTPD_LICENSE_FILES = LICENSE
-
-#AURA_HTTPD_CONF_OPTS += -DCROSS_COMPILE=?
-
 AURA_HTTPD_MAKE_OPTS += VERBOSE=1
 
 $(eval $(cmake-package))
diff --git a/general/package/aws-producer/aws-producer.mk b/general/package/aws-producer/aws-producer.mk
index 0cb3b670..dfba2a24 100644
--- a/general/package/aws-producer/aws-producer.mk
+++ b/general/package/aws-producer/aws-producer.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-AWS_PRODUCER_SITE_METHOD = git
-AWS_PRODUCER_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-producer-c
-AWS_PRODUCER_VERSION = $(shell git ls-remote $(AWS_PRODUCER_SITE) HEAD | head -1 | cut -f1)
+AWS_PRODUCER_SITE = $(call github,awslabs,amazon-kinesis-video-streams-producer-c,$(AWS_PRODUCER_VERSION))
+AWS_PRODUCER_VERSION = master
 
 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 e4328b71..9b07b927 100644
--- a/general/package/aws-webrtc/aws-webrtc.mk
+++ b/general/package/aws-webrtc/aws-webrtc.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-AWS_WEBRTC_SITE_METHOD = git
-AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c
-AWS_WEBRTC_VERSION = $(shell git ls-remote $(AWS_WEBRTC_SITE) develop | head -1 | cut -f1)
+AWS_WEBRTC_SITE = $(call github,OpenIPC,webrtc-c,$(AWS_WEBRTC_VERSION))
+AWS_WEBRTC_VERSION = develop
 
 AWS_WEBRTC_INSTALL_STAGING = YES
 AWS_WEBRTC_LICENSE = Apache-2.0
diff --git a/general/package/capjpeg/capjpeg.mk b/general/package/capjpeg/capjpeg.mk
index b085ac30..6dc9b411 100644
--- a/general/package/capjpeg/capjpeg.mk
+++ b/general/package/capjpeg/capjpeg.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-CAPJPEG_SITE_METHOD = git
-CAPJPEG_SITE = https://github.com/openipc/capjpeg
-CAPJPEG_VERSION = $(shell git ls-remote $(CAPJPEG_SITE) HEAD | head -1 | cut -f1)
-else
-CAPJPEG_SITE = https://github.com/openipc/capjpeg/archive
-CAPJPEG_SOURCE = main.tar.gz
-endif
+CAPJPEG_SITE = $(call github,openipc,capjpeg,$(CAPJPEG_VERSION))
+CAPJPEG_VERSION = master
 
 CAPJPEG_LICENSE = MIT
 CAPJPEG_LICENSE_FILES = LICENSE
diff --git a/general/package/df_sdwan_edge/Config.in b/general/package/df_sdwan_edge/Config.in
deleted file mode 100644
index a9317737..00000000
--- a/general/package/df_sdwan_edge/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_DF_SDWAN_EDGE
-	bool "DataFlow SDWAN Edge"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	default n
-	help
-	  Edge for Software Defined WAN by DataFlow.
-
-	  https://getdataflow.com/sdwan
-	  
-comment "DataFlow SDWAN needs a toolchain w/ C++, threads"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/general/package/df_sdwan_edge/df_sdwan_edge.mk b/general/package/df_sdwan_edge/df_sdwan_edge.mk
deleted file mode 100644
index adf9fc84..00000000
--- a/general/package/df_sdwan_edge/df_sdwan_edge.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#
-# DataFlow SDWAN Edge
-#
-################################################################################
-
-# - Package information
-DF_SDWAN_EDGE_VERSION = current
-DF_SDWAN_EDGE_SOURCE = df_sdwan_edge.$(OPENIPC_SOC_FAMILY).tar.xz
-DF_SDWAN_EDGE_SITE = http://getdataflow.ru/download/sdwan/openipc
-
-DF_SDWAN_EDGE_LICENSE = PROPRIETARY
-DF_SDWAN_EDGE_LICENSE_FILES = LICENSE
-
-# - Install commands
-define DF_SDWAN_EDGE_INSTALL_TARGET_CMDS
-	# --- Create folders
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/opt/sdwan
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/opt/sdwan/bin
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/opt/sdwan/bin/modules
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/opt/sdwan/config
-
-	# --- Install binaries
-	$(INSTALL) -m 755 $(@D)/bin/sdwan-edge-core $(TARGET_DIR)/opt/sdwan/bin/sdwan-edge-core
-	$(INSTALL) -m 644 $(@D)/bin/libdataflow.so $(TARGET_DIR)/opt/sdwan/bin/libdataflow.so
-	$(INSTALL) -m 644 $(@D)/bin/modules/df_netio.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_netio.so
-	$(INSTALL) -m 644 $(@D)/bin/modules/df_sdfl.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_sdfl.so
-	$(INSTALL) -m 644 $(@D)/bin/modules/df_sdwan-edge.so $(TARGET_DIR)/opt/sdwan/bin/modules/df_sdwan-edge.so
-
-	# --- Install configuration
-	$(INSTALL) -m 644 $(@D)/config/edge.conf $(TARGET_DIR)/opt/sdwan/config/edge.conf
-	$(INSTALL) -m 644 $(@D)/config/memory.conf $(TARGET_DIR)/opt/sdwan/config/memory.conf
-	$(INSTALL) -m 644 $(@D)/config/sdwan.conf $(TARGET_DIR)/opt/sdwan/config/sdwan.conf
-	$(INSTALL) -m 644 $(@D)/config/sdwan_logger.conf $(TARGET_DIR)/opt/sdwan/config/sdwan_logger.conf
-
-	# --- Install service
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
-	$(INSTALL) -m 755 $(@D)/service/S45sdwan-edge $(TARGET_DIR)/etc/init.d/S45sdwan-edge
-endef
-
-$(eval $(generic-package))
diff --git a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
index e0941022..e60bb3f0 100644
--- a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
+++ b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-FDK_AAC_OPENIPC_SITE_METHOD = git
-FDK_AAC_OPENIPC_SITE = https://github.com/widgetii/fdk-aac
-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_SITE = $(call github,widgetii,fdk-aac,$(FDK_AAC_OPENIPC_VERSION))
+FDK_AAC_OPENIPC_VERSION = tinification
 
 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 3343d25d..fefba34c 100644
--- a/general/package/gdbserver-lite/gdbserver-lite.mk
+++ b/general/package/gdbserver-lite/gdbserver-lite.mk
@@ -1,17 +1,11 @@
 ################################################################################
 #
-# gdbserver-lite | updated 2021.05.10
+# gdbserver-lite
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-GDBSERVER_LITE_SITE_METHOD = git
-GDBSERVER_LITE_SITE = https://github.com/bet4it/gdbserver
-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_SITE = $(call github,bet4it,gdbserver,$(GDBSERVER_LITE_VERSION))
+GDBSERVER_LITE_VERSION = master
 
 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 ce5120af..a4b21f45 100644
--- a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
+++ b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-HISILICON_OPENSDK_SITE_METHOD = git
-HISILICON_OPENSDK_SITE = https://github.com/openipc/openhisilicon
-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_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK_VERSION))
+HISILICON_OPENSDK_VERSION = master
 
 HISILICON_OPENSDK_LICENSE = GPL-3.0
 HISILICON_OPENSDK_LICENSE_FILES = LICENSE
diff --git a/general/package/ingenic-diag-tools/ingenic-diag-tools.mk b/general/package/ingenic-diag-tools/ingenic-diag-tools.mk
index f6629c94..b41cbbd6 100644
--- a/general/package/ingenic-diag-tools/ingenic-diag-tools.mk
+++ b/general/package/ingenic-diag-tools/ingenic-diag-tools.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-INGENIC_DIAG_TOOLS_SITE_METHOD = git
-INGENIC_DIAG_TOOLS_SITE = https://github.com/gtxaspec/jz-diag-tools
-INGENIC_DIAG_TOOLS_VERSION = $(shell git ls-remote $(INGENIC_DIAG_TOOLS_SITE) HEAD | head -1 | cut -f1)
-else
-INGENIC_DIAG_TOOLS_SITE = https://github.com/gtxaspec/jz-diag-tools/archive
-INGENIC_DIAG_TOOLS_SOURCE = main.tar.gz
-endif
+INGENIC_DIAG_TOOLS_SITE = $(call github,gtxaspec,jz-diag-tools,$(INGENIC_DIAG_TOOLS_VERSION))
+INGENIC_DIAG_TOOLS_VERSION = master
 
 define INGENIC_DIAG_TOOLS_BUILD_CMDS
     $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)
diff --git a/general/package/ingenic-libimp-control/ingenic-libimp-control.mk b/general/package/ingenic-libimp-control/ingenic-libimp-control.mk
index 18242049..914250cb 100644
--- a/general/package/ingenic-libimp-control/ingenic-libimp-control.mk
+++ b/general/package/ingenic-libimp-control/ingenic-libimp-control.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-INGENIC_LIBIMP_CONTROL_SITE_METHOD = git
-INGENIC_LIBIMP_CONTROL_SITE = https://github.com/gtxaspec/libimp_control
-INGENIC_LIBIMP_CONTROL_VERSION = $(shell git ls-remote $(INGENIC_LIBIMP_CONTROL_SITE) HEAD | head -1 | cut -f1)
-else
-INGENIC_LIBIMP_CONTROL_SITE = https://github.com/gtxaspec/libimp_control/archive
-INGENIC_LIBIMP_CONTROL_SOURCE = master.tar.gz
-endif
+INGENIC_LIBIMP_CONTROL_SITE = $(call github,gtxaspec,libimp_control,$(INGENIC_LIBIMP_CONTROL_VERSION))
+INGENIC_LIBIMP_CONTROL_VERSION = master
 
 define INGENIC_LIBIMP_CONTROL_BUILD_CMDS
 	$(MAKE) CONFIG_SOC=$(OPENIPC_SOC_MODEL) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)
diff --git a/general/package/ingenic-opensdk/ingenic-opensdk.mk b/general/package/ingenic-opensdk/ingenic-opensdk.mk
index d04387fb..f5c39320 100644
--- a/general/package/ingenic-opensdk/ingenic-opensdk.mk
+++ b/general/package/ingenic-opensdk/ingenic-opensdk.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-INGENIC_OPENSDK_SITE_METHOD = git
-INGENIC_OPENSDK_SITE = https://github.com/openipc/openingenic
-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_SITE = $(call github,openipc,openingenic,$(INGENIC_OPENSDK_VERSION))
+INGENIC_OPENSDK_VERSION = master
 
 INGENIC_OPENSDK_LICENSE = GPL-3.0
 INGENIC_OPENSDK_LICENSE_FILES = LICENSE
diff --git a/general/package/ingenic-pwm/ingenic-pwm.mk b/general/package/ingenic-pwm/ingenic-pwm.mk
index 1a6d1548..3befa54d 100644
--- a/general/package/ingenic-pwm/ingenic-pwm.mk
+++ b/general/package/ingenic-pwm/ingenic-pwm.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-INGENIC_PWM_SITE_METHOD = git
-INGENIC_PWM_SITE = https://github.com/gtxaspec/ingenic-pwm
-INGENIC_PWM_VERSION = $(shell git ls-remote $(INGENIC_PWM_SITE) HEAD | head -1 | cut -f1)
-else
-INGENIC_PWM_SITE = https://github.com/gtxaspec/ingenic-pwm/archive
-INGENIC_PWM_SOURCE = master.tar.gz
-endif
+INGENIC_PWM_SITE = $(call github,gtxaspec,ingenic-pwm,$(INGENIC_PWM_VERSION))
+INGENIC_PWM_VERSION = master
 
 define INGENIC_PWM_BUILD_CMDS
     $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)
diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk
index 5b5d5e5b..305ba99c 100644
--- a/general/package/ipctool/ipctool.mk
+++ b/general/package/ipctool/ipctool.mk
@@ -4,21 +4,20 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-IPCTOOL_SITE_METHOD = git
-IPCTOOL_SITE = https://github.com/openipc/ipctool
-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_SITE = $(call github,openipc,ipctool,$(IPCTOOL_VERSION))
+IPCTOOL_VERSION = master
 
 IPCTOOL_LICENSE = MIT
 IPCTOOL_LICENSE_FILES = LICENSE
+IPCTOOL_INSTALL_STAGING = YES
 
 IPCTOOL_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_VERSION=ON
 IPCTOOL_MAKE_OPTS += VERBOSE=1
 
+define IPCTOOL_INSTALL_STAGING_CMDS
+	$(INSTALL) -m 755 -t $(STAGING_DIR)/usr/lib $(@D)/libipchw.a
+endef
+
 define IPCTOOL_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/ipcinfo
diff --git a/general/package/jsonfilter/jsonfilter.mk b/general/package/jsonfilter/jsonfilter.mk
index e96ca763..75aed7ff 100644
--- a/general/package/jsonfilter/jsonfilter.mk
+++ b/general/package/jsonfilter/jsonfilter.mk
@@ -1,17 +1,11 @@
 ################################################################################
 #
-# jsonfilter | updated 2022.09.27
+# jsonfilter
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-JSONFILTER_SITE_METHOD = git
-JSONFILTER_SITE = https://github.com/openwrt/jsonpath
-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_SITE = $(call github,openwrt,jsonpath,$(JSONFILTER_VERSION))
+JSONFILTER_VERSION = master
 
 JSONFILTER_LICENSE = ISC, BSD-3-Clause
 JSONFILTER_DEPENDENCIES = json-c libubox
diff --git a/general/package/libsrtp-openipc/libsrtp-openipc.mk b/general/package/libsrtp-openipc/libsrtp-openipc.mk
index fc7a15bb..f0d3c2e9 100644
--- a/general/package/libsrtp-openipc/libsrtp-openipc.mk
+++ b/general/package/libsrtp-openipc/libsrtp-openipc.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LIBSRTP_OPENIPC_SITE_METHOD = git
-LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp
-LIBSRTP_OPENIPC_VERSION = $(shell git ls-remote $(LIBSRTP_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+LIBSRTP_OPENIPC_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_OPENIPC_VERSION))
+LIBSRTP_OPENIPC_VERSION = master
 
 LIBSRTP_OPENIPC_INSTALL_STAGING = YES
 LIBSRTP_OPENIPC_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/general/package/microsnander/microsnander.mk b/general/package/microsnander/microsnander.mk
index a63ca786..32825221 100644
--- a/general/package/microsnander/microsnander.mk
+++ b/general/package/microsnander/microsnander.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-MICROSNANDER_SITE_METHOD = git
-MICROSNANDER_SITE = https://github.com/openipc/microsnander
-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_SITE = $(call github,openipc,microsnander,$(MICROSNANDER_VERSION))
+MICROSNANDER_VERSION = master
 
 MICROSNANDER_LICENSE = MIT
 MICROSNANDER_LICENSE_FILES = LICENSE
diff --git a/general/package/mini/mini.mk b/general/package/mini/mini.mk
index 7d4d6593..4eaecc08 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 = $(shell git ls-remote $(MINI_SITE) HEAD | head -1 | cut -f1)
+MINI_VERSION = bc1e8b8e87a76b76399160f6b110d0d896037aa2
 
 MINI_GIT_SUBMODULES = YES
 MINI_LICENSE = GPL-3.0
diff --git a/general/package/motors/motors.mk b/general/package/motors/motors.mk
index d1353035..f027b1ef 100644
--- a/general/package/motors/motors.mk
+++ b/general/package/motors/motors.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-MOTORS_SITE_METHOD = git
-MOTORS_SITE = https://github.com/openipc/motors
-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_SITE = $(call github,openipc,motors,$(MOTORS_VERSION))
+MOTORS_VERSION = master
 
 MOTORS_LICENSE = MIT
 MOTORS_LICENSE_FILES = LICENSE
diff --git a/general/package/mt7601u-openipc/mt7601u-openipc.mk b/general/package/mt7601u-openipc/mt7601u-openipc.mk
index d491593c..c14a82b5 100644
--- a/general/package/mt7601u-openipc/mt7601u-openipc.mk
+++ b/general/package/mt7601u-openipc/mt7601u-openipc.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-MT7601U_OPENIPC_SITE_METHOD = git
-MT7601U_OPENIPC_SITE = https://github.com/openipc/mt7601u
-MT7601U_OPENIPC_VERSION = $(shell git ls-remote $(MT7601U_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+MT7601U_OPENIPC_SITE = $(call github,openipc,mt7601u,$(MT7601U_OPENIPC_VERSION))
+MT7601U_OPENIPC_VERSION = master
 MT7601U_OPENIPC_LICENSE = GPL-2.0
 
 MT7601U_OPENIPC_MODULE_MAKE_OPTS = \
diff --git a/general/package/onvif-simple-server/onvif-simple-server.mk b/general/package/onvif-simple-server/onvif-simple-server.mk
index 1169058f..91c87f39 100644
--- a/general/package/onvif-simple-server/onvif-simple-server.mk
+++ b/general/package/onvif-simple-server/onvif-simple-server.mk
@@ -4,10 +4,8 @@
 #
 ################################################################################
 
-ONVIF_SIMPLE_SERVER_SITE_METHOD = git
-ONVIF_SIMPLE_SERVER_SITE = https://github.com/roleoroleo/onvif_simple_server
-#ONVIF_SIMPLE_SERVER_VERSION = de6d585a245e4873c49b113360f98907f2b4cf49
-ONVIF_SIMPLE_SERVER_VERSION = $(shell git ls-remote $(ONVIF_SIMPLE_SERVER_SITE) HEAD | head -1 | awk '{ print $$1 }')
+ONVIF_SIMPLE_SERVER_SITE = $(call github,roleoroleo,onvif_simple_server,$(ONVIF_SIMPLE_SERVER_VERSION))
+ONVIF_SIMPLE_SERVER_VERSION = master
 
 ONVIF_SIMPLE_SERVER_DEPENDENCIES = mbedtls
 ONVIF_SIMPLE_SERVER_LICENSE = MIT
diff --git a/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk b/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk
index a0f80e79..b8326160 100644
--- a/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk
+++ b/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-RTL8188FU_OPENIPC_SITE_METHOD = git
-RTL8188FU_OPENIPC_SITE = https://github.com/openipc/realtek-wlan
-RTL8188FU_OPENIPC_VERSION = $(shell git ls-remote $(RTL8188FU_OPENIPC_SITE) rtl8188fu | head -1 | cut -f1)
+RTL8188FU_OPENIPC_SITE = $(call github,openipc,realtek-wlan,$(RTL8188FU_OPENIPC_VERSION))
+RTL8188FU_OPENIPC_VERSION = rtl8188fu
 
 RTL8188FU_OPENIPC_LICENSE = GPL-2.0
 RTL8188FU_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/rtl8189es-openipc/rtl8189es-openipc.mk b/general/package/rtl8189es-openipc/rtl8189es-openipc.mk
index dd209bf8..9115e088 100644
--- a/general/package/rtl8189es-openipc/rtl8189es-openipc.mk
+++ b/general/package/rtl8189es-openipc/rtl8189es-openipc.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-RTL8189ES_OPENIPC_SITE_METHOD = git
-RTL8189ES_OPENIPC_SITE = https://github.com/jwrdegoede/rtl8189es_linux
-RTL8189ES_OPENIPC_VERSION = $(shell git ls-remote $(RTL8189ES_OPENIPC_SITE) master | head -1 | cut -f1)
-else
-RTL8189ES_OPENIPC_SITE = https://github.com/jwrdegoede/rtl8189es_linux/archive
-RTL8189ES_OPENIPC_SOURCE = master.tar.gz
-endif
+RTL8189ES_OPENIPC_SITE = $(call github,jwrdegoede,rtl8189es_linux,$(RTL8189ES_OPENIPC_VERSION))
+RTL8189ES_OPENIPC_VERSION = master
 
 RTL8189ES_OPENIPC_LICENSE = GPL-2.0
 RTL8189ES_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk b/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
index f773f4ba..c79e65e4 100644
--- a/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
+++ b/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-RTL8189FS_OPENIPC_SITE_METHOD = git
-RTL8189FS_OPENIPC_SITE = https://github.com/openipc/realtek-wlan
-RTL8189FS_OPENIPC_VERSION = $(shell git ls-remote $(RTL8189FS_OPENIPC_SITE) rtl8189fs | head -1 | cut -f1)
-else
-RTL8189FS_OPENIPC_SITE = https://github.com/openipc/realtek-wlan/archive
-RTL8189FS_OPENIPC_SOURCE = rtl8189fs.tar.gz
-endif
+RTL8189FS_OPENIPC_SITE = $(call github,openipc,realtek-wlan,$(RTL8189FS_OPENIPC_VERSION))
+RTL8189FS_OPENIPC_VERSION = rtl8189fs
 
 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 d0ba6222..8d773f4e 100644
--- a/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk
+++ b/general/package/rtl8192eu-openipc/rtl8192eu-openipc.mk
@@ -1,17 +1,11 @@
 ################################################################################
 #
-# rtl8192eu
+# rtl8192eu-openipc
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-RTL8192EU_OPENIPC_SITE_METHOD = git
-RTL8192EU_OPENIPC_SITE = https://github.com/mange/rtl8192eu-linux-driver
-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_SITE = $(call github,mange,rtl8192eu-linux-driver,$(RTL8192EU_OPENIPC_VERSION))
+RTL8192EU_OPENIPC_VERSION = master
 
 RTL8192EU_OPENIPC_LICENSE = GPL-2.0
 RTL8192EU_OPENIPC_LICENSE_FILES = COPYING
@@ -22,7 +16,5 @@ define RTL8192EU_OPENIPC_INSTALL_FIRMWARE
 		$(TARGET_DIR)/lib/firmware/rtlwifi/rtl8192her.bin
 endef
 
-# RTL8192EU_OPENIPC_POST_INSTALL_TARGET_HOOKS += RTL8192EU_OPENIPC_INSTALL_FIRMWARE
-
 $(eval $(kernel-module))
 $(eval $(generic-package))
diff --git a/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk b/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk
index 1eb66b8e..c3907840 100644
--- a/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk
+++ b/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-RTL8733BU_OPENIPC_SITE_METHOD = git
-RTL8733BU_OPENIPC_SITE = https://github.com/openipc/realtek-wlan
-RTL8733BU_OPENIPC_VERSION = $(shell git ls-remote $(RTL8733BU_OPENIPC_SITE) rtl8733bu | head -1 | cut -f1)
+RTL8733BU_OPENIPC_SITE = $(call github,openipc,realtek-wlan,$(RTL8733BU_OPENIPC_VERSION))
+RTL8733BU_OPENIPC_VERSION = rtl8733bu
 
 RTL8733BU_OPENIPC_LICENSE = GPL-2.0
 RTL8733BU_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk
index 28afb147..41de6abc 100644
--- a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk
+++ b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-RTL8812AU_OPENIPC_SITE_METHOD = git
-RTL8812AU_OPENIPC_SITE = https://github.com/svpcom/rtl8812au
-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_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION))
+RTL8812AU_OPENIPC_VERSION = master
 
 RTL8812AU_OPENIPC_LICENSE = GPL-2.0
 RTL8812AU_OPENIPC_LICENSE_FILES = COPYING
diff --git a/general/package/sigmastar-osdrv-infinity6/files/src/config_tool.c b/general/package/sigmastar-osdrv-infinity6/files/src/config_tool.c
index 5c01a0a4..26a04b89 100644
--- a/general/package/sigmastar-osdrv-infinity6/files/src/config_tool.c
+++ b/general/package/sigmastar-osdrv-infinity6/files/src/config_tool.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <src/tools.h>
 
 #define BOUNDS 0x80000000
 #define LENGTH 0x1A000
@@ -11,6 +12,8 @@
 #define CMDQ "E_MMAP_ID_CMDQ"
 #define SSTAR 0x1F2025A4
 
+bool mem_reg(uint32_t addr, uint32_t *data, int op);
+
 int main() {
 	char buf[128];
 	int fd, size;
diff --git a/general/package/sigmastar-osdrv-infinity6/sigmastar-osdrv-infinity6.mk b/general/package/sigmastar-osdrv-infinity6/sigmastar-osdrv-infinity6.mk
index a49b8cf0..4be1df3e 100644
--- a/general/package/sigmastar-osdrv-infinity6/sigmastar-osdrv-infinity6.mk
+++ b/general/package/sigmastar-osdrv-infinity6/sigmastar-osdrv-infinity6.mk
@@ -13,8 +13,7 @@ SIGMASTAR_OSDRV_INFINITY6_DEPENDENCIES = ipctool
 
 define SIGMASTAR_OSDRV_INFINITY6_BUILD_CMDS
 	cp -rf $(SIGMASTAR_OSDRV_INFINITY6_PKGDIR)/files/src $(@D)
-	$(TARGET_CC) $(@D)/src/config_tool.c -o $(@D)/config_tool -s \
-		-I$(BUILD_DIR)/ipctool -L$(BUILD_DIR)/ipctool -lipchw
+	$(TARGET_CC) $(@D)/src/config_tool.c -o $(@D)/config_tool -lipchw -s
 endef
 
 define SIGMASTAR_OSDRV_INFINITY6_INSTALL_TARGET_CMDS
diff --git a/general/package/webui/webui.mk b/general/package/webui/webui.mk
index 06f02c49..0407c4c9 100644
--- a/general/package/webui/webui.mk
+++ b/general/package/webui/webui.mk
@@ -4,14 +4,8 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-WEBUI_SITE_METHOD = git
-WEBUI_SITE = https://github.com/openipc/webui
-WEBUI_VERSION = $(shell git ls-remote $(WEBUI_SITE) HEAD | head -1 | cut -f1)
-else
-WEBUI_SITE = https://github.com/openipc/webui/archive
-WEBUI_SOURCE = master.tar.gz
-endif
+WEBUI_SITE = $(call github,openipc,webui,$(WEBUI_VERSION))
+WEBUI_VERSION = master
 
 WEBUI_LICENSE = MIT
 WEBUI_LICENSE_FILES = LICENSE
diff --git a/general/package/yaml-cli/yaml-cli.mk b/general/package/yaml-cli/yaml-cli.mk
index 25041fad..8cd39b81 100644
--- a/general/package/yaml-cli/yaml-cli.mk
+++ b/general/package/yaml-cli/yaml-cli.mk
@@ -4,21 +4,14 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
-YAML_CLI_SITE_METHOD = git
-YAML_CLI_SITE = https://github.com/openipc/yaml-cli
-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_SITE = $(call github,openipc,yaml-cli,$(YAML_CLI_VERSION))
+YAML_CLI_VERSION = master
 
 YAML_CLI_LICENSE = MIT
 YAML_CLI_LICENSE_FILES = LICENSE
 
 YAML_CLI_DEPENDENCIES = libyaml
 YAML_CLI_CONF_OPTS += -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_BINDIR="/usr/bin"
-
 YAML_CLI_MAKE_OPTS += VERBOSE=1
 
 $(eval $(cmake-package))