Changeset 435


Ignore:
Timestamp:
Oct 12, 2012, 10:35:37 PM (8 years ago)
Author:
ehem
Message:

Make patch application ordering ignore the branch and revision selection tags.
This might have had poor effects if left unaddressed.

Location:
branches/contrib/openwrt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/openwrt/openwrt.mk

    r433 r435  
    9696          $(OPENWRT_PATCH_DIRS) \
    9797          -name .svn -prune -o \! -type d -printf %f/%p\\n | \
    98         gawk \
    99           'match($$1, "^[[:digit:]]+((-$(OPENWRT_BRANCH))|(-all))?(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
    100           { if(revs[5] <= '$${rev}' && (!length(revs[6]) || revs[6] >= '$${rev}')) print }' | \
     98        gawk -F / '\
     99          BEGIN { OFS=FS } \
     100          match($$1, "^([[:digit:]])+((-$(OPENWRT_BRANCH))|(-all))?(-([[:digit:]]*):([[:digit:]]*))?_([^/]*)", revs) \
     101            { if(revs[6] <= '$${rev}' && (!length(revs[7]) || revs[7] >= '$${rev}'))
     102              { $$1=revs[1] "_" revs[8]; print }
     103            }' | \
    101104        sort | sed -e's/^[^/]\+\///' | \
    102105        while read pat ; \
     
    152155          $(OPENWRT_PATCH_DIRS) \
    153156          -name .svn -prune -o \! -type d -printf %f/%p\\n | \
    154         gawk \
    155           'match($$1, "^[[:digit:]]+((-$(OPENWRT_BRANCH))|(-all))?(-([[:digit:]]*):([[:digit:]]*))?_", revs) \
    156           { if(revs[5] <= '$${rev}' && (!length(revs[6]) || revs[6] >= '$${rev}')) print }' | \
     157        gawk -F / '\
     158          BEGIN { OFS=FS } \
     159          match($$1, "^([[:digit:]])+((-$(OPENWRT_BRANCH))|(-all))?(-([[:digit:]]*):([[:digit:]]*))?_([^/]*)", revs) \
     160            { if(revs[6] <= '$${rev}' && (!length(revs[7]) || revs[7] >= '$${rev}'))
     161              { $$1=revs[1] "_" revs[8]; print }
     162            }' | \
    157163        sort -r | sed -e's/^[^/]\+\///' | \
    158164        while read pat ; \
  • branches/contrib/openwrt/patches/README

    r434 r435  
    2424
    2525<nnn>  is used to set order of application. Lower numbered patches are applied
    26        first. The ordering is done by running the list of patches through
    27        `sort`, as a result,  "1000_foo" will be done before "200_bar". Note that
    28        all patches in all patch directories are listed, sorted and then applied!
     26       first.  The ordering is done by running the list of patches through
     27       `sort`, as a result,  "1000_foo" will be done before "200_bar".  The
     28       branch and revision tags are removed prior sorting, so they will not
     29       influence the order of application.  Note that all patches in all patch
     30       directories are listed, sorted and then applied as a single group in one
     31       pass!
    2932
    3033<desc> contains a functional description of the patch. Usually separated by
Note: See TracChangeset for help on using the changeset viewer.