X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Fsdk%2FMakefile;h=14cb8d0644d6f48f8e9cdcb39079936aace58be8;hp=a8413562b2c9a1e8fb3fc7e13c53fccdea06d4e7;hb=6b12de7834db4b8d79fbcc94c5fc00505ca88e13;hpb=f52d66ff00b24111f87c274d3d7085ef2e1d27b1

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index a8413562b2..14cb8d0644 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,39 +1,100 @@
 # 
-# 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
 
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
+override MAKEFLAGS=
 
-SDK_NAME:=OpenWrt-SDK-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+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_TARGET := staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+
+EXCLUDE_DIRS:=*/ccache \
+	*/stamp \
+	*/stampfiles \
+	*/man \
+	*/info \
+	*/root-* \
+	initial \
+	*.install.clean \
+	*.install.flags \
+	*.install \
+	*/doc \
+	$(STAGING_SUBDIR_TARGET)/usr/bin
+
+SDK_DIRS = \
+		staging_dir/host \
+		$(STAGING_SUBDIR_TARGET) \
+		staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \
+
+SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }')
+
+KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
+
+KERNEL_FILES_ARCH = \
+	Makefile* \
+	module.lds \
+	Kbuild.platforms \
+	*/Platform \
+	include \
+	scripts \
+	kernel/asm-offsets.s
+
+KERNEL_FILES_BASE := \
+	.config \
+	Makefile \
+	scripts \
+	include \
+	Module.symvers \
+	$(addprefix arch/$(LINUX_KARCH)/,$(KERNEL_FILES_ARCH))
+
+KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(KERNEL_FILES_BASE))))
+
 all: compile
 
-$(BIN_DIR)/$(SDK_NAME).tar.bz2:
-	(cd $(STAGING_DIR); \
-		rm -rf info man share stampfiles; \
-		cd usr; \
-		rm -rf doc info man share; \
-	)
-	rm -rf $(SDK_BUILD_DIR)
+$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 	mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
-	$(CP) $(STAGING_DIR) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
-	$(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
-	find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf 
-	find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf 
+	$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
+	$(TAR) -cf - -C $(TOPDIR) \
+		$(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
+		$(SDK_DIRS) $(KERNEL_FILES) | \
+		$(TAR) -xf - -C $(SDK_BUILD_DIR)
+	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 \
+		$(TOPDIR)/.config \
+		./files/Config.in \
+		./files/Makefile \
+		./files/README.SDK \
+		$(SDK_BUILD_DIR)/
+	$(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
+	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(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); \
 		tar cfj $@ $(SDK_NAME); \
 	)
@@ -41,7 +102,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
 download:
 prepare:
 compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
-install:
+install: compile
 
 clean:
 	rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2