Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
Date: Sun, 07 Jan 2018 16:56:22
Message-Id: 1515344151.64981bc77cab21181a2184b7b5c993333f41ded7.floppym@gentoo
1 commit: 64981bc77cab21181a2184b7b5c993333f41ded7
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 7 16:55:30 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 7 16:55:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64981bc7
7
8 sys-kernel/dracut: backport support for newer AMD microcode
9
10 Closes: https://bugs.gentoo.org/643764
11 Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
12
13 .../{dracut-046.ebuild => dracut-046-r1.ebuild} | 3 ++-
14 sys-kernel/dracut/files/046-amd-microcode.patch | 30 ++++++++++++++++++++++
15 2 files changed, 32 insertions(+), 1 deletion(-)
16
17 diff --git a/sys-kernel/dracut/dracut-046.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
18 similarity index 98%
19 rename from sys-kernel/dracut/dracut-046.ebuild
20 rename to sys-kernel/dracut/dracut-046-r1.ebuild
21 index 8c505a56267..501ca018791 100644
22 --- a/sys-kernel/dracut/dracut-046.ebuild
23 +++ b/sys-kernel/dracut/dracut-046-r1.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2017 Gentoo Foundation
26 +# Copyright 1999-2018 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=6
30 @@ -51,6 +51,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
31
32 PATCHES=(
33 "${FILESDIR}/045-systemdutildir.patch"
34 + "${FILESDIR}/046-amd-microcode.patch"
35 )
36
37 src_configure() {
38
39 diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch
40 new file mode 100644
41 index 00000000000..c351275dbeb
42 --- /dev/null
43 +++ b/sys-kernel/dracut/files/046-amd-microcode.patch
44 @@ -0,0 +1,30 @@
45 +From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001
46 +From: Daniel Molkentin <dmolkentin@××××.com>
47 +Date: Tue, 12 Dec 2017 17:48:36 +0100
48 +Subject: [PATCH] Simplify microcode lookup for for AMD CPUs
49 +
50 +---
51 + dracut-functions.sh | 7 ++-----
52 + 1 file changed, 2 insertions(+), 5 deletions(-)
53 +
54 +diff --git a/dracut-functions.sh b/dracut-functions.sh
55 +index 112b2434..d7fc5303 100755
56 +--- a/dracut-functions.sh
57 ++++ b/dracut-functions.sh
58 +@@ -661,11 +661,8 @@ get_ucode_file ()
59 + local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //`
60 +
61 + if [[ "$(get_cpu_vendor)" == "AMD" ]]; then
62 +- # If family greater than or equal to 0x16
63 +- if [[ $family -ge 22 ]]; then
64 +- printf "microcode_amd_fam16h.bin"
65 +- elif [[ $family -eq 21 ]]; then
66 +- printf "microcode_amd_fam15h.bin"
67 ++ if [[ $family -ge 21 ]]; then
68 ++ printf "microcode_amd_fam%xh.bin" $family
69 + else
70 + printf "microcode_amd.bin"
71 + fi
72 +--
73 +2.16.0.rc0
74 +