X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fquilt.mk;h=d3233d823895cbcd06a3e742bad047923f507d37;hb=dc6dd2603c7cb736fe4cf36a0206101ca4af19a6;hp=70bc84e4cce6a56f4f6ca70becb30371ddc881a3;hpb=c31aea4ac424030caf7bf580dc9cef809c9e09a4;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/include/quilt.mk b/include/quilt.mk index 70bc84e4cc..d3233d8238 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -66,13 +66,11 @@ define Build/Patch/Default $(call PatchDir,$(PATCH_DIR),) endef +kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.) define Kernel/Patch/Default rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches - if [ -d $(GENERIC_FILES_DIR) ]; then $(CP) $(GENERIC_FILES_DIR)/* $(LINUX_DIR)/; fi - if [ -d $(FILES_DIR) ]; then \ - $(CP) $(FILES_DIR)/* $(LINUX_DIR)/; \ - find $(LINUX_DIR)/ -name \*.rej | xargs rm -f; \ - fi + $(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/) + find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f $(call PatchDir,$(GENERIC_PATCH_DIR),generic/) $(call PatchDir,$(PATCH_DIR),platform/) endef