From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 32322138330 for ; Sun, 7 Jan 2018 16:56:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67D52E0857; Sun, 7 Jan 2018 16:56:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35CACE0857 for ; Sun, 7 Jan 2018 16:56:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 015C6335D46 for ; Sun, 7 Jan 2018 16:56:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51CFD198 for ; Sun, 7 Jan 2018 16:56:16 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1515344151.64981bc77cab21181a2184b7b5c993333f41ded7.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-046-r1.ebuild sys-kernel/dracut/dracut-046.ebuild sys-kernel/dracut/files/046-amd-microcode.patch X-VCS-Directories: sys-kernel/dracut/files/ sys-kernel/dracut/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 64981bc77cab21181a2184b7b5c993333f41ded7 X-VCS-Branch: master Date: Sun, 7 Jan 2018 16:56:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dbd461d9-8230-4db7-8c16-9a49714843c0 X-Archives-Hash: 4be8095917ba4eda2729bcb556bcc78d commit: 64981bc77cab21181a2184b7b5c993333f41ded7 Author: Mike Gilbert gentoo org> AuthorDate: Sun Jan 7 16:55:30 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Jan 7 16:55:51 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64981bc7 sys-kernel/dracut: backport support for newer AMD microcode Closes: https://bugs.gentoo.org/643764 Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37 .../{dracut-046.ebuild => dracut-046-r1.ebuild} | 3 ++- sys-kernel/dracut/files/046-amd-microcode.patch | 30 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys-kernel/dracut/dracut-046.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild similarity index 98% rename from sys-kernel/dracut/dracut-046.ebuild rename to sys-kernel/dracut/dracut-046-r1.ebuild index 8c505a56267..501ca018791 100644 --- a/sys-kernel/dracut/dracut-046.ebuild +++ b/sys-kernel/dracut/dracut-046-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -51,6 +51,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}/045-systemdutildir.patch" + "${FILESDIR}/046-amd-microcode.patch" ) src_configure() { diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch new file mode 100644 index 00000000000..c351275dbeb --- /dev/null +++ b/sys-kernel/dracut/files/046-amd-microcode.patch @@ -0,0 +1,30 @@ +From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Tue, 12 Dec 2017 17:48:36 +0100 +Subject: [PATCH] Simplify microcode lookup for for AMD CPUs + +--- + dracut-functions.sh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 112b2434..d7fc5303 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -661,11 +661,8 @@ get_ucode_file () + local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //` + + if [[ "$(get_cpu_vendor)" == "AMD" ]]; then +- # If family greater than or equal to 0x16 +- if [[ $family -ge 22 ]]; then +- printf "microcode_amd_fam16h.bin" +- elif [[ $family -eq 21 ]]; then +- printf "microcode_amd_fam15h.bin" ++ if [[ $family -ge 21 ]]; then ++ printf "microcode_amd_fam%xh.bin" $family + else + printf "microcode_amd.bin" + fi +-- +2.16.0.rc0 +