From e0faab1d837b364d670d1947de997cd94c0506ed Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Thu, 7 Jun 2018 19:18:40 -0400 Subject: [PATCH] Remove @GITHUB from include/download.mk, fix up PROJECT_GIT and package/utils/usbutils --- include/download.mk | 7 ++++--- package/utils/usbutils/Makefile | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/download.mk b/include/download.mk index ae3167091e..6fc26ce6e2 100644 --- a/include/download.mk +++ b/include/download.mk @@ -6,8 +6,9 @@ # See /LICENSE for more information. # -OPENWRT_GIT = http://git.openwrt.org -LEDE_GIT = https://git.lede-project.org +PROJECT_GIT = https://gogs.librecmc.org/OWEALs +OPENWRT_GIT = $(PROJECT_GIT) +LEDE_GIT = $(PROJECT_GIT) ifdef PKG_SOURCE_VERSION PKG_VERSION ?= $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION)) @@ -21,7 +22,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) define dl_method $(strip \ $(if $(2),$(2), \ - $(if $(filter @APACHE/% @GITHUB/% @GNOME/% @GNU/% @KERNEL_LIBRE/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \ + $(if $(filter @APACHE/% @GNOME/% @GNU/% @KERNEL_LIBRE/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \ $(if $(filter git://%,$(1)),git, \ $(if $(filter svn://%,$(1)),svn, \ $(if $(filter cvs://%,$(1)),cvs, \ diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index 29b1f85e14..4db70b0849 100644 --- a/package/utils/usbutils/Makefile +++ b/package/utils/usbutils/Makefile @@ -37,7 +37,7 @@ USB_IDS_FILE:=usb.ids.$(USB_IDS_REV) define Download/usb_ids FILE:=$(USB_IDS_FILE) URL_FILE:=usb.ids - URL:=@GITHUB/gentoo/hwids/ae25707c751fff79148328229a76fc44232abeae + URL:=$(PROJECT_GIT)/hwids/raw/ae25707c751fff79148328229a76fc44232abeae/usb.ids HASH:=eca5d4b4b2c72e61d5d6d67b5dc6f75e92b4ac9cf9cdf1344f06622e0f57d82f endef $(eval $(call Download,usb_ids)) -- 2.25.1