diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-10 13:41:00 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-10 13:41:00 +0000 |
| commit | bd97e26b6af3a3e3571b0e7164ab46380b8a03e6 (patch) | |
| tree | f7f3e388a1ca574315eaf33368d8364d9aca72a5 /include | |
| parent | b8885f1f93a2d6cf32afdf2e59f87a837a0d4de7 (diff) | |
put LINUX_KARCH in .kernel.mk
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5013 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/kernel-build.mk | 10 | ||||
| -rw-r--r-- | include/kernel.mk | 9 | ||||
| -rw-r--r-- | include/package.mk | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index c5b366848..6aefe0b89 100644 --- a/include/kernel-build.mk +++ b/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/include/kernel.mk b/include/kernel.mk index bd558ceec..580e3951d 100644 --- a/include/kernel.mk +++ b/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/include/package.mk b/include/package.mk index 069e28b84..e93192413 100644 --- a/include/package.mk +++ b/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 |