summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aports/rtw88-edge/APKBUILD8
-rw-r--r--aports/rtw88-edge/Makefile.patch19
-rw-r--r--aports/rtw88/APKBUILD8
-rw-r--r--aports/rtw88/Makefile.patch19
4 files changed, 22 insertions, 32 deletions
diff --git a/aports/rtw88-edge/APKBUILD b/aports/rtw88-edge/APKBUILD
index ccb2d4f..1660c1b 100644
--- a/aports/rtw88-edge/APKBUILD
+++ b/aports/rtw88-edge/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Gabor Pali <pali.gabor@gmail.com>
pkgname='rtw88-edge'
-pkgver=20231024
+pkgver=20240316
pkgrel=06080010100
-_gitrev='ca9f4e199efbf8c377e8a1769ba5b05b23f92c82'
+_gitrev='986b6e74f94b14369c6b528d7ae76255993c05a5'
pkgdesc='Backport of the Realtek Wifi 5 drivers from the wireless-next repo (edge)'
arch="x86_64"
url='https://github.com/lwfinger/rtw88'
@@ -34,6 +34,6 @@ package() {
}
sha512sums="
-28dfab87e2768970c572df340e170dc451deb6a2c2cbc817e22f858c8ed627883977a9fffc5a8500e7b5c79bcbd40bc6ce14e45d6741cc9066046aad5e2baabc Makefile.patch
-372e27570739e9d857e187bf39d008801d07aa534ce0db7f1ed5843df0803295d641f623ff4408ef45d26cbb3678f527d01c3e92e4bd2d25d22a6a9f600171ad ca9f4e199efbf8c377e8a1769ba5b05b23f92c82.zip
+9450b2ac41745710f33d79f51d646707faf744e876ac69c3780ccec9684dd106046a08da3e59af4faa95c462bf8834a35c020da3124074b902d5d0d0c078e379 Makefile.patch
+7ec8d2381ec1cc05b3ecbca4fc472bbc52fc336da26ffa9e322ec104526791b6d512d350f9883ee31879316d02136b2fd56ae86f4477e1fcffa4ae4f54607c89 986b6e74f94b14369c6b528d7ae76255993c05a5.zip
"
diff --git a/aports/rtw88-edge/Makefile.patch b/aports/rtw88-edge/Makefile.patch
index f0d9b91..306488e 100644
--- a/aports/rtw88-edge/Makefile.patch
+++ b/aports/rtw88-edge/Makefile.patch
@@ -8,7 +8,7 @@
EXTRA_CFLAGS += -DCONFIG_RTW88_8822CE=1
EXTRA_CFLAGS += -DCONFIG_RTW88_8723DE=1
EXTRA_CFLAGS += -DCONFIG_RTW88_DEBUG=1
-@@ -63,60 +62,24 @@
+@@ -63,24 +62,12 @@
obj-m += rtw_8822be.o
rtw_8822be-objs := rtw8822be.o
@@ -30,9 +30,10 @@
-obj-m += rtw_8822cs.o
-rtw_8822cs-objs := rtw8822cs.o
-
- obj-m += rtw_8723d.o
- rtw_8723d-objs := rtw8723d.o rtw8723d_table.o
+ obj-m += rtw88_8723x.o
+ rtw88_8723x-objs := rtw8723x.o
+@@ -90,36 +77,12 @@
obj-m += rtw_8723de.o
rtw_8723de-objs := rtw8723de.o
@@ -48,7 +49,7 @@
-obj-m += rtw_8821ce.o
-rtw_8821ce-objs := rtw8821ce.o
-
--obj-m += rtw_8821cs.o
+-`obj-m += rtw_8821cs.o
-rtw_8821cs-objs := rtw8821cs.o
-
-obj-m += rtw_8821cu.o
@@ -69,23 +70,17 @@
ccflags-y += -D__CHECK_ENDIAN__
all:
-@@ -164,25 +127,14 @@
- echo "Skipping key creation"
- endif
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_pci.ko
-- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_usb.ko
-- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_sdio.ko
+@@ -170,20 +133,11 @@
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_core.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723d.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723de.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723du.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723ds.ko
-+ @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821c.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822b.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822be.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822bu.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822bs.ko
-- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821c.ko
+ @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821c.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821ce.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821cu.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821cs.ko
diff --git a/aports/rtw88/APKBUILD b/aports/rtw88/APKBUILD
index dc9cc70..7b194b2 100644
--- a/aports/rtw88/APKBUILD
+++ b/aports/rtw88/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Gabor Pali <pali.gabor@gmail.com>
pkgname='rtw88'
-pkgver=20231024
+pkgver=20240316
pkgrel=06060220100
-_gitrev='ca9f4e199efbf8c377e8a1769ba5b05b23f92c82'
+_gitrev='986b6e74f94b14369c6b528d7ae76255993c05a5'
pkgdesc='Backport of the Realtek Wifi 5 drivers from the wireless-next repo'
arch="x86_64"
url='https://github.com/lwfinger/rtw88'
@@ -34,6 +34,6 @@ package() {
}
sha512sums="
-28dfab87e2768970c572df340e170dc451deb6a2c2cbc817e22f858c8ed627883977a9fffc5a8500e7b5c79bcbd40bc6ce14e45d6741cc9066046aad5e2baabc Makefile.patch
-372e27570739e9d857e187bf39d008801d07aa534ce0db7f1ed5843df0803295d641f623ff4408ef45d26cbb3678f527d01c3e92e4bd2d25d22a6a9f600171ad ca9f4e199efbf8c377e8a1769ba5b05b23f92c82.zip
+9450b2ac41745710f33d79f51d646707faf744e876ac69c3780ccec9684dd106046a08da3e59af4faa95c462bf8834a35c020da3124074b902d5d0d0c078e379 Makefile.patch
+7ec8d2381ec1cc05b3ecbca4fc472bbc52fc336da26ffa9e322ec104526791b6d512d350f9883ee31879316d02136b2fd56ae86f4477e1fcffa4ae4f54607c89 986b6e74f94b14369c6b528d7ae76255993c05a5.zip
"
diff --git a/aports/rtw88/Makefile.patch b/aports/rtw88/Makefile.patch
index f0d9b91..306488e 100644
--- a/aports/rtw88/Makefile.patch
+++ b/aports/rtw88/Makefile.patch
@@ -8,7 +8,7 @@
EXTRA_CFLAGS += -DCONFIG_RTW88_8822CE=1
EXTRA_CFLAGS += -DCONFIG_RTW88_8723DE=1
EXTRA_CFLAGS += -DCONFIG_RTW88_DEBUG=1
-@@ -63,60 +62,24 @@
+@@ -63,24 +62,12 @@
obj-m += rtw_8822be.o
rtw_8822be-objs := rtw8822be.o
@@ -30,9 +30,10 @@
-obj-m += rtw_8822cs.o
-rtw_8822cs-objs := rtw8822cs.o
-
- obj-m += rtw_8723d.o
- rtw_8723d-objs := rtw8723d.o rtw8723d_table.o
+ obj-m += rtw88_8723x.o
+ rtw88_8723x-objs := rtw8723x.o
+@@ -90,36 +77,12 @@
obj-m += rtw_8723de.o
rtw_8723de-objs := rtw8723de.o
@@ -48,7 +49,7 @@
-obj-m += rtw_8821ce.o
-rtw_8821ce-objs := rtw8821ce.o
-
--obj-m += rtw_8821cs.o
+-`obj-m += rtw_8821cs.o
-rtw_8821cs-objs := rtw8821cs.o
-
-obj-m += rtw_8821cu.o
@@ -69,23 +70,17 @@
ccflags-y += -D__CHECK_ENDIAN__
all:
-@@ -164,25 +127,14 @@
- echo "Skipping key creation"
- endif
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_pci.ko
-- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_usb.ko
-- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_sdio.ko
+@@ -170,20 +133,11 @@
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_core.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723d.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723de.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723du.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8723ds.ko
-+ @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821c.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822b.ko
@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822be.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822bu.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8822bs.ko
-- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821c.ko
+ @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821c.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821ce.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821cu.ko
- @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der rtw_8821cs.ko