Changeset 405

Timestamp:

Oct 5, 2012, 11:10:41 PM (10 years ago)

Author:

ehem

Message:

Minor tweaks to openwrt.mk. Allow for "-all" to indicate a patch for all
branches (adds symetry with "all" directory). Turn list of patch
directories into a variable, allows for plugins to use system by adding
to value. openwrt/unpatch shouldn't fail if the branch hasn't been
checked out, nor should it fail if run multiple times, fixed.

File:

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

branches/contrib/openwrt/openwrt.mk

@@ -22 +22 @@
 
 OPENWRT_PATCHES_DIR=$(TOPDIR)/openwrt/patches
+
+OPENWRT_PATCH_DIRS= "$(OPENWRT_PATCHES_DIR)/all" \
+        "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)"
+
+
 
 openwrt/all: openwrt/build
@@ -85 +90 @@
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
         find \
-          "$(OPENWRT_PATCHES_DIR)/all" "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)" \
+          $(OPENWRT_PATCH_DIRS) \
           -name .svn -prune -o \! -type d -printf %f/%p\\n | \
         gawk \
-          'match($$1, "^[[:digit:]]+(-$(OPENWRT_BRANCH))?(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
-          { if(revs[3] <= '$${rev}' && (!length(revs[4]) || revs[4] >= '$${rev}')) print }' | \
+          'match($$1, "^[[:digit:]]+((-$(OPENWRT_BRANCH))|(-all))?(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
+          { if(revs[5] <= '$${rev}' && (!length(revs[6]) || revs[6] >= '$${rev}')) print }' | \
         sort | sed -e's/^[^/]\+\///' | \
         while read pat ; \
@@ -102 +107 @@
         touch $@
 
-openwrt/unpatch: openwrt/checkout
+openwrt/unpatch:
+        if [ ! -f openwrt/patch ]; then exit 0; fi; \
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
         find \
-          "$(OPENWRT_PATCHES_DIR)/all" "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)" \
+          $(OPENWRT_PATCH_DIRS) \
           -name .svn -prune -o \! -type d -printf %f/%p\\n | \
         gawk \
-          'match($$1, "^[[:digit:]]+(-$(OPENWRT_BRANCH))?(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
-          { if(revs[3] <= '$${rev}' && (!length(revs[4]) || revs[4] >= '$${rev}')) print }' | \
+          'match($$1, "^[[:digit:]]+((-$(OPENWRT_BRANCH))|(-all))?(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
+          { if(revs[5] <= '$${rev}' && (!length(revs[6]) || revs[6] >= '$${rev}')) print }' | \
         sort -r | sed -e's/^[^/]\+\///' | \
         while read pat ; \