From 54513929e2012694309a51f0a7131cef35db1de9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Jan 2017 04:29:38 +0000 Subject: Revert "forcefully reload dkms modules tree" This reverts commit b5027a3f4659856dfe7c24258a2e73cfa4067e59. --- eclass/redcore-kernel.eclass | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'eclass') diff --git a/eclass/redcore-kernel.eclass b/eclass/redcore-kernel.eclass index f0ac4239..cb855639 100644 --- a/eclass/redcore-kernel.eclass +++ b/eclass/redcore-kernel.eclass @@ -724,11 +724,15 @@ _grub2_update_grubcfg() { fi } -_reload_dkms_modules() { +_remove_dkms_modules() { + if [ "${PR}" == "r0" ] ; then + local kver="${PV}-${K_ROGKERNEL_SELF_TARBALL_NAME}" + else + local kver="${PV}-${K_ROGKERNEL_SELF_TARBALL_NAME}-${PR}" + fi if [[ -x $(which dkms) ]] ; then for i in $(dkms status | cut -d " " -f1,2 | sed -e 's/,//g' | sed -e 's/ /\//g' | sed -e 's/://g') ; do - dkms remove $i -k --all - dkms add $i + dkms remove $i -k "${kver}" done fi } @@ -763,7 +767,7 @@ redcore-kernel_pkg_postrm() { if _is_kernel_binary; then _dracut_initramfs_delete fi - _reload_dkms_modules + _remove_dkms_modules _grub2_update_grubcfg } -- cgit v1.2.3