Changeset 412

Timestamp:

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

Author:

amain

Message:

openwrt: add openwrt/(un)patch/force targets and success/fail messages to ease development of patches

Location:

branches/contrib/openwrt

Files:

• openwrt.mk (modified) (4 diffs)
• patches/README (modified) (2 diffs)

branches/contrib/openwrt/openwrt.mk

@@ -87 +87 @@
         touch $@
 
+openwrt/patch/force:
+        rm -f $(TOPDIR)/openwrt/patch
+        make -C $(TOPDIR) openwrt/patch FORCE_PATCH=1
+
 openwrt/patch: openwrt/checkout
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
@@ -98 +102 @@
         while read pat ; \
         do \
+                pati=$$(echo $${pat} | sed 's!$(OPENWRT_PATCHES_DIR)/!!') ; \
                 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -N < $${pat} ; \
                 then \
-                        echo Failed applying patch: $${pat} > /dev/stderr ; \
-                        rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
-                        exit 1 ; \
+                        echo ">> fail: $${pati}" > /dev/stderr ; \
+                        #rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
+                        [ $(FORCE_PATCH) != "1" ] && exit 1 || true ; \
+                else \
+                        echo ">> success: $${pati}" ; \
                 fi ; \
         done
+        rm -f openwrt/unpatch
         touch $@
 
-openwrt/unpatch:
-        if [ ! -f openwrt/patch ]; then exit 0; fi; \
+openwrt/unpatch/force:
+        rm -f $(TOPDIR)/openwrt/unpatch
+        make -C $(TOPDIR) openwrt/unpatch FORCE_PATCH=1
+
+openwrt/unpatch: openwrt/patch
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
         find \
@@ -119 +130 @@
         while read pat ; \
         do \
+                pati=$$(echo $${pat} | sed 's!$(OPENWRT_PATCHES_DIR)/!!') ; \
                 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -R < $${pat} ; \
                 then \
-                        echo Failed removing patch: $${pat} > /dev/stderr ; \
-                        rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
-                        exit 1 ; \
+                        echo ">> fail: $${pati}" > /dev/stderr ; \
+                        #rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \
+                        [ $(FORCE_PATCH) != "1" ] && exit 1 || true; \
+                else \
+                        echo ">> success: $${pati}" ; \
                 fi ; \
         done
-        rm openwrt/patch
+        rm -f openwrt/patch
         touch $@
-
 
 openwrt/files-copy: openwrt/patch
@@ -173 +186 @@
         rm -f openwrt/files-copy
 
+.PHONY: openwrt/patch/force \
+        openwrt/unpatch/force
+

branches/contrib/openwrt/patches/README

@@ -25 +25 @@
 <nnn>  is used to set order of application. Lower numbered patches are applied
        first. The ordering is done by running the list of patches through
-       `sort`, as a result,  "1000_foo" will be done before "200_bar".
+       `sort`, as a result,  "1000_foo" will be done before "200_bar". Note that
+       all patches in all patch directories are listed, sorted and then applied!
 
 <desc> contains a functional description of the patch. Usually separated by
@@ -39 +40 @@
 
 
-Make targets
-------------
-make openwrt/patch
-maken openwrt/unpatch
+Patch make targets
+------------------
+make openwrt/patch              - Exit when a patch fails
+maken openwrt/unpatch           - Exit when an unpatch fails
+make openwrt/patch/force        - Try to apply all patches
+maken openwrt/unpatch/force     - Try to unapply all patches
+
+The force options are very usefull when developping.