sdk: do not exclude ccache executable

[openwrt/openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index d0d113de90f44b882dde5b9b86c3561f95c0bb53..7f277f9affd8d4f6c55967c7d19219ddfe46ec30 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,5 +1,6 @@
 # 
 # Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -18,7 +19,7 @@ SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 STAGING_SUBDIR_HOST := staging_dir/host
 STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
 
-EXCLUDE_DIRS:=*/ccache \
+EXCLUDE_DIRS:=*/ccache/* \
        */stamp \
        */stampfiles \
        */man \
@@ -37,6 +38,7 @@ SDK_DIRS = \
 BASE_FEED:=$(shell git config --get remote.origin.url 2>/dev/null | sed -ne 's/^/src-git base /p')
 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.lede-project.org/source.git$(filter-out ;master,;$(shell git rev-parse --abbrev-ref HEAD)))
 
 KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))