summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/global/paths.in9
-rw-r--r--scripts/functions1
2 files changed, 10 insertions, 0 deletions
diff --git a/config/global/paths.in b/config/global/paths.in
index 2a35af2..bfd0cfd 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 4cfa78d..02e2eee 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