Changeset 391

Timestamp:

Oct 1, 2012, 1:35:52 AM (10 years ago)

Author:

ehem

Message:

More features for patching. This version doesn't have problems with
subdirectories or checking directories with different depths. This also
adds the ability to include the branch name specification in the files.

File:

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

branches/contrib/openwrt/openwrt.mk

@@ -2 +2 @@
 #
 # Copyright (C) 2010 Johan van Zoomeren <amain@debwrt.net>
+# Copyright (C) 2012 Elliott Mitchell <ehem+debwrt@m5p.com>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -79 +80 @@
 openwrt/patch: openwrt/checkout
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
-        field=`echo "$(OPENWRT_PATCHES_DIR)" | awk -F / '{print NF+2}'` ; \
-        find "$(OPENWRT_PATCHES_DIR)/all" "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)" -name .svn -prune -o -print | \
-        awk -F / \
-          'match($$'$${field}', "^[[:digit:]]+(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
-          { if(revs[2] <= "'$${rev}'" && (!length(revs[3]) || revs[3] >= "'$${rev}'")) print }' | \
-        sort -t / -k $${field} | \
+        find \
+          "$(OPENWRT_PATCHES_DIR)/all" "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)" \
+          -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 }' | \
+        sort | sed -e's/^[^/]\+\///' | \
         while read pat ; \
         do \
@@ -98 +100 @@
 openwrt/unpatch: openwrt/checkout
         rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
-        field=`echo "$(OPENWRT_PATCHES_DIR)" | awk -F / '{print NF+2}'` ; \
-        find "$(OPENWRT_PATCHES_DIR)/all" "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)" -name .svn -prune -o -print | \
-        awk -F / \
-          'match($$'$${field}', "^[[:digit:]]+(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
-          { if(revs[2] <= "'$${rev}'" && (!length(revs[3]) || revs[3] >= "'$${rev}'")) print }' | \
-        sort -t / -k $${field} -r | \
+        find \
+          "$(OPENWRT_PATCHES_DIR)/all" "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)" \
+          -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 }' | \
+        sort -r | sed -e's/^[^/]\+\///' | \
         while read pat ; \
         do \