summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2024-10-12 18:29:48 +0200
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2024-10-12 18:29:48 +0200
commit0a077c53365808b0ef9562c165d588f054f256ea (patch)
treeaf59d14c922651e8c18046ada9ec735bda7f041f /sys-kernel
parentdev-ruby/rspec-core: Stabilize 3.13.1 sparc, #941043 (diff)
downloadgentoo-0a077c53365808b0ef9562c165d588f054f256ea.tar.gz
gentoo-0a077c53365808b0ef9562c165d588f054f256ea.tar.bz2
gentoo-0a077c53365808b0ef9562c165d588f054f256ea.zip
sys-kernel/dkms: backport regression fix
Closes: https://bugs.gentoo.org/941246 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/dkms/dkms-3.1.0-r1.ebuild (renamed from sys-kernel/dkms/dkms-3.1.0.ebuild)4
-rw-r--r--sys-kernel/dkms/files/dkms-3.1.0-cleanup-leftover-cmd.patch26
2 files changed, 30 insertions, 0 deletions
diff --git a/sys-kernel/dkms/dkms-3.1.0.ebuild b/sys-kernel/dkms/dkms-3.1.0-r1.ebuild
index 235f0a1eb372..bf3caa23c5cb 100644
--- a/sys-kernel/dkms/dkms-3.1.0.ebuild
+++ b/sys-kernel/dkms/dkms-3.1.0-r1.ebuild
@@ -26,6 +26,10 @@ RESTRICT="test"
CONFIG_CHECK="~MODULES"
+PATCHES=(
+ "${FILESDIR}/${P}-cleanup-leftover-cmd.patch"
+)
+
src_compile() {
# Nothing to do here
return
diff --git a/sys-kernel/dkms/files/dkms-3.1.0-cleanup-leftover-cmd.patch b/sys-kernel/dkms/files/dkms-3.1.0-cleanup-leftover-cmd.patch
new file mode 100644
index 000000000000..cec0cba6161a
--- /dev/null
+++ b/sys-kernel/dkms/files/dkms-3.1.0-cleanup-leftover-cmd.patch
@@ -0,0 +1,26 @@
+From c0af71e5454214fc9d2b995b9aa45937fe1f3eb2 Mon Sep 17 00:00:00 2001
+From: Simone Caronni <negativo17@gmail.com>
+Date: Sat, 5 Oct 2024 17:06:59 +0200
+Subject: [PATCH] Remove last remnants of log_action_msg from
+ dkms_autoinstaller.in
+
+---
+ dkms_autoinstaller.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dkms_autoinstaller.in b/dkms_autoinstaller.in
+index 31c382e..358e3d1 100755
+--- a/dkms_autoinstaller.in
++++ b/dkms_autoinstaller.in
+@@ -59,9 +59,9 @@ case "$1" in
+ kernel=$(uname -r)
+ fi
+ if [ -f /etc/dkms/no-autoinstall ]; then
+- log_action_msg "Automatic installation of modules has been disabled."
++ echo "Automatic installation of modules has been disabled."
+ elif ! _check_kernel_dir $kernel; then
+- log_action_msg "Automatic installation of modules for kernel $kernel was skipped since the kernel headers for this kernel do not seem to be installed."
++ echo "Automatic installation of modules for kernel $kernel was skipped since the kernel headers for this kernel do not seem to be installed."
+ else
+ dkms autoinstall --kernelver $kernel
+ res=$?