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 F3953138330 for ; Sun, 7 Jan 2018 20:16:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E86AE07EA; Sun, 7 Jan 2018 20:16:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 F384FE07EA for ; Sun, 7 Jan 2018 20:16:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8FE26340D1B for ; Sun, 7 Jan 2018 20:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 547BC1D for ; Sun, 7 Jan 2018 20:16:10 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1515354337.06c085dcc400b0fb80e1ebac1924822d1456ccaa.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ X-VCS-Repository: proj/musl X-VCS-Files: sys-kernel/dracut/Manifest 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: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 06c085dcc400b0fb80e1ebac1924822d1456ccaa X-VCS-Branch: master Date: Sun, 7 Jan 2018 20:16:10 +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: 13fe55f9-7740-413c-b278-2b2ebd50be71 X-Archives-Hash: c25b5dab6daf002bcb9147a1b6aa9e7f commit: 06c085dcc400b0fb80e1ebac1924822d1456ccaa Author: Aric Belsito gmail com> AuthorDate: Sun Jan 7 19:45:37 2018 +0000 Commit: Aric Belsito gmail com> CommitDate: Sun Jan 7 19:45:37 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=06c085dc sys-kernel/dracut: version bump to 046-r1 sys-kernel/dracut/Manifest | 4 +-- .../{dracut-046.ebuild => dracut-046-r1.ebuild} | 3 ++- sys-kernel/dracut/files/046-amd-microcode.patch | 30 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 8cb1009..29e5148 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,2 +1,2 @@ -DIST dracut-045.tar.xz 292652 SHA256 ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a WHIRLPOOL d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9 -DIST dracut-046.tar.xz 299520 SHA256 3cb206abc198811972d452d53e88c32f29dd1b0bb24e35e23b4056aa74824f99 SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 WHIRLPOOL 2a430978934e00a5c87908a6e312e94785d8c2d4d9281c23de9a04d0e91658d234e97dbf826c3e90c6d3c7186f96eb251cfd5e7508ac0c2d2e9dd46486dc284d +DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a +DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 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 55a83e3..e028ce3 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 @@ -52,6 +52,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}/045-systemdutildir.patch" + "${FILESDIR}/046-amd-microcode.patch" "${FILESDIR}"/${P}-libfts.patch ) 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 0000000..c351275 --- /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 +