aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-04-03 18:37:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-04-03 18:37:30 +0000
commitfc626a33aaf6d337f8a54cfd11aef6ff3c188a73 (patch)
tree32a3eb95d70d0a97be7f16ccc13db4be1ccf252a /include
parent09c0e0ce708f8493f8ff2db4a0dc832a52cb4ced (diff)
downloadupstream-fc626a33aaf6d337f8a54cfd11aef6ff3c188a73.tar.gz
upstream-fc626a33aaf6d337f8a54cfd11aef6ff3c188a73.tar.bz2
upstream-fc626a33aaf6d337f8a54cfd11aef6ff3c188a73.zip
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
Diffstat (limited to 'include')
-rw-r--r--include/quilt.mk5
1 files changed, 4 insertions, 1 deletions
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