[sdk] do not copy all the staging_dir/ directories, only the right toolchain and...

[openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 6c75600..55c1e13 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk


@@ -19,12 +18,14 @@ SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 EXCLUDE_DIRS:=*/ccache */stamp */man */share */stampfiles */info
 
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 EXCLUDE_DIRS:=*/ccache */stamp */man */share */stampfiles */info
 

+SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }')
+

 all: compile
 
 $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
        mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
        $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
 all: compile
 
 $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
        mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
        $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/

-       $(TAR) -cf - -C $(TOPDIR) $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") --exclude="staging_dir/$(ARCH)" staging_dir | \
+       $(TAR) -cf - -C $(TOPDIR) $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") --exclude="staging_dir/$(ARCH)" staging_dir/host staging_dir/target-$(ARCH)_$(LIBC)-$(LIBCV) staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \

                $(TAR) -xf - -C $(SDK_BUILD_DIR)
        mkdir -p $(SDK_BUILD_DIR)/target/linux
        $(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/
                $(TAR) -xf - -C $(SDK_BUILD_DIR)
        mkdir -p $(SDK_BUILD_DIR)/target/linux
        $(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/


@@ -33,7 +34,6 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                $(SDK_BUILD_DIR)/target/linux/*/patches
        $(CP) \
                $(TOPDIR)/LICENSE \
                $(SDK_BUILD_DIR)/target/linux/*/patches
        $(CP) \
                $(TOPDIR)/LICENSE \

-               $(TOPDIR)/feeds.conf.default \

                $(TOPDIR)/rules.mk \
                $(TOPDIR)/.config \
                ./files/Config.in \
                $(TOPDIR)/rules.mk \
                $(TOPDIR)/.config \
                ./files/Config.in \


@@ -44,6 +44,10 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                ./files/package/rules.mk \
                $(TOPDIR)/package/Makefile \
                $(SDK_BUILD_DIR)/package/
                ./files/package/rules.mk \
                $(TOPDIR)/package/Makefile \
                $(SDK_BUILD_DIR)/package/

+       echo "src-svn trunk $(SVN_PACKAGE_URL)" \
+               > $(SDK_BUILD_DIR)/feeds.conf.default
+       cat $(TOPDIR)/feeds.conf.default \
+               >> $(SDK_BUILD_DIR)/feeds.conf.default

        echo REVISION:="$(REVISION)" > $(SDK_BUILD_DIR)/include/version.mk
        find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
        echo REVISION:="$(REVISION)" > $(SDK_BUILD_DIR)/include/version.mk
        find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf