Skip to content

Commit 69a32e3

Browse files
committed
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 <drv_types.h> | ^~~~~~~~~~~~~ ``` 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 <drv_types.h> | ^~~~~~~~~~~~~ ```
1 parent 3af06a5 commit 69a32e3

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

lib/functions/configuration/main-config.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ function do_main_configuration() {
272272
[[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default)
273273
[[ -z $ARCH ]] && ARCH=arm64 # makes little sense to default to anything... # @TODO: remove, but check_config_userspace_release_and_desktop requires it
274274
ATF_COMPILE=yes # @TODO: move to armhf/arm64
275-
[[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes"
276275
[[ -z $PLYMOUTH ]] && PLYMOUTH="yes"
277276
[[ -z $AUFS ]] && AUFS="yes"
278277
[[ -z $IMAGE_PARTITION_TABLE ]] && IMAGE_PARTITION_TABLE="msdos"
@@ -474,6 +473,17 @@ function do_extra_configuration() {
474473

475474
declare -r -g IMAGE_FILE_ID="${calculated_image_version}" # Global, readonly.
476475

476+
if [[ -z $EXTRAWIFI ]]; then
477+
display_alert "EXTRAWIFI" "EXTRAWIFI is not set, defaulting to yes, kernel: ${KERNEL_MAJOR_MINOR}" "warn"
478+
EXTRAWIFI="yes"
479+
if linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.15; then
480+
display_alert "EXTRAWIFI" "EXTRAWIFI is not set, 6.15 disabled" "warn"
481+
EXTRAWIFI="no" # 6.15 breakage
482+
fi
483+
else
484+
display_alert "EXTRAWIFI" "EXTRAWIFI is set to ${EXTRAWIFI}" "warn"
485+
fi
486+
477487
display_alert "Done with do_extra_configuration" "do_extra_configuration" "debug"
478488
}
479489

0 commit comments

Comments
 (0)