From patchwork Sat Jan 7 11:46:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 6412 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Npz345HLmz40V9 for ; Sat, 7 Jan 2023 11:47:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Npz302vSLzt7; Sat, 7 Jan 2023 11:47:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Npz301WDpz2ydc; Sat, 7 Jan 2023 11:47:24 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Npz2y4MKSz2xQp for ; Sat, 7 Jan 2023 11:47:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Npz2y1Byczm6; Sat, 7 Jan 2023 11:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1673092042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=inApIyB8Qfs8RiYFsnLMynbN98xWJ5LOR5HwlFKzdKQ=; b=GkXq/6QrhlEVn+E5zQUVOALF5n5LcaYwh/5jxV+mNLSGwBbs+YeIW6Jsjc42oAFXfTFHbk LbLXN8HnE1uVeGg7kGD05oxUH8TFCP0D5fu06iA7TbCGlYmeatxDOSFxLj97jGoX0lSZTc o1HV6D//PjZXm3rZ7uEQvaVQtvBujhRx00IsTxHzijXxg9QUBKJez8Vx3v7Od2W2fSW0Qd pxBAvrhtWATA4TdxcpL0CuIPlsaLc4GhmV+LzhVxcHDLI1Z0jmPb08BDvuTALt1ijXWz1g HIChilf6/PALCvn+CSFzb7a9GERiIKGZnnYMIPU/cF7KEhQz1ZQEGIwQaCxjIQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1673092042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=inApIyB8Qfs8RiYFsnLMynbN98xWJ5LOR5HwlFKzdKQ=; b=C+cj4cHqGH2p5TPkCqYPmdJAfkOnEPbYXmnrK+j3PBSu8t16Vz5mx6MEtJSPaclefVtClM SKJvjdp3TkcDx+Bg== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH 3/9] rtl8189fs: update to 476020109b3841421af289a7b78c7a25b0c45fac Date: Sat, 7 Jan 2023 11:46:55 +0000 Message-Id: <20230107114701.4075482-4-arne_f@ipfire.org> In-Reply-To: <20230107114701.4075482-1-arne_f@ipfire.org> References: <20230107114701.4075482-1-arne_f@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 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 # +# Copyright (C) 2007-2023 IPFire Team # # # # 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