diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-04-03 18:37:30 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-04-03 18:37:30 +0000 |
commit | 84bc683a7ba7330cfa98f2e28a7d0511fe4bc7bf (patch) | |
tree | 32a3eb95d70d0a97be7f16ccc13db4be1ccf252a | |
parent | 8b820a5355f378dedab1f57ccfdc1e526fca7179 (diff) |
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
-rw-r--r-- | include/quilt.mk | 5 |
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 |