From f20f8b9e3c0ccc44319a6fa8173ab1cd53c2314d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 13 Dec 2021 12:02:52 +0100 Subject: [PATCH] rtl8812au: use buildroot provided aircrack-ng driver (#1660) Use rtl8812au driver provided by buildroot. This uses a newer verison of the v5.6.4.2 branch which works with newer kernel and seems to be the recommended branch. Note: It seems that our buildroot package currently fails to properly deploy the 88XXau.ko kernel module. Instead of fixing our version, just move to the buildroot version. --- buildroot-external/Config.in | 1 - .../configs/khadas_vim3_defconfig | 2 +- .../configs/odroid_c2_defconfig | 2 +- .../configs/odroid_c4_defconfig | 2 +- .../configs/odroid_n2_defconfig | 2 +- .../configs/odroid_xu4_defconfig | 2 +- .../package/rtl8812au/Config.in | 10 ---------- .../package/rtl8812au/rtl8812au.mk | 19 ------------------- 8 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 buildroot-external/package/rtl8812au/Config.in delete mode 100644 buildroot-external/package/rtl8812au/rtl8812au.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 3348544546b..ee355d72778 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -6,7 +6,6 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/intel-e1000e/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in" -source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8812au/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in" diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig index 7ae8dce30b2..9767fec0be7 100644 --- a/buildroot-external/configs/khadas_vim3_defconfig +++ b/buildroot-external/configs/khadas_vim3_defconfig @@ -116,4 +116,4 @@ BR2_PACKAGE_KHADAS_BOOT=y BR2_PACKAGE_KHADAS_BOOT_VIM3=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_RTL8812AU=y +BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 0aeb7989d80..b30ef4c1d49 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -116,7 +116,7 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_RTL8812AU=y +BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RPI_RF_MOD_DTS=y BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index a19c200cc99..92413b23b02 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -114,7 +114,7 @@ BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C4=y -BR2_PACKAGE_RTL8812AU=y +BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RPI_RF_MOD_DTS=y BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index d0d9b265a81..2a28b6cfdfb 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -116,7 +116,7 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_RTL8812AU=y +BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RPI_RF_MOD_DTS=y BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 2c9b3feec0b..ec82772fe0b 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -118,5 +118,5 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_RTL8812AU=y +BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y BR2_PACKAGE_RPI_RF_MOD=y diff --git a/buildroot-external/package/rtl8812au/Config.in b/buildroot-external/package/rtl8812au/Config.in deleted file mode 100644 index 970ada7ea9f..00000000000 --- a/buildroot-external/package/rtl8812au/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -comment "RTL8812AU needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_RTL8812AU - bool "Realtek RTL8812AU Wi-Fi driver" - depends on BR2_LINUX_KERNEL - help - Install Realtek RTL8812AU Wi-Fi driver as a kernel module. - - https://github.com/gnab/rtl8812au/ diff --git a/buildroot-external/package/rtl8812au/rtl8812au.mk b/buildroot-external/package/rtl8812au/rtl8812au.mk deleted file mode 100644 index 4fd9aab28d6..00000000000 --- a/buildroot-external/package/rtl8812au/rtl8812au.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# Realtek RTL8812AU driver -# -################################################################################ - -RTL8812AU_VERSION = 1c9d034b20aa5c15dbf5bb5dfcb83346a692f827 -RTL8812AU_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_VERSION)) -RTL8812AU_LICENSE = GPL-2.0 -RTL8812AU_LICENSE_FILES = COPYING -#RTL8812AU_MODULE_SUBDIRS = src - -RTL8812AU_MODULE_MAKE_OPTS = \ - CONFIG_88XXAU=m \ - KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(generic-package))