* [PATCH 2/4] kernel: purge unused patches
[not found] <20231124144503.14577-1-arne_f@ipfire.org>
@ 2023-11-24 14:45 ` Arne Fitzenreiter
2023-11-24 14:45 ` [PATCH 3/4] rtl8812au: update to 202110629-e6a0d17 Arne Fitzenreiter
2023-11-24 14:45 ` [PATCH 4/4] rtl8xxx: remove unused or replaced external modules Arne Fitzenreiter
2 siblings, 0 replies; 3+ messages in thread
From: Arne Fitzenreiter @ 2023-11-24 14:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11350 bytes --]
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
...evtmpfs-mount-with-noexec-and-nosuid.patch | 93 -------------------
....9.8_cs5535audio_fix_logspam_on_geos.patch | 31 -------
...rm64-dpaa2-add-support-for-10g-modes.patch | 39 --------
...inux-5.15-arm64-dpaa2-fix-lock-issue.patch | 81 ----------------
4 files changed, 244 deletions(-)
delete mode 100644 src/patches/linux/devtmpfs-mount-with-noexec-and-nosuid.patch
delete mode 100644 src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch
delete mode 100644 src/patches/linux/linux-5-15-arm64-dpaa2-add-support-for-10g-modes.patch
delete mode 100644 src/patches/linux/linux-5.15-arm64-dpaa2-fix-lock-issue.patch
diff --git a/src/patches/linux/devtmpfs-mount-with-noexec-and-nosuid.patch b/src/patches/linux/devtmpfs-mount-with-noexec-and-nosuid.patch
deleted file mode 100644
index 222b7b6ea..000000000
--- a/src/patches/linux/devtmpfs-mount-with-noexec-and-nosuid.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 28f0c335dd4a1a4b44b3e6c6402825a93132e1a4 Mon Sep 17 00:00:00 2001
-From: Kees Cook <keescook(a)chromium.org>
-Date: Wed, 22 Dec 2021 17:50:20 +0500
-Subject: devtmpfs: mount with noexec and nosuid
-
-devtmpfs is writable. Add the noexec and nosuid as default mount flags
-to prevent code execution from /dev. The systems who don't use systemd
-and who rely on CONFIG_DEVTMPFS_MOUNT=y are the ones to be protected by
-this patch. Other systems are fine with the udev solution.
-
-No sane program should be relying on executing from /dev. So this patch
-reduces the attack surface. It doesn't prevent any specific attack, but
-it reduces the possibility that someone can use /dev as a place to put
-executable code. Chrome OS has been carrying this patch for several
-years. It seems trivial and simple solution to improve the protection of
-/dev when CONFIG_DEVTMPFS_MOUNT=y.
-
-Original patch:
-https://lore.kernel.org/lkml/20121120215059.GA1859(a)www.outflux.net/
-
-Cc: ellyjones(a)chromium.org
-Cc: Kay Sievers <kay(a)vrfy.org>
-Cc: Roland Eggner <edvx1(a)systemanalysen.net>
-Co-developed-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
-Signed-off-by: Kees Cook <keescook(a)chromium.org>
-Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
-Link: https://lore.kernel.org/r/YcMfDOyrg647RCmd(a)debian-BULLSEYE-live-builder-AMD64
-Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
----
- drivers/base/Kconfig | 11 +++++++++++
- drivers/base/devtmpfs.c | 10 ++++++++--
- 2 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
-index ffcbe2bc460eb..6f04b831a5c04 100644
---- a/drivers/base/Kconfig
-+++ b/drivers/base/Kconfig
-@@ -62,6 +62,17 @@ config DEVTMPFS_MOUNT
- rescue mode with init=/bin/sh, even when the /dev directory
- on the rootfs is completely empty.
-
-+config DEVTMPFS_SAFE
-+ bool "Use nosuid,noexec mount options on devtmpfs"
-+ depends on DEVTMPFS
-+ help
-+ This instructs the kernel to include the MS_NOEXEC and MS_NOSUID mount
-+ flags when mounting devtmpfs.
-+
-+ Notice: If enabled, things like /dev/mem cannot be mmapped
-+ with the PROT_EXEC flag. This can break, for example, non-KMS
-+ video drivers.
-+
- config STANDALONE
- bool "Select only drivers that don't need compile-time external firmware"
- default y
-diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
-index 8be352ab4ddbf..1e2c2d3882e2c 100644
---- a/drivers/base/devtmpfs.c
-+++ b/drivers/base/devtmpfs.c
-@@ -29,6 +29,12 @@
- #include <uapi/linux/mount.h>
- #include "base.h"
-
-+#ifdef CONFIG_DEVTMPFS_SAFE
-+#define DEVTMPFS_MFLAGS (MS_SILENT | MS_NOEXEC | MS_NOSUID)
-+#else
-+#define DEVTMPFS_MFLAGS (MS_SILENT)
-+#endif
-+
- static struct task_struct *thread;
-
- static int __initdata mount_dev = IS_ENABLED(CONFIG_DEVTMPFS_MOUNT);
-@@ -363,7 +369,7 @@ int __init devtmpfs_mount(void)
- if (!thread)
- return 0;
-
-- err = init_mount("devtmpfs", "dev", "devtmpfs", MS_SILENT, NULL);
-+ err = init_mount("devtmpfs", "dev", "devtmpfs", DEVTMPFS_MFLAGS, NULL);
- if (err)
- printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
- else
-@@ -412,7 +418,7 @@ static noinline int __init devtmpfs_setup(void *p)
- err = ksys_unshare(CLONE_NEWNS);
- if (err)
- goto out;
-- err = init_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, NULL);
-+ err = init_mount("devtmpfs", "/", "devtmpfs", DEVTMPFS_MFLAGS, NULL);
- if (err)
- goto out;
- init_chdir("/.."); /* will traverse into overmounted root */
---
-cgit
-
diff --git a/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch b/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch
deleted file mode 100644
index 79bd5e69e..000000000
--- a/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur linux-4.9.8.org/sound/pci/cs5535audio/cs5535audio.c linux-4.9.8/sound/pci/cs5535audio/cs5535audio.c
---- linux-4.9.8.org/sound/pci/cs5535audio/cs5535audio.c 2017-02-04 09:47:29.000000000 +0100
-+++ linux-4.9.8/sound/pci/cs5535audio/cs5535audio.c 2017-02-09 19:24:55.658297050 +0100
-@@ -83,9 +83,9 @@
- break;
- udelay(1);
- } while (--timeout);
-- if (!timeout)
-- dev_err(cs5535au->card->dev,
-- "Failure writing to cs5535 codec\n");
-+// if (!timeout)
-+// dev_err(cs5535au->card->dev,
-+// "Failure writing to cs5535 codec\n");
- }
-
- static unsigned short snd_cs5535audio_codec_read(struct cs5535audio *cs5535au,
-@@ -109,10 +109,10 @@
- break;
- udelay(1);
- } while (--timeout);
-- if (!timeout)
-- dev_err(cs5535au->card->dev,
-- "Failure reading codec reg 0x%x, Last value=0x%x\n",
-- reg, val);
-+// if (!timeout)
-+// dev_err(cs5535au->card->dev,
-+// "Failure reading codec reg 0x%x, Last value=0x%x\n",
-+// reg, val);
-
- return (unsigned short) val;
- }
diff --git a/src/patches/linux/linux-5-15-arm64-dpaa2-add-support-for-10g-modes.patch b/src/patches/linux/linux-5-15-arm64-dpaa2-add-support-for-10g-modes.patch
deleted file mode 100644
index ef8d459b7..000000000
--- a/src/patches/linux/linux-5-15-arm64-dpaa2-add-support-for-10g-modes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c314138bd045e050432158ab021160de3ba51c5e Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel(a)armlinux.org.uk>
-Date: Thu, 30 Jan 2020 22:42:38 +0000
-Subject: [PATCH 2/4] net: dpaa2-mac: add support for more 10G modes
-
-Phylink documentation says:
- * Note that the PHY may be able to transform from one connection
- * technology to another, so, eg, don't clear 1000BaseX just
- * because the MAC is unable to BaseX mode. This is more about
- * clearing unsupported speeds and duplex settings. The port modes
- * should not be cleared; phylink_set_port_modes() will help with this.
-
-So add the missing 10G modes.
-
-Signed-off-by: Russell King <rmk+kernel(a)armlinux.org.uk>
----
- drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-index 8fe32ed4f6dc..3be849cee47b 100644
---- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-@@ -140,6 +140,12 @@ static void dpaa2_mac_validate(struct phylink_config *config,
- case PHY_INTERFACE_MODE_10GBASER:
- case PHY_INTERFACE_MODE_USXGMII:
- phylink_set(mask, 10000baseT_Full);
-+ phylink_set(mask, 10000baseKR_Full);
-+ phylink_set(mask, 10000baseCR_Full);
-+ phylink_set(mask, 10000baseSR_Full);
-+ phylink_set(mask, 10000baseLR_Full);
-+ phylink_set(mask, 10000baseLRM_Full);
-+ phylink_set(mask, 10000baseER_Full);
- if (state->interface == PHY_INTERFACE_MODE_10GBASER)
- break;
- phylink_set(mask, 5000baseT_Full);
---
-2.30.1
-
diff --git a/src/patches/linux/linux-5.15-arm64-dpaa2-fix-lock-issue.patch b/src/patches/linux/linux-5.15-arm64-dpaa2-fix-lock-issue.patch
deleted file mode 100644
index 587821bac..000000000
--- a/src/patches/linux/linux-5.15-arm64-dpaa2-fix-lock-issue.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 3a39dbe0c0c41f8dba5246ce6e2c5c4bcd6ba661 Mon Sep 17 00:00:00 2001
-From: Ioana Ciornei <ioana.ciornei(a)nxp.com>
-Date: Thu, 21 Nov 2019 21:15:25 +0200
-Subject: [PATCH 1/4] dpaa2-eth: do not hold rtnl_lock on phylink_create() or
- _destroy()
-
-The rtnl_lock should not be held when calling phylink_create() or
-phylink_destroy() since it leads to the deadlock listed below:
-
-[ 18.656576] rtnl_lock+0x18/0x20
-[ 18.659798] sfp_bus_add_upstream+0x28/0x90
-[ 18.663974] phylink_create+0x2cc/0x828
-[ 18.667803] dpaa2_mac_connect+0x14c/0x2a8
-[ 18.671890] dpaa2_eth_connect_mac+0x94/0xd8
-
-Fix this by moving the _lock() and _unlock() calls just outside of
-phylink_of_phy_connect() and phylink_disconnect_phy().
-
-Fixes: 719479230893 ("dpaa2-eth: add MAC/PHY support through phylink")
-Reported-by: Russell King <linux(a)armlinux.org.uk>
-Signed-off-by: Ioana Ciornei <ioana.ciornei(a)nxp.com>
-Signed-off-by: Russell King <rmk+kernel(a)armlinux.org.uk>
----
- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 ----
- drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 4 ++++
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-index 8b7a29e1e221..20e65053f036 100644
---- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -4214,12 +4214,10 @@ static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)
- dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
- dpaa2_eth_update_tx_fqids(priv);
-
-- rtnl_lock();
- if (dpaa2_eth_has_mac(priv))
- dpaa2_eth_disconnect_mac(priv);
- else
- dpaa2_eth_connect_mac(priv);
-- rtnl_unlock();
- }
-
- return IRQ_HANDLED;
-@@ -4513,9 +4511,7 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)
- #endif
-
- unregister_netdev(net_dev);
-- rtnl_lock();
- dpaa2_eth_disconnect_mac(priv);
-- rtnl_unlock();
-
- dpaa2_eth_dl_port_del(priv);
- dpaa2_eth_dl_traps_unregister(priv);
-diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-index ae6d382d8735..8fe32ed4f6dc 100644
---- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-@@ -351,7 +351,9 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
- if (mac->pcs)
- phylink_set_pcs(mac->phylink, &mac->pcs->pcs);
-
-+ rtnl_lock();
- err = phylink_fwnode_phy_connect(mac->phylink, dpmac_node, 0);
-+ rtnl_unlock();
- if (err) {
- netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err);
- goto err_phylink_destroy;
-@@ -372,7 +374,9 @@ void dpaa2_mac_disconnect(struct dpaa2_mac *mac)
- if (!mac->phylink)
- return;
-
-+ rtnl_lock();
- phylink_disconnect_phy(mac->phylink);
-+ rtnl_unlock();
- phylink_destroy(mac->phylink);
- dpaa2_pcs_destroy(mac);
- }
---
-2.30.1
-
--
2.42.0
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 3/4] rtl8812au: update to 202110629-e6a0d17...
[not found] <20231124144503.14577-1-arne_f@ipfire.org>
2023-11-24 14:45 ` [PATCH 2/4] kernel: purge unused patches Arne Fitzenreiter
@ 2023-11-24 14:45 ` Arne Fitzenreiter
2023-11-24 14:45 ` [PATCH 4/4] rtl8xxx: remove unused or replaced external modules Arne Fitzenreiter
2 siblings, 0 replies; 3+ messages in thread
From: Arne Fitzenreiter @ 2023-11-24 14:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
lfs/rtl8812au | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lfs/rtl8812au b/lfs/rtl8812au
index e18ba8b5f..fd3128f42 100644
--- a/lfs/rtl8812au
+++ b/lfs/rtl8812au
@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-VER = 20210629-07ac856293e247347b891c5dbd13f3ab8321132d
+VER = 20210629-e6a0d1704ccd31145800ff5eb09ec2435a02f995
THISAPP = 8812au-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0d5fdcef6f52f396cac436ce17f6c52db3fcb43cdeb6fdcb1b0baa76fdfc2cfc8d94fcc925eed0c7cd4dfda00ac45dfbdcd661b69146cc45dfbb598f53471246
+$(DL_FILE)_BLAKE2 = d70ec16ade6dc17da22dcd6ff5de2cf09d4d079f42881b7d0ab78c19797241ff65516432b5655f5a30b158f034bccc354d89bcd1923d4cdb8256c670b15ea848
install : $(TARGET)
@@ -77,7 +77,6 @@ $(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/rtl8812au/enable_usbmodeswitch.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch
cd $(DIR_APP) && CONFIG_RTL8812AU=m make $(MAKETUNING) \
-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
@@ -94,4 +93,3 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP)
@$(POSTBUILD)
-
--
2.42.0
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 4/4] rtl8xxx: remove unused or replaced external modules
[not found] <20231124144503.14577-1-arne_f@ipfire.org>
2023-11-24 14:45 ` [PATCH 2/4] kernel: purge unused patches Arne Fitzenreiter
2023-11-24 14:45 ` [PATCH 3/4] rtl8812au: update to 202110629-e6a0d17 Arne Fitzenreiter
@ 2023-11-24 14:45 ` Arne Fitzenreiter
2 siblings, 0 replies; 3+ messages in thread
From: Arne Fitzenreiter @ 2023-11-24 14:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 17997 bytes --]
rtl8189es and rtl8189fs are used at my knowledge only on 32bit arm boards.
If there is any 64bit board i can restore it.
rtl8822bu and rtl8821cu are both supported in mainline kernel 6.6.x so
no separate module is needed anymore.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
lfs/rtl8189es | 95 --------------------------------------------------
lfs/rtl8189fs | 96 ---------------------------------------------------
lfs/rtl8821cu | 95 --------------------------------------------------
lfs/rtl8822bu | 96 ---------------------------------------------------
make.sh | 4 ---
5 files changed, 386 deletions(-)
delete mode 100644 lfs/rtl8189es
delete mode 100644 lfs/rtl8189fs
delete mode 100644 lfs/rtl8821cu
delete mode 100644 lfs/rtl8822bu
diff --git a/lfs/rtl8189es b/lfs/rtl8189es
deleted file mode 100644
index c829769ac..000000000
--- a/lfs/rtl8189es
+++ /dev/null
@@ -1,95 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VERSUFIX = ipfire$(KCFG)
-MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-
-VER = e58bd86c9d9408c648b1246a0dd76b16856ec172
-
-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)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = a2898188d6ed215b9a8f6bfd5684f4df1ad448b69537119c6633100db06349538b1e0491887f3c705bac1dcd79cf18e27084da34719745bfd54e9530793aa4da
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
- $(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && CONFIG_RTL8189ES=m make $(MAKETUNING) \
- -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP) modules
-
- # Install the built kernel modules.
- mkdir -p $(MODPATH)
- cd $(DIR_APP) && for f in $$(ls *.ko); do \
- /lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
- $$f; \
- xz $$f; \
- install -m 644 $$f.xz $(MODPATH); \
- done
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
-
diff --git a/lfs/rtl8189fs b/lfs/rtl8189fs
deleted file mode 100644
index bec128698..000000000
--- a/lfs/rtl8189fs
+++ /dev/null
@@ -1,96 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VERSUFIX = ipfire$(KCFG)
-MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-
-VER = 476020109b3841421af289a7b78c7a25b0c45fac
-
-# 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)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 6b4032f5024e0d5c4e097dbf743952e628e619e351cab25fe514e35ea2a949122bb793a4dddf0397759f4f659773f2eec9bb9fa3287bd1421dc3e16b796f650b
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
- $(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && CONFIG_RTL8189FS=m make $(MAKETUNING) \
- -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
-
- # Install the built kernel modules.
- mkdir -p $(MODPATH)
- cd $(DIR_APP) && for f in $$(ls *.ko); do \
- /lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
- $$f; \
- xz $$f; \
- install -m 644 $$f.xz $(MODPATH); \
- done
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/rtl8821cu b/lfs/rtl8821cu
deleted file mode 100644
index 1a305add5..000000000
--- a/lfs/rtl8821cu
+++ /dev/null
@@ -1,95 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VERSUFIX = ipfire$(KCFG)
-MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-
-VER = 20210118-7b8c45a270454f05e2dbf3beeb4afcf817db65da
-
-THISAPP = 8821cu-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 4f81f274d141ae140b96ac3a60642d70b8d2603080f3e8ed9f836815fec6eeb9b5f8648ed53663dbbe171176600760fae26cf5815395d004328a89037149122c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
- $(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && CONFIG_RTL8821CU=m make $(MAKETUNING) \
- -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
-
- # Install the built kernel modules.
- mkdir -p $(MODPATH)
- cd $(DIR_APP) && for f in $$(ls *.ko); do \
- /lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
- $$f; \
- xz $$f; \
- install -m 644 $$f.xz $(MODPATH); \
- done
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
-
diff --git a/lfs/rtl8822bu b/lfs/rtl8822bu
deleted file mode 100644
index e6462727e..000000000
--- a/lfs/rtl8822bu
+++ /dev/null
@@ -1,96 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VERSUFIX = ipfire$(KCFG)
-MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-
-VER = 20210702-2590672d717e2516dd2e96ed66f1037a6815bced
-
-THISAPP = 88x2bu-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = cfb62db38b7fb45cd08373fc08f98a7f15823ff93aa2f5fba3f5b71d50131bc6b1b7a68a16924b000ad431cffcd64fd635a49a76f70748a4df129e2c07f30936
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
- $(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(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/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch
- cd $(DIR_APP) && CONFIG_RTL8822BU=m make $(MAKETUNING) \
- -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
-
- # Install the built kernel modules.
- mkdir -p $(MODPATH)
- cd $(DIR_APP) && for f in $$(ls *.ko); do \
- /lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
- /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
- $$f; \
- xz $$f; \
- install -m 644 $$f.xz $(MODPATH); \
- done
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
-
diff --git a/make.sh b/make.sh
index a5390b788..c601426d0 100755
--- a/make.sh
+++ b/make.sh
@@ -1703,11 +1703,7 @@ buildipfire() {
# Kernelbuild ... current we have no platform that need
# multi kernel builds so KCFG is empty
lfsmake2 linux KCFG=""
- lfsmake2 rtl8189es KCFG=""
- lfsmake2 rtl8189fs KCFG=""
lfsmake2 rtl8812au KCFG=""
- lfsmake2 rtl8822bu KCFG=""
- lfsmake2 rtl8821cu KCFG=""
lfsmake2 linux-initrd KCFG=""
}
--
2.42.0
^ permalink raw reply [flat|nested] 3+ messages in thread