Package: adapt remaining packages to github call (#1278)

OpenIPC · Jan 23, 2024 · 1dfc53b · 1dfc53b
1 parent 618c99b
commit 1dfc53b
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -104,8 +104,8 @@ endef
 
 define REPACK_FIRMWARE
 	cd $(TARGET)/images && if test -e rootfs.tar; then mv -f rootfs.tar rootfs.$(BR2_OPENIPC_SOC_MODEL).tar; fi
-	$(if $(1),cd $(TARGET)/images && if test -e $(1); then mv -f $(1) $(1).$(BR2_OPENIPC_SOC_MODEL)); fi
-	$(if $(2),cd $(TARGET)/images && if test -e $(2); then mv -f $(2) $(2).$(BR2_OPENIPC_SOC_MODEL)); fi
+	$(if $(1),cd $(TARGET)/images && if test -e $(1); then mv -f $(1) $(1).$(BR2_OPENIPC_SOC_MODEL); fi)
+	$(if $(2),cd $(TARGET)/images && if test -e $(2); then mv -f $(2) $(2).$(BR2_OPENIPC_SOC_MODEL); fi)
 	$(if $(1),cd $(TARGET)/images && md5sum $(1).$(BR2_OPENIPC_SOC_MODEL) > $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum)
 	$(if $(2),cd $(TARGET)/images && md5sum $(2).$(BR2_OPENIPC_SOC_MODEL) > $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum)
 	$(if $(1),$(eval KERNEL = $(1).$(BR2_OPENIPC_SOC_MODEL) $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum),$(eval KERNEL =))

diff --git a/general/package/baresip-openipc/baresip-openipc.mk b/general/package/baresip-openipc/baresip-openipc.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-BARESIP_OPENIPC_VERSION = 2.0.1
-BARESIP_OPENIPC_SOURCE = v$(BARESIP_OPENIPC_VERSION).tar.gz
-BARESIP_OPENIPC_SITE = https://github.com/baresip/baresip/archive
+BARESIP_OPENIPC_SITE = $(call github,baresip,baresip,$(BARESIP_OPENIPC_VERSION))
+BARESIP_OPENIPC_VERSION = v2.0.1
+
 BARESIP_OPENIPC_DEPENDENCIES = libre-openipc librem-openipc zlib
 
 BARESIP_OPENIPC_MAKE_ENV = \

diff --git a/general/package/libre-openipc/libre-openipc.mk b/general/package/libre-openipc/libre-openipc.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-LIBRE_OPENIPC_VERSION = 2.1.1
-LIBRE_OPENIPC_SOURCE = v$(LIBRE_OPENIPC_VERSION).tar.gz
-LIBRE_OPENIPC_SITE = https://github.com/baresip/re/archive
+LIBRE_OPENIPC_SITE = $(call github,baresip,re,$(LIBRE_OPENIPC_VERSION))
+LIBRE_OPENIPC_VERSION = v2.1.1
 
 LIBRE_OPENIPC_INSTALL_STAGING = YES
 

diff --git a/general/package/librem-openipc/librem-openipc.mk b/general/package/librem-openipc/librem-openipc.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-LIBREM_OPENIPC_VERSION = 2.0.1
-LIBREM_OPENIPC_SOURCE = v$(LIBREM_OPENIPC_VERSION).tar.gz
-LIBREM_OPENIPC_SITE = https://github.com/baresip/rem/archive
+LIBREM_OPENIPC_SITE = $(call github,baresip,rem,$(LIBREM_OPENIPC_VERSION))
+LIBREM_OPENIPC_VERSION = v2.0.1
 
 LIBREM_OPENIPC_INSTALL_STAGING = YES
 LIBREM_OPENIPC_DEPENDENCIES = libre-openipc

diff --git a/general/package/logcat-openipc/logcat-openipc.mk b/general/package/logcat-openipc/logcat-openipc.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LOGCAT_OPENIPC_SITE = https://github.com/gtxaspec/linux_logcat/archive
-LOGCAT_OPENIPC_SOURCE = master.tar.gz
+LOGCAT_OPENIPC_SITE = $(call github,gtxaspec,linux_logcat,$(LOGCAT_OPENIPC_VERSION))
+LOGCAT_OPENIPC_VERSION = master
 
 LOGCAT_OPENIPC_LICENSE = GPL-2.0
 LOGCAT_OPENIPC_LICENSE_FILES = COPYING

diff --git a/general/package/majestic-plugins/majestic-plugins.mk b/general/package/majestic-plugins/majestic-plugins.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-MAJESTIC_PLUGINS_SITE = https://github.com/openipc/majestic-plugins/archive
-MAJESTIC_PLUGINS_SOURCE = master.tar.gz
+MAJESTIC_PLUGINS_SITE = $(call github,openipc,majestic-plugins,$(MAJESTIC_PLUGINS_VERSION))
+MAJESTIC_PLUGINS_VERSION = master
 
 MAJESTIC_PLUGINS_PATH = $(BASE_DIR)/../majestic-plugins
 

diff --git a/general/package/quirc-openipc/quirc-openipc.mk b/general/package/quirc-openipc/quirc-openipc.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc/archive
-QUIRC_OPENIPC_SOURCE = master.tar.gz
+QUIRC_OPENIPC_SITE = $(call github,openipc,quirc,$(QUIRC_OPENIPC_VERSION))
+QUIRC_OPENIPC_VERSION = master
 
 QUIRC_OPENIPC_DEPENDENCIES = libjpeg-openipc
 QUIRC_OPENIPC_MAKE_OPTS = \

diff --git a/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk b/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-SIGMASTAR_OSDRV_SENSORS_SITE = https://github.com/openipc/sensors/archive
-SIGMASTAR_OSDRV_SENSORS_SOURCE = master.tar.gz
+SIGMASTAR_OSDRV_SENSORS_SITE = $(call github,openipc,sensors,$(SIGMASTAR_OSDRV_SENSORS_VERSION))
+SIGMASTAR_OSDRV_SENSORS_VERSION = master
 
 SIGMASTAR_OSDRV_SENSORS_LICENSE = MIT
 SIGMASTAR_OSDRV_SENSORS_LICENSE_FILES = LICENSE

diff --git a/general/package/ssv6x5x-openipc/ssv6x5x-openipc.mk b/general/package/ssv6x5x-openipc/ssv6x5x-openipc.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-SSV6X5X_OPENIPC_SITE = https://github.com/openipc/ssv6x5x/archive
-SSV6X5X_OPENIPC_SOURCE = master.tar.gz
+SSV6X5X_OPENIPC_SITE = $(call github,openipc,ssv6x5x,$(SSV6X5X_OPENIPC_VERSION))
+SSV6X5X_OPENIPC_VERSION = master
 
 SSV6X5X_OPENIPC_LICENSE = GPL-2.0
 SSV6X5X_OPENIPC_LICENSE_FILES = COPYING

diff --git a/general/package/ssw101b/ssw101b.mk b/general/package/ssw101b/ssw101b.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-SSW101B_SITE = https://github.com/openipc/ssw101b/archive
-SSW101B_SOURCE = master.tar.gz
+SSW101B_SITE = $(call github,openipc,ssw101b,$(SSW101B_VERSION))
+SSW101B_VERSION = master
+
 SSW101B_LICENSE = GPL-2.0
 
 $(eval $(kernel-module))

diff --git a/general/package/vdec-openipc/vdec-openipc.mk b/general/package/vdec-openipc/vdec-openipc.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-VDEC_OPENIPC_SITE = https://github.com/openipc/silicon_research/archive
-VDEC_OPENIPC_SOURCE = master.tar.gz
+VDEC_OPENIPC_SITE = $(call github,openipc,silicon_research,$(VDEC_OPENIPC_VERSION))
+VDEC_OPENIPC_VERSION = master
+
 VDEC_OPENIPC_LICENSE = MIT
 
 define VDEC_OPENIPC_BUILD_CMDS

diff --git a/general/package/venc-openipc/venc-openipc.mk b/general/package/venc-openipc/venc-openipc.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-VENC_OPENIPC_SITE = https://github.com/openipc/silicon_research/archive
-VENC_OPENIPC_SOURCE = master.tar.gz
+VENC_OPENIPC_SITE = $(call github,openipc,silicon_research,$(VENC_OPENIPC_VERSION))
+VENC_OPENIPC_VERSION = master
+
 VENC_OPENIPC_LICENSE = MIT
 
 ifeq ($(OPENIPC_SOC_VENDOR),hisilicon)