diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-03 14:55:53 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-03 14:55:53 +0000 |
| commit | 8e52b00c08077ea9d8a8c7dac30be9c98d0ad833 (patch) | |
| tree | cb5eba0e4f6e22e81665e3ef321d102d1ca321fc /include/kernel.mk | |
| parent | b158be34cfdbbf42d7d562ea9fd2aa8fe1c1c666 (diff) | |
replace a few unnecessary $(shell) calls
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14739 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/kernel.mk')
| -rw-r--r-- | include/kernel.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 39be10a57..5d5c9e917 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 |