From 2efc2b23197f16c6e4490af108dc4bd3861e9de1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 31 Aug 2009 12:47:58 +0200
Subject: config: add fallback to patch order

Add the possibility to fallback to either bundled or local patches
if local or bundled are missing.

diff --git a/config/global/paths.in b/config/global/paths.in
index bfd0cfd..e277f04 100644
--- a/config/global/paths.in
+++ b/config/global/paths.in
@@ -94,6 +94,24 @@ config PATCH_LOCAL_BUNDLED
       Apply your local patches, then apply the patches
       bundled with crosstool-NG.
 
+config PATCH_BUNDLED_FALLBACK_LOCAL
+    bool
+    prompt "Bundled only, local if no bundled"
+    select PATCH_USE_LOCAL
+    select PATCH_SINGLE
+    help
+      Apply the patches bundled with crosstool-NG;
+      if there's no bundled patches, apply your local patches.
+
+config PATCH_LOCAL_FALLBACK_BUNDLED
+    bool
+    prompt "Local only, bundled if no local"
+    select PATCH_USE_LOCAL
+    select PATCH_SINGLE
+    help
+      Only apply your local patches;
+      if there's no local patches, apply patches bundled with crosstool-NG.
+
 endchoice
 
 config PATCH_ORDER
@@ -103,6 +121,10 @@ config PATCH_ORDER
     default "bundled,local"     if PATCH_BUNDLED_LOCAL
     default "local,bundled"     if PATCH_LOCAL_BUNDLED
 
+config PATCH_SINGLE
+    bool
+    default n
+
 config PATCH_USE_LOCAL
     bool
     default n
diff --git a/scripts/functions b/scripts/functions
index 02e2eee..ae584c4 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -630,6 +630,9 @@ CT_Patch() {
                     CT_DoExecLog ALL patch -g0 -F1 -p1 -f <"${p}"
                 fi
             done
+            if [ "${CT_PATCH_SINGLE}" = "y" ]; then
+                break
+            fi
         fi
     done
 
-- 
cgit v0.10.2-6-g49f6