Skip to content

Commit 9ca280c

Browse files
committed
rpm spec 20210321 5.12-rc2
1 parent 0686ca1 commit 9ca280c

2 files changed

Lines changed: 52 additions & 3 deletions

File tree

contrib/rename_to_rtl8821ce.patch

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
commit e9dc7b7d6e503ed851a39378b5b909a0ffaa9a4b
2+
Author: Sérgio M. Basto <sergio@serjux.com>
3+
Date: Sun Nov 29 23:23:08 2020 +0000
4+
5+
Rename 8821ce.ko to rtl8821ce.ko
6+
7+
diff --git a/Makefile b/Makefile
8+
index 5b5dc9a..b7904fd 100755
9+
--- a/Makefile
10+
+++ b/Makefile
11+
@@ -825,13 +825,13 @@ endif
12+
ifeq ($(CONFIG_RTL8821C), y)
13+
RTL871X := rtl8821c
14+
ifeq ($(CONFIG_USB_HCI), y)
15+
-MODULE_NAME = 8821cu
16+
+MODULE_NAME = rtl8821cu
17+
endif
18+
ifeq ($(CONFIG_PCI_HCI), y)
19+
-MODULE_NAME = 8821ce
20+
+MODULE_NAME = rtl8821ce
21+
endif
22+
ifeq ($(CONFIG_SDIO_HCI), y)
23+
-MODULE_NAME = 8821cs
24+
+MODULE_NAME = rtl8821cs
25+
endif
26+
27+
endif
28+
diff --git a/dkms.conf b/dkms.conf
29+
index 582b3be..d6e8b3c 100644
30+
--- a/dkms.conf
31+
+++ b/dkms.conf
32+
@@ -1,6 +1,6 @@
33+
PACKAGE_NAME="rtl8821ce"
34+
PACKAGE_VERSION="#MODULE_VERSION#"
35+
-BUILT_MODULE_NAME[0]="8821ce"
36+
+BUILT_MODULE_NAME[0]="rtl8821ce"
37+
MAKE="'make' -j$(nproc) KVER=$kernelver"
38+
CLEAN="'make' clean"
39+
DEST_MODULE_LOCATION[0]="/updates/dkms"

contrib/rtl8821ce-kmod.spec

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
%global commit 863cec82fea704c84fb65e42186f7782e1545a83
1+
%global commit 897e7c4c15dd5a0a569745dc223d969a26ff5bfc
22
%global shortcommit %(c=%{commit}; echo ${c:0:7})
3-
%global gitdate 20201129
3+
%global gitdate 20210321
44

55
# buildforkernels macro hint: when you build a new version or a new release
66
# that contains bugfixes or other improvements then you must disable the
@@ -13,13 +13,14 @@
1313

1414
Name: rtl8821ce-kmod
1515
Version: 0.1
16-
Release: 2%{?gitdate:.%gitdate.git%shortcommit}%{?dist}
16+
Release: 4%{?gitdate:.%gitdate.git%shortcommit}%{?dist}
1717
Summary: Kernel modules for Realtek RTL8821CE Driver
1818
License: GPLv2
1919
#URL: https://github.com/tomaspinho/rtl8821ce
2020
URL: https://github.com/sergiomb2/rtl8821ce
2121
Source0: %{url}/archive/%{commit}/rtl8821ce-%{shortcommit}.tar.gz
2222
Source1: rtw88_blacklist.conf
23+
Patch0: rename_to_rtl8821ce.patch
2324

2425
%global AkmodsBuildRequires %{_bindir}/kmodtool, xz, time, elfutils-libelf-devel, gcc, bc
2526
BuildRequires: %{AkmodsBuildRequires}
@@ -51,6 +52,9 @@ Provides: %{name}-common = %{version}-%{release}
5152
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
5253

5354
%setup -q -c
55+
pushd rtl8821ce-%{commit}
56+
%patch0 -p1
57+
popd
5458

5559
for kernel_version in %{?kernel_versions} ; do
5660
cp -a rtl8821ce-%{commit} _kmod_build_${kernel_version%%___*}
@@ -85,6 +89,12 @@ done
8589
%{_sysconfdir}/modprobe.d/rtw88_blacklist.conf
8690

8791
%changelog
92+
* Mon Mar 22 2021 Sérgio Basto <sergio@serjux.com> - 0.1-4.20210321.git897e7c4
93+
- 20210321 5.12-rc2
94+
95+
* Mon Mar 01 2021 Sérgio Basto <sergio@serjux.com> - 0.1-3.20210301.git64ac6d3
96+
- 20210301
97+
8898
* Tue Oct 06 2020 Sérgio Basto <sergio@serjux.com> - 0.1-1.20201006.gitfe97b50
8999
- Initial release
90100

0 commit comments

Comments
 (0)