Changeset 424

Timestamp:

Oct 10, 2012, 2:29:19 AM (8 years ago)

Author:

ehem

Message:

Small adjustments. Reenable invalidating the checkout in case of patch
failure. This is cheaper now, since it takes advantage of Subversion to clean
things.

File:

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

branches/contrib/openwrt/openwrt.mk

@@ -102 +102 @@
         while read pat ; \
         do \
-                pati=$$(echo $${pat} | sed 's!$(OPENWRT_PATCHES_DIR)/!!') ; \
+                pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
                 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -N < $${pat} ; \
                 then \
                         echo ">> fail: $${pati}" > /dev/stderr ; \
-                        #rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
-                        [ $(FORCE_PATCH) != "1" ] && exit 1 || true ; \
+                        [ "$(FORCE_PATCH)" = "1" ] || ( \
+                          rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
+                          exit 1 ); \
                 else \
                         echo ">> success: $${pati}" ; \
@@ -130 +131 @@
         while read pat ; \
         do \
-                pati=$$(echo $${pat} | sed 's!$(OPENWRT_PATCHES_DIR)/!!') ; \
+                pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
                 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -R < $${pat} ; \
                 then \
                         echo ">> fail: $${pati}" > /dev/stderr ; \
-                        #rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
-                        [ $(FORCE_PATCH) != "1" ] && exit 1 || true; \
+                        [ "$(FORCE_PATCH)" = "1" ] || ( \
+                          rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
+                          exit 1 ); \
                 else \
                         echo ">> success: $${pati}" ; \