Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
Date: Sun, 07 Jan 2018 20:16:14
Message-Id: 1515354337.06c085dcc400b0fb80e1ebac1924822d1456ccaa.lluixhi@gentoo
1 commit: 06c085dcc400b0fb80e1ebac1924822d1456ccaa
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 7 19:45:37 2018 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Sun Jan 7 19:45:37 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=06c085dc
7
8 sys-kernel/dracut: version bump to 046-r1
9
10 sys-kernel/dracut/Manifest | 4 +--
11 .../{dracut-046.ebuild => dracut-046-r1.ebuild} | 3 ++-
12 sys-kernel/dracut/files/046-amd-microcode.patch | 30 ++++++++++++++++++++++
13 3 files changed, 34 insertions(+), 3 deletions(-)
14
15 diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
16 index 8cb1009..29e5148 100644
17 --- a/sys-kernel/dracut/Manifest
18 +++ b/sys-kernel/dracut/Manifest
19 @@ -1,2 +1,2 @@
20 -DIST dracut-045.tar.xz 292652 SHA256 ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a WHIRLPOOL d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9
21 -DIST dracut-046.tar.xz 299520 SHA256 3cb206abc198811972d452d53e88c32f29dd1b0bb24e35e23b4056aa74824f99 SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 WHIRLPOOL 2a430978934e00a5c87908a6e312e94785d8c2d4d9281c23de9a04d0e91658d234e97dbf826c3e90c6d3c7186f96eb251cfd5e7508ac0c2d2e9dd46486dc284d
22 +DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
23 +DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
24
25 diff --git a/sys-kernel/dracut/dracut-046.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
26 similarity index 98%
27 rename from sys-kernel/dracut/dracut-046.ebuild
28 rename to sys-kernel/dracut/dracut-046-r1.ebuild
29 index 55a83e3..e028ce3 100644
30 --- a/sys-kernel/dracut/dracut-046.ebuild
31 +++ b/sys-kernel/dracut/dracut-046-r1.ebuild
32 @@ -1,4 +1,4 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 +# Copyright 1999-2018 Gentoo Foundation
35 # Distributed under the terms of the GNU General Public License v2
36
37 EAPI=6
38 @@ -52,6 +52,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
39
40 PATCHES=(
41 "${FILESDIR}/045-systemdutildir.patch"
42 + "${FILESDIR}/046-amd-microcode.patch"
43 "${FILESDIR}"/${P}-libfts.patch
44 )
45
46
47 diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch
48 new file mode 100644
49 index 0000000..c351275
50 --- /dev/null
51 +++ b/sys-kernel/dracut/files/046-amd-microcode.patch
52 @@ -0,0 +1,30 @@
53 +From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001
54 +From: Daniel Molkentin <dmolkentin@××××.com>
55 +Date: Tue, 12 Dec 2017 17:48:36 +0100
56 +Subject: [PATCH] Simplify microcode lookup for for AMD CPUs
57 +
58 +---
59 + dracut-functions.sh | 7 ++-----
60 + 1 file changed, 2 insertions(+), 5 deletions(-)
61 +
62 +diff --git a/dracut-functions.sh b/dracut-functions.sh
63 +index 112b2434..d7fc5303 100755
64 +--- a/dracut-functions.sh
65 ++++ b/dracut-functions.sh
66 +@@ -661,11 +661,8 @@ get_ucode_file ()
67 + local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //`
68 +
69 + if [[ "$(get_cpu_vendor)" == "AMD" ]]; then
70 +- # If family greater than or equal to 0x16
71 +- if [[ $family -ge 22 ]]; then
72 +- printf "microcode_amd_fam16h.bin"
73 +- elif [[ $family -eq 21 ]]; then
74 +- printf "microcode_amd_fam15h.bin"
75 ++ if [[ $family -ge 21 ]]; then
76 ++ printf "microcode_amd_fam%xh.bin" $family
77 + else
78 + printf "microcode_amd.bin"
79 + fi
80 +--
81 +2.16.0.rc0
82 +