sdk: add missing kernel include files

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

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 2318f4d09b396dc7bbabd759be56e61658061b4e..cdfb2c8c45f2c2eb8704abf9775c619963948836 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -16,18 +16,31 @@ PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
 
 SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
+
+STAGING_SUBDIR_HOST := staging_dir/host
+STAGING_SUBDIR_TARGET := staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+
 EXCLUDE_DIRS:=*/ccache \
        */stamp \
        */stampfiles \
        */man \
        */info \
+       */root-* \
+       initial \
+       *.install.clean \
+       *.install.flags \
+       *.install \
+       */doc
 
 SDK_DIRS = \
-               staging_dir/host \
-               staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \
-               staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \
+               $(STAGING_SUBDIR_HOST) \
+               $(STAGING_SUBDIR_TARGET) \
+               $(STAGING_SUBDIR_TOOLCHAIN)
 
-SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }')
+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'))
 
 KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
 
@@ -37,6 +50,7 @@ KERNEL_FILES_ARCH = \
        Kbuild.platforms \
        */Platform \
        include \
+       */include \
        scripts \
        kernel/asm-offsets.s
 
@@ -59,11 +73,27 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
                $(SDK_DIRS) $(KERNEL_FILES) | \
                $(TAR) -xf - -C $(SDK_BUILD_DIR)
+
+       @-( \
+               find \
+                       $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/bin \
+                       $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/bin \
+                       $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/bin \
+                       $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/*/bin \
+                       $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/libexec \
+                       -type f; \
+               find \
+                       $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \
+                       $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \
+                       -type f -name \*.so\* -or -name \*.a; \
+       ) | xargs strip 2>/dev/null >/dev/null
+
        mkdir -p $(SDK_BUILD_DIR)/target/linux
        $(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/
        rm -rf \
                $(SDK_BUILD_DIR)/target/linux/*/files* \
                $(SDK_BUILD_DIR)/target/linux/*/patches*
+       ./convert-config.pl $(TOPDIR)/.config > $(SDK_BUILD_DIR)/Config-build.in
        $(CP) -L \
                $(TOPDIR)/LICENSE \
                $(TOPDIR)/rules.mk \
@@ -75,12 +105,16 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
        $(CP) \
                $(TOPDIR)/package/Makefile \
                $(SDK_BUILD_DIR)/package/
-       $(if $(SVN_PACKAGE_URL),echo "src-svn trunk $(SVN_PACKAGE_URL)" \
-               > $(SDK_BUILD_DIR)/feeds.conf.default,\
-               -rm -f $(SDK_BUILD_DIR)/feeds.conf.default)
-       cat $(TOPDIR)/feeds.conf.default \
-               >> $(SDK_BUILD_DIR)/feeds.conf.default
+
+       -rm -f $(SDK_BUILD_DIR)/feeds.conf.default
+       $(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default)
+       if [ -f $(TOPDIR)/feeds.conf ]; then \
+               cat $(TOPDIR)/feeds.conf >> $(SDK_BUILD_DIR)/feeds.conf.default; \
+       else \
+               cat $(TOPDIR)/feeds.conf.default >> $(SDK_BUILD_DIR)/feeds.conf.default; \
+       fi
        $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk
+       $(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk
        find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf