Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

r8125: use pkgname-based modprobe.d filename to avoid conflicts

Peter Jung795002579d76
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index 5b7a5fa0..2c09133e 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index bf699868..fb91633e 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index 63d949b9..fde95012 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -724,7 +724,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index 85f73f01..28d681a3 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index e762403f..4ee375b0 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -709,7 +709,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index 29c33bc2..c4234a3b 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -718,7 +718,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 61cf048e..929804a2 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -785,7 +785,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 6d18c9ce..b80f894c 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index e92ed8b5..2a24bb02 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index b0a751f1..259745c0 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -792,7 +792,7 @@ _package-r8125() {
# Blacklist r8169 so that r8125 is used instead
install -dm755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
}
pkgname=("$pkgbase")