target/sdk: generate a Config.in file with the settings of the build that the SDK...

[openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 16b4a61..376aef8 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -11,28 +11,61 @@ include $(INCLUDE_DIR)/host.mk
 
 override MAKEFLAGS=
 
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
+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)
-EXCLUDE_DIRS:=*/ccache */stamp */man */share */stampfiles */info
+EXCLUDE_DIRS:=*/ccache \
+       */stamp \
+       */stampfiles \
+       */man \
+       */info \
+
+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) \
 
 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: 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/host staging_dir/target-$(ARCH)_$(LIBC)-$(LIBCV) staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \
+       $(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
-       $(CP) \
+               $(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 \
@@ -41,14 +74,14 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                ./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
+       $(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
-       echo REVISION:="$(REVISION)" > $(SDK_BUILD_DIR)/include/version.mk
+       $(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