Update Linux to 6.1.54 (LTS) and 6.5.4 (stable), support IPv6

12 files changed, 57 insertions, 75 deletions

diff --git a/aports/broadcom-wl-edge/APKBUILD b/aports/broadcom-wl-edge/APKBUILD
index d88f303..2646d58 100644
--- a/aports/broadcom-wl-edge/APKBUILD
+++ b/aports/broadcom-wl-edge/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=broadcom-wl-edge
 pkgver=6.30.223.271
-pkgrel=12
+pkgrel=13
 pkgdesc='Broadcom 802.11 Linux STA wireless driver (edge)'
 arch="x86_64"
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
@@ -33,7 +33,7 @@ source="broadcom-wl.conf
         https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz
 	"
 
-_kernver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d | sed 's!./linux-headers-!!')
+_kernver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d -name '*-edge' | sed 's!./linux-headers-!!')
 _kbase="/lib/modules/${_kernver}"
 
 prepare() {
diff --git a/aports/broadcom-wl/APKBUILD b/aports/broadcom-wl/APKBUILD
index b1c3fd5..1728b3b 100644
--- a/aports/broadcom-wl/APKBUILD
+++ b/aports/broadcom-wl/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=broadcom-wl
 pkgver=6.30.223.271
-pkgrel=12
+pkgrel=13
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch="x86_64"
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
diff --git a/aports/linux-edge/APKBUILD b/aports/linux-edge/APKBUILD
index 844e2fa..23a85a8 100644
--- a/aports/linux-edge/APKBUILD
+++ b/aports/linux-edge/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
 pkgname=linux-edge
-pkgver=6.5.3
+pkgver=6.5.4
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -161,6 +161,6 @@ _dev() {
 
 sha512sums="
 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257  linux-6.5.tar.xz
-b95330e8bc3437fb197741bfa02c674e87e3bfbe03880a6996e425f2acf0155dd0ead178f3610943755ceb9dc4df9f6fb558268533bc0a230353ddf941010a9e  config-edge.x86_64
-84e5282053953bb35532d482e87dc9e7f1152e421b7da1fa5ef4bf0cfaadd4d36eaf8b0055aab95a3f68076abefca105710315fe1996a293c511739d2663a8dd  patch-6.5.3.xz
+369d48e90db776e88d44501809c9b3045315d39e72887d2bd70c355bd454e2514d187237069cb856891b8d71d8b5787214805e18cfd60f29644300f8dcd18df1  config-edge.x86_64
+cb5935b12082580895017d956edb8a7e8bf6effdf8f9ca0e2f9d938295760202098303db1e15537389d582c094d29457bea3bca5f8746f40673ac5a424dac7c6  patch-6.5.4.xz
 "
diff --git a/aports/linux-edge/config-edge.x86_64 b/aports/linux-edge/config-edge.x86_64
index 29734b1..1e8032a 100644
--- a/aports/linux-edge/config-edge.x86_64
+++ b/aports/linux-edge/config-edge.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.5.3 Kernel Configuration
+# Linux/x86_64 6.5.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 12.2.1_git20220924-r10) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
@@ -749,8 +749,8 @@ CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_AH=y
-CONFIG_XFRM_ESP=y
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -765,7 +765,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
 CONFIG_IP_MROUTE_COMMON=y
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
@@ -774,12 +773,10 @@ CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 # CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 CONFIG_INET_TABLE_PERTURB_ORDER=16
-CONFIG_INET_TUNNEL=y
 # CONFIG_INET_DIAG is not set
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
@@ -802,20 +799,18 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
+CONFIG_IPV6=m
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
 # CONFIG_INET6_ESP_OFFLOAD is not set
 # CONFIG_INET6_ESPINTCP is not set
 # CONFIG_INET6_IPCOMP is not set
 # CONFIG_IPV6_MIP6 is not set
 # CONFIG_IPV6_ILA is not set
 # CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_SIT is not set
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_MROUTE is not set
@@ -901,7 +896,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 
 #
@@ -990,26 +985,28 @@ CONFIG_IP_NF_MANGLE=y
 # CONFIG_NF_SOCKET_IPV6 is not set
 # CONFIG_NF_TPROXY_IPV6 is not set
 # CONFIG_NF_DUP_IPV6 is not set
-CONFIG_NF_REJECT_IPV6=y
-CONFIG_NF_LOG_IPV6=y
-CONFIG_IP6_NF_IPTABLES=y
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
 # CONFIG_IP6_NF_MATCH_AH is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_HL is not set
-CONFIG_IP6_NF_MATCH_IPV6HEADER=y
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 # CONFIG_IP6_NF_MATCH_MH is not set
 # CONFIG_IP6_NF_MATCH_RPFILTER is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_MATCH_SRH is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_NAT is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=y
@@ -1182,7 +1179,6 @@ CONFIG_NET_9P_VIRTIO=y
 # CONFIG_PSAMPLE is not set
 # CONFIG_NET_IFE is not set
 # CONFIG_LWTUNNEL is not set
-CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_PAGE_POOL=y
 # CONFIG_PAGE_POOL_STATS is not set
@@ -1593,7 +1589,8 @@ CONFIG_WCN36XX=m
 CONFIG_ATH11K=m
 CONFIG_ATH11K_PCI=m
 # CONFIG_ATH11K_DEBUG is not set
-# CONFIG_ATH12K is not set
+CONFIG_ATH12K=m
+# CONFIG_ATH12K_DEBUG is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -1692,7 +1689,7 @@ CONFIG_MT7615E=m
 CONFIG_MT7915E=m
 CONFIG_MT7921_COMMON=m
 CONFIG_MT7921E=m
-# CONFIG_MT7996E is not set
+CONFIG_MT7996E=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WLAN_VENDOR_PURELIFI=y
 CONFIG_WLAN_VENDOR_RALINK=y
@@ -1731,18 +1728,7 @@ CONFIG_RTLWIFI_PCI=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822B=m
-CONFIG_RTW88_8822C=m
-CONFIG_RTW88_8723D=m
-CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8723DE=m
-# CONFIG_RTW88_8821CE is not set
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
+# CONFIG_RTW88 is not set
 # CONFIG_RTW89 is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_SILABS is not set
@@ -1830,7 +1816,7 @@ CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-# CONFIG_LEGACY_TIOCSTI is not set
+CONFIG_LEGACY_TIOCSTI=y
 CONFIG_LDISC_AUTOLOAD=y
 
 #
diff --git a/aports/linux-lts/APKBUILD b/aports/linux-lts/APKBUILD
index 0aa90fd..6338162 100644
--- a/aports/linux-lts/APKBUILD
+++ b/aports/linux-lts/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
 pkgname=linux-lts
-pkgver=6.1.53
+pkgver=6.1.54
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -163,6 +163,6 @@ _dev() {
 sha512sums="
 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68  linux-6.1.tar.xz
 3816cfc8dd14d1c5ced05bbf19b099472c9bbbd1abced32cbb4b6b5baecfaa28c345e4e522648837d98e5bc7c311810cae9160f4c91019bb857a3857076b8e0e  awk.patch
-4084cfdfca1a3dd85816be4f59c30f0f6f8e007ce2a063d11385a841d879dc096b0ab60e2ef36e0ef9ea7dbe60aa03a84bbbd7a369cd4a4c3a2433f034ebde2a  config-lts.x86_64
-b5442dead51ac824dde986f08a62371e94a6743f7d27ed40410a30d2da9e31602068a8929cc693a15b7b2d41d23e09e702f2ddd5e0485ec1bbf5750765eba2e0  patch-6.1.53.xz
+005a39a389103fb4515ee8d8cb74092afaf7a1c2d871189fe7296aba4e272485afa574aa9fde5f9d35e97fda3e5930556ad68d83726b5a26e0c0df9fa35c84d4  config-lts.x86_64
+adf488c3d4ef31d011501f91474d9863fc95f402dc2dca5a07a8a9a38101775916d8442962a64e6353152f10e79410bc7a6b2a2eb84e9be993ca2c2334fbb5f9  patch-6.1.54.xz
 "
diff --git a/aports/linux-lts/config-lts.x86_64 b/aports/linux-lts/config-lts.x86_64
index 3c8d0f8..4726d34 100644
--- a/aports/linux-lts/config-lts.x86_64
+++ b/aports/linux-lts/config-lts.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.1.53 Kernel Configuration
+# Linux/x86_64 6.1.54 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 12.2.1_git20220924-r10) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
@@ -738,8 +738,8 @@ CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_AH=y
-CONFIG_XFRM_ESP=y
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -754,7 +754,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
 CONFIG_IP_MROUTE_COMMON=y
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
@@ -763,12 +762,10 @@ CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 # CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 CONFIG_INET_TABLE_PERTURB_ORDER=16
-CONFIG_INET_TUNNEL=y
 # CONFIG_INET_DIAG is not set
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
@@ -791,20 +788,18 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
+CONFIG_IPV6=m
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
 # CONFIG_INET6_ESP_OFFLOAD is not set
 # CONFIG_INET6_ESPINTCP is not set
 # CONFIG_INET6_IPCOMP is not set
 # CONFIG_IPV6_MIP6 is not set
 # CONFIG_IPV6_ILA is not set
 # CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_SIT is not set
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_MROUTE is not set
@@ -890,7 +885,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 
 #
@@ -980,26 +975,28 @@ CONFIG_IP_NF_MANGLE=y
 # CONFIG_NF_SOCKET_IPV6 is not set
 # CONFIG_NF_TPROXY_IPV6 is not set
 # CONFIG_NF_DUP_IPV6 is not set
-CONFIG_NF_REJECT_IPV6=y
-CONFIG_NF_LOG_IPV6=y
-CONFIG_IP6_NF_IPTABLES=y
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
 # CONFIG_IP6_NF_MATCH_AH is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_HL is not set
-CONFIG_IP6_NF_MATCH_IPV6HEADER=y
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 # CONFIG_IP6_NF_MATCH_MH is not set
 # CONFIG_IP6_NF_MATCH_RPFILTER is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_MATCH_SRH is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_NAT is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=y
@@ -1175,7 +1172,6 @@ CONFIG_NET_9P_VIRTIO=y
 # CONFIG_PSAMPLE is not set
 # CONFIG_NET_IFE is not set
 # CONFIG_LWTUNNEL is not set
-CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
diff --git a/aports/rtl8821ce-edge/APKBUILD b/aports/rtl8821ce-edge/APKBUILD
index 8121bc6..d2e7442 100644
--- a/aports/rtl8821ce-edge/APKBUILD
+++ b/aports/rtl8821ce-edge/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname='rtl8821ce-edge'
 pkgver=20230915
-pkgrel=0
+pkgrel=1
 _gitrev='0d2c745d7ef023bccd63cf79e98556f0b5a39024'
 pkgdesc='Driver for Realtek 8821CE, an 802.11ac device (edge)'
 arch="x86_64"
diff --git a/aports/rtl8821ce/APKBUILD b/aports/rtl8821ce/APKBUILD
index a76671c..bc23f90 100644
--- a/aports/rtl8821ce/APKBUILD
+++ b/aports/rtl8821ce/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname='rtl8821ce'
 pkgver=20230915
-pkgrel=0
+pkgrel=1
 _gitrev='0d2c745d7ef023bccd63cf79e98556f0b5a39024'
 pkgdesc='Driver for Realtek 8821CE, an 802.11ac device'
 arch="x86_64"
diff --git a/aports/rtw88-edge/APKBUILD b/aports/rtw88-edge/APKBUILD
index f4d8935..7c6cea9 100644
--- a/aports/rtw88-edge/APKBUILD
+++ b/aports/rtw88-edge/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname='rtw88-edge'
 pkgver=20230913
-pkgrel=0
+pkgrel=1
 _gitrev='d0f932dba10827bae07cb7044854651565591b87'
 pkgdesc='Backport of the Realtek Wifi 5 drivers from the wireless-next repo (edge)'
 arch="x86_64"
diff --git a/aports/rtw88/APKBUILD b/aports/rtw88/APKBUILD
index 86b6863..53ea908 100644
--- a/aports/rtw88/APKBUILD
+++ b/aports/rtw88/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname='rtw88'
 pkgver=20230913
-pkgrel=0
+pkgrel=1
 _gitrev='d0f932dba10827bae07cb7044854651565591b87'
 pkgdesc='Backport of the Realtek Wifi 5 drivers from the wireless-next repo'
 arch="x86_64"
diff --git a/aports/rtw89-edge/APKBUILD b/aports/rtw89-edge/APKBUILD
index 755d3eb..41a9a59 100644
--- a/aports/rtw89-edge/APKBUILD
+++ b/aports/rtw89-edge/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname='rtw89-edge'
 pkgver=20230913
-pkgrel=0
+pkgrel=1
 _gitrev='12837647e34f07e117d90b25708a4f8baa772f50'
 pkgdesc='Driver for Realtek 8852AE, an 802.11ax device (edge)'
 arch="x86_64"
@@ -14,7 +14,7 @@ install=
 options="!check !strip"
 source="https://github.com/lwfinger/rtw89/archive/${_gitrev}.zip"
 
-_kver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d | sed 's!./linux-headers-!!')
+_kver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d -name '*-edge' | sed 's!./linux-headers-!!')
 _kbase="/lib/modules/${_kver}"
 _srcdir="$srcdir/rtw89-$_gitrev"
 
diff --git a/aports/rtw89/APKBUILD b/aports/rtw89/APKBUILD
index 693716c..846dbbd 100644
--- a/aports/rtw89/APKBUILD
+++ b/aports/rtw89/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname='rtw89'
 pkgver=20230913
-pkgrel=0
+pkgrel=1
 _gitrev='12837647e34f07e117d90b25708a4f8baa772f50'
 pkgdesc='Driver for Realtek 8852AE, an 802.11ax device'
 arch="x86_64"