From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 3 Apr 2008 18:37:30 +0000 (+0000)
Subject: clean up reject files after copying target/linux/*/files to the kernel tree
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/84bc683a7ba7330cfa98f2e28a7d0511fe4bc7bf

clean up reject files after copying target/linux/*/files to the kernel tree


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10722 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/quilt.mk b/include/quilt.mk
index f07f4c524..95f81e709 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -68,7 +68,10 @@ endef
 define Kernel/Patch/Default
 	$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
 	if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi
-	if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(LINUX_DIR)/; \
+		find $(LINUX_DIR)/ -name \*.rej | xargs rm -f; \
+	fi
 	$(call PatchDir,$(GENERIC_PATCH_DIR),generic/)
 	$(call PatchDir,$(PATCH_DIR),platform/)
 endef