Skip to content

Commit

Permalink
rpm spec 20210321 5.12-rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiomb2 committed Mar 26, 2021
1 parent 469d638 commit 982c2b3
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 3 deletions.
39 changes: 39 additions & 0 deletions contrib/rename_to_rtl8821ce.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
commit e9dc7b7d6e503ed851a39378b5b909a0ffaa9a4b
Author: Sérgio M. Basto <sergio@serjux.com>
Date: Sun Nov 29 23:23:08 2020 +0000

Rename 8821ce.ko to rtl8821ce.ko

diff --git a/Makefile b/Makefile
index 5b5dc9a..b7904fd 100755
--- a/Makefile
+++ b/Makefile
@@ -825,13 +825,13 @@ endif
ifeq ($(CONFIG_RTL8821C), y)
RTL871X := rtl8821c
ifeq ($(CONFIG_USB_HCI), y)
-MODULE_NAME = 8821cu
+MODULE_NAME = rtl8821cu
endif
ifeq ($(CONFIG_PCI_HCI), y)
-MODULE_NAME = 8821ce
+MODULE_NAME = rtl8821ce
endif
ifeq ($(CONFIG_SDIO_HCI), y)
-MODULE_NAME = 8821cs
+MODULE_NAME = rtl8821cs
endif

endif
diff --git a/dkms.conf b/dkms.conf
index 582b3be..d6e8b3c 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,6 +1,6 @@
PACKAGE_NAME="rtl8821ce"
PACKAGE_VERSION="#MODULE_VERSION#"
-BUILT_MODULE_NAME[0]="8821ce"
+BUILT_MODULE_NAME[0]="rtl8821ce"
MAKE="'make' -j$(nproc) KVER=$kernelver"
CLEAN="'make' clean"
DEST_MODULE_LOCATION[0]="/updates/dkms"
16 changes: 13 additions & 3 deletions contrib/rtl8821ce-kmod.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit 863cec82fea704c84fb65e42186f7782e1545a83
%global commit 897e7c4c15dd5a0a569745dc223d969a26ff5bfc
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gitdate 20201129
%global gitdate 20210321

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

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

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

%setup -q -c
pushd rtl8821ce-%{commit}
%patch0 -p1
popd

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

%changelog
* Mon Mar 22 2021 Sérgio Basto <sergio@serjux.com> - 0.1-4.20210321.git897e7c4
- 20210321 5.12-rc2

* Mon Mar 01 2021 Sérgio Basto <sergio@serjux.com> - 0.1-3.20210301.git64ac6d3
- 20210301

* Tue Oct 06 2020 Sérgio Basto <sergio@serjux.com> - 0.1-1.20201006.gitfe97b50
- Initial release

0 comments on commit 982c2b3

Please sign in to comment.