From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 4 Feb 2007 19:36:11 +0000 (+0000)
Subject: Minor kernel build changes: Change '[ -d ... ] && cmd' to 'if [ -d ... ]; then cmd... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6a50014b624835de674b12ab9da45fd8f47cb5ea;p=openwrt%2Fstaging%2Fnbd.git

Minor kernel build changes: Change '[ -d ... ] && cmd' to 'if [ -d ... ]; then cmd; fi' to avoid make errors if the condition is false If $(PLATFORM_DIR)/files exists, copy it into the kernel tree on prepare.

SVN-Revision: 6263
---

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index c0b17aa841..1ac847e93c 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -69,8 +69,9 @@ endif
 
 define Kernel/Prepare/Default
 	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
-	[ -d $(GENERIC_PLATFORM_DIR)/patches ] && $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches 
-	[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
+	if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi
+	if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
+	if [ -d ./patches ]; then $(PATCH) $(LINUX_DIR) ./patches; fi
 endef
 define Kernel/Prepare
 	$(call Kernel/Prepare/Default)