aboutsummaryrefslogtreecommitdiffstats
path: root/include/kernel.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-03-03 14:55:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-03-03 14:55:53 +0000
commit431c9267b4016b7e712a0edf1e594bd71ac850b4 (patch)
tree2ac6aae6590e7bd3fec6de9d2446b64acf4aa4ed /include/kernel.mk
parentf3c14b3de8490a16cdb59f18239ce5afd3372708 (diff)
downloadupstream-431c9267b4016b7e712a0edf1e594bd71ac850b4.tar.gz
upstream-431c9267b4016b7e712a0edf1e594bd71ac850b4.tar.bz2
upstream-431c9267b4016b7e712a0edf1e594bd71ac850b4.zip
replace a few unnecessary $(shell) calls
SVN-Revision: 14739
Diffstat (limited to 'include/kernel.mk')
-rw-r--r--include/kernel.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index 39be10a577..5d5c9e9172 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -30,7 +30,7 @@ else
KERNEL_CROSS?=$(TARGET_CROSS)
endif
- PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+ PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
@@ -50,10 +50,10 @@ else
endif
ifneq (,$(findstring uml,$(BOARD)))
- LINUX_KARCH:=um
+ LINUX_KARCH=um
else
ifeq (,$(LINUX_KARCH))
- LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/x86/' \
+ LINUX_KARCH=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/x86/' \
-e 's/mipsel/mips/' \
-e 's/mipseb/mips/' \
-e 's/sh[234]/sh/' \
@@ -159,7 +159,11 @@ define AutoLoad
add_module $(1) "$(2)";
endef
-define CompareKernelPatchVer
- $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
-endef
+ifdef DUMP
+ CompareKernelPatchVer=0
+else
+ define CompareKernelPatchVer
+ $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
+ endef
+endif