Revbump to include new location of microcode.dat file, bug #233141

(Portage version: 2.1.6.11/cvs/Linux ia64)

3 files changed, 37 insertions, 6 deletions

diff --git a/sys-apps/microcode-ctl/ChangeLog b/sys-apps/microcode-ctl/ChangeLog
index b308d099b45f..1555ea929a2f 100644
--- a/sys-apps/microcode-ctl/ChangeLog
+++ b/sys-apps/microcode-ctl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/microcode-ctl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.29 2008/05/05 04:05:57 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.30 2009/05/02 12:54:14 armin76 Exp $
+
+*microcode-ctl-1.17-r2 (02 May 2009)
+
+  02 May 2009; Raúl Porcel <armin76@gentoo.org> +files/microcode_ctl.rc-r1,
+  -microcode-ctl-1.17-r1.ebuild, +microcode-ctl-1.17-r2.ebuild:
+  Revbump to include new location of microcode.dat file, bug #233141
 
 *microcode-ctl-1.17-r1 (05 May 2008)
 
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.rc-r1 b/sys-apps/microcode-ctl/files/microcode_ctl.rc-r1
new file mode 100644
index 000000000000..d2a09692a82a
--- /dev/null
+++ b/sys-apps/microcode-ctl/files/microcode_ctl.rc-r1
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2008 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-r1,v 1.1 2009/05/02 12:54:14 armin76 Exp $
+
+depend() {
+	need localmount
+}
+
+start() {
+	local ret
+
+	# Make sure the kernel supports the microcode device ...
+	# if it doesnt, try to modprobe the kernel module
+	grep -qs ' microcode$' /proc/misc || modprobe -q microcode
+
+	ebegin "Updating microcode"
+	microcode_ctl -qu -f /lib/firmware/microcode.dat -d ${MICROCODE_DEV}
+	ret=$?
+	eend ${ret} "Failed to update microcode via '${MICROCODE_DEV}'"
+
+	[ "${MICROCODE_UNLOAD}" = "yes" ] && rmmod microcode >/dev/null 2>&1
+
+	return ${ret}
+}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.17-r1.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild
index 43d72493846a..78f5749d55d0 100644
--- a/sys-apps/microcode-ctl/microcode-ctl-1.17-r1.ebuild
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.17-r1.ebuild,v 1.1 2008/05/05 04:05:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild,v 1.1 2009/05/02 12:54:14 armin76 Exp $
 
 inherit toolchain-funcs
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
-RDEPEND="sys-apps/microcode-data"
+RDEPEND=">=sys-apps/microcode-data-20090330"
 
 S=${WORKDIR}/${MY_P}
 
@@ -30,7 +30,7 @@ src_install() {
 	doman microcode_ctl.8
 	dodoc Changelog README
 
-	newinitd "${FILESDIR}"/microcode_ctl.rc microcode_ctl
+	newinitd "${FILESDIR}"/microcode_ctl.rc-r1 microcode_ctl
 	newconfd "${FILESDIR}"/microcode_ctl.conf.d microcode_ctl
 }