Просмотр исходного кода

separate series file fixup from quilt check to avoid series file breakages after fixing a broken patch stack with quilt

SVN-Revision: 9120
Felix Fietkau 18 лет назад
Родитель
Сommit
7d179076ca
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      include/quilt.mk

+ 6 - 2
include/quilt.mk

@@ -54,10 +54,11 @@ endef
 QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
 QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
 ifneq ($(QUILT),)
 ifneq ($(QUILT),)
   STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
   STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
+  STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
   override CONFIG_AUTOREBUILD=
   override CONFIG_AUTOREBUILD=
-  $(STAMP_CONFIGURED): $(STAMP_PATCHED) FORCE
+  $(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
   prepare: $(STAMP_PATCHED)
   prepare: $(STAMP_PATCHED)
-  quilt-check: $(STAMP_PATCHED)
+  quilt-check: $(STAMP_CHECKED)
 endif
 endif
 
 
 define Build/Patch/Default
 define Build/Patch/Default
@@ -119,6 +120,9 @@ $(STAMP_PATCHED): $(STAMP_PREPARED)
 			find * -type f \! -name series | sort > series; \
 			find * -type f \! -name series | sort > series; \
 		fi; \
 		fi; \
 	)
 	)
+	touch $@
+
+$(STAMP_CHECKED): $(STAMP_PATCHED)
 	if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi
 	if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi
 	touch $@
 	touch $@