X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fquilt.mk;h=70bc84e4cce6a56f4f6ca70becb30371ddc881a3;hb=70d4a590b0fc63e9bf9e832c3a12639422394032;hp=f07f4c5249524b94c0176dd75ed0c774f2562a47;hpb=5925d4c0b5f1a1cade2c6123e2e8eec746560ef4;p=openwrt-10.03%2F.git

diff --git a/include/quilt.mk b/include/quilt.mk
index f07f4c524..70bc84e4c 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -12,6 +12,7 @@ ifeq ($(TARGET_BUILD),1)
   PKG_BUILD_DIR:=$(LINUX_DIR)
 endif
 PATCH_DIR?=./patches
+FILES_DIR?=./files
 
 ifeq ($(MAKECMDGOALS),refresh)
   override QUILT=1
@@ -66,9 +67,12 @@ define Build/Patch/Default
 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
+	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
 	$(call PatchDir,$(GENERIC_PATCH_DIR),generic/)
 	$(call PatchDir,$(PATCH_DIR),platform/)
 endef
@@ -144,7 +148,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)