X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/84bc683a7ba7330cfa98f2e28a7d0511fe4bc7bf..d59e028829fab21384fcd5f9d86199d679759971:/include/quilt.mk?ds=sidebyside diff --git a/include/quilt.mk b/include/quilt.mk index 95f81e709..ffc5850d8 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 @@ -67,9 +68,9 @@ 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)/; \ + 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/) @@ -147,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 refresh -p ab --no-index --quiltrc=/dev/null --no-timestamps; \ done; ! quilt next 2>/dev/null >/dev/null $(Quilt/Refresh)