config: add the local,bundled patch order
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Aug 31 12:51:53 2009 +0200 (2009-08-31)
changeset 15087eeeaf4bc78a
parent 1507 ec5314609c00
child 1509 f79fcf38ec21
config: add the local,bundled patch order

This ordering first applies the local patches, then the bundeld ones.
config/global/paths.in
scripts/functions
     1.1 --- a/config/global/paths.in	Mon Aug 31 12:05:52 2009 +0200
     1.2 +++ b/config/global/paths.in	Mon Aug 31 12:51:53 2009 +0200
     1.3 @@ -86,6 +86,14 @@
     1.4        Apply the patches bundled with crosstool-NG,
     1.5        then apply your local patches.
     1.6  
     1.7 +config PATCH_LOCAL_BUNDLED
     1.8 +    bool
     1.9 +    prompt "Local, then bundled"
    1.10 +    select PATCH_USE_LOCAL
    1.11 +    help
    1.12 +      Apply your local patches, then apply the patches
    1.13 +      bundled with crosstool-NG.
    1.14 +
    1.15  endchoice
    1.16  
    1.17  config PATCH_ORDER
    1.18 @@ -93,6 +101,7 @@
    1.19      default "bundled"           if PATCH_BUNDLED
    1.20      default "local"             if PATCH_LOCAL
    1.21      default "bundled,local"     if PATCH_BUNDLED_LOCAL
    1.22 +    default "local,bundled"     if PATCH_LOCAL_BUNDLED
    1.23  
    1.24  config PATCH_USE_LOCAL
    1.25      bool
     2.1 --- a/scripts/functions	Mon Aug 31 12:05:52 2009 +0200
     2.2 +++ b/scripts/functions	Mon Aug 31 12:51:53 2009 +0200
     2.3 @@ -618,6 +618,7 @@
     2.4          bundled)        patch_dirs=("${bundled_patch_dir}");;
     2.5          local)          patch_dirs=("${local_patch_dir}");;
     2.6          bundled,local)  patch_dirs=("${bundled_patch_dir}" "${local_patch_dir}");;
     2.7 +        local,bundled)  patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}");;
     2.8      esac
     2.9  
    2.10      for d in "${patch_dirs[@]}"; do