modprobe the microcode module if it doesnt exist

5 files changed, 15 insertions, 61 deletions

diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index 7f5812b77e25..7e53d477510f 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -4,15 +4,13 @@ Hash: SHA1
 MD5 f05cb94bafe3844a45c84eac3426d7ee ChangeLog 2435
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 465d692ac8702596ac216b3eb2320490 microcode-ctl-1.11.ebuild 1165
-MD5 e4ab99afa45409c6a78939cf632c10e4 microcode-ctl-1.10.ebuild 1165
-MD5 1df04769a594a38cffc1f8a077fc3fa9 files/digest-microcode-ctl-1.10 70
 MD5 95e076b988c73349d2606d4ecd052a56 files/digest-microcode-ctl-1.11 70
-MD5 dba18ac7a7761ad3802e4c146bb25a6d files/microcode_ctl.rc 438
-MD5 cf9bec50cc6330e817b856deb0cf00f5 files/microcode_ctl.conf.d 263
+MD5 e8b0bb1b0be1aef5fcb99663b9457b35 files/microcode_ctl.rc 618
+MD5 23438cd1b63d7190967405e42ad1a0f6 files/microcode_ctl.conf.d 267
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFBlv+mHTu7gpaalycRAkS6AJ95X1VTdYRbUM7OxbzQkTQRygJZWACgxF4h
-iMRVjOLjY5LpZ++rntKpv10=
-=wo+e
+iD8DBQFB3zTRroRuSHgZdywRAnouAJ9m8wpAPhmwEXGC3eunSGWknAew4wCfe+Aq
+3FXUrFC6GLebdNE/vtryMzY=
+=kTOx
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/microcode-ctl/files/digest-microcode-ctl-1.10 b/sys-apps/microcode-ctl/files/digest-microcode-ctl-1.10
deleted file mode 100644
index 24f62bbed327..000000000000
--- a/sys-apps/microcode-ctl/files/digest-microcode-ctl-1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff8be753e5d5d7275495b7c99bdd55f3 microcode_ctl-1.10.tar.gz 199396
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d b/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
index d127de8c0d92..9e3e7c6cf6d5 100644
--- a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
+++ b/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
@@ -1,5 +1,5 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.conf.d,v 1.2 2004/09/01 22:04:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.conf.d,v 1.3 2005/01/08 01:17:49 vapier Exp $
 
-MICROCODE_DEV="/dev/microcode"
+MICROCODE_DEV="/dev/cpu/microcode"
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.rc b/sys-apps/microcode-ctl/files/microcode_ctl.rc
index a0b4b3aaddb7..fe60aa9995ff 100644
--- a/sys-apps/microcode-ctl/files/microcode_ctl.rc
+++ b/sys-apps/microcode-ctl/files/microcode_ctl.rc
@@ -1,13 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.rc,v 1.2 2004/11/14 06:47:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.rc,v 1.3 2005/01/08 01:17:49 vapier Exp $
 
 depend() {
 	need localmount
 }
 
 start() {
+	# Make sure the kernel supports the microcode device ...
+	# if it doesnt, try to modprobe the kernel module
+	grep -qo ' microcode$' /proc/misc || modprobe microcode >& /dev/null
+
 	ebegin "Updating microcode"
 	/usr/sbin/microcode_ctl -qu -d ${MICROCODE_DEV}
 	eend $? "Failed to update microcode via '${MICROCODE_DEV}'"
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.10.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.10.ebuild
deleted file mode 100644
index 011d18060ae9..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.10.ebuild,v 1.2 2004/11/14 06:35:44 vapier Exp $
-
-inherit toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel IA32 microcode update utility"
-HOMEPAGE="http://www.urbanmyth.org/microcode"
-SRC_URI="http://www.urbanmyth.org/microcode/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.51"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		|| die "compile problem"
-}
-
-src_install() {
-	dosbin microcode_ctl || die "dosbin"
-	doman microcode_ctl.8
-	dodoc Changelog README
-
-	insinto /etc
-	newins intel-ia32microcode-*.txt microcode.dat
-
-	newinitd ${FILESDIR}/microcode_ctl.rc microcode_ctl
-	newconfd ${FILESDIR}/microcode_ctl.conf.d microcode_ctl
-}
-
-pkg_postinst() {
-	ewarn "Your kernel must include microcode update support."
-	echo
-	einfo "Microcode updates will be lost at every reboot."
-	einfo "You can use the init.d script to update at boot time."
-}