From b09e70bda5f9e5e559f6aeea95ba15035b3654a3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 31 Aug 2009 12:51:53 +0200
Subject: [PATCH] config: add the local,bundled patch order

This ordering first applies the local patches, then the bundeld ones.
---
 config/global/paths.in | 9 +++++++++
 scripts/functions      | 1 +
 2 files changed, 10 insertions(+)

diff --git a/config/global/paths.in b/config/global/paths.in
index 2a35af21..bfd0cfd7 100644
--- a/config/global/paths.in
+++ b/config/global/paths.in
@@ -86,6 +86,14 @@ config PATCH_BUNDLED_LOCAL
       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 @@ config PATCH_ORDER
     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 --git a/scripts/functions b/scripts/functions
index 4cfa78dd..02e2eee6 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -618,6 +618,7 @@ CT_Patch() {
         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