X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fkernel-build.mk;h=5544a82e37f50f213fdd9ad1c109dd9bf0d7be3e;hb=0c0df9eb082d5ff83d0f22f6e00bf580729fb49d;hp=8400bd2f1e88b8fd074a216de3dc6fa0509fd8d7;hpb=dc8f7b0692f74559101fd004b744415384b932fd;p=openwrt.git

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 8400bd2f1e..5544a82e37 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -4,6 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+include $(INCLUDE_DIR)/host.mk
 -include $(INCLUDE_DIR)/modules-$(KERNEL).mk
 
 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
@@ -17,6 +18,15 @@ KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEAS
 TARGETS += $(KERNEL_IPKG)
 INSTALL_TARGETS += $(KERNEL_IPKG)
 
+LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
+	-e 's/mipsel/mips/' \
+	-e 's/mipseb/mips/' \
+	-e 's/powerpc/ppc/' \
+	-e 's/sh[234]/sh/' \
+	-e 's/armeb/arm/' \
+)
+
+
 $(TARGETS): $(PACKAGE_DIR)
 
 $(PACKAGE_DIR):
@@ -71,8 +81,8 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
 
 $(LINUX_DIR)/.modules_done:
 	rm -rf $(KERNEL_BUILD_DIR)/modules
-	$(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) modules
-	$(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
+	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
 	touch $(LINUX_DIR)/.modules_done
 
 modules: $(LINUX_DIR)/.modules_done
@@ -82,7 +92,6 @@ $(LINUX_DIR)/.linux-compile:
 	@rm -f $(BUILD_DIR)/linux
 	ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
 	@$(MAKE) modules
-	@$(MAKE) packages
 	touch $@
 
 $(KERNEL_IPKG):
@@ -99,6 +108,7 @@ $(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
 	echo "CONFIG_KERNEL:=$(KERNEL)" >> $@
 	echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@
 	echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+	echo "CONFIG_LINUX_KARCH:=$(LINUX_KARCH)" >> $@
 
 pkg-install: FORCE
 	@for pkg in $(INSTALL_TARGETS); do \
@@ -110,6 +120,7 @@ prepare: $(LINUX_DIR)/.configured
 	@mkdir -p $(LINUX_DIR) $(PACKAGE_DIR)
 
 compile: prepare $(LINUX_DIR)/.linux-compile
+	@$(MAKE) packages
 
 install: compile $(LINUX_KERNEL)