* [PATCH 1/9] postfix: patch for build with kernel 6.x
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
@ 2023-01-07 11:46 ` Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 2/9] rtl8189es: update to e58bd86c9d9408c648b1246a0dd76b16856ec172 Arne Fitzenreiter
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2890 bytes --]
---
lfs/postfix | 3 ++-
.../postfix/postfix-3.7.2-fix_linux6.patch | 24 +++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 src/patches/postfix/postfix-3.7.2-fix_linux6.patch
diff --git a/lfs/postfix b/lfs/postfix
index 0a078b8d2..160772bee 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# 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 #
@@ -103,6 +103,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/postfix/postfix-3.7.2-fix_linux6.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/postfix-3.6.2-glibc-234-build-fix.patch
cd $(DIR_APP) && make -f Makefile.init makefiles \
DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
diff --git a/src/patches/postfix/postfix-3.7.2-fix_linux6.patch b/src/patches/postfix/postfix-3.7.2-fix_linux6.patch
new file mode 100644
index 000000000..f5a9c5826
--- /dev/null
+++ b/src/patches/postfix/postfix-3.7.2-fix_linux6.patch
@@ -0,0 +1,24 @@
+diff -Naur postfix-3.7.2.org/makedefs postfix-3.7.2/makedefs
+--- postfix-3.7.2.org/makedefs 2022-01-23 21:53:41.000000000 +0100
++++ postfix-3.7.2/makedefs 2022-10-18 16:11:50.259575443 +0200
+@@ -627,7 +627,7 @@
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+ : ${PLUGIN_LD="${CC-gcc} -shared"}
+ ;;
+- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR
++ Linux.[3-6].*) SYSTYPE=LINUX$RELEASE_MAJOR
+ case "$CCARGS" in
+ *-DNO_DB*) ;;
+ *-DHAS_DB*) ;;
+diff -Naur postfix-3.7.2.org/src/util/sys_defs.h postfix-3.7.2/src/util/sys_defs.h
+--- postfix-3.7.2.org/src/util/sys_defs.h 2021-12-05 19:59:27.000000000 +0100
++++ postfix-3.7.2/src/util/sys_defs.h 2022-10-18 16:09:29.682371415 +0200
+@@ -751,7 +751,7 @@
+ /*
+ * LINUX.
+ */
+-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5)
++#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) || defined(LINUX6)
+ #define SUPPORTED
+ #define UINT32_TYPE unsigned int
+ #define UINT16_TYPE unsigned short
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/9] rtl8189es: update to e58bd86c9d9408c648b1246a0dd76b16856ec172
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 1/9] postfix: patch for build with kernel 6.x Arne Fitzenreiter
@ 2023-01-07 11:46 ` Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 3/9] rtl8189fs: update to 476020109b3841421af289a7b78c7a25b0c45fac Arne Fitzenreiter
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 12554 bytes --]
this is needed for kernel 6.1.x
---
lfs/rtl8189es | 9 +-
src/patches/rtl8189es/remove-ipx.patch | 319 -------------------------
2 files changed, 4 insertions(+), 324 deletions(-)
delete mode 100644 src/patches/rtl8189es/remove-ipx.patch
diff --git a/lfs/rtl8189es b/lfs/rtl8189es
index bd373facb..c829769ac 100644
--- a/lfs/rtl8189es
+++ b/lfs/rtl8189es
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# 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 #
@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-VER = 03ac413135a355b55b693154c44b70f86a39732e
+VER = e58bd86c9d9408c648b1246a0dd76b16856ec172
THISAPP = rtl8189ES_linux-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3cc2d7bb7ba01e90a1190a74dfdfaac4f377c1565cb97cb40c213269a3c2fbe853c8c22769554a3d4ad47e0d1461058de9fc4dba7599c8f6afd50e8ea89e5138
+$(DL_FILE)_BLAKE2 = a2898188d6ed215b9a8f6bfd5684f4df1ad448b69537119c6633100db06349538b1e0491887f3c705bac1dcd79cf18e27084da34719745bfd54e9530793aa4da
install : $(TARGET)
@@ -76,9 +76,8 @@ $(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/rtl8189es/remove-ipx.patch
cd $(DIR_APP) && CONFIG_RTL8189ES=m make $(MAKETUNING) \
- -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
+ -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP) modules
# Install the built kernel modules.
mkdir -p $(MODPATH)
diff --git a/src/patches/rtl8189es/remove-ipx.patch b/src/patches/rtl8189es/remove-ipx.patch
deleted file mode 100644
index 1340fa39c..000000000
--- a/src/patches/rtl8189es/remove-ipx.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-diff -Naur rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e.org/core/rtw_br_ext.c rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e/core/rtw_br_ext.c
---- rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e.org/core/rtw_br_ext.c 2021-03-02 18:42:47.000000000 +0100
-+++ rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e/core/rtw_br_ext.c 2021-11-04 18:21:00.965922215 +0100
-@@ -22,7 +22,6 @@
- #ifdef __KERNEL__
- #include <linux/if_arp.h>
- #include <net/ip.h>
--#include <net/ipx.h>
- #include <linux/atalk.h>
- #include <linux/udp.h>
- #include <linux/if_pppox.h>
-@@ -171,39 +170,6 @@
- }
-
-
--static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
-- unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
--{
-- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
--
-- networkAddr[0] = NAT25_IPX;
-- memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
-- memcpy(networkAddr+5, ipxNodeAddr, 6);
--}
--
--
--static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
-- unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
--{
-- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
--
-- networkAddr[0] = NAT25_IPX;
-- memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
-- memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2);
--}
--
--
--static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
-- unsigned short *network, unsigned char *node)
--{
-- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
--
-- networkAddr[0] = NAT25_APPLE;
-- memcpy(networkAddr+1, (unsigned char *)network, 2);
-- networkAddr[3] = *node;
--}
--
--
- static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
- unsigned char *ac_mac, unsigned short *sid)
- {
-@@ -929,267 +895,6 @@
- }
-
- /*---------------------------------------------------*/
-- /* Handle IPX and Apple Talk frame */
-- /*---------------------------------------------------*/
-- else if((protocol == __constant_htons(ETH_P_IPX)) ||
-- (protocol == __constant_htons(ETH_P_ATALK)) ||
-- (protocol == __constant_htons(ETH_P_AARP)))
-- {
-- unsigned char ipx_header[2] = {0xFF, 0xFF};
-- struct ipxhdr *ipx = NULL;
-- struct elapaarp *ea = NULL;
-- struct ddpehdr *ddp = NULL;
-- unsigned char *framePtr = skb->data + ETH_HLEN;
--
-- if(protocol == __constant_htons(ETH_P_IPX))
-- {
-- DBG_871X("NAT25: Protocol=IPX (Ethernet II)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- }
-- else //if(protocol <= __constant_htons(ETH_FRAME_LEN))
-- {
-- if(!memcmp(ipx_header, framePtr, 2))
-- {
-- DBG_871X("NAT25: Protocol=IPX (Ethernet 802.3)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- }
-- else
-- {
-- unsigned char ipx_8022_type = 0xE0;
-- unsigned char snap_8022_type = 0xAA;
--
-- if(*framePtr == snap_8022_type)
-- {
-- unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; // IPX SNAP ID
-- unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; // Apple Talk AARP SNAP ID
-- unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; // Apple Talk DDP SNAP ID
--
-- framePtr += 3; // eliminate the 802.2 header
--
-- if(!memcmp(ipx_snap_id, framePtr, 5))
-- {
-- framePtr += 5; // eliminate the SNAP header
--
-- DBG_871X("NAT25: Protocol=IPX (Ethernet SNAP)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- }
-- else if(!memcmp(aarp_snap_id, framePtr, 5))
-- {
-- framePtr += 5; // eliminate the SNAP header
--
-- ea = (struct elapaarp *)framePtr;
-- }
-- else if(!memcmp(ddp_snap_id, framePtr, 5))
-- {
-- framePtr += 5; // eliminate the SNAP header
--
-- ddp = (struct ddpehdr *)framePtr;
-- }
-- else
-- {
-- DEBUG_WARN("NAT25: Protocol=Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0],
-- framePtr[1], framePtr[2], framePtr[3], framePtr[4]);
-- return -1;
-- }
-- }
-- else if(*framePtr == ipx_8022_type)
-- {
-- framePtr += 3; // eliminate the 802.2 header
--
-- if(!memcmp(ipx_header, framePtr, 2))
-- {
-- DBG_871X("NAT25: Protocol=IPX (Ethernet 802.2)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- }
-- else
-- return -1;
-- }
-- }
-- }
--
-- /* IPX */
-- if(ipx != NULL)
-- {
-- switch(method)
-- {
-- case NAT25_CHECK:
-- if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN))
-- {
-- DBG_871X("NAT25: Check IPX skb_copy\n");
-- return 0;
-- }
-- return -1;
--
-- case NAT25_INSERT:
-- {
-- DBG_871X("NAT25: Insert IPX, Dest=%08x,%02x%02x%02x%02x%02x%02x,%04x Source=%08x,%02x%02x%02x%02x%02x%02x,%04x\n",
-- ipx->ipx_dest.net,
-- ipx->ipx_dest.node[0],
-- ipx->ipx_dest.node[1],
-- ipx->ipx_dest.node[2],
-- ipx->ipx_dest.node[3],
-- ipx->ipx_dest.node[4],
-- ipx->ipx_dest.node[5],
-- ipx->ipx_dest.sock,
-- ipx->ipx_source.net,
-- ipx->ipx_source.node[0],
-- ipx->ipx_source.node[1],
-- ipx->ipx_source.node[2],
-- ipx->ipx_source.node[3],
-- ipx->ipx_source.node[4],
-- ipx->ipx_source.node[5],
-- ipx->ipx_source.sock);
--
-- if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN))
-- {
-- DBG_871X("NAT25: Use IPX Net, and Socket as network addr\n");
--
-- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock);
--
-- // change IPX source node addr to wlan STA address
-- memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN);
-- }
-- else
-- {
-- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node);
-- }
--
-- __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
--
-- __nat25_db_print(priv);
-- }
-- return 0;
--
-- case NAT25_LOOKUP:
-- {
-- if(!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN))
-- {
-- DBG_871X("NAT25: Lookup IPX, Modify Destination IPX Node addr\n");
--
-- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
--
-- // replace IPX destination node addr with Lookup destination MAC addr
-- memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN);
-- }
-- else
-- {
-- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-- }
-- }
-- return 0;
--
-- default:
-- return -1;
-- }
-- }
--
-- /* AARP */
-- else if(ea != NULL)
-- {
-- /* Sanity check fields. */
-- if(ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN)
-- {
-- DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
-- return -1;
-- }
--
-- switch(method)
-- {
-- case NAT25_CHECK:
-- return 0;
--
-- case NAT25_INSERT:
-- {
-- // change to AARP source mac address to wlan STA address
-- memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN);
--
-- DBG_871X("NAT25: Insert AARP, Source=%d,%d Destination=%d,%d\n",
-- ea->pa_src_net,
-- ea->pa_src_node,
-- ea->pa_dst_net,
-- ea->pa_dst_node);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_src_net, &ea->pa_src_node);
--
-- __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
--
-- __nat25_db_print(priv);
-- }
-- return 0;
--
-- case NAT25_LOOKUP:
-- {
-- DBG_871X("NAT25: Lookup AARP, Source=%d,%d Destination=%d,%d\n",
-- ea->pa_src_net,
-- ea->pa_src_node,
-- ea->pa_dst_net,
-- ea->pa_dst_node);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_dst_net, &ea->pa_dst_node);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
--
-- // change to AARP destination mac address to Lookup result
-- memcpy(ea->hw_dst, skb->data, ETH_ALEN);
-- }
-- return 0;
--
-- default:
-- return -1;
-- }
-- }
--
-- /* DDP */
-- else if(ddp != NULL)
-- {
-- switch(method)
-- {
-- case NAT25_CHECK:
-- return -1;
--
-- case NAT25_INSERT:
-- {
-- DBG_871X("NAT25: Insert DDP, Source=%d,%d Destination=%d,%d\n",
-- ddp->deh_snet,
-- ddp->deh_snode,
-- ddp->deh_dnet,
-- ddp->deh_dnode);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_snet, &ddp->deh_snode);
--
-- __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
--
-- __nat25_db_print(priv);
-- }
-- return 0;
--
-- case NAT25_LOOKUP:
-- {
-- DBG_871X("NAT25: Lookup DDP, Source=%d,%d Destination=%d,%d\n",
-- ddp->deh_snet,
-- ddp->deh_snode,
-- ddp->deh_dnet,
-- ddp->deh_dnode);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-- }
-- return 0;
--
-- default:
-- return -1;
-- }
-- }
--
-- return -1;
-- }
--
-- /*---------------------------------------------------*/
- /* Handle PPPoE frame */
- /*---------------------------------------------------*/
- else if((protocol == __constant_htons(ETH_P_PPP_DISC)) ||
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 3/9] rtl8189fs: update to 476020109b3841421af289a7b78c7a25b0c45fac
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 1/9] postfix: patch for build with kernel 6.x Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 2/9] rtl8189es: update to e58bd86c9d9408c648b1246a0dd76b16856ec172 Arne Fitzenreiter
@ 2023-01-07 11:46 ` Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 4/9] rtl8822bu: update to 20210702-2590672d717e2516dd2e96ed66f1037a6815bced Arne Fitzenreiter
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3359 bytes --]
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 <info(a)ipfire.org> #
+# 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 #
@@ -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
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 4/9] rtl8822bu: update to 20210702-2590672d717e2516dd2e96ed66f1037a6815bced
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
` (2 preceding siblings ...)
2023-01-07 11:46 ` [PATCH 3/9] rtl8189fs: update to 476020109b3841421af289a7b78c7a25b0c45fac Arne Fitzenreiter
@ 2023-01-07 11:46 ` Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 5/9] rtl8812au: update to 20210629-07ac856293e247347b891c5dbd13f3ab8321132d Arne Fitzenreiter
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11940 bytes --]
this is needed for kernel-6.1.x
---
lfs/rtl8822bu | 7 +-
src/patches/rtl8822bu/remove-ipx.patch | 280 -------------------------
2 files changed, 3 insertions(+), 284 deletions(-)
delete mode 100644 src/patches/rtl8822bu/remove-ipx.patch
diff --git a/lfs/rtl8822bu b/lfs/rtl8822bu
index 74c80f325..b7221f101 100644
--- a/lfs/rtl8822bu
+++ b/lfs/rtl8822bu
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# 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 #
@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-VER = fd0b735e2e30d32f4d91497242cf6af288bdd082
+VER = 20210702-2590672d717e2516dd2e96ed66f1037a6815bced
THISAPP = 88x2bu-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4d3500428b174dfa5e9fb7ef2a8a1f5714129ad443969251dc70c10d23391318dfa900f39977cb437ed2fd5a75903c45d1cc3fa429a897ed9ed53b22ed145878
+$(DL_FILE)_BLAKE2 = cfb62db38b7fb45cd08373fc08f98a7f15823ff93aa2f5fba3f5b71d50131bc6b1b7a68a16924b000ad431cffcd64fd635a49a76f70748a4df129e2c07f30936
install : $(TARGET)
@@ -76,7 +76,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/rtl8822bu/remove-ipx.patch
cd $(DIR_APP) && CONFIG_RTL8822BU=m make $(MAKETUNING) \
-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
diff --git a/src/patches/rtl8822bu/remove-ipx.patch b/src/patches/rtl8822bu/remove-ipx.patch
deleted file mode 100644
index d0caaed7e..000000000
--- a/src/patches/rtl8822bu/remove-ipx.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff -Naur 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082.org/core/rtw_br_ext.c 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082/core/rtw_br_ext.c
---- 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082.org/core/rtw_br_ext.c 2021-09-30 20:27:33.000000000 +0200
-+++ 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082/core/rtw_br_ext.c 2021-11-04 18:57:11.853953556 +0100
-@@ -17,7 +17,6 @@
- #ifdef __KERNEL__
- #include <linux/if_arp.h>
- #include <net/ip.h>
-- #include <net/ipx.h>
- #include <linux/atalk.h>
- #include <linux/udp.h>
- #include <linux/if_pppox.h>
-@@ -168,40 +167,6 @@
- memcpy(networkAddr + 7, (unsigned char *)ipAddr, 4);
- }
-
--
--static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
-- unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
--{
-- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
--
-- networkAddr[0] = NAT25_IPX;
-- memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
-- memcpy(networkAddr + 5, ipxNodeAddr, 6);
--}
--
--
--static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
-- unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
--{
-- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
--
-- networkAddr[0] = NAT25_IPX;
-- memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
-- memcpy(networkAddr + 5, (unsigned char *)ipxSocketAddr, 2);
--}
--
--
--static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
-- unsigned short *network, unsigned char *node)
--{
-- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
--
-- networkAddr[0] = NAT25_APPLE;
-- memcpy(networkAddr + 1, (unsigned char *)network, 2);
-- networkAddr[3] = *node;
--}
--
--
- static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
- unsigned char *ac_mac, unsigned short *sid)
- {
-@@ -890,227 +855,6 @@
- }
-
- /*---------------------------------------------------*/
-- /* Handle IPX and Apple Talk frame */
-- /*---------------------------------------------------*/
-- else if ((protocol == __constant_htons(ETH_P_IPX)) ||
-- (protocol == __constant_htons(ETH_P_ATALK)) ||
-- (protocol == __constant_htons(ETH_P_AARP))) {
-- unsigned char ipx_header[2] = {0xFF, 0xFF};
-- struct ipxhdr *ipx = NULL;
-- struct elapaarp *ea = NULL;
-- struct ddpehdr *ddp = NULL;
-- unsigned char *framePtr = skb->data + ETH_HLEN;
--
-- if (protocol == __constant_htons(ETH_P_IPX)) {
-- RTW_INFO("NAT25: Protocol=IPX (Ethernet II)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- } else { /* if(protocol <= __constant_htons(ETH_FRAME_LEN)) */
-- if (!memcmp(ipx_header, framePtr, 2)) {
-- RTW_INFO("NAT25: Protocol=IPX (Ethernet 802.3)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- } else {
-- unsigned char ipx_8022_type = 0xE0;
-- unsigned char snap_8022_type = 0xAA;
--
-- if (*framePtr == snap_8022_type) {
-- unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; /* IPX SNAP ID */
-- unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; /* Apple Talk AARP SNAP ID */
-- unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; /* Apple Talk DDP SNAP ID */
--
-- framePtr += 3; /* eliminate the 802.2 header */
--
-- if (!memcmp(ipx_snap_id, framePtr, 5)) {
-- framePtr += 5; /* eliminate the SNAP header */
--
-- RTW_INFO("NAT25: Protocol=IPX (Ethernet SNAP)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- } else if (!memcmp(aarp_snap_id, framePtr, 5)) {
-- framePtr += 5; /* eliminate the SNAP header */
--
-- ea = (struct elapaarp *)framePtr;
-- } else if (!memcmp(ddp_snap_id, framePtr, 5)) {
-- framePtr += 5; /* eliminate the SNAP header */
--
-- ddp = (struct ddpehdr *)framePtr;
-- } else {
-- DEBUG_WARN("NAT25: Protocol=Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0],
-- framePtr[1], framePtr[2], framePtr[3], framePtr[4]);
-- return -1;
-- }
-- } else if (*framePtr == ipx_8022_type) {
-- framePtr += 3; /* eliminate the 802.2 header */
--
-- if (!memcmp(ipx_header, framePtr, 2)) {
-- RTW_INFO("NAT25: Protocol=IPX (Ethernet 802.2)\n");
-- ipx = (struct ipxhdr *)framePtr;
-- } else
-- return -1;
-- }
-- }
-- }
--
-- /* IPX */
-- if (ipx != NULL) {
-- switch (method) {
-- case NAT25_CHECK:
-- if (!memcmp(skb->data + ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) {
-- RTW_INFO("NAT25: Check IPX skb_copy\n");
-- return 0;
-- }
-- return -1;
--
-- case NAT25_INSERT: {
-- RTW_INFO("NAT25: Insert IPX, Dest=%08x,%02x%02x%02x%02x%02x%02x,%04x Source=%08x,%02x%02x%02x%02x%02x%02x,%04x\n",
-- ipx->ipx_dest.net,
-- ipx->ipx_dest.node[0],
-- ipx->ipx_dest.node[1],
-- ipx->ipx_dest.node[2],
-- ipx->ipx_dest.node[3],
-- ipx->ipx_dest.node[4],
-- ipx->ipx_dest.node[5],
-- ipx->ipx_dest.sock,
-- ipx->ipx_source.net,
-- ipx->ipx_source.node[0],
-- ipx->ipx_source.node[1],
-- ipx->ipx_source.node[2],
-- ipx->ipx_source.node[3],
-- ipx->ipx_source.node[4],
-- ipx->ipx_source.node[5],
-- ipx->ipx_source.sock);
--
-- if (!memcmp(skb->data + ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) {
-- RTW_INFO("NAT25: Use IPX Net, and Socket as network addr\n");
--
-- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock);
--
-- /* change IPX source node addr to wlan STA address */
-- memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN);
-- } else
-- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node);
--
-- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
--
-- __nat25_db_print(priv);
-- }
-- return 0;
--
-- case NAT25_LOOKUP: {
-- if (!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN)) {
-- RTW_INFO("NAT25: Lookup IPX, Modify Destination IPX Node addr\n");
--
-- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
--
-- /* replace IPX destination node addr with Lookup destination MAC addr */
-- memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN);
-- } else {
-- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-- }
-- }
-- return 0;
--
-- default:
-- return -1;
-- }
-- }
--
-- /* AARP */
-- else if (ea != NULL) {
-- /* Sanity check fields. */
-- if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
-- DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
-- return -1;
-- }
--
-- switch (method) {
-- case NAT25_CHECK:
-- return 0;
--
-- case NAT25_INSERT: {
-- /* change to AARP source mac address to wlan STA address */
-- memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN);
--
-- RTW_INFO("NAT25: Insert AARP, Source=%d,%d Destination=%d,%d\n",
-- ea->pa_src_net,
-- ea->pa_src_node,
-- ea->pa_dst_net,
-- ea->pa_dst_node);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_src_net, &ea->pa_src_node);
--
-- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
--
-- __nat25_db_print(priv);
-- }
-- return 0;
--
-- case NAT25_LOOKUP: {
-- RTW_INFO("NAT25: Lookup AARP, Source=%d,%d Destination=%d,%d\n",
-- ea->pa_src_net,
-- ea->pa_src_node,
-- ea->pa_dst_net,
-- ea->pa_dst_node);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_dst_net, &ea->pa_dst_node);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
--
-- /* change to AARP destination mac address to Lookup result */
-- memcpy(ea->hw_dst, skb->data, ETH_ALEN);
-- }
-- return 0;
--
-- default:
-- return -1;
-- }
-- }
--
-- /* DDP */
-- else if (ddp != NULL) {
-- switch (method) {
-- case NAT25_CHECK:
-- return -1;
--
-- case NAT25_INSERT: {
-- RTW_INFO("NAT25: Insert DDP, Source=%d,%d Destination=%d,%d\n",
-- ddp->deh_snet,
-- ddp->deh_snode,
-- ddp->deh_dnet,
-- ddp->deh_dnode);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_snet, &ddp->deh_snode);
--
-- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
--
-- __nat25_db_print(priv);
-- }
-- return 0;
--
-- case NAT25_LOOKUP: {
-- RTW_INFO("NAT25: Lookup DDP, Source=%d,%d Destination=%d,%d\n",
-- ddp->deh_snet,
-- ddp->deh_snode,
-- ddp->deh_dnet,
-- ddp->deh_dnode);
--
-- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode);
--
-- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-- }
-- return 0;
--
-- default:
-- return -1;
-- }
-- }
--
-- return -1;
-- }
--
-- /*---------------------------------------------------*/
- /* Handle PPPoE frame */
- /*---------------------------------------------------*/
- else if ((protocol == __constant_htons(ETH_P_PPP_DISC)) ||
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 5/9] rtl8812au: update to 20210629-07ac856293e247347b891c5dbd13f3ab8321132d
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
` (3 preceding siblings ...)
2023-01-07 11:46 ` [PATCH 4/9] rtl8822bu: update to 20210702-2590672d717e2516dd2e96ed66f1037a6815bced Arne Fitzenreiter
@ 2023-01-07 11:46 ` Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 6/9] rtl8821cu: update to 20210118-7b8c45a270454f05e2dbf3beeb4afcf817db65da Arne Fitzenreiter
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2328 bytes --]
this is needed for kernel-6.1.x
---
lfs/rtl8812au | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lfs/rtl8812au b/lfs/rtl8812au
index 0a31923ec..d9cfbe073 100644
--- a/lfs/rtl8812au
+++ b/lfs/rtl8812au
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# 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 #
@@ -27,10 +27,10 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-VER = 307d694076b056588c652c2bdaa543a89eb255d9
+VER = 20210629-07ac856293e247347b891c5dbd13f3ab8321132d
-THISAPP = rtl8812au-$(VER)
-DL_FILE = $(THISAPP).tar.xz
+THISAPP = 8812au-$(VER)
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4939d940dbfee8cd069a096e51e039f7b43bf043f493b97bf61c70d59a0d3060d19a6bb19281b990c4ac1c23d6f7b727bc41ed8edacc6c8f82d53865c81dd3e6
+$(DL_FILE)_BLAKE2 = 0d5fdcef6f52f396cac436ce17f6c52db3fcb43cdeb6fdcb1b0baa76fdfc2cfc8d94fcc925eed0c7cd4dfda00ac45dfbdcd661b69146cc45dfbb598f53471246
install : $(TARGET)
@@ -77,7 +77,7 @@ $(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) && CONFIG_88XXAU=m make $(MAKETUNING) \
+ cd $(DIR_APP) && CONFIG_RTL8812AU=m make $(MAKETUNING) \
-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
# Install the built kernel modules.
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 6/9] rtl8821cu: update to 20210118-7b8c45a270454f05e2dbf3beeb4afcf817db65da
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
` (4 preceding siblings ...)
2023-01-07 11:46 ` [PATCH 5/9] rtl8812au: update to 20210629-07ac856293e247347b891c5dbd13f3ab8321132d Arne Fitzenreiter
@ 2023-01-07 11:46 ` Arne Fitzenreiter
2023-01-07 11:46 ` [PATCH 7/9] strace: update to 6.1 Arne Fitzenreiter
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]
this is needed for kernel-6.1.x
---
lfs/rtl8821cu | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/rtl8821cu b/lfs/rtl8821cu
index b5a0357bc..1a305add5 100644
--- a/lfs/rtl8821cu
+++ b/lfs/rtl8821cu
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# 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 #
@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-VER = 20210118-f91ddf3cc7555b9a1c27c90f23764cfc0b1b6f9c
+VER = 20210118-7b8c45a270454f05e2dbf3beeb4afcf817db65da
THISAPP = 8821cu-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a3ea84b45258fed06baab211393725391fe26686fe85c2273605e6cb59e3e83e54d45e24bc2c3b046de9bb3af8a8cc3a584dbd80ecea3bb8416fb5e79113fb69
+$(DL_FILE)_BLAKE2 = 4f81f274d141ae140b96ac3a60642d70b8d2603080f3e8ed9f836815fec6eeb9b5f8648ed53663dbbe171176600760fae26cf5815395d004328a89037149122c
install : $(TARGET)
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 7/9] strace: update to 6.1
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
` (5 preceding siblings ...)
2023-01-07 11:46 ` [PATCH 6/9] rtl8821cu: update to 20210118-7b8c45a270454f05e2dbf3beeb4afcf817db65da Arne Fitzenreiter
@ 2023-01-07 11:46 ` Arne Fitzenreiter
2023-01-07 11:47 ` [PATCH 8/9] xradio: disabled build Arne Fitzenreiter
2023-01-09 15:33 ` kernel: update to 6.1.x Michael Tremer
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]
needed for kernel-6.1.x
---
lfs/strace | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/strace b/lfs/strace
index 4c6c12a14..37c5d40d1 100644
--- a/lfs/strace
+++ b/lfs/strace
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# 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 #
@@ -26,7 +26,7 @@ include Config
SUMMARY = A utility to trace the system calls of a program
-VER = 5.17
+VER = 6.1
SUP_ARCHES = x86_64 armv6l aarch64
THISAPP = strace-$(VER)
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec
+$(DL_FILE)_BLAKE2 = f11bdddcc23d9bbe7196a102165ac40d3f39e0dec8b9c727e226d99ae0b6f22865bd0582d4e9c15fdce87dd405e0e9c68b60041bd2b90bc8480557f82ca6dcb8
install : $(TARGET)
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 8/9] xradio: disabled build
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
` (6 preceding siblings ...)
2023-01-07 11:46 ` [PATCH 7/9] strace: update to 6.1 Arne Fitzenreiter
@ 2023-01-07 11:47 ` Arne Fitzenreiter
2023-01-09 15:33 ` kernel: update to 6.1.x Michael Tremer
8 siblings, 0 replies; 10+ messages in thread
From: Arne Fitzenreiter @ 2023-01-07 11:47 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
im not sure if i can fix this next days, if not i will remove
the module. It only works on armv6l and is not widespread.
---
lfs/xradio | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lfs/xradio b/lfs/xradio
index 84374319e..c34ecd90b 100644
--- a/lfs/xradio
+++ b/lfs/xradio
@@ -35,7 +35,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
-SUP_ARCH = armv6l
+#SUP_ARCH = armv6l
+SUP_ARCH = none
###############################################################################
# Top-level Rules
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: kernel: update to 6.1.x
2023-01-07 11:46 kernel: update to 6.1.x Arne Fitzenreiter
` (7 preceding siblings ...)
2023-01-07 11:47 ` [PATCH 8/9] xradio: disabled build Arne Fitzenreiter
@ 2023-01-09 15:33 ` Michael Tremer
8 siblings, 0 replies; 10+ messages in thread
From: Michael Tremer @ 2023-01-09 15:33 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hello Arne,
Thank you very much for this patchset. A new kernel!
Is this supposed to be included in the coming Core Update where we planned to ship a kernel anyways, or do you feel that this major update will need some more testing?
I don’t believe that we are in any kind of rush at the moment to have the next update released, so it would feel okay for me to include it in 173.
Best,
-Michael
> On 7 Jan 2023, at 11:46, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
>
> this series update the kernel to 6.1.3 and also some other needed
> updates.
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread