From aa46ee922a0ba5c15dcc58700d95057c1088a7e3 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 10 Apr 2025 12:25:23 +0200 Subject: [PATCH] main-config: HACK: disable EXTRAWIFI completely for kernels 6.15+ (move to extra_config) wifi: HACK: drop `rtl8192eu` until we can fix `rtw_cmd.c:17:10: fatal error: drv_types.h: No such file` ``` drivers/net/wireless/rtl8192eu/core/rtw_cmd.c:17:10: fatal error: drv_types.h: No such file or directory 17 | #include | ^~~~~~~~~~~~~ ``` wifi: HACK: drop `driver_rtl8189ES` until we can fix `core/rtw_cmd.c:17:10: fatal error: drv_types.h: No such file` ``` drivers/net/wireless/rtl8189es/core/rtw_cmd.c:17:10: fatal error: drv_types.h: No such file or directory 17 | #include | ^~~~~~~~~~~~~ ``` --- lib/functions/configuration/main-config.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index ed72e7235..639c55698 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -272,7 +272,6 @@ function do_main_configuration() { [[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default) [[ -z $ARCH ]] && ARCH=arm64 # makes little sense to default to anything... # @TODO: remove, but check_config_userspace_release_and_desktop requires it ATF_COMPILE=yes # @TODO: move to armhf/arm64 - [[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes" [[ -z $PLYMOUTH ]] && PLYMOUTH="yes" [[ -z $AUFS ]] && AUFS="yes" [[ -z $IMAGE_PARTITION_TABLE ]] && IMAGE_PARTITION_TABLE="msdos" @@ -474,6 +473,17 @@ function do_extra_configuration() { declare -r -g IMAGE_FILE_ID="${calculated_image_version}" # Global, readonly. + if [[ -z $EXTRAWIFI ]]; then + display_alert "EXTRAWIFI" "EXTRAWIFI is not set, defaulting to yes, kernel: ${KERNEL_MAJOR_MINOR}" "warn" + EXTRAWIFI="yes" + if linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.15; then + display_alert "EXTRAWIFI" "EXTRAWIFI is not set, 6.15 disabled" "warn" + EXTRAWIFI="no" # 6.15 breakage + fi + else + display_alert "EXTRAWIFI" "EXTRAWIFI is set to ${EXTRAWIFI}" "warn" + fi + display_alert "Done with do_extra_configuration" "do_extra_configuration" "debug" }