diff --git a/net-wireless/rtl8814au/Manifest b/net-wireless/rtl8814au/Manifest index 2cf4ed53b..50a7943f4 100644 --- a/net-wireless/rtl8814au/Manifest +++ b/net-wireless/rtl8814au/Manifest @@ -1,3 +1,3 @@ -DIST rtl8814au-20211122.tar.gz 2648090 BLAKE2B 4326ccf897903922a1d8efc34756a6dba70b0dd103909ecbc89b1714c25f9f03edfaad5816f5d00336091647254e188a286768996b0e042051df878fc477c1ba SHA512 dc39d0a0fcd275407fa3a4751611172629d9018f6fc5535ecae26d8ff44de5e374a708407a49ce3bce22adee4fee0a96f21e6d5b13dac667c63073b79008b513 DIST rtl8814au-20221110.tar.gz 2642540 BLAKE2B 0d7fab629e31f77526c02eea5391d603c19cdeb4c440a15eab984346ab70aa1c0203b2556d580c9b1040f5bd83535bcf6ad28e18119fb7629772618c75f4d8a5 SHA512 1d72cd9188afaa2e015fc4e321eed8fbf6ffafe9d9e624e97eaccbc68acebc6691a032cf6cfe1c44b1fb907db9f010e140c0100c43ffffb2b7206ab017198d8a DIST rtl8814au-20230321.tar.gz 2646177 BLAKE2B c458cf6cca2b97ddff5784f1285d0ba1969868507902fe426f7d99f774032a8e09b443df70609f4a56b9bca2ac4d27645cc2ea0c5ba80b2af7865963acab673f SHA512 2c176a3be30dd8398e24a5b7f00bf50f7541225ad25921e1b02cef481450833b6ac65cdbd418303a9ecfbfd7f343296d1d3107cc97049c708e35b9b227723f4f +DIST rtl8814au-20230623.tar.gz 2646935 BLAKE2B 07b67f3ef585df48c2e1c3ff73ffc16302b5c30ec7313f00a3598b4039b703b7570cc4212f861a64d850fd8e5904552bc6047d61bcf727505e5ea06abb4baa20 SHA512 f2f63786e876d7c91e197a66c35a99c7a4bb3852993b8ecb1725bbeb3b876f84dd9a8e9c8f48daea831a68090afaf83e7e9dbb93a493061ef968f0b1cca6749c diff --git a/net-wireless/rtl8814au/files/rtl-20211122-kernel-5.10.patch b/net-wireless/rtl8814au/files/rtl-20211122-kernel-5.10.patch deleted file mode 100644 index 8b55985f5..000000000 --- a/net-wireless/rtl8814au/files/rtl-20211122-kernel-5.10.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/core/efuse/rtw_efuse.c b/core/efuse/rtw_efuse.c -index a357253..667f5f8 100755 ---- a/core/efuse/rtw_efuse.c -+++ b/core/efuse/rtw_efuse.c -@@ -3204,7 +3204,9 @@ int storeAdaptorInfoFile(char *path, u8 *efuse_data) - int retriveAdaptorInfoFile(char *path, u8 *efuse_data) - { - int ret = _SUCCESS; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) - mm_segment_t oldfs; -+#endif - struct file *fp; - - if (path && efuse_data) { -diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c -index 846df87..1d15677 100755 ---- a/core/rtw_ieee80211.c -+++ b/core/rtw_ieee80211.c -@@ -1522,7 +1522,9 @@ int rtw_get_mac_addr_intel(unsigned char *buf) - int ret = 0; - int i; - struct file *fp = NULL; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) - mm_segment_t oldfs; -+#endif - unsigned char c_mac[MAC_ADDRESS_LEN]; - char fname[] = "/config/wifi/mac.txt"; diff --git a/net-wireless/rtl8814au/rtl8814au-20221110.ebuild b/net-wireless/rtl8814au/rtl8814au-20221110.ebuild index 57b739c1d..b4113a3e3 100644 --- a/net-wireless/rtl8814au/rtl8814au-20221110.ebuild +++ b/net-wireless/rtl8814au/rtl8814au-20221110.ebuild @@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/morrownr/8814au" SRC_URI="https://github.com/morrownr/8814au/archive/${COMMIT}.tar.gz -> rtl8814au-${PV}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~amd64" +KEYWORDS="amd64" +SLOT="0" DEPEND="virtual/linux-sources" diff --git a/net-wireless/rtl8814au/rtl8814au-20230321.ebuild b/net-wireless/rtl8814au/rtl8814au-20230321.ebuild index aea505d10..9f5139981 100644 --- a/net-wireless/rtl8814au/rtl8814au-20230321.ebuild +++ b/net-wireless/rtl8814au/rtl8814au-20230321.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit linux-mod +inherit linux-mod-r1 COMMIT="6f80699e68fd2a9f2bba3f1a56ca06d1b7992bd8" @@ -12,6 +12,7 @@ SRC_URI="https://github.com/morrownr/8814au/archive/${COMMIT}.tar.gz -> rtl8814a LICENSE="GPL-2" KEYWORDS="~amd64" +SLOT="0" DEPEND="virtual/linux-sources" @@ -22,6 +23,6 @@ BUILD_TARGETS="all" BUILD_TARGET_ARCH="${ARCH}" pkg_setup() { - linux-mod_pkg_setup + linux-mod-r1_pkg_setup BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" } diff --git a/net-wireless/rtl8814au/rtl8814au-20211122-r1.ebuild b/net-wireless/rtl8814au/rtl8814au-20230623.ebuild similarity index 50% rename from net-wireless/rtl8814au/rtl8814au-20211122-r1.ebuild rename to net-wireless/rtl8814au/rtl8814au-20230623.ebuild index 808c108fa..47a145088 100644 --- a/net-wireless/rtl8814au/rtl8814au-20211122-r1.ebuild +++ b/net-wireless/rtl8814au/rtl8814au-20230623.ebuild @@ -2,28 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit linux-mod +inherit linux-mod-r1 -COMMIT="6d49275ba594ce7a1593851d17b97beddbb5179b" +COMMIT="f058ea8af3afd2a06b2a0a8bf8e2129bcb07d5f5" DESCRIPTION="Realtek 8814AU USB WiFi module for Linux kernel" HOMEPAGE="https://github.com/morrownr/8814au" -SRC_URI="https://github.com/morrownr/8814au/archive/${COMMIT}.tar.gz -> rtl8814au-${PV}.tar.gz" +SRC_URI="https://github.com/morrownr/8814au/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" KEYWORDS="~amd64" +SLOT="0" DEPEND="virtual/linux-sources" S="${WORKDIR}/8814au-${COMMIT}" -MODULE_NAMES="8814au(net/wireless)" -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" +src_compile() { + local modlist=( 8814au=net/wireless ) + local modargs=( KSRC="${KV_OUT_DIR}" ) -PATCHES=( "${FILESDIR}/rtl-${PV}-kernel-5.10.patch" ) - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" + linux-mod-r1_src_compile } diff --git a/net-wireless/rtl8821cu/Manifest b/net-wireless/rtl8821cu/Manifest index 2dfd269d7..4789b51f7 100644 --- a/net-wireless/rtl8821cu/Manifest +++ b/net-wireless/rtl8821cu/Manifest @@ -1,3 +1,4 @@ DIST rtl8821cu-20210506.tar.gz 3645635 BLAKE2B 72792c9db722190de7c1f728f32e87b00010cd0593a68cc635011f0cc556d16cd6dbd5396d4da5eaba8da10fa579e19c1611d23b0924c82f48f17f693639cf36 SHA512 5d98f8cbc39935674fb5a58daf20c88b31d75becf25ba3603397eac79569d44d472a7135e99a95aacc8989d61e526b107f1c2dbf47d2c207107f62572db20642 DIST rtl8821cu-20210616.tar.gz 13821386 BLAKE2B f71e979f9d783486809343e777fa008058c61ead739a64ef11149d4a6da24d628c61d56c7c03f0c32c90d5474b2c179e106702b0cc695ca0261ce8f1f457de8f SHA512 2ff4503bc5a80a28611c293381d4b08deb9512042b1ffcb2e379dba65ae833250210abd25255d6066f28ecdd551d45bcf0dcc3db4a75e0605a3414ed29189efd DIST rtl8821cu-20211114.tar.gz 3646836 BLAKE2B 824d816110c59341bdc9bda5a3b7d1a152e27e7d60f166195277131996d19ba5106298998718e235d86d28348481b8acc8ea88744b8765b70741c03c448daf4a SHA512 c1329a42d20e2a9ffd638cbecf17285ed22e9c1fd85ac4ca8a1e0e22b803a160e11fd9323a318d1b60db89e61d88800ad39de02acc291432193840050c80bf06 +DIST rtl8821cu-20230910.tar.gz 13821543 BLAKE2B cd96fd25187aa43219ed983a75de48afa0067551402ba7b40764773022b5a9ea19bfa495e81bd278c03be7f91e5b724125476544a1cafc391553ac164ad2436e SHA512 b41e4bfee81fc38257f42928cad73bc858d8a99d722b001e8f6a7a1b1f2987696cdaa2909cef651bbc25e622a2799fcb8d93859dd5e6847b6817f33c3bce6fff diff --git a/net-wireless/rtl8821cu/rtl8821cu-20230910.ebuild b/net-wireless/rtl8821cu/rtl8821cu-20230910.ebuild new file mode 100644 index 000000000..a65a6eb7f --- /dev/null +++ b/net-wireless/rtl8821cu/rtl8821cu-20230910.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit linux-mod-r1 + +COMMIT="f6d4598290c5e9c8e545130e8a31d130f6d135f4" + +DESCRIPTION="Realtek USB WiFi Adapters based on 8811CU/8821CU/8821CUH/8731AU Chipsets" +HOMEPAGE="https://github.com/morrownr/8821cu-20210916" +SRC_URI="https://github.com/morrownr/8821cu-20210916/archive/${COMMIT}.tar.gz -> rtl8821cu-${PV}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64" +SLOT="0" + +DEPEND="virtual/linux-sources" + +S="${WORKDIR}/8821cu-20210916-${COMMIT}" + +src_compile() { + local modlist=( 8821cu=net/wireless ) + local modargs=( KSRC="${KV_OUT_DIR}" ) + + linux-mod-r1_src_compile +}