From 92ca97e31b0bc1a4f8b02db7223bb4becd0044fa Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 1 Oct 2021 13:13:12 +0200 Subject: [PATCH 1/3] pkg: support PKG_MIRROR_URL, use if PKG_USE_MIRROR=1 (default) --- pkg/pkg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/pkg.mk b/pkg/pkg.mk index eb82b0639c..abc67d51bf 100644 --- a/pkg/pkg.mk +++ b/pkg/pkg.mk @@ -24,6 +24,12 @@ ifeq (,$(PKG_LICENSE)) $(error PKG_LICENSE not defined) endif +ifneq (, $(PKG_MIRROR_URL)) + ifneq (0, $(PKG_USE_MIRROR)) + PKG_URL = $(PKG_MIRROR_URL) + endif +endif + PKG_DIR ?= $(CURDIR) PKG_PATCH_DIR ?= $(PKG_DIR)/patches From 96f50ea52da5095c23853e2af497a9a28e4c83ee Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 1 Oct 2021 13:14:12 +0200 Subject: [PATCH 2/3] .murdock: set PKG_USE_MIRROR=0 for nightlies --- .murdock | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.murdock b/.murdock index 3e7584270d..cb11097ded 100755 --- a/.murdock +++ b/.murdock @@ -72,7 +72,11 @@ NIGHTLY=${NIGHTLY:-0} RUN_TESTS=${RUN_TESTS:-${NIGHTLY}} DWQ_ENV="-E BOARDS -E APPS -E NIGHTLY -E RUN_TESTS -E ENABLE_TEST_CACHE - -E TEST_HASH -E CI_PULL_LABELS" + -E TEST_HASH -E CI_PULL_LABELS -EPKG_USE_MIRROR" + +if [ ${NIGHTLY} -eq 1 ]; then + export PKG_USE_MIRROR=0 +fi get_supported_kconfig_board_app() { local board=$1 From 332a1a122138f42fa45213f0cfcd283fd09db562 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 1 Oct 2021 13:14:37 +0200 Subject: [PATCH 3/3] pkg/yxml: add git mirror url --- pkg/yxml/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/yxml/Makefile b/pkg/yxml/Makefile index 26ecd627be..7a2c8343eb 100644 --- a/pkg/yxml/Makefile +++ b/pkg/yxml/Makefile @@ -1,5 +1,6 @@ PKG_NAME=yxml PKG_URL=https://g.blicky.net/yxml.git +PKG_MIRROR_URL=https://github.com/RIOT-OS-pkgmirror/yxml.git PKG_VERSION=f9438757fc49b9f86961ddb55ae430e36bb88ebb PKG_LICENSE=MIT