[3/9] rtl8189fs: update to 476020109b3841421af289a7b78c7a25b0c45fac

Message ID 20230107114701.4075482-4-arne_f@ipfire.org
State Accepted
Commit f5be1e572f4db367ee2afba3ab58bcda14f632fb
Headers
Series [1/9] postfix: patch for build with kernel 6.x |

Commit Message

Arne Fitzenreiter 7 Jan 2023, 11:46 a.m. UTC
  this is needed for kernel 6.1.x
---
 lfs/rtl8189fs                             | 13 +++++++------
 src/patches/rtl8189fs/disable_debug.patch | 11 -----------
 2 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 src/patches/rtl8189fs/disable_debug.patch
  

Patch

diff --git a/lfs/rtl8189fs b/lfs/rtl8189fs
index 831d0eb73..bec128698 100644
--- a/lfs/rtl8189fs
+++ b/lfs/rtl8189fs
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2023  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -27,10 +27,12 @@  include Config
 VERSUFIX = ipfire$(KCFG)
 MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
 
-VER        = 3129a665f835ce0342f9a85a0ce14a556e656b8c
+VER        = 476020109b3841421af289a7b78c7a25b0c45fac
 
-THISAPP    = rtl8189FS_linux-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+# The rtl8189ES is no typo. This is extra branch in Hans de Goede's rtl8189ES
+# repo to support the rtl8189FS
+THISAPP    = rtl8189ES_linux-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -43,7 +45,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 75b4d3c7ccd5f3241967cd6594b89cad69ec5c0da10bbb7a07baa928c8e6b6d71869d54fbdc87f06eeb4d8ace82708dfd27e23c417545d603dd4f2ea45629c0e
+$(DL_FILE)_BLAKE2 = 6b4032f5024e0d5c4e097dbf743952e628e619e351cab25fe514e35ea2a949122bb793a4dddf0397759f4f659773f2eec9bb9fa3287bd1421dc3e16b796f650b
 
 install : $(TARGET)
 
@@ -76,7 +78,6 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8189fs/disable_debug.patch
 	cd $(DIR_APP) && CONFIG_RTL8189FS=m make $(MAKETUNING) \
 		-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
 
diff --git a/src/patches/rtl8189fs/disable_debug.patch b/src/patches/rtl8189fs/disable_debug.patch
deleted file mode 100644
index d29c55e6c..000000000
--- a/src/patches/rtl8189fs/disable_debug.patch
+++ /dev/null
@@ -1,11 +0,0 @@ 
-diff -Naur rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c.org/include/autoconf.h rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c/include/autoconf.h
---- rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c.org/include/autoconf.h	2021-10-01 14:51:56.000000000 +0000
-+++ rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c/include/autoconf.h	2022-02-26 12:00:09.188965578 +0000
-@@ -224,7 +224,6 @@
- /*
-  * Debug Related Config
-  */
--#define CONFIG_DEBUG /* DBG_871X, etc... */
- 
- #ifdef CONFIG_DEBUG
- #define DBG	1	// for ODM & BTCOEX debug