Changeset 426

Timestamp:

Oct 10, 2012, 7:48:45 AM (8 years ago)

Author:

ehem

Message:

Remove plugin patches to DebWRT in opposite order of application to increase
the likelyhood of their successful removal. Use -N for normal patches to make
application/removal more consistent.

File:

• branches/contrib/plugins/plugins.mk (modified) (2 diffs)

branches/contrib/plugins/plugins.mk

@@ -52 +52 @@
                         else \
                                 echo "Normal patch: $$patch"; \
-                                patch -p1 -d $(TOPDIR) <$(PLUGINS_DIR)/$$plugin/debwrt/$$patch; \
+                                patch -N -p1 -d $(TOPDIR) <$(PLUGINS_DIR)/$$plugin/debwrt/$$patch; \
                         fi \
                 done; \
@@ -61 +61 @@
         @for plugin in $(PLUGIN_LIST); do \
                 echo "De-applying plugin '$$plugin' on DebWrt:"; \
-                for patch in `find $(PLUGINS_DIR)/$$plugin/debwrt/ -maxdepth 1 -mindepth 1 -type f -printf '%f\n' | sort`; do \
+                for patch in `find $(PLUGINS_DIR)/$$plugin/debwrt/ -maxdepth 1 -mindepth 1 -type f -printf '%f\n' | sort -r`; do \
                         if ( echo "$$patch" | grep -q ".rpatch$$" ); then \
                                 echo "Reverse patch: $$patch"; \
-                                patch -p1 -d $(TOPDIR) <$(PLUGINS_DIR)/$$plugin/debwrt/$$patch; \
+                                patch -N -p1 -d $(TOPDIR) <$(PLUGINS_DIR)/$$plugin/debwrt/$$patch; \
                         else \
                                 echo "Normal patch: $$patch"; \