sdk: avoid using private repository clone urls as base repo entry

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

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index c1eca736b0f3bfa48dd23534375900bb700cef05..c93e31745846dcb25ca4e50d8ae11443beffd623 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -29,13 +29,14 @@ EXCLUDE_DIRS:=*/ccache/* \
        *.install.clean \
        *.install.flags \
        *.install \
-       */doc
+       */doc \
+       */share/locale
 
 SDK_DIRS = \
                $(STAGING_SUBDIR_HOST) \
                $(STAGING_SUBDIR_TOOLCHAIN)
 
-BASE_FEED:=$(shell git config --get remote.origin.url 2>/dev/null | sed -ne 's/^/src-git base /p')
+BASE_FEED:=$(shell git config --get remote.origin.url 2>/dev/null | sed -ne '\#\(git\|http\|https\)://#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)))
@@ -91,7 +92,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
                find \
                        $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \
                        $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \
-                       -type f -name \*.so\* -or -name \*.a; \
+                       -type f -name \*.so\*; \
        ) | xargs strip 2>/dev/null >/dev/null
 
        mkdir -p $(SDK_BUILD_DIR)/target/linux