refresh patch

[openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index a05b7c6..e171d83 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,41 +1,59 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # 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 $(INCLUDE_DIR)/host.mk
 
+override MAKEFLAGS=
+
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
-SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
+SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
-EXCLUDE_DIRS:=ccache stamp
+EXCLUDE_DIRS:=*/ccache \
+       */stamp \
+       */stampfiles \
+       */man \
+       */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)/
-       $(TAR) -cf - -C $(TOPDIR) --exclude="$(EXCLUDE_DIRS)" staging_dir/$(ARCH) | \
+       $(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)
-       (cd $(SDK_BUILD_DIR)/staging_dir/$(ARCH); \
-               rm -rf info man share stampfiles; \
-               cd usr; \
-               rm -rf doc info man share; \
-       )
-       $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/
-       $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/
-       $(CP) ./files/Makefile $(SDK_BUILD_DIR)/
-       $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
-       $(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
-       echo OPENWRTVERSION:="$(OPENWRTVERSION)" > $(SDK_BUILD_DIR)/.version.mk
-       rm -rf $(SDK_BUILD_DIR)/staging_dir/$(ARCH)/{ccache,stamp}
+       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
+       $(CP) \
+               $(TOPDIR)/LICENSE \
+               $(TOPDIR)/rules.mk \
+               $(TOPDIR)/.config \
+               ./files/Config.in \
+               ./files/Makefile \
+               ./files/README.SDK \
+               $(SDK_BUILD_DIR)/
+       $(CP) \
+               ./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
        find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
        (cd $(BUILD_DIR); \