Changeset 431

Timestamp:

Oct 11, 2012, 7:53:34 AM (8 years ago)

Author:

ehem

Message:

Hopefully get the patch/unpatch rules to a good state. This looks like a
sane way to have them behave.

File:

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

branches/contrib/openwrt/openwrt.mk

@@ -93 +93 @@
 openwrt/patch: openwrt/checkout
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
+        retval=0 ; \
         find \
           $(OPENWRT_PATCH_DIRS) \
@@ -102 +103 @@
         while read pat ; \
         do \
+                echo "$${pat}" >> $@ ; \
                 pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
                 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p1 -N < "$${pat}" ; \
                 then \
                         echo ">> fail: $${pati}" > /dev/stderr ; \
-                        $(if $(FORCE_PATCH),, \
-                          rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
-                          exit 1 ; ) \
+                        $(if $(FORCE_PATCH),retval=1,exit 1) ; \
                 else \
                         echo ">> success: $${pati}" ; \
@@ -114 +114 @@
         done ; \
         rm -f openwrt/unpatch ; \
-        touch $@
+        exit $retval
 
 openwrt/unpatch/force:
@@ -120 +120 @@
         make -C $(TOPDIR) openwrt/unpatch FORCE_PATCH=1
 
+ifndef FORCE_PATCH
 openwrt/unpatch: openwrt/patch
-        if [ ! -f openwrt/patch ]; then exit 0; fi; \
+        tac openwrt/patch | \
+        while read pat ; \
+        do \
+                pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
+                if ! patch -d "$(OPENWRT_BUILD_DIR)" -p1 -R < "$${pat}" ; \
+                then \
+                        echo ">> fail: $${pati}" > /dev/stderr ; \
+                        echo ">> fatal: build in unrecoverable state" > /dev/stderr ; \
+                        rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
+                        exit 127 ; \
+                else \
+                        echo ">> success: $${pati}" ; \
+                fi ; \
+        done ; \
+        rm -f openwrt/patch ; \
+        touch $@
+else
+openwrt/unpatch:
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
+        retval=0 ; \
         find \
           $(OPENWRT_PATCH_DIRS) \
@@ -136 +155 @@
                 then \
                         echo ">> fail: $${pati}" > /dev/stderr ; \
-                        $(if $(FORCE_PATCH),, \
-                          rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
-                          exit 1 ; ) \
+                        retval=1 ; \
                 else \
                         echo ">> success: $${pati}" ; \
@@ -144 +161 @@
         done ; \
         rm -f openwrt/patch ; \
-        touch $@
+        touch $@ ; \
+        exit $retval
+endif