Improve postinst message showing information on how to use the microcode for built-in kernels.

Package-Manager: portage-2.2.0_alpha18/cvs/Linux x86_64

3 files changed, 46 insertions, 21 deletions

diff --git a/sys-kernel/amd-ucode/ChangeLog b/sys-kernel/amd-ucode/ChangeLog
index 77009755dd54..4b2d3ed8fd42 100644
--- a/sys-kernel/amd-ucode/ChangeLog
+++ b/sys-kernel/amd-ucode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/amd-ucode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/amd-ucode/ChangeLog,v 1.2 2011/01/17 16:34:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/amd-ucode/ChangeLog,v 1.3 2011/01/20 18:16:28 flameeyes Exp $
+
+  20 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  amd-ucode-2011.01.11.ebuild:
+  Improve postinst message showing information on how to use the microcode for
+  built-in kernels.
 
   17 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Add amd64 as co-maintainer for the package.
diff --git a/sys-kernel/amd-ucode/Manifest b/sys-kernel/amd-ucode/Manifest
index ec15e304a687..1dadf3cd300b 100644
--- a/sys-kernel/amd-ucode/Manifest
+++ b/sys-kernel/amd-ucode/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST amd-ucode-2011-01-11.tar 30720 RMD160 2efef269441d3232005700d966ab0abfbcbddfb7 SHA1 942b1ff9802aeec8ee9d28c0ece459648442fc8d SHA256 60c42629f3c91f97a350bc6a3ad0a256f7b794bfab1f143d7f1924a70728f4ec
-EBUILD amd-ucode-2011.01.11.ebuild 1840 RMD160 b7c032333ea9842451a9061fb605ee155244a62f SHA1 b8c3db4319b5a88856a4eef189ce1d187853d766 SHA256 41d38ea1da67db2d78af1d8c7767557c1c47ef38638f95cd637f5b0c42cffeb0
-MISC ChangeLog 568 RMD160 f9765091a955aeaecb912e5be49559be4843ec46 SHA1 4988a7c53b9a9c199d2f280ca322386bbe197281 SHA256 87720b6734470a20ccdf93e032868071f257a0d9c0d465b6a4fe18f1fc2ee0a7
+EBUILD amd-ucode-2011.01.11.ebuild 2332 RMD160 a2e7b6e05a8e9e44f05ee1e804ff8e8720b11d0b SHA1 77486e3234af69416926f985f7ad0f61cc7003fd SHA256 951723059419027b3aa4a1ddb564a07ab4b0b84e0318e0ddd785d7eadadfe5fb
+MISC ChangeLog 755 RMD160 9f644eb5de49c320f10dd401e41e0ff5c41c15cd SHA1 ab2ae11873eb85a2406e2e0c3f7d23abc6331be1 SHA256 919486d4fddfb6b3fa984d1693f010e4b13c5e1897ba884edc5bb32246be596c
 MISC metadata.xml 231 RMD160 a4ee7537ad7b05b1bd32fd5f8610112c2c2fd9b0 SHA1 eccb7834cf66db8a5228a168bfaecdbe4c106ecd SHA256 daa39ab9583fa1c70ca766198963a1d29a58d4a9b3e188001de75b57103b8d44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk00b3wACgkQAiZjviIA2XjZQACgj9TLcuoJx7zuq/2XjZzHKBvd
-cNwAnAlFww5fOOYFQE42C86bt3YsOOtl
-=O12F
+iEYEARECAAYFAk04fBoACgkQAiZjviIA2XhPAQCg0CBwu5FxQHFpqgzJj+pIDPzE
+v8QAn1wmh4WJ7WELLp0Xnpr5yyootpEN
+=FzIc
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/amd-ucode/amd-ucode-2011.01.11.ebuild b/sys-kernel/amd-ucode/amd-ucode-2011.01.11.ebuild
index 806acfece42d..db5c91770b89 100644
--- a/sys-kernel/amd-ucode/amd-ucode-2011.01.11.ebuild
+++ b/sys-kernel/amd-ucode/amd-ucode-2011.01.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/amd-ucode/amd-ucode-2011.01.11.ebuild,v 1.1 2011/01/16 23:48:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/amd-ucode/amd-ucode-2011.01.11.ebuild,v 1.2 2011/01/20 18:16:28 flameeyes Exp $
 
 inherit versionator linux-info
 
@@ -35,20 +35,40 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "The microcode will be updated next time the microcode kernel code"
-	elog "will be executed; you can issue the following command to force a"
-	elog "reload, if you built the support as modules:"
-	elog ""
-	elog "    modprobe -r microcode && modprobe microcode"
+	local show_modules_info=yes
+	local show_builtin_info=yes
+
+	if linux_config_exists; then
+		if linux_chkconfig_builtin MICROCODE; then
+			show_modules_info=no
+		elif linux_chkconfig_module MICROCODE; then
+			show_builtin_info=no
+		fi
+	fi
+
+	elog "You have installed the microcode for AMD CPUs. The kernel will load"
+	elog "it the next time the microcode driver will be executed."
 	elog ""
-	elog "If you didn't build the microcode support as a module, you should"
-	elog "rebuild your kernel with the new microcode embedded."
-
-	if linux_config_exists && ! linux_chkconfig_module MICROCODE; then
-		ewarn ""
-		ewarn "You're suggested to build CPU microcode update support as module"
-		ewarn "as there is currently no automatic way to load in the updated"
-		ewarn "microcode when it is built-in in the kernel."
-		ewarn ""
+
+	if test $show_modules_info = yes; then
+		elog "If you built the microcode driver as a module, you can issue the"
+		elog "following command to force a reload:"
+		elog ""
+		elog "    modprobe -r microcode && modprobe microcode"
+		elog ""
+	fi
+
+	if test $show_builtin_info = yes; then
+		elog "If you built the microcode driver in the kernel, it won't load"
+		elog "the file as is. To update the microcode you'll have to set the"
+		elog "following configuration in the kernel:"
+		elog ""
+		elog "    CONFIG_EXTRA_FIRMWARE=amd-ucode/microcode_amd.bin"
+		elog "    CONFIG_EXTRA_FIRMWARE_DIR=/lib/firmware"
+		elog ""
+		elog "Please note that this will build the firmware within the kernel"
+		elog "image, so you'll have to rebuild the kernel after an upgrade"
+		elog "of the ${CATEGORY}/${PN} package."
+		elog ""
 	fi
 }