Skip to content

Commit 7104918

Browse files
galaknashif
galak
authored and
nashif
committed
Enable support for local patches
Enable local patches and point to them in the top level patches dir. So for gcc, we'd have patches in patches/gcc/7.3.0/ Signed-off-by: Kumar Gala <[email protected]>
1 parent 3c99f1c commit 7104918

File tree

8 files changed

+40
-30
lines changed

8 files changed

+40
-30
lines changed

‎configs/arc.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
7070
# CT_FORCE_EXTRACT is not set
7171
CT_OVERRIDE_CONFIG_GUESS_SUB=y
7272
# CT_ONLY_EXTRACT is not set
73-
CT_PATCH_BUNDLED=y
74-
# CT_PATCH_BUNDLED_LOCAL is not set
75-
CT_PATCH_ORDER="bundled"
73+
# CT_PATCH_BUNDLED is not set
74+
CT_PATCH_BUNDLED_LOCAL=y
75+
CT_PATCH_ORDER="bundled,local"
76+
CT_PATCH_USE_LOCAL=y
77+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7678

7779
#
7880
# Build behavior

‎configs/arm.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
7070
# CT_FORCE_EXTRACT is not set
7171
CT_OVERRIDE_CONFIG_GUESS_SUB=y
7272
# CT_ONLY_EXTRACT is not set
73-
CT_PATCH_BUNDLED=y
74-
# CT_PATCH_BUNDLED_LOCAL is not set
75-
CT_PATCH_ORDER="bundled"
73+
# CT_PATCH_BUNDLED is not set
74+
CT_PATCH_BUNDLED_LOCAL=y
75+
CT_PATCH_ORDER="bundled,local"
76+
CT_PATCH_USE_LOCAL=y
77+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7678

7779
#
7880
# Build behavior

‎configs/i586.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
7070
# CT_FORCE_EXTRACT is not set
7171
CT_OVERRIDE_CONFIG_GUESS_SUB=y
7272
# CT_ONLY_EXTRACT is not set
73-
CT_PATCH_BUNDLED=y
74-
# CT_PATCH_BUNDLED_LOCAL is not set
75-
CT_PATCH_ORDER="bundled"
73+
# CT_PATCH_BUNDLED is not set
74+
CT_PATCH_BUNDLED_LOCAL=y
75+
CT_PATCH_ORDER="bundled,local"
76+
CT_PATCH_USE_LOCAL=y
77+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7678

7779
#
7880
# Build behavior

‎configs/iamcu.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
7070
# CT_FORCE_EXTRACT is not set
7171
CT_OVERRIDE_CONFIG_GUESS_SUB=y
7272
# CT_ONLY_EXTRACT is not set
73-
CT_PATCH_BUNDLED=y
74-
# CT_PATCH_BUNDLED_LOCAL is not set
75-
CT_PATCH_ORDER="bundled"
73+
# CT_PATCH_BUNDLED is not set
74+
CT_PATCH_BUNDLED_LOCAL=y
75+
CT_PATCH_ORDER="bundled,local"
76+
CT_PATCH_USE_LOCAL=y
77+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7678

7779
#
7880
# Build behavior

‎configs/mips.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
6767
# CT_FORCE_EXTRACT is not set
6868
CT_OVERRIDE_CONFIG_GUESS_SUB=y
6969
# CT_ONLY_EXTRACT is not set
70-
CT_PATCH_BUNDLED=y
71-
# CT_PATCH_BUNDLED_LOCAL is not set
72-
CT_PATCH_ORDER="bundled"
70+
# CT_PATCH_BUNDLED is not set
71+
CT_PATCH_BUNDLED_LOCAL=y
72+
CT_PATCH_ORDER="bundled,local"
73+
CT_PATCH_USE_LOCAL=y
74+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7375

7476
#
7577
# Build behavior

‎configs/nios2.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
7070
# CT_FORCE_EXTRACT is not set
7171
CT_OVERRIDE_CONFIG_GUESS_SUB=y
7272
# CT_ONLY_EXTRACT is not set
73-
CT_PATCH_BUNDLED=y
74-
# CT_PATCH_BUNDLED_LOCAL is not set
75-
CT_PATCH_ORDER="bundled"
73+
# CT_PATCH_BUNDLED is not set
74+
CT_PATCH_BUNDLED_LOCAL=y
75+
CT_PATCH_ORDER="bundled,local"
76+
CT_PATCH_USE_LOCAL=y
77+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7678

7779
#
7880
# Build behavior

‎configs/riscv32.config‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
6969
# CT_FORCE_EXTRACT is not set
7070
CT_OVERRIDE_CONFIG_GUESS_SUB=y
7171
# CT_ONLY_EXTRACT is not set
72-
CT_PATCH_BUNDLED=y
73-
# CT_PATCH_LOCAL is not set
74-
# CT_PATCH_BUNDLED_LOCAL is not set
75-
# CT_PATCH_LOCAL_BUNDLED is not set
76-
# CT_PATCH_NONE is not set
77-
CT_PATCH_ORDER="bundled"
72+
# CT_PATCH_BUNDLED is not set
73+
CT_PATCH_BUNDLED_LOCAL=y
74+
CT_PATCH_ORDER="bundled,local"
75+
CT_PATCH_USE_LOCAL=y
76+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7877

7978
#
8079
# Build behavior

‎configs/xtensa.config‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,11 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
6969
# CT_FORCE_EXTRACT is not set
7070
CT_OVERRIDE_CONFIG_GUESS_SUB=y
7171
# CT_ONLY_EXTRACT is not set
72-
CT_PATCH_BUNDLED=y
73-
# CT_PATCH_LOCAL is not set
74-
# CT_PATCH_BUNDLED_LOCAL is not set
75-
# CT_PATCH_LOCAL_BUNDLED is not set
76-
# CT_PATCH_NONE is not set
77-
CT_PATCH_ORDER="bundled"
72+
# CT_PATCH_BUNDLED is not set
73+
CT_PATCH_BUNDLED_LOCAL=y
74+
CT_PATCH_ORDER="bundled,local"
75+
CT_PATCH_USE_LOCAL=y
76+
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches"
7877

7978
#
8079
# Build behavior

0 commit comments

Comments
 (0)