| 1 |
commit: b2cd6f1408b75dbef2bf24ffbff1e0f9376c94c3 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 14 15:08:03 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 16 14:29:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b2cd6f14 |
| 7 |
|
| 8 |
gen_funcs.sh: _tc-getPROG(): Fix overriding of default program |
| 9 |
|
| 10 |
tc-getBUILD_PROG() could pass multiple variables so we need to check |
| 11 |
all variables until we find our config variable containing user's value. |
| 12 |
|
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
gen_funcs.sh | 12 ++++++++++-- |
| 16 |
1 file changed, 10 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/gen_funcs.sh b/gen_funcs.sh |
| 19 |
index 507fadf..6917202 100755 |
| 20 |
--- a/gen_funcs.sh |
| 21 |
+++ b/gen_funcs.sh |
| 22 |
@@ -1167,8 +1167,16 @@ _tc-getPROG() { |
| 23 |
type=KERNEL |
| 24 |
fi |
| 25 |
|
| 26 |
- local prog_default_varname="DEFAULT_${type}_${var}" |
| 27 |
- local prog_override_varname="${type}_${var}" |
| 28 |
+ local prog_default_varname= |
| 29 |
+ local prog_override_varname= |
| 30 |
+ for v in ${vars} ; do |
| 31 |
+ prog_default_varname="DEFAULT_${type}_${v}" |
| 32 |
+ if [[ -n "${!prog_default_varname}" ]] |
| 33 |
+ then |
| 34 |
+ prog_override_varname="${type}_${v}" |
| 35 |
+ break |
| 36 |
+ fi |
| 37 |
+ done |
| 38 |
|
| 39 |
if [[ -n "${!prog_default_varname}" ]] \ |
| 40 |
&& [[ "${!prog_override_varname}" != "${!prog_default_varname}" ]] |
Archives