From 29cf7a080f52e2bacddec6050d81c01d9c391310 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Nov 2016 16:22:53 +0000 Subject: Revert "it looks like this dkms code doesn't work when called from eclass, so drop it" This reverts commit 8b2df332991d0d24c8f4f1d9a11ec25441e4ede9. --- eclass/redcore-kernel.eclass | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/eclass/redcore-kernel.eclass b/eclass/redcore-kernel.eclass index ad74ea13..f8960a94 100644 --- a/eclass/redcore-kernel.eclass +++ b/eclass/redcore-kernel.eclass @@ -717,12 +717,26 @@ _dracut_initramfs_delete() { _grub2_update_grubcfg() { if [[ -x $(which grub2-mkconfig) ]]; then + elog "Updating GRUB-2 bootloader configuration, please wait" $(which grub2-mkconfig) -o "${ROOT}boot/grub/grub.cfg" else elog "It looks like you're not using GRUB-2, you must update bootloader configuration by hand" fi } +_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/, /\//' | uniq) ; do + dkms remove $i -k "${kver}" + done + fi +} + redcore-kernel_pkg_postinst() { if _is_kernel_binary; then # Update kernel initramfs to match user customizations @@ -738,6 +752,12 @@ redcore-kernel_pkg_postinst() { local depmod_r=$(_get_release_level) _update_depmod "${depmod_r}" + elog "Please report kernel bugs at:" + elog "http://forum.rogentos.ro" + elog "The kernel source code is located at =${K_KERNEL_SOURCES_PKG}." + elog "RogentOS Team recommends portage users to install it" + elog "if you want to build any 3rd party kernel modules" + elog "(e.g. nvidia-drivers, virtualbox, etc...)." else kernel-2_pkg_postinst fi @@ -753,6 +773,7 @@ redcore-kernel_pkg_postrm() { if _is_kernel_binary; then _dracut_initramfs_delete fi + _remove_dkms_modules _grub2_update_grubcfg } -- cgit v1.2.3