summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Northon2022-08-14 07:00:23 -0400
committerPatrick Northon2022-08-14 07:00:23 -0400
commit0cb3de9519466df00bf8d8f1374eb59b4bb85db2 (patch)
tree2da693ce3b3fb2c77b25e8204b2111ba3054902b
parent9152b0f15de37f1544f4d8e726ff4945b326b11a (diff)
downloadaur-0cb3de9519466df00bf8d8f1374eb59b4bb85db2.tar.gz
Update build flags and automatically blacklist r8169.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--dkms.conf2
-rw-r--r--r8168-dkms.install4
4 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c009f1a3973f..a10325605b9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = r8168-dkms
pkgdesc = A kernel module for Realtek 8168 network cards (DKMS version)
pkgver = 8.050.03
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/mtorromeo/r8168
install = r8168-dkms.install
arch = i686
@@ -17,7 +17,7 @@ pkgbase = r8168-dkms
source = linux-5.18.patch
source = linux-5.19.patch
sha256sums = SKIP
- sha256sums = e33abcbc8fbe3129459ebc60be3b2f8ed55ddc53755f4956d6feb16c61c43250
+ sha256sums = d37b8acbd4fe06f81538581712a04751a96fc37bad3a4bd3ae8329f8744c49b3
sha256sums = d8d542770e504775600f686d03412a37cc32489872be7aeb388b5b08d9806096
sha256sums = f5e08919764bc56d4f11b23fcb7cece663cae3f591992a0ca2be760e6890a9f8
diff --git a/PKGBUILD b/PKGBUILD
index 5b992b630d81..3169c4c7660d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
_pkgbase=r8168
pkgname=${_pkgbase}-dkms
pkgver=8.050.03
-pkgrel=3
+pkgrel=4
pkgdesc="A kernel module for Realtek 8168 network cards (DKMS version)"
url="https://github.com/mtorromeo/r8168"
license=("GPL")
@@ -22,7 +22,7 @@ source=("r8168-dkms::git+https://github.com/mtorromeo/r8168.git"
"linux-5.18.patch"
'linux-5.19.patch')
sha256sums=('SKIP'
- 'e33abcbc8fbe3129459ebc60be3b2f8ed55ddc53755f4956d6feb16c61c43250'
+ 'd37b8acbd4fe06f81538581712a04751a96fc37bad3a4bd3ae8329f8744c49b3'
'd8d542770e504775600f686d03412a37cc32489872be7aeb388b5b08d9806096'
'f5e08919764bc56d4f11b23fcb7cece663cae3f591992a0ca2be760e6890a9f8')
install=r8168-dkms.install
@@ -42,4 +42,7 @@ package() {
cd "${pkgname}"
cp -dr --no-preserve='ownership' src "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/src"
+
+ echo "blacklist r8169" | \
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/$pkgname.conf"
}
diff --git a/dkms.conf b/dkms.conf
index fa144011c5d7..6cf43667ff99 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,6 +1,6 @@
PACKAGE_NAME="@PKGNAME@"
PACKAGE_VERSION="@PKGVER@"
-MAKE[0]="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build/src EXTRA_CFLAGS='-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN' modules"
+MAKE[0]="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build/src EXTRA_CFLAGS='-DCONFIG_R8168_NAPI=y -DCONFIG_R8168_VLAN=y -DCONFIG_ASPM=y -DENABLE_S5WOL=y -DENABLE_EEE=y' modules"
CLEAN="rm src/@PKGNAME@.ko src/*.o || true"
BUILT_MODULE_NAME[0]="@PKGNAME@"
BUILT_MODULE_LOCATION[0]="src/"
diff --git a/r8168-dkms.install b/r8168-dkms.install
index 70eaa49a9bf2..e8a5013baad8 100644
--- a/r8168-dkms.install
+++ b/r8168-dkms.install
@@ -1,9 +1,5 @@
post_install() {
dkms add r8168/${1%-*}
- cat << EOF
-==> The module r8168 conflicts with r8169. You can blacklist it with:
-==> echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf
-EOF
}
pre_upgrade() {