From f6ef5a895c18bf4d88fea6fbf2e3864673e0ccd9 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 26 May 2021 22:17:21 +0800 Subject: [PATCH 1/2] scripts/download: update mirror url Signed-off-by: Tianling Shen --- scripts/download.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/download.pl b/scripts/download.pl index 9f64446059..ae56fe1f98 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -280,8 +280,8 @@ foreach my $mirror (@ARGV) { } } -push @mirrors, "https://mirror01.download.immortalwrt.eu.org/openwrt-18.06"; -push @mirrors, "https://mirror02.download.immortalwrt.eu.org/openwrt-18.06"; +push @mirrors, "https://mirror01.download.immortalwrt.eu.org"; +push @mirrors, "https://mirror02.download.immortalwrt.eu.org"; push @mirrors, "https://openwrt.cc/dl/immortalwrt/openwrt-18.06"; push @mirrors, 'https://sources.cdn.openwrt.org'; push @mirrors, 'https://sources.openwrt.org'; From f7602bc1f147f635f8987457d96bd8f5b4cffd3b Mon Sep 17 00:00:00 2001 From: ElonH Date: Wed, 26 May 2021 22:33:34 +0800 Subject: [PATCH 2/2] sdk: generate correct base feed immortalwrt default branch is not master --- target/sdk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/sdk/Makefile b/target/sdk/Makefile index dbb693b49c..8fc2ba1cf9 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -43,7 +43,7 @@ SDK_DIRS = \ GIT_URL:=$(shell git config --get remote.origin.url 2>/dev/null) GIT_URL:=$(if $(CONFIG_BUILDBOT),$(filter git://% http://% https://%,$(GIT_URL)),$(GIT_URL)) GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null) -GIT_BRANCH:=$(filter-out master HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) +GIT_BRANCH:=$(filter-out HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }') BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))