# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1251715913 -7200
# Node ID 7eeeaf4bc78afab529b7734d3f13f5d9b1a347e6
# Parent  ec5314609c006e06097f052440b2eed7f8e4183c
config: add the local,bundled patch order

This ordering first applies the local patches, then the bundeld ones.

diff -r ec5314609c00 -r 7eeeaf4bc78a config/global/paths.in
--- a/config/global/paths.in	Mon Aug 31 12:05:52 2009 +0200
+++ b/config/global/paths.in	Mon Aug 31 12:51:53 2009 +0200
@@ -86,6 +86,14 @@
       Apply the patches bundled with crosstool-NG,
       then apply your local patches.
 
+config PATCH_LOCAL_BUNDLED
+    bool
+    prompt "Local, then bundled"
+    select PATCH_USE_LOCAL
+    help
+      Apply your local patches, then apply the patches
+      bundled with crosstool-NG.
+
 endchoice
 
 config PATCH_ORDER
@@ -93,6 +101,7 @@
     default "bundled"           if PATCH_BUNDLED
     default "local"             if PATCH_LOCAL
     default "bundled,local"     if PATCH_BUNDLED_LOCAL
+    default "local,bundled"     if PATCH_LOCAL_BUNDLED
 
 config PATCH_USE_LOCAL
     bool
diff -r ec5314609c00 -r 7eeeaf4bc78a scripts/functions
--- a/scripts/functions	Mon Aug 31 12:05:52 2009 +0200
+++ b/scripts/functions	Mon Aug 31 12:51:53 2009 +0200
@@ -618,6 +618,7 @@
         bundled)        patch_dirs=("${bundled_patch_dir}");;
         local)          patch_dirs=("${local_patch_dir}");;
         bundled,local)  patch_dirs=("${bundled_patch_dir}" "${local_patch_dir}");;
+        local,bundled)  patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}");;
     esac
 
     for d in "${patch_dirs[@]}"; do