Skip to content

Commit 6f0a6f2

Browse files
committed
framework armbian-kernel.sh: our config/kernel should take precedence over kernel tree's defconfig
1 parent 1e7ef9d commit 6f0a6f2

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

lib/functions/compilation/armbian-kernel.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -519,28 +519,24 @@ function armbian_kernel_config_apply_opts_from_arrays() {
519519

520520
if [[ -f .config ]]; then
521521
for opt_n in "${opts_n[@]}"; do
522-
display_alert "Disabling kernel opt" "${opt_n}=n" "debug"
523522
kernel_config_set_n "${opt_n}"
524523
done
525524

526525
for opt_y in "${opts_y[@]}"; do
527-
display_alert "Enabling kernel opt" "${opt_y}=y" "debug"
528526
kernel_config_set_y "${opt_y}"
529527
done
530528

531529
for opt_m in "${opts_m[@]}"; do
532530
actual_opt_value='m'
533-
if egrep -q "(CONFIG_)?${opt_m}=y" "${kernel_config_source_filename}" .config; then
531+
if egrep -q "(CONFIG_)?${opt_m}=m" "${kernel_config_source_filename}"; then
532+
: # do nothing
533+
elif egrep -q "(CONFIG_)?${opt_m}=y" "${kernel_config_source_filename}" .config; then
534534
actual_opt_value='y'
535-
kernel_config_set_y "${opt_m}"
536-
else
537-
kernel_config_set_m "${opt_m}"
538535
fi
539-
display_alert "Enabling kernel opt" "${opt_m}=${actual_opt_value}" "debug"
536+
kernel_config_set_${actual_opt_value} "${opt_m}"
540537
done
541538

542539
for opt_val in "${!opts_val[@]}"; do
543-
display_alert "Setting kernel opt" "${opt_val}=${opts_val[$opt_val]}" "debug"
544540
kernel_config_set_val "${opt_val}" "${opts_val[$opt_val]}"
545541
done
546542
fi

0 commit comments

Comments
 (0)