X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/605132cc3bf8d2fb568a8473b3cec3e9979e7d2d..c1527e419dfb27952d17c2722c77759670ad3d00:/include/quilt.mk

diff --git a/include/quilt.mk b/include/quilt.mk
index c310fd99a..8a63442dd 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
-	$(if $(QUILT),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
+	rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches
+	$(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
@@ -128,7 +126,7 @@ define Build/Quilt
 
   $(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
   $(STAMP_CHECKED): $(STAMP_PATCHED)
-	if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt next >/dev/null 2>&1 && quilt push -a || quilt top >/dev/null 2>&1); fi
+	if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); if quilt next >/dev/null 2>&1; then quilt push -a; else quilt top >/dev/null 2>&1; fi); fi
 	touch $$@
 
   quilt-check: $(STAMP_PREPARED) FORCE
@@ -148,7 +146,7 @@ define Build/Quilt
   refresh: quilt-check
 	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null
 	@cd $(PKG_BUILD_DIR); while quilt next 2>/dev/null >/dev/null && quilt push; do \
-		quilt refresh; \
+		QUILT_DIFF_OPTS="-p" quilt refresh -p ab --no-index --quiltrc=/dev/null --no-timestamps; \
 	done; ! quilt next 2>/dev/null >/dev/null
 	$(Quilt/Refresh)