Browse Source

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
Felix Fietkau 19 years ago
parent
commit
6a50014b62
1 changed files with 3 additions and 2 deletions
  1. 3 2
      include/kernel-build.mk

+ 3 - 2
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)