diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-04-03 18:37:30 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-04-03 18:37:30 +0000 |
commit | 03354353afb128342cdd3d76b89eee38b37978d6 (patch) | |
tree | 2cceb9babf44dd4d2d0fbe1bd65415915515d00c /include | |
parent | dd2afbeee3b7cb99b65585e5bacdcd403c51996e (diff) | |
download | upstream-03354353afb128342cdd3d76b89eee38b37978d6.tar.gz upstream-03354353afb128342cdd3d76b89eee38b37978d6.tar.bz2 upstream-03354353afb128342cdd3d76b89eee38b37978d6.zip |
clean up reject files after copying target/linux/*/files to the kernel tree
SVN-Revision: 10722
Diffstat (limited to 'include')
-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 |