[openwrt/openwrt] sdk: change base feed fallback to git.openwrt.org

LEDE Commits lede-commits at lists.infradead.org
Thu Jan 11 09:21:00 PST 2018


jow pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/17b194aeac0196614cbee470348d77ea7f4971ee

commit 17b194aeac0196614cbee470348d77ea7f4971ee
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Wed Jan 10 23:53:45 2018 +0100

    sdk: change base feed fallback to git.openwrt.org
    
    Change the hardcoded lede-project.org base feed fallback to
    $(PROJECT_GIT)/openwrt/openwrt.git instead.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 target/sdk/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index ba28674..d3822a0 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -9,6 +9,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
+include $(INCLUDE_DIR)/download.mk
 
 override MAKEFLAGS=
 
@@ -45,7 +46,7 @@ GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^
 BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C git svn info 2>/dev/null | sed -ne 's/^URL: /src-gitsvn base /p'))
 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn info 2>/dev/null | sed -ne 's/^URL: /src-svn base /p'))
-BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base https://git.openwrt.org/source.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
+BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
 
 KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
 



More information about the lede-commits mailing list