From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 10 Oct 2006 13:41:00 +0000 (+0000)
Subject: put LINUX_KARCH in .kernel.mk
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c2527c7204b8fdd4638af13d1899013ab262eb28;p=openwrt%2Fstaging%2Fansuel.git

put LINUX_KARCH in .kernel.mk

SVN-Revision: 5013
---

diff --git a/openwrt/include/kernel-build.mk b/openwrt/include/kernel-build.mk
index c5b3668481..6aefe0b891 100644
--- a/openwrt/include/kernel-build.mk
+++ b/openwrt/include/kernel-build.mk
@@ -17,6 +17,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):
@@ -98,6 +107,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 \
diff --git a/openwrt/include/kernel.mk b/openwrt/include/kernel.mk
index bd558ceec7..580e3951d1 100644
--- a/openwrt/include/kernel.mk
+++ b/openwrt/include/kernel.mk
@@ -17,6 +17,7 @@ else
   ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL))
      LINUX_VERSION:=$(CONFIG_LINUX_VERSION)
      LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE)
+     LINUX_KARCH:=$(CONFIG_LINUX_KARCH)
   else
   # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
     $(warning rebuilding .kernel.mk)
@@ -30,14 +31,6 @@ else
     LINUX_KMOD_SUFFIX=o
   endif
 
-  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/' \
-  )
-
   KERNELNAME=
   ifneq (,$(findstring x86,$(BOARD)))
     KERNELNAME="bzImage"
diff --git a/openwrt/include/package.mk b/openwrt/include/package.mk
index 069e28b84f..e931924134 100644
--- a/openwrt/include/package.mk
+++ b/openwrt/include/package.mk
@@ -16,7 +16,7 @@ define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
       _INFO:=
-      ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
         _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif