From 03354353afb128342cdd3d76b89eee38b37978d6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 3 Apr 2008 18:37:30 +0000 Subject: [PATCH] clean up reject files after copying target/linux/*/files to the kernel tree SVN-Revision: 10722 --- include/quilt.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/quilt.mk b/include/quilt.mk index f07f4c5249..95f81e7094 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 -- 2.25.1