diff --git a/include/download.mk b/include/download.mk
index 457637f2bd..c3ed751e12 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -199,23 +199,19 @@ endef
 # Only intends to be called as a submethod from other DownloadMethod
 define DownloadMethod/rawgit
 	echo "Checking out files from the git repository..."; \
-	for eachurl in $(URL); \
-	do \
-		mkdir -p $(TMP_DIR)/dl && \
-		cd $(TMP_DIR)/dl && \
-		rm -rf $(SUBDIR) && \
-		[ \! -d $(SUBDIR) ] && \
-		git clone $(OPTS) $$$${eachurl} $(SUBDIR) && \
-		(cd $(SUBDIR) && git checkout $(VERSION) && \
-			git submodule update --init --recursive) && \
-		echo "Packing checkout..." && \
-		export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
-		rm -rf $(SUBDIR)/.git && \
-		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
-		rm -rf $(SUBDIR) && \
-		break; \
-	done;
+	mkdir -p $(TMP_DIR)/dl && \
+	cd $(TMP_DIR)/dl && \
+	rm -rf $(SUBDIR) && \
+	[ \! -d $(SUBDIR) ] && \
+	git clone $(OPTS) $(URL) $(SUBDIR) && \
+	(cd $(SUBDIR) && git checkout $(VERSION) && \
+	git submodule update --init --recursive) && \
+	echo "Packing checkout..." && \
+	export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
+	rm -rf $(SUBDIR)/.git && \
+	$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+	mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+	rm -rf $(SUBDIR);
 endef
 
 define DownloadMethod/bzr
diff --git a/include/package-immortalwrt.mk b/include/package-immortalwrt.mk
deleted file mode 100644
index a6dd885b9b..0000000000
--- a/include/package-immortalwrt.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# Copyright (C) 2019-2021 ImmortalWrt.org
-
-PKG_RELEASE ?= $(AUTORELESE)
-
-ifndef PKG_SOURCE_VERSION
-  PKG_SOURCE ?= $(PKG_NAME)-$(PKG_VERSION).tar.gz
-endif
-
-ifeq ($(PKG_SOURCE_PROTO),git)
-  ifdef PKG_SOURCE_REPO
-    PKG_SOURCE_URL:= \
-      https://ghproxy.com/https://github.com/$(PKG_SOURCE_REPO).git \
-      https://github.com.cnpmjs.org/$(PKG_SOURCE_REPO).git \
-      https://pd.zwc365.com/seturl/https://github.com/$(PKG_SOURCE_REPO).git \
-      https://hub.fastgit.org/$(PKG_SOURCE_REPO).git \
-      https://github.com/$(PKG_SOURCE_REPO).git
-  endif
-endif
-
-ifneq ($(filter $(PKG_BUILD_DEPENDS),golang/host),)
-  GO_PKG_LDFLAGS ?= -s -w
-  PKG_USE_MIPS16 ?= 0
-endif
-
-HOST_BUILD_PARALLEL ?= 1
-PKG_BUILD_PARALLEL ?= 1
-
-include $(INCLUDE_DIR)/package.mk
diff --git a/package/ctcgfw/ChinaDNS/Makefile b/package/ctcgfw/ChinaDNS/Makefile
index f7f4b72612..6818808fa8 100644
--- a/package/ctcgfw/ChinaDNS/Makefile
+++ b/package/ctcgfw/ChinaDNS/Makefile
@@ -13,7 +13,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ChinaDNS
 PKG_VERSION:=2.0.1
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHREPO/lrinQVQ/openwrt-chinadns/releases/download/v$(PKG_VERSION)
 PKG_HASH:=caab37a27c444d917f0b92c65d7082543dc22acc7c24322be07a108a44794369
 
@@ -22,9 +24,10 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jian Chang <aa65535@live.com>
 
 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/ChinaDNS
 	SECTION:=net
diff --git a/package/ctcgfw/GoQuiet/Makefile b/package/ctcgfw/GoQuiet/Makefile
index 5b3bb28265..b55974cbc7 100644
--- a/package/ctcgfw/GoQuiet/Makefile
+++ b/package/ctcgfw/GoQuiet/Makefile
@@ -10,7 +10,7 @@ PKG_NAME:=GoQuiet
 PKG_VERSION:=1.2.2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=cbeuw/GoQuiet
+PKG_SOURCE_URL:=https://github.com/cbeuw/GoQuiet.git
 PKG_SOURCE_VERSION:=013cdfdf72000dcd4691799c37a0cf960ab4c82f
 PKG_MIRROR_HASH:=c9c97463e5286e8ad10de5e86512b98f60672235c47cfd9696188a16496fc56c
 
@@ -18,15 +18,18 @@ PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_GQ_CLIENT_COMPRESS_UPX \
 	CONFIG_GQ_SERVER_COMPRESS_UPX
 
 GO_PKG:=github.com/cbeuw/GoQuiet
+GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:=main.version=$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/GoQuiet/template
diff --git a/package/ctcgfw/annie/Makefile b/package/ctcgfw/annie/Makefile
index 498d6d8c94..63d804a191 100644
--- a/package/ctcgfw/annie/Makefile
+++ b/package/ctcgfw/annie/Makefile
@@ -10,9 +10,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=annie
 PKG_VERSION:=0.10.3
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=iawia002/annie
+PKG_SOURCE_URL:=https://github.com/iawia002/annie.git
 PKG_SOURCE_DATE:=2020-12-15
 PKG_SOURCE_VERSION:=abc3c9df18173c91a5ca7a77fecc0665dea01aa1
 PKG_MIRROR_HASH:=d49d79c342377a1edbf6870f7dd49cb4de70718934151793298004db72fc538a
@@ -26,11 +27,14 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_ANNIE_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/iawia002/annie
 GO_PKG_BUILD_PKG:=$$(GO_PKG)
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/annie
diff --git a/package/ctcgfw/bpytop/Makefile b/package/ctcgfw/bpytop/Makefile
index 34a102e75a..786e5fa2a4 100644
--- a/package/ctcgfw/bpytop/Makefile
+++ b/package/ctcgfw/bpytop/Makefile
@@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bpytop
 PKG_VERSION:=1.0.62
+PKG_RELEASE:=1
 
 PYPI_NAME:=bpytop
 PKG_HASH:=9a408ffe6575c4e20621215e532b206fe6b6d2e7e4bd053ab4b4906e6d7ba909
@@ -17,7 +18,7 @@ PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 define Package/bpytop
diff --git a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile
index 2920a43285..300d8a5d15 100644
--- a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile
+++ b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile
@@ -10,8 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=brcmfmac-firmware-4366c0-pcie-vendor
 PKG_VERSION:=1
+PKG_RELEASE:=4
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/brcmfmac-firmware-4366c0-pcie-vendor
 	SECTION:=firmware
diff --git a/package/ctcgfw/brook/Makefile b/package/ctcgfw/brook/Makefile
index 75e19d3e2e..759275bc4b 100644
--- a/package/ctcgfw/brook/Makefile
+++ b/package/ctcgfw/brook/Makefile
@@ -9,7 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=brook
 PKG_VERSION:=20210214
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/txthinking/brook/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=a8e2e989f6d09e36c1fbe8593404d53a0615dc93e91a0be94dda898f0d55ff1d
 
@@ -18,6 +20,8 @@ PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_BROOK_COMPRESS_GOPROXY \
@@ -25,8 +29,9 @@ PKG_CONFIG_DEPENDS:= \
 
 GO_PKG:=github.com/txthinking/brook
 GO_PKG_BUILD_PKG:=github.com/txthinking/brook/cli/brook
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/brook
diff --git a/package/ctcgfw/cdnspeedtest/Makefile b/package/ctcgfw/cdnspeedtest/Makefile
index 1054adce6b..81ae45a2cd 100644
--- a/package/ctcgfw/cdnspeedtest/Makefile
+++ b/package/ctcgfw/cdnspeedtest/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=CloudflareSpeedTest
 PKG_VERSION:=1.4.9
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/XIU2/CloudflareSpeedTest/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=7b7a18b54eae74d70f18105cc9c74822ce05336b2b894c59a388f46430733dcd
 
@@ -23,10 +25,13 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CDNSPEEDTEST_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=CloudflareSpeedTest
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/cdnspeedtest
diff --git a/package/ctcgfw/chinadns-ng/Makefile b/package/ctcgfw/chinadns-ng/Makefile
index 8816a6d59b..60d1a411d9 100644
--- a/package/ctcgfw/chinadns-ng/Makefile
+++ b/package/ctcgfw/chinadns-ng/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=1.0-beta.24
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=zfl9/chinadns-ng
+PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git
 PKG_SOURCE_DATE:=2021-02-11
 PKG_SOURCE_VERSION:=df3bb7c6310df9b3c0f874b7a0c38ea5ce0996cb
 PKG_MIRROR_HASH:=4b0a159e1ecd81392a67b31528b0430afa991bfceef5dd60d2d843edfccb6b12
@@ -22,9 +22,10 @@ PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=pexcn <i@pexcn.me>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/chinadns-ng
 	SECTION:=net
diff --git a/package/ctcgfw/cpp-httplib/Makefile b/package/ctcgfw/cpp-httplib/Makefile
index 68d82cd3bd..7d0e41ff44 100644
--- a/package/ctcgfw/cpp-httplib/Makefile
+++ b/package/ctcgfw/cpp-httplib/Makefile
@@ -11,7 +11,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cpp-httplib
 PKG_VERSION:=0.5.7
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/yhirose/cpp-httplib/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=27b7f6346bdeb1ead9d17bd7cea89d9ad491f50f0479081053cc6e5742a89e64
 
@@ -19,10 +21,12 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
 
+HOST_BUILD_PARALLEL:=1
+PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/cpp-httplib
diff --git a/package/ctcgfw/cups-bjnp/Makefile b/package/ctcgfw/cups-bjnp/Makefile
index 57eeec6965..74bea2cd8e 100644
--- a/package/ctcgfw/cups-bjnp/Makefile
+++ b/package/ctcgfw/cups-bjnp/Makefile
@@ -9,13 +9,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cups-bjnp
 PKG_VERSION:=2.0
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/cups-bjnp
 PKG_HASH:=2acb716680d66f1378cf8dcd45fedf7f72ccc9b66fa80214d6dcb042b5e3c9ab
 
 PKG_BUILD_DEPENDS:=cups
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/cups-bjnp
   SECTION:=net
diff --git a/package/ctcgfw/cups/Makefile b/package/ctcgfw/cups/Makefile
index 701c2c4797..2f393d0e8a 100644
--- a/package/ctcgfw/cups/Makefile
+++ b/package/ctcgfw/cups/Makefile
@@ -10,12 +10,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cups
 PKG_VERSION:=2.1.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.gz
 PKG_SOURCE_URL:=http://www.cups.org/software/$(PKG_VERSION)
 PKG_HASH:=4b14fd833180ac529ebebea766a09094c2568bf8426e219cb3a1715304ef728d
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+include $(INCLUDE_DIR)/package.mk
 
 define Package/cups/Default
   URL:=http://www.cups.org/
@@ -152,8 +155,6 @@ define Package/libcupsppdc/description
   Common UNIX Printing System - PPDC library
 endef
 
-TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
 define Build/Configure
 	$(call Build/Configure/Default, \
 		--with-cups-user="nobody" \
diff --git a/package/ctcgfw/cxxopts/Makefile b/package/ctcgfw/cxxopts/Makefile
index 227a9b01a6..ed419125d0 100644
--- a/package/ctcgfw/cxxopts/Makefile
+++ b/package/ctcgfw/cxxopts/Makefile
@@ -5,12 +5,13 @@
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cxxopts
 PKG_VERSION:=2.2.1
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/jarro2783/cxxopts/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=984aa3c8917d649b14d7f6277104ce38dd142ce378a9198ec926f03302399681
 
@@ -18,9 +19,10 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
+PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_OPTIONS+= -DCXXOPTS_ENABLE_INSTALL=ON \
diff --git a/package/ctcgfw/duktape/Makefile b/package/ctcgfw/duktape/Makefile
index 14621b7279..67ca1ae451 100644
--- a/package/ctcgfw/duktape/Makefile
+++ b/package/ctcgfw/duktape/Makefile
@@ -4,14 +4,14 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=duktape
 PKG_VERSION:=2.99.99-19cc8f5
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=svaarala/duktape
+PKG_SOURCE_URL:=https://github.com/svaarala/duktape.git
 PKG_MIRROR_HASH:=7e9caaf9c7e82bc01f859019359b3a13fa038f0e5e82a6541687a30c1ccfa604
 PKG_SOURCE_VERSION:=19cc8f5bb855791ff55cbf60d2cea72df485e86f
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -27,8 +27,9 @@ PKG_BUILD_DEPENDS:=node/host
 
 PKG_FIXUP:=autoreconf
 PKG_USE_MIPS16:=0
+PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/duktape
 	SECTION:=utils
@@ -87,4 +88,4 @@ define Package/libduktape/install
 endef
 
 $(eval $(call BuildPackage,duktape))
-$(eval $(call BuildPackage,libduktape))
+$(eval $(call BuildPackage,libduktape))
\ No newline at end of file
diff --git a/package/ctcgfw/filebrowser/Makefile b/package/ctcgfw/filebrowser/Makefile
index 26f063715b..188d01a10d 100644
--- a/package/ctcgfw/filebrowser/Makefile
+++ b/package/ctcgfw/filebrowser/Makefile
@@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=filebrowser
 PKG_VERSION:=2.13.0
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=e1f6586
@@ -19,17 +20,20 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=golang/host node/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_FILEBROWSER_COMPRESS_GOPROXY \
 	CONFIG_FILEBROWSER_COMPRESS_UPX
 
 GO_PKG:=github.com/filebrowser/filebrowser
+GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:= \
 	$(GO_PKG)/v2/version.CommitSHA=$(PKG_SOURCE_VERSION) \
 	$(GO_PKG)/v2/version.Version=$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/filebrowser
diff --git a/package/ctcgfw/go-nats/Makefile b/package/ctcgfw/go-nats/Makefile
index 87e89a6250..bd0f019d31 100644
--- a/package/ctcgfw/go-nats/Makefile
+++ b/package/ctcgfw/go-nats/Makefile
@@ -10,9 +10,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=go-nats
 PKG_VERSION:=0.0.1
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=enobufs/go-nats
+PKG_SOURCE_URL:=https://github.com/enobufs/go-nats.git
 PKG_SOURCE_DATE:=2019-09-23
 PKG_SOURCE_VERSION:=4effc32e0f4006da0636b24f4468cf32ce494d71
 PKG_MIRROR_HASH:=52156d096ba21fdc18316040749b20868e500d7bd785a0d33533610ba7f7169b
@@ -26,10 +27,13 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_GO_NATS_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/enobufs/go-nats
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/go-nats
diff --git a/package/ctcgfw/gost/Makefile b/package/ctcgfw/gost/Makefile
index 35960baca5..6f42542840 100644
--- a/package/ctcgfw/gost/Makefile
+++ b/package/ctcgfw/gost/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gost
 PKG_VERSION:=2.11.1
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/ginuerzh/gost/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=d94b570a7a84094376b8c299d740528f51b540d9162f1db562247a15a89340bf
 
@@ -23,11 +25,14 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_GOST_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/ginuerzh/gost
 GO_PKG_BUILD_PKG:=github.com/ginuerzh/gost/cmd/gost
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/gost
diff --git a/package/ctcgfw/gotop/Makefile b/package/ctcgfw/gotop/Makefile
index 48d27bd710..56cbad9fac 100644
--- a/package/ctcgfw/gotop/Makefile
+++ b/package/ctcgfw/gotop/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gotop
 PKG_VERSION:=4.1.1
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/xxxserxxx/gotop/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
@@ -23,11 +25,14 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_GOTOP_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/xxxserxxx/gotop
+GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:=main.Version=$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/gotop
diff --git a/package/ctcgfw/gowebdav/Makefile b/package/ctcgfw/gowebdav/Makefile
index fa75fe355d..26a985f4b1 100644
--- a/package/ctcgfw/gowebdav/Makefile
+++ b/package/ctcgfw/gowebdav/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gowebdav
 PKG_VERSION:=0.0.2
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/1715173329/gowebdav/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=0a6a2af4f24905ffea247b6044d01129d938af4b3a256bf19b42c52bb452f947
 
@@ -21,10 +23,13 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_GOWEBDAV_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/1715173329/gowebdav
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/gowebdav
diff --git a/package/ctcgfw/ipt2socks-alt/Makefile b/package/ctcgfw/ipt2socks-alt/Makefile
index 3bf62699fd..96ef6275e4 100644
--- a/package/ctcgfw/ipt2socks-alt/Makefile
+++ b/package/ctcgfw/ipt2socks-alt/Makefile
@@ -12,16 +12,18 @@ PKG_NAME:=ipt2socks-alt
 PKG_VERSION:=1.0.2
 PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/zfl9/ipt2socks/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=f247d72b61b1f40ce347904c43523bff257fc9f00ff269ecccf06f1d0f4b9d5e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(firstword $(subst -, ,$(PKG_NAME)))-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILE:=LICENSE
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/ipt2socks-alt
 	SECTION:=net
diff --git a/package/ctcgfw/jpcre2/Makefile b/package/ctcgfw/jpcre2/Makefile
index f7b62fdc63..7cd11fb05a 100644
--- a/package/ctcgfw/jpcre2/Makefile
+++ b/package/ctcgfw/jpcre2/Makefile
@@ -5,12 +5,13 @@
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jpcre2
 PKG_VERSION:=10.32.01
+PKG_RELEASE:=2
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/jpcre2/jpcre2/tar.gz/$(PKG_VERSION)?
 PKG_HASH:=668cbc6d2c0a065bb6abe8494d5a1bb3549a14cd956a44a2df9095045623ea47
 
@@ -19,9 +20,10 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=pcre2
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/jpcre2
 	SECTION:=lib
@@ -37,7 +39,7 @@ endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/jpcre2.hpp $(1)/usr/include/jpcre2.hpp
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/jpcre2.hpp $(1)/usr/include/jpcre2.hpp
 endef
 
 $(eval $(call BuildPackage,jpcre2))
diff --git a/package/ctcgfw/libtar/Makefile b/package/ctcgfw/libtar/Makefile
index fa6562d816..10c50264f5 100644
--- a/package/ctcgfw/libtar/Makefile
+++ b/package/ctcgfw/libtar/Makefile
@@ -11,9 +11,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtar
 PKG_VERSION:=1.2.20
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=ElonH/libtar
+PKG_SOURCE_URL:=https://github.com/ElonH/libtar.git
 PKG_SOURCE_DATE:=2020-03-08
 PKG_SOURCE_VERSION:=987a29eaf8c68f8a502dd3880c58e0e1ef99d6a7
 PKG_MIRROR_HASH:=7d9d7d8d33d39ac1e6a586361247f53a33ad0063c3940521b431a7d9b6170eac
@@ -23,9 +24,10 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
 
 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_ARGS+= --enable-shared=yes --enable-static=no
 
diff --git a/package/ctcgfw/mentohust/Makefile b/package/ctcgfw/mentohust/Makefile
index e04bfb5c6b..6231796f33 100644
--- a/package/ctcgfw/mentohust/Makefile
+++ b/package/ctcgfw/mentohust/Makefile
@@ -12,16 +12,19 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mentohust
 PKG_VERSION:=0.3.1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=KyleRicardo/MentoHUST-OpenWrt-ipk
+PKG_SOURCE_URL:=https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk.git
 PKG_SOURCE_DATE:=2018-11-27
 PKG_SOURCE_VERSION:=557cffca8032b6d8ac948be8a79255dc64a1915d
 PKG_MIRROR_HASH:=1db6cd4402ea3e1fa2adc3adcc1490fffdac224ae83024d883429b8b67fb9c74
 
+PKG_BUILD_PARALLEL:=1
+
 MAKE_PATH:=src
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/mentohust
 	SECTION:=net
diff --git a/package/ctcgfw/microsocks11/Makefile b/package/ctcgfw/microsocks11/Makefile
index e15fd476f8..4ca9465e94 100644
--- a/package/ctcgfw/microsocks11/Makefile
+++ b/package/ctcgfw/microsocks11/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=microsocks11
 PKG_VERSION:=2.3.0
+PKG_RELEASE:=2
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/EvanMcBroom/microsocks11/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=7b2f7c1fca9ba6cb135c9ec3f2f7304b6ccd790bc15318619f515b3b2e5e148e
 
@@ -19,8 +21,9 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=cxxopts
+PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/microsocks11
diff --git a/package/ctcgfw/mt7601u-ap/Makefile b/package/ctcgfw/mt7601u-ap/Makefile
index bc9acc6d2c..3a5a2e175f 100644
--- a/package/ctcgfw/mt7601u-ap/Makefile
+++ b/package/ctcgfw/mt7601u-ap/Makefile
@@ -8,18 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt7601u-ap
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=Anthony96922/mt7601u-ap
 PKG_SOURCE_DATE:=2020-05-01
+PKG_SOURCE_URL:=https://github.com/Anthony96922/mt7601u-ap.git
 PKG_SOURCE_VERSION:=624307427149e53b75937ccbe7cb235ec3ef2f58
 PKG_MIRROR_HASH:=70e8f7e94ddca09e1f55ef1b30a47fa7c504750ec654bc0c500f1a3d491eca97
 
+PKG_BUILD_PARALLEL:=1
+
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/mt7601u-ap
   SUBMENU:=Wireless Drivers
diff --git a/package/ctcgfw/mwol/Makefile b/package/ctcgfw/mwol/Makefile
index 458c984c1d..f3fe846f9b 100644
--- a/package/ctcgfw/mwol/Makefile
+++ b/package/ctcgfw/mwol/Makefile
@@ -13,9 +13,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwol
 PKG_VERSION:=1.0.0
+PKG_RELEASE=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=Mleaf/mwol
+PKG_SOURCE_URL:=https://github.com/Mleaf/mwol.git
 PKG_SOURCE_DATE:=2020-01-08
 PKG_SOURCE_VERSION:=59f9805901b4ac2916a0273ffbc29197fcd17a62
 PKG_MIRROR_HASH:=64f88b81ed88b1695f240fe4c0414bd32a5cf6e53ea008c67713ae8315ff3d0d
@@ -24,7 +25,9 @@ PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=mleaf <mleaf90@gmail.com>
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/mwol
diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile
index 87822534d1..03a87a5046 100644
--- a/package/ctcgfw/naiveproxy/Makefile
+++ b/package/ctcgfw/naiveproxy/Makefile
@@ -5,12 +5,13 @@
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
 PKG_VERSION:=89.0.4389.72-1
+PKG_RELEASE:=2
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=94b1c3f1e63ecab43eb8006a38ed1a76f1e510364ba651abaef0ec575449f687
 
@@ -20,6 +21,7 @@ PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=ncurses/host ninja/host python3/host
 PKG_USE_MIPS16:=0
+PKG_BUILD_PARALLEL:=1
 
 ifneq ($(CONFIG_CPU_TYPE)," ")
 	CPU_TYPE:=$(word 1, $(subst +," ,$(CONFIG_CPU_TYPE)))
@@ -32,7 +34,7 @@ else
 	CPU_SUBTYPE:=""
 endif
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/naiveproxy/config
 	depends on !(arc||armeb||mips||mips64||powerpc)
diff --git a/package/ctcgfw/nps/Makefile b/package/ctcgfw/nps/Makefile
index ddc70b40d9..a63a206656 100644
--- a/package/ctcgfw/nps/Makefile
+++ b/package/ctcgfw/nps/Makefile
@@ -9,7 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nps
 PKG_VERSION:=0.26.9
+PKG_RELEASE:=4
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/ehang-io/nps/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=7df414180ed4f0049dc08f0e3c625a6de4ebed34da591515f9514b3763dd578d
 
@@ -22,11 +24,14 @@ PKG_CONFIG_DEPENDS := \
 	CONFIG_NPS_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=ehang.io/nps
 GO_PKG_BUILD_PKG:=ehang.io/nps/cmd/...
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/nps/template
diff --git a/package/ctcgfw/ootoc/Makefile b/package/ctcgfw/ootoc/Makefile
index a9d5908651..04bbd77553 100644
--- a/package/ctcgfw/ootoc/Makefile
+++ b/package/ctcgfw/ootoc/Makefile
@@ -11,18 +11,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ootoc
 PKG_VERSION:=2.2.3
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=ElonH/ootoc
+PKG_SOURCE_URL:=https://github.com/ElonH/ootoc.git
 PKG_SOURCE_DATE:=2020-03-21
 PKG_SOURCE_VERSION:=8e7495e49018a100043b2e013b65b589900ddabe
 PKG_MIRROR_HASH:=9fe7b360241a070cfe623cd59330b7305a59d329056bbf04666f1840e3ec8988
 
 PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
 
+PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_OPTIONS+= -DOOTOC_TEST:BOOL=OFF
@@ -48,4 +50,4 @@ define Package/ootoc/install
 	$(INSTALL_BIN) ./files/ootoc.init $(1)/etc/init.d/ootoc
 endef
 
-$(eval $(call BuildPackage,ootoc))
+$(eval $(call BuildPackage,ootoc))
\ No newline at end of file
diff --git a/package/ctcgfw/open-app-filter/Makefile b/package/ctcgfw/open-app-filter/Makefile
index f1fe633181..9df5306551 100644
--- a/package/ctcgfw/open-app-filter/Makefile
+++ b/package/ctcgfw/open-app-filter/Makefile
@@ -1,24 +1,17 @@
-#
-# Copyright (C) 2021 ImmortalWrt
-# (https://immortalwrt.org)
-#
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=open-app-filter
 PKG_VERSION:=5.0.1
+PKG_RELEASE:=1
 
+PKG_SOURCE_URL:=https://github.com/destan19/OpenAppFilter.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=destan19/OpenAppFilter
 PKG_SOURCE_DATE:=2021-03-08
 PKG_SOURCE_VERSION:=59aa2a1f40ebee65e48c7fd5d28d6c2706e60145
 PKG_MIRROR_HASH:=a969d5a5c16e418844a63fc6d23facb5ad0327d0bcadc72814bbecc2f9c4a099
 
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 RSTRIP:=:
 
diff --git a/package/ctcgfw/parted/Makefile b/package/ctcgfw/parted/Makefile
index 45af71f46f..c94dda99e7 100644
--- a/package/ctcgfw/parted/Makefile
+++ b/package/ctcgfw/parted/Makefile
@@ -5,19 +5,20 @@
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parted
 PKG_VERSION:=3.3
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=parted-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/parted
 PKG_HASH:=57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/parted
   SECTION:=utils
diff --git a/package/ctcgfw/phicomm-k3screenctrl/Makefile b/package/ctcgfw/phicomm-k3screenctrl/Makefile
index de19331cb5..04a3d99ad0 100644
--- a/package/ctcgfw/phicomm-k3screenctrl/Makefile
+++ b/package/ctcgfw/phicomm-k3screenctrl/Makefile
@@ -10,9 +10,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=phicomm-k3screenctrl
 PKG_VERSION:=1.0
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=lwz322/k3screenctrl
+PKG_SOURCE_URL:=https://github.com/lwz322/k3screenctrl.git
 PKG_SOURCE_DATE:=2020-09-18
 PKG_SOURCE_VERSION:=d8896cfad4bdf39f58999f9420807f986300bada
 PKG_MIRROR_HASH:=9eab074f5ac366013d394be2c57905a8585439d1ca2a8b602a09a098a8aa8fb7
@@ -22,9 +23,10 @@ PKG_LICENSE_FILE:=LICENSE
 PKG_MAINTAINER:=Hamster Tian <haotia@gmail.com>
 
 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 TARGET_CFLAGS+= -D_GNU_SOURCE
 
diff --git a/package/ctcgfw/quickjs/Makefile b/package/ctcgfw/quickjs/Makefile
index a5d3118190..177812a20b 100644
--- a/package/ctcgfw/quickjs/Makefile
+++ b/package/ctcgfw/quickjs/Makefile
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quickjs
 PKG_VERSION:=2020-11-08
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://bellard.org/quickjs/
@@ -19,9 +20,10 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/quickjs
 	SECTION:=lib
diff --git a/package/ctcgfw/r8152/Makefile b/package/ctcgfw/r8152/Makefile
index 24a3774862..c4352e419c 100644
--- a/package/ctcgfw/r8152/Makefile
+++ b/package/ctcgfw/r8152/Makefile
@@ -9,13 +9,15 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8152
 PKG_VERSION:=2.14
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/wget/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=617c159eb72355c240be3f78971e5a01c9dffe5545a7ae76bb2bd87bb7a346ed
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-linux-$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/usb-net-rtl8152-vendor
   TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
diff --git a/package/ctcgfw/r8168/Makefile b/package/ctcgfw/r8168/Makefile
index 6cbff0495d..bcb6af5045 100644
--- a/package/ctcgfw/r8168/Makefile
+++ b/package/ctcgfw/r8168/Makefile
@@ -9,10 +9,11 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8168
 PKG_VERSION:=8.048.03
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/r8168
   TITLE:=Driver for Realtek r8168 chipsets
diff --git a/package/ctcgfw/rapidjson/Makefile b/package/ctcgfw/rapidjson/Makefile
index e2a96641aa..64d0ec5f6d 100644
--- a/package/ctcgfw/rapidjson/Makefile
+++ b/package/ctcgfw/rapidjson/Makefile
@@ -5,14 +5,14 @@
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rapidjson
 PKG_VERSION:=1.1.0
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=Tencent/rapidjson
+PKG_SOURCE_URL:=https://github.com/Tencent/rapidjson.git
 PKG_SOURCE_DATE:=2021-01-06
 PKG_SOURCE_VERSION:=585042c02ba6350e10fc43df8beee1bc097f4c5f
 PKG_MIRROR_HASH:=ef7d015b91f58355b02ce8356214ec7d6bdc3807d01b220834faa00afbcd7a7f
@@ -21,9 +21,10 @@ PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
+PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_OPTIONS+= -DRAPIDJSON_BUILD_DOC=OFF \
diff --git a/package/ctcgfw/rclone-ng/Makefile b/package/ctcgfw/rclone-ng/Makefile
index c862bad364..a571617f2e 100644
--- a/package/ctcgfw/rclone-ng/Makefile
+++ b/package/ctcgfw/rclone-ng/Makefile
@@ -11,6 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rclone-ng
 PKG_VERSION:=0.5.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHREPO/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/
@@ -20,7 +21,7 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILE:=LICENSE
 PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 
diff --git a/package/ctcgfw/rclone-webui-react/Makefile b/package/ctcgfw/rclone-webui-react/Makefile
index 3e8f8b1033..c0e8a2d27e 100644
--- a/package/ctcgfw/rclone-webui-react/Makefile
+++ b/package/ctcgfw/rclone-webui-react/Makefile
@@ -11,6 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rclone-webui-react
 PKG_VERSION:=2.0.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=@GHREPO/rclone/rclone-webui-react/releases/download/v$(PKG_VERSION)/currentbuild.zip?
@@ -20,7 +21,7 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILE:=LICENSE
 PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 UNZIP_CMD:=unzip -q -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
 
diff --git a/package/ctcgfw/rclone/Makefile b/package/ctcgfw/rclone/Makefile
index 02a60ad94b..b0e601fe91 100644
--- a/package/ctcgfw/rclone/Makefile
+++ b/package/ctcgfw/rclone/Makefile
@@ -11,7 +11,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rclone
 PKG_VERSION:=1.53.4
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/rclone/rclone/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=acb53ccef1c1e638e53ca24933510d9be3666145372e1163470aa38414af8d48
 
@@ -24,16 +26,19 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_RCLONE_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/rclone/rclone
 GO_PKG_EXCLUDES:=test
+GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:= \
 	github.com/rclone/rclone/fs.Version=v$(PKG_VERSION) \
 	main.Version=v$(PKG_VERSION) \
 	main.BuildUser=openwrt \
 	main.BuildHost=openwrt
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/rclone
diff --git a/package/ctcgfw/rtl8188eu/Makefile b/package/ctcgfw/rtl8188eu/Makefile
index e2cb559f18..05b6722b1e 100644
--- a/package/ctcgfw/rtl8188eu/Makefile
+++ b/package/ctcgfw/rtl8188eu/Makefile
@@ -8,17 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtl8188eu
+PKG_RELEASE:=1
 
+PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8188eus.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=aircrack-ng/rtl8188eus
 PKG_SOURCE_DATE:=2021-02-06
 PKG_SOURCE_VERSION:=1e7145f3237b3eeb3baf775f4a883e6d79c1cfe6
 PKG_MIRROR_HASH:=3f68779aed2b9fabca042ea4effbdf35e25e632a00febe6c3f09646a8c75ee5d
 
+PKG_BUILD_PARALLEL:=1
+
 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rtl8188eu
   SUBMENU:=Wireless Drivers
diff --git a/package/ctcgfw/rtl8189es/Makefile b/package/ctcgfw/rtl8189es/Makefile
index 40707a13d6..ec0cf806b7 100644
--- a/package/ctcgfw/rtl8189es/Makefile
+++ b/package/ctcgfw/rtl8189es/Makefile
@@ -8,19 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtl8189es
+PKG_RELEASE:=1
 
+PKG_SOURCE_URL:=https://github.com/jwrdegoede/rtl8189ES_linux.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=jwrdegoede/rtl8189ES_linux
 PKG_SOURCE_DATE:=2020-06-15
 PKG_SOURCE_VERSION:=42f293406700988c10655aaa5ee865b411389aeb
 PKG_MIRROR_HASH:=1609e1dd2c8c7b664c9c012ff6b2f04d6a3989573d01b6e31e5988a88b2f8ef0
 
 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
+PKG_BUILD_PARALLEL:=1
 
 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rtl8189es
   SUBMENU:=Wireless Drivers
diff --git a/package/ctcgfw/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile
index c5bdf1d462..43d834efcc 100644
--- a/package/ctcgfw/rtl8812au-ac/Makefile
+++ b/package/ctcgfw/rtl8812au-ac/Makefile
@@ -12,9 +12,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtl8812au-ac
+PKG_RELEASE:=1
 
+PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=aircrack-ng/rtl8812au
 PKG_SOURCE_DATE:=2021-02-03
 PKG_SOURCE_VERSION:=b65dcf4105641716d16f3a6c96507fdd9c1862b4
 PKG_MIRROR_HASH:=5416d4a6e671c6b07f44f35fae54662baef71f448c4be4ade58bf7fc5ca4f192
@@ -23,10 +24,12 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Marty Jones <mj8263788@gmail.com>
 
+PKG_BUILD_PARALLEL:=1
+
 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rtl8812au-ac
   SUBMENU:=Wireless Drivers
diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile
index 1dc5017c30..624d03c544 100644
--- a/package/ctcgfw/rtl8821cu/Makefile
+++ b/package/ctcgfw/rtl8821cu/Makefile
@@ -9,9 +9,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtl8821cu
+PKG_RELEASE:=1
 
+PKG_SOURCE_URL:=https://github.com/brektrou/rtl8821CU.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=brektrou/rtl8821CU
 PKG_SOURCE_DATE:=2020-12-19
 PKG_SOURCE_VERSION:=428a0820487418ec69c0edb91726d1cf19763b1e
 PKG_MIRROR_HASH:=77958d3bff8b0145504a10959765be0e3743b9c4880a5173d156238c2c569a56
@@ -20,10 +21,12 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINTER:=CN_SZTL <cnsztl@immortalwrt.org>
 
+PKG_BUILD_PARALLEL:=1
+
 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rtl8821cu
   SUBMENU:=Wireless Drivers
diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile
index e12761e32c..8569378788 100644
--- a/package/ctcgfw/rtl88x2bu/Makefile
+++ b/package/ctcgfw/rtl88x2bu/Makefile
@@ -9,9 +9,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtl88x2bu
+PKG_RELEASE:=1
 
+PKG_SOURCE_URL:=https://github.com/cilynx/rtl88x2bu.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=cilynx/rtl88x2bu
 PKG_SOURCE_DATE:=2021-01-21
 PKG_SOURCE_VERSION:=48e7c19c92a77554403e1347447f8e2cfd780228
 PKG_MIRROR_HASH:=2991028fb7bd7e31d041b1e99d0e0d86781fff95fc70e4560ca9fcbe038f063f
@@ -20,10 +21,12 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINTER:=ElonH <elonh@immortalwrt.org>
 
+PKG_BUILD_PARALLEL:=1
+
 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rtl88x2bu
   SUBMENU:=Wireless Drivers
diff --git a/package/ctcgfw/shadowsocks-rust/Makefile b/package/ctcgfw/shadowsocks-rust/Makefile
index f37bebd587..de2d7429f8 100644
--- a/package/ctcgfw/shadowsocks-rust/Makefile
+++ b/package/ctcgfw/shadowsocks-rust/Makefile
@@ -12,6 +12,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadowsocks-rust
 PKG_VERSION:=1.9.2
+PKG_RELEASE:=1
 
 PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION)
 PKG_SOURCE_BODY:=unknown-linux-musl
@@ -61,7 +62,7 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 
diff --git a/package/ctcgfw/simple-obfs/Makefile b/package/ctcgfw/simple-obfs/Makefile
index d8a2c6b15b..a3482cb69a 100644
--- a/package/ctcgfw/simple-obfs/Makefile
+++ b/package/ctcgfw/simple-obfs/Makefile
@@ -12,9 +12,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=simple-obfs
 PKG_VERSION:=0.0.5
+PKG_RELEASE:=6
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=shadowsocks/simple-obfs
+PKG_SOURCE_URL:=https://github.com/shadowsocks/simple-obfs.git
 PKG_SOURCE_DATE:=2019-08-17
 PKG_SOURCE_VERSION:=486bebd9208539058e57e23a12f23103016e09b4
 PKG_MIRROR_HASH:=b1ae62a6826616b35b6aea0c6b2d55b5f36da96be0cd1c229c263b508d1aeef0
@@ -25,9 +26,10 @@ PKG_MAINTAINER:=Jian Chang <aa65535@live.com>
 
 PKG_BUILD_DEPENDS:=libev
 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/simple-obfs/template
 	SECTION:=net
diff --git a/package/ctcgfw/simple-torrent/Makefile b/package/ctcgfw/simple-torrent/Makefile
index d32c26be32..0b941c0bcb 100644
--- a/package/ctcgfw/simple-torrent/Makefile
+++ b/package/ctcgfw/simple-torrent/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=simple-torrent
 PKG_VERSION:=1.2.14
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/boypt/simple-torrent/tar.gz/$(PKG_VERSION)?
 PKG_HASH:=e3b3357ab8eb9431ec7c22b2f453d219cfe0652c5c26bbf0a052c99271cbf6a5
 
@@ -23,12 +25,15 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_SIMPLE_TORRENT_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=cloud-torrent
+GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:= \
 	main.VERSION=$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/simple-torrent
diff --git a/package/ctcgfw/ssocks/Makefile b/package/ctcgfw/ssocks/Makefile
index ab8fc18c2c..29683b7953 100644
--- a/package/ctcgfw/ssocks/Makefile
+++ b/package/ctcgfw/ssocks/Makefile
@@ -12,9 +12,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ssocks
 PKG_VERSION:=0.0.14
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=tostercx/ssocks
+PKG_SOURCE_URL:=https://github.com/tostercx/ssocks.git
 PKG_SOURCE_DATE:=2020-07-09
 PKG_SOURCE_VERSION:=c2024789c1ee076d171fd6061d7c133302216ea7
 PKG_MIRROR_HASH:=3654e9f1fb54646e1e89c19e7aa3e105b84b2e20b5b634662c21c66691d1d22e
@@ -23,7 +24,9 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/ssocks/template
diff --git a/package/ctcgfw/sub-web/Makefile b/package/ctcgfw/sub-web/Makefile
index 012d0bbf5e..424484f6bd 100644
--- a/package/ctcgfw/sub-web/Makefile
+++ b/package/ctcgfw/sub-web/Makefile
@@ -5,14 +5,14 @@
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sub-web
 PKG_VERSION:=1.0.0
+PKG_RELEASE:=6
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=CareyWang/sub-web
+PKG_SOURCE_URL:=https://github.com/CareyWang/sub-web.git
 PKG_SOURCE_DATE:=2021-01-07
 PKG_SOURCE_VERSION:=26d278800cc42025f8ceecff64b26f47b9fc2d14
 PKG_MIRROR_HASH:=a83f49aeecfa086ad8da3503b1ff95f8505845588839ed569d22fb0ced417b9f
@@ -23,7 +23,7 @@ PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=node/host node-yarn/host
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/sub-web
   SECTION:=net
diff --git a/package/ctcgfw/subconverter/Makefile b/package/ctcgfw/subconverter/Makefile
index 0e2432f6a5..5fab9266d7 100644
--- a/package/ctcgfw/subconverter/Makefile
+++ b/package/ctcgfw/subconverter/Makefile
@@ -5,14 +5,14 @@
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subconverter
 PKG_VERSION:=0.6.4
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=tindy2013/subconverter
+PKG_SOURCE_URL:=https://github.com/tindy2013/subconverter.git
 PKG_SOURCE_DATE:=2020-12-19
 PKG_SOURCE_VERSION:=a57906c9a6edd04da869b12ffb88f397c3ea8af6
 PKG_MIRROR_HASH:=07815478cbfa1644ad016ea4b68a2edc9316f9aa23edf699d82c4c9026e17462
@@ -22,8 +22,9 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=duktape jpcre2 rapidjson
+PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/subconverter
diff --git a/package/ctcgfw/subweb/Makefile b/package/ctcgfw/subweb/Makefile
index 5c2260e1ae..bfd6eff256 100644
--- a/package/ctcgfw/subweb/Makefile
+++ b/package/ctcgfw/subweb/Makefile
@@ -9,9 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subweb
 PKG_VERSION:=20200702
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=lzdnico/subweb
+PKG_SOURCE_URL:=https://github.com/lzdnico/subweb.git
 PKG_MIRROR_HASH:=61855d9412056f2f0eb588840bb35b9b47dea97db887e47c15c52fe897f8b7bd
 PKG_SOURCE_VERSION:=9acc47d2e9cda1b16d7fe184a16f528848467810
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -25,8 +26,9 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 PKG_USE_MIPS16:=0
+PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
 	SECTION:=net
diff --git a/package/ctcgfw/tcping-simple/Makefile b/package/ctcgfw/tcping-simple/Makefile
index 76de26edd3..48376395d4 100644
--- a/package/ctcgfw/tcping-simple/Makefile
+++ b/package/ctcgfw/tcping-simple/Makefile
@@ -10,8 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tcping-simple
 PKG_VERSION:=1.3.5
+PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=@GITHUB/MushrooM93/tcping/b9ee61a5c1d05f228aa70027331556f0c27dd4c2/
+PKG_SOURCE_URL:=https://raw.githubusercontent.com/MushrooM93/tcping/b9ee61a5c1d05f228aa70027331556f0c27dd4c2/
 PKG_SOURCE:=tcping.c
 PKG_HASH:=3459b9f15621920dc632b5871da96c62c8a77ad15ee7bfdba4adee29f4eed089
 PKG_BUILD_DIR:=$(BUILD_DIR)/tcping-$(PKG_VERSION)
@@ -20,9 +21,12 @@ PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=MushrooM93 <799163169@qq.com>
 
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
 PKG_USE_MIPS16:=0
+PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
 	SECTION:=net
@@ -43,6 +47,9 @@ define Build/Compile
 	$(TARGET_CROSS)gcc $(PKG_BUILD_DIR)/$(PKG_SOURCE) -o $(PKG_BUILD_DIR)/tcping-simple
 endef
 
+define Build/Install
+endef
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping-simple $(1)/usr/bin
diff --git a/package/ctcgfw/tinyfecvpn/Makefile b/package/ctcgfw/tinyfecvpn/Makefile
index bb568f3c99..daa5aebd23 100644
--- a/package/ctcgfw/tinyfecvpn/Makefile
+++ b/package/ctcgfw/tinyfecvpn/Makefile
@@ -9,9 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinyfecVPN
 PKG_VERSION:=20210116.0
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=wangyu-/tinyfecVPN
+PKG_SOURCE_URL:=https://github.com/wangyu-/tinyfecVPN.git
 PKG_SOURCE_DATE:=2021-01-17
 PKG_SOURCE_VERSION:=c9b98721ea1d62ab8e1c4c9e2a0ed04394dfe0ae
 PKG_MIRROR_HASH:=28cdadf0f162e52d3c6b10b6a6cdcd22e80783b36b33e341b5dea156bfb75b74
@@ -19,7 +20,9 @@ PKG_MIRROR_HASH:=28cdadf0f162e52d3c6b10b6a6cdcd22e80783b36b33e341b5dea156bfb75b7
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=Yu Wang
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
 
 define Package/tinyfecvpn
   SECTION:=net
diff --git a/package/ctcgfw/tinymembench/Makefile b/package/ctcgfw/tinymembench/Makefile
index 94485f142e..8d3a07c273 100644
--- a/package/ctcgfw/tinymembench/Makefile
+++ b/package/ctcgfw/tinymembench/Makefile
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinymembench
 PKG_VERSION:=0.4
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_REPO:=ssvb/tinymembench
+PKG_SOURCE_URL:=https://github.com/ssvb/tinymembench.git
 PKG_SOURCE_VERSION:=a2cf6d7e382e3aea1eb39173174d9fa28cad15f3
 PKG_MIRROR_HASH:=b5b69e3d0c19e5a55bfebe386e29196c751612e30bd5aefc2ee1df11c18e0300
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/tinymembench
   SECTION:=utils
diff --git a/package/ctcgfw/tinyportmapper/Makefile b/package/ctcgfw/tinyportmapper/Makefile
index c4ec3c6bb6..697c1baef4 100644
--- a/package/ctcgfw/tinyportmapper/Makefile
+++ b/package/ctcgfw/tinyportmapper/Makefile
@@ -9,14 +9,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinyPortMapper
 PKG_VERSION:=20200818.0
+PKG_RELEASE:=2
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/wangyu-/tinyPortMapper/tar.gz/$(PKG_VERSION)?
 PKG_HASH:=094aef3fa0646fe3d0418f87767c1dd24ba1a80518f1e8a7cae2783aed88e732
 
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=Yu Wang
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
 
 define Package/tinyPortMapper
   SECTION:=net
diff --git a/package/ctcgfw/v2ray-plugin/Makefile b/package/ctcgfw/v2ray-plugin/Makefile
index 329c6f3f99..399af2253b 100644
--- a/package/ctcgfw/v2ray-plugin/Makefile
+++ b/package/ctcgfw/v2ray-plugin/Makefile
@@ -12,7 +12,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-plugin
 PKG_VERSION:=4.36.2
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=70cf85958a5233c8798990f4b7de57ce6f2e9a4535345260df06a4962a21e85a
 
@@ -25,11 +27,14 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_V2RAY_PLUGIN_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/shadowsocks/v2ray-plugin
+GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:=main.VERSION=v$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/v2ray-plugin/config
diff --git a/package/ctcgfw/verysync/Makefile b/package/ctcgfw/verysync/Makefile
index 5aec4d8043..283a5d82bb 100644
--- a/package/ctcgfw/verysync/Makefile
+++ b/package/ctcgfw/verysync/Makefile
@@ -32,12 +32,13 @@ endif
 
 PKG_NAME:=verysync
 PKG_VERSION:=v2.4.2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dl.verysync.com/releases/$(PKG_VERSION)/
 PKG_HASH:=skip
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 
 TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 
diff --git a/package/ctcgfw/webdav-go/Makefile b/package/ctcgfw/webdav-go/Makefile
index af32d10ba0..0496c770c3 100644
--- a/package/ctcgfw/webdav-go/Makefile
+++ b/package/ctcgfw/webdav-go/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=webdav-go
 PKG_VERSION:=4.0.0
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/hacdias/webdav/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=3a6754933cc138623830944cb1ce9151baebe780b8111415c2e0044970586ca5
 
@@ -24,10 +26,13 @@ PKG_CONFIG_DEPENDS:= \
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(firstword $(subst -, ,$(PKG_NAME)))-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/hacdias/webdav
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/webdav-go
diff --git a/package/ctcgfw/xray-plugin/Makefile b/package/ctcgfw/xray-plugin/Makefile
index 4efdd32aac..064c22ba80 100644
--- a/package/ctcgfw/xray-plugin/Makefile
+++ b/package/ctcgfw/xray-plugin/Makefile
@@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xray-plugin
 PKG_VERSION:=1.4.0
+PKG_RELEASE:=1
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GHCODELOAD/teddysun/xray-plugin/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=6247235aa8bf1ebb994032de932d8c41ab6641d68d0cb448b32a236494cc6c42
 
@@ -24,10 +26,13 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_XRAY_PLUGIN_COMPRESS_UPX
 
 PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/teddysun/xray-plugin
+GO_PKG_LDFLAGS:=-s -w
 
-include $(INCLUDE_DIR)/package-immortalwrt.mk
+include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/xray-plugin/config