Add option for experimental bundled patches

This adds 3 new options to patch order:
* bundled + bundled_exp
* bundled + bundled_exp + local
* local + bundled + bundled_exp

The path for bundled experimental patches is: ${CT_LIB_DIR}/packages/${pkg_dir}/experimental
and patches that are still being reviewed, but not yet applied upstream
may be toggled with ENABLE_EXPERIMENTAL_BUNDLED_PATCHES.

Also fix modelines for editors on bootstrap and scripts/functions, and
fix mix whitespace in scripts/functions.

Closes: #1916

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

2 files changed, 44 insertions, 5 deletions

diff --git a/config/global/ct-behave.in b/config/global/ct-behave.in
index 42171e4d..067602a7 100644
--- a/config/global/ct-behave.in
+++ b/config/global/ct-behave.in
@@ -60,6 +60,17 @@ config ALLOW_BUILD_AS_ROOT_SURE
     prompt "Are you sure?"
     depends on ALLOW_BUILD_AS_ROOT
 
+config ENABLE_EXPERIMENTAL_BUNDLED_PATCHES
+    bool
+    default n
+    depends on EXPERIMENTAL
+    prompt "Enable Experimental Bundled Patches"
+    help
+      This option is for advanced users or special senarios where a
+      patch has been submitted upstream, but still not reviewed
+      or applied yet, but fix an issue with a package or feature that
+      is also marked experimental.
+
 config DEBUG_CT
     bool
     prompt "Debug crosstool-NG"
diff --git a/config/global/extract.in b/config/global/extract.in
index 4e624801..21163046 100644
--- a/config/global/extract.in
+++ b/config/global/extract.in
@@ -48,6 +48,12 @@ config PATCH_BUNDLED
     help
       Only apply patches bundled with crosstool-NG.
 
+config PATCH_BUNDLED_EXP
+    bool "Bundled, then experimental bundled"
+    depends on ENABLE_EXPERIMENTAL_BUNDLED_PATCHES
+    help
+      Apply the bundled patches, and experimental bundled patches.
+
 config PATCH_LOCAL
     bool "Local only"
     select PATCH_USE_LOCAL
@@ -64,6 +70,15 @@ config PATCH_BUNDLED_LOCAL
       Apply the patches bundled with crosstool-NG, then apply your local
       patches.
 
+config PATCH_BUNDLED_EXP_LOCAL
+    bool "Bundled, then experimental bundled, then local"
+    select PATCH_USE_LOCAL
+    depends on ENABLE_EXPERIMENTAL_BUNDLED_PATCHES
+    help
+      Apply the patches bundled with crosstool-NG, then apply the
+      experimental patches bundled with crosstool-NG, then apply
+      your local patches.
+
 config PATCH_LOCAL_BUNDLED
     bool "Local, then bundled"
     select PATCH_USE_LOCAL
@@ -73,6 +88,16 @@ config PATCH_LOCAL_BUNDLED
       crosstool-NG. Note that the bundled patches cannot be guaranteed
       to apply on top of your local patches.
 
+config PATCH_LOCAL_BUNDLED_EXP
+    bool "Local, then bundled, then experimental bunlded"
+    select PATCH_USE_LOCAL
+    depends on ENABLE_EXPERIMENTAL_BUNDLED_PATCHES
+    help
+      Apply your local patches, then apply the patches bundled with
+      crosstool-NG, then apply the experimental patches bundled with
+      crosstool-NG. Note that the bundled patches cannot be guaranteed
+      to apply on top of your local patches.
+
 config PATCH_NONE
     bool "None"
     depends on EXPERIMENTAL
@@ -90,11 +115,14 @@ endchoice
 
 config PATCH_ORDER
     string
-    default "bundled"           if PATCH_BUNDLED
-    default "local"             if PATCH_LOCAL
-    default "bundled,local"     if PATCH_BUNDLED_LOCAL
-    default "local,bundled"     if PATCH_LOCAL_BUNDLED
-    default "none"              if PATCH_NONE
+    default "bundled"                   if PATCH_BUNDLED
+    default "local"                     if PATCH_LOCAL
+    default "bundled,local"             if PATCH_BUNDLED_LOCAL
+    default "local,bundled"             if PATCH_LOCAL_BUNDLED
+    default "bundled,bundled_exp"       if PATCH_BUNDLED_EXP
+    default "bundled,bundled_exp,local" if PATCH_BUNDLED_EXP_LOCAL
+    default "local,bundled,bundled_exp" if PATCH_LOCAL_BUNDLED_EXP
+    default "none"                      if PATCH_NONE
 
 config PATCH_USE_LOCAL
     bool