Changeset 433

Timestamp:

Oct 11, 2012, 8:42:29 PM (8 years ago)

Author:

ehem

Message:

This looks to make more sense. The last patch applied is the one that would
have produced an error, so can ignore that *1* error when unpatching. The
force unpatch does require the tree to have been checked out (doesn't actually
need the patches to have been applied in the first place though!).

File:

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

branches/contrib/openwrt/openwrt.mk

@@ -121 +121 @@
 ifndef FORCE_PATCH
 openwrt/unpatch: openwrt/patch
+        pat=`tail -1 openwrt/patch`; \
+        pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
+        if ! patch -d "$(OPENWRT_BUILD_DIR)" -p1 -R < "$${pat}" ; \
+        then \
+                echo ">> fail: $${pati} (ignored)" > /dev/stderr ; \
+        else \
+                echo ">> success: $${pati}" ; \
+        fi ; \
         tac openwrt/patch | \
+        tail -n+2 | \
         while read pat ; \
         do \
@@ -138 +147 @@
         touch $@
 else
-openwrt/unpatch:
+openwrt/unpatch: openwrt/checkout
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
         find \