From ed4b3118a7c1bf06de87897f62873cde35797035 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:53:31 +0200 Subject: [PATCH] Package: use head branch by default for openipc --- general/package/atbm603x/atbm603x.mk | 4 ++-- general/package/exfat-openipc/exfat-openipc.mk | 2 +- general/package/hisilicon-opensdk/hisilicon-opensdk.mk | 2 +- general/package/ingenic-opensdk/ingenic-opensdk.mk | 2 +- general/package/ipctool/ipctool.mk | 6 ++---- general/package/majestic/majestic.mk | 5 +---- general/package/mavfwd/mavfwd.mk | 4 ++-- general/package/microbe-web/microbe-web.mk | 2 +- general/package/microsnander/microsnander.mk | 4 ++-- general/package/motors/motors.mk | 4 ++-- general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk | 2 +- general/package/quirc-openipc/quirc-openipc.mk | 2 +- general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk | 2 +- general/package/ssw101b/ssw101b.mk | 2 +- 14 files changed, 19 insertions(+), 24 deletions(-) diff --git a/general/package/atbm603x/atbm603x.mk b/general/package/atbm603x/atbm603x.mk index e25b99c3..90a008c5 100644 --- a/general/package/atbm603x/atbm603x.mk +++ b/general/package/atbm603x/atbm603x.mk @@ -4,8 +4,8 @@ # ################################################################################ -ATBM603X_VERSION = f01238ec655f8736d54033b986fbf889f1eef01c -ATBM603X_SITE = $(call github,OpenIPC,atbm_60xx,$(ATBM603X_VERSION)) +ATBM603X_VERSION = HEAD +ATBM603X_SITE = $(call github,openipc,atbm_60xx,$(ATBM603X_VERSION)) ATBM603X_LICENSE = GPL-2.0 ATBM603X_MODULE_MAKE_OPTS = \ diff --git a/general/package/exfat-openipc/exfat-openipc.mk b/general/package/exfat-openipc/exfat-openipc.mk index 5f4984ee..e1be6ab4 100644 --- a/general/package/exfat-openipc/exfat-openipc.mk +++ b/general/package/exfat-openipc/exfat-openipc.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFAT_OPENIPC_VERSION = 7f592ba5718e3e757cd0edd2d934fe2fe87f7d61 +EXFAT_OPENIPC_VERSION = HEAD EXFAT_OPENIPC_SITE = $(call github,namjaejeon,linux-exfat-oot,$(EXFAT_OPENIPC_VERSION)) EXFAT_OPENIPC_LICENSE = GPL-2.0 EXFAT_OPENIPC_LICENSE_FILES = COPYING diff --git a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk index 8bde17b9..b4ae2e44 100644 --- a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk +++ b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -HISILICON_OPENSDK_VERSION = c033009fa4551650480604dababcb5a852983593 +HISILICON_OPENSDK_VERSION = HEAD HISILICON_OPENSDK_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK_VERSION)) HISILICON_OPENSDK_LICENSE = GPL-3.0 HISILICON_OPENSDK_LICENSE_FILES = LICENSE diff --git a/general/package/ingenic-opensdk/ingenic-opensdk.mk b/general/package/ingenic-opensdk/ingenic-opensdk.mk index d3a85e0f..c1b70109 100644 --- a/general/package/ingenic-opensdk/ingenic-opensdk.mk +++ b/general/package/ingenic-opensdk/ingenic-opensdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INGENIC_OPENSDK_VERSION = $(shell git ls-remote https://github.com/OpenIPC/openingenic master | awk '{ print $$1 }') +INGENIC_OPENSDK_VERSION = HEAD INGENIC_OPENSDK_SITE = $(call github,openipc,openingenic,$(INGENIC_OPENSDK_VERSION)) INGENIC_OPENSDK_LICENSE = GPL-3.0 INGENIC_OPENSDK_LICENSE_FILES = LICENSE diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk index 489eb33e..ec0b838d 100644 --- a/general/package/ipctool/ipctool.mk +++ b/general/package/ipctool/ipctool.mk @@ -4,14 +4,12 @@ # ################################################################################ -IPCTOOL_VERSION = $(shell git ls-remote https://github.com/OpenIPC/ipctool/ master | awk '{ print $$1 }') -IPCTOOL_SITE = https://github.com/OpenIPC/ipctool.git -IPCTOOL_SITE_METHOD = git +IPCTOOL_VERSION = HEAD +IPCTOOL_SITE = $(call github,openipc,ipctool,$(IPCTOOL_VERSION)) IPCTOOL_LICENSE = MIT IPCTOOL_LICENSE_FILES = LICENSE IPCTOOL_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_VERSION=ON - IPCTOOL_MAKE_OPTS += VERBOSE=1 define IPCTOOL_INSTALL_TARGET_CMDS diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index 6463efb6..dc13de59 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -44,11 +44,8 @@ define MAJESTIC_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic -endef -define MAJESTIC_REMOVE_DOWNLOAD - rm -f $(BR2_DL_DIR)/majestic/$(MAJESTIC_SOURCE) + rm -rf $(MAJESTIC_DL_DIR) endef -MAJESTIC_PRE_DOWNLOAD_HOOKS += MAJESTIC_REMOVE_DOWNLOAD $(eval $(generic-package)) diff --git a/general/package/mavfwd/mavfwd.mk b/general/package/mavfwd/mavfwd.mk index d597e827..d4cc7733 100644 --- a/general/package/mavfwd/mavfwd.mk +++ b/general/package/mavfwd/mavfwd.mk @@ -4,9 +4,9 @@ # ################################################################################ -# MAVFWD_VERSION = $(shell git ls-remote https://github.com/OpenIPC/mavfwd/ master | awk '{ print $$1 }') +# MAVFWD_VERSION = HEAD MAVFWD_VERSION = 220d30e118d26008e94445887a03d77ba73c2d29 -MAVFWD_SITE = $(call github,OpenIPC,mavfwd,$(MAVFWD_VERSION)) +MAVFWD_SITE = $(call github,openipc,mavfwd,$(MAVFWD_VERSION)) MAVFWD_LICENSE = MIT MAVFWD_LICENSE_FILES = LICENSE diff --git a/general/package/microbe-web/microbe-web.mk b/general/package/microbe-web/microbe-web.mk index 5a0e271c..397caa55 100644 --- a/general/package/microbe-web/microbe-web.mk +++ b/general/package/microbe-web/microbe-web.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROBE_WEB_VERSION = $(shell git ls-remote https://github.com/OpenIPC/microbe-web/ master | awk '{ print $$1 }') +MICROBE_WEB_VERSION = HEAD MICROBE_WEB_SITE = $(call github,openipc,microbe-web,$(MICROBE_WEB_VERSION)) MICROBE_WEB_LICENSE = MIT MICROBE_WEB_LICENSE_FILES = LICENSE diff --git a/general/package/microsnander/microsnander.mk b/general/package/microsnander/microsnander.mk index 137dfc3a..87ed33a3 100644 --- a/general/package/microsnander/microsnander.mk +++ b/general/package/microsnander/microsnander.mk @@ -1,10 +1,10 @@ ################################################################################ # -# microsnander | updated 2022.08.13 +# microsnander # ################################################################################ -MICROSNANDER_VERSION = 17ad43fe93126fcff5135c54d7d375f5dd901387 +MICROSNANDER_VERSION = HEAD MICROSNANDER_SITE = $(call github,openipc,microsnander,$(MICROSNANDER_VERSION)) MICROSNANDER_LICENSE = MIT MICROSNANDER_LICENSE_FILES = LICENSE diff --git a/general/package/motors/motors.mk b/general/package/motors/motors.mk index 680f7b76..41356ef6 100644 --- a/general/package/motors/motors.mk +++ b/general/package/motors/motors.mk @@ -1,10 +1,10 @@ ################################################################################ # -# motors | updated 2023.05.11 +# motors # ################################################################################ -MOTORS_VERSION = 63e955dc0d3e048f801bd4ee2fcdc1dbfe562c0c +MOTORS_VERSION = HEAD MOTORS_SITE = $(call github,openipc,motors,$(MOTORS_VERSION)) MOTORS_LICENSE = MIT MOTORS_LICENSE_FILES = LICENSE diff --git a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk index c8e633e1..40114859 100644 --- a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk +++ b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MT7601U_AP_OPENIPC_VERSION = 1e3e907a87c8c79f567b7349c058327744424dce +MT7601U_AP_OPENIPC_VERSION = HEAD MT7601U_AP_OPENIPC_SITE = $(call github,openipc,mt7601u,$(MT7601U_AP_OPENIPC_VERSION)) MT7601U_AP_OPENIPC_LICENSE = GPL-2.0 diff --git a/general/package/quirc-openipc/quirc-openipc.mk b/general/package/quirc-openipc/quirc-openipc.mk index 7cb1a0f5..ea6195e9 100644 --- a/general/package/quirc-openipc/quirc-openipc.mk +++ b/general/package/quirc-openipc/quirc-openipc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUIRC_OPENIPC_VERSION = 33251ce2005855392666fd8c7436d8c309a127d7 +QUIRC_OPENIPC_VERSION = HEAD QUIRC_OPENIPC_SITE = $(call github,openipc,quirc,$(QUIRC_OPENIPC_VERSION)) QUIRC_OPENIPC_DEPENDENCIES += libjpeg QUIRC_OPENIPC_LICENSE = ISC diff --git a/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk b/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk index 891773f0..7286c1db 100644 --- a/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk +++ b/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8733BU_OPENIPC_VERSION = 57bc087de30d3c34ff1c4b1452ea5c91aeb75d07 +RTL8733BU_OPENIPC_VERSION = HEAD RTL8733BU_OPENIPC_SITE = $(call github,openipc,rtl8733bu,$(RTL8733BU_OPENIPC_VERSION)) RTL8733BU_OPENIPC_LICENSE = GPL-2.0 RTL8733BU_OPENIPC_LICENSE_FILES = COPYING diff --git a/general/package/ssw101b/ssw101b.mk b/general/package/ssw101b/ssw101b.mk index 0bad0534..a4176b74 100644 --- a/general/package/ssw101b/ssw101b.mk +++ b/general/package/ssw101b/ssw101b.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSW101B_VERSION = b7e425bcba9f17a87c48658c700823f02160e5ff +SSW101B_VERSION = HEAD SSW101B_SITE = $(call github,openipc,ssw101b,$(SSW101B_VERSION)) SSW101B_LICENSE = GPL-2.0