Improve MICROCODE kernel detection/warning. Remove old version. Signed off by base-system team

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 20 insertions, 53 deletions

diff --git a/sys-apps/microcode-ctl/ChangeLog b/sys-apps/microcode-ctl/ChangeLog
index 0aeed5b5e002..048849989141 100644
--- a/sys-apps/microcode-ctl/ChangeLog
+++ b/sys-apps/microcode-ctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/microcode-ctl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.31 2009/06/10 20:23:22 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.32 2011/01/24 14:16:01 darkside Exp $
+
+  24 Jan 2011; Jeremy Olexa <darkside@gentoo.org>
+  microcode-ctl-1.17-r2.ebuild:
+  Improve MICROCODE kernel detection/warning. Remove old version. Signed off
+  by base-system team
 
   10 Jun 2009; Markus Meier <maekke@gentoo.org>
   microcode-ctl-1.17-r2.ebuild:
diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index 6ba07765fa32..34e09a2740e2 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -3,6 +3,5 @@ AUX microcode_ctl.rc 709 RMD160 970592f014fe7f1b1b78c58544362cb8151f4be4 SHA1 36
 AUX microcode_ctl.rc-r1 744 RMD160 aa531d42e8ffa1fad08f872adfc6a49627e7fd6c SHA1 d23799da662b3af9d5427e2a7cf3511b2f574db8 SHA256 816efe96d791ed949afa0b0914fbfd403642486ab2ceab78fad2973cb0297770
 DIST microcode_ctl-1.17.tar.gz 326921 RMD160 d5dba99ed89365fef51f9493a10fbb02bd1fb94a SHA1 3c32cf0b3658018a4d0de203aebdb96dce6f68d6 SHA256 41ef081c3a2649ca012714a3e2034d748612b1a8f007aa275f395f81cb230bb7
 EBUILD microcode-ctl-1.17-r2.ebuild 1339 RMD160 b9f80f471ce2b5af0111fd2f5b44a459b386afac SHA1 f49d8fd95fa4755299c10a63d1d2702aa6cb1fc6 SHA256 0abe1fa5a7a9cb7b78757164ebb01eed20d7ee9ce571863b86c1dfe8b2fbad09
-EBUILD microcode-ctl-1.17.ebuild 1116 RMD160 9f268e330668dc9f25064f99b57a5a4404fb0c3d SHA1 770b9ab482537438875fb5b5efb9d8633eeb9516 SHA256 b3f708c53e09fc99f7a02bad33239513c7000d7ae4a9b47339f8213a5827ad64
 MISC ChangeLog 5307 RMD160 af8a9a14983d82dc7ca4e236825ab55b9f3f2610 SHA1 923e18271f4defb42726583cc97ccb5eb211d358 SHA256 23d07cef3da52e3703b1c662346254571d5f43c9c808e2460d8a0e0b1279dc3e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild
index 03dc75524844..1c99b6fda911 100644
--- a/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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-r2.ebuild,v 1.2 2009/06/10 20:23:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.17-r2.ebuild,v 1.3 2011/01/24 14:16:01 darkside Exp $
 
-inherit toolchain-funcs
+inherit linux-info toolchain-funcs
 
 MY_P=${PN/-/_}-${PV}
 DESCRIPTION="Intel processor microcode update utility"
@@ -35,8 +35,14 @@ src_install() {
 }
 
 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."
+	# Just a friendly warning
+	if ! linux_config_exists || ! linux_chkconfig_present MICROCODE; then
+		echo
+		ewarn "Your kernel must include microcode update support."
+		ewarn "  Processor type and features --->"
+		ewarn "  <*> /dev/cpu/microcode - microcode support"
+		echo
+	fi
+	elog "Microcode updates will be lost at every reboot."
+	elog "You can use the init.d script to update at boot time."
 }
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.17.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.17.ebuild
deleted file mode 100644
index bfb7879388ad..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.17.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.4 2007/06/30 22:07:01 vapier Exp $
-
-inherit toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor 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=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		|| 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."
-}