1 |
commit: aa0c1b8902caaf411e6a1abf46fb4d8f5e5867ed |
2 |
Author: Christoph Junghans <junghans <AT> lanl <DOT> gov> |
3 |
AuthorDate: Tue Jul 3 22:00:18 2018 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 19 07:35:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aa0c1b89 |
7 |
|
8 |
fix override of KERNEL_MAKE_DIRECTIVE_OVERRIDE |
9 |
|
10 |
Setting KERNEL_MAKE_DIRECTIVE_OVERRIDE in genkernel.conf didn't |
11 |
work. As default get loaded afterwards. |
12 |
|
13 |
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org> |
14 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
15 |
|
16 |
defaults/config.sh | 2 +- |
17 |
1 file changed, 1 insertion(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/defaults/config.sh b/defaults/config.sh |
20 |
index b961f68..3be9e4d 100755 |
21 |
--- a/defaults/config.sh |
22 |
+++ b/defaults/config.sh |
23 |
@@ -8,7 +8,7 @@ KERNEL_MAKE_DIRECTIVE="--INVALID--" |
24 |
# for xen-based kernels, the default value of |
25 |
# KERNEL_MAKE_DIRECTIVE_OVERRIDE cannot be "" |
26 |
DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE="--INVALID--" |
27 |
-KERNEL_MAKE_DIRECTIVE_OVERRIDE="${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}" |
28 |
+KERNEL_MAKE_DIRECTIVE_OVERRIDE="${KERNEL_MAKE_DIRECTIVE_OVERRIDE:-${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}}" |
29 |
KERNEL_MAKE_DIRECTIVE_2="" |
30 |
KERNEL_BINARY="--INVALID--" |
31 |
KERNEL_BINARY_OVERRIDE="" |