Changeset 433


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/openwrt/openwrt.mk

    r432 r433  
    121121ifndef FORCE_PATCH
    122122openwrt/unpatch: openwrt/patch
     123        pat=`tail -1 openwrt/patch`; \
     124        pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
     125        if ! patch -d "$(OPENWRT_BUILD_DIR)" -p1 -R < "$${pat}" ; \
     126        then \
     127                echo ">> fail: $${pati} (ignored)" > /dev/stderr ; \
     128        else \
     129                echo ">> success: $${pati}" ; \
     130        fi ; \
    123131        tac openwrt/patch | \
     132        tail -n+2 | \
    124133        while read pat ; \
    125134        do \
     
    138147        touch $@
    139148else
    140 openwrt/unpatch:
     149openwrt/unpatch: openwrt/checkout
    141150        rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
    142151        find \
Note: See TracChangeset for help on using the changeset viewer.