gentoo resync : 07.01.2018

3 files changed, 34 insertions, 2 deletions

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index e54c49815a5e..6828c6aeb386 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -2,6 +2,7 @@ AUX 044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch 1027 BLA
 AUX 044-0002-systemd-initrd-add-initrd-root-device.target.patch 924 BLAKE2B eeeb9efe85637db0566dd8f4c2543626ed8786b97293ed1f25c9aa543a4c239ba6771f6add7cf76cf540bffae82b68ed699a601f0f28fd3651e4c11440345b63 SHA512 443391ad3a70c3933d42129a298e12de007944c3141f8ec2785666ee5f66a24edc1eb5faa5c2016540aeb1fadb93139fce3b53b3960f7a5492aac2ff9bc95e70
 AUX 044-0003-50-dracut.install-use-bin-bash-shebang.patch 558 BLAKE2B 7a5c30a6a70b4dba8463c4701910dd9878f6923a572532b022cfd0c63e9f3f01559d5c2e5c419f8e3b7196d3e2c587279e16761e60e8e67d8fc8ab5d35c96cdf SHA512 657685b27d3ffd326fd1976ccd89cbe4ab9122b63f2a6a03cae3bd54663bd1a26366552550ea50af671aa5a604b9ca08caf1bc689551e46f7d208c7d5e83730b
 AUX 045-systemdutildir.patch 1665 BLAKE2B ddca173403586e0ec4f8af86bf9d8004a0fa6176155c8b9d3e7906fdbf23db910290d60cf1834da7635c75b58b107616a722b560b076608920f9cc4b3a6351ff SHA512 f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b
+AUX 046-amd-microcode.patch 1013 BLAKE2B be9f9b545e5d68285f2b4e3a4ccee3e39c0c41349450053e411532c47e9634157df190ea2bceacb422a3f1b874ae256c34a4822f3fb964b8c06a05f7adec3a59 SHA512 c37734a66a9727cb0effc5a02b85e6bd2d3e5b05913657f517fcb26fc6cacc89398e28dd2865e5abe0148520bc95530a6cffb904b5dbde00af1d85e7d1c26b65
 AUX dracut-044-bash-4.4.patch 5036 BLAKE2B faf944f4405b560d7f43ce2fd0595b223f1c91eed11422b19a5b61b710e69c10b855d3fb99fd28f204d8c31c49c272259704e148fcb794bbd8309b3779a62b4f SHA512 68522464fb446175f967c8453e8427f961e97522661a22a7c302a90ff716ab75b0cfc32f568a06f1e1821ba7115d6d2f48b6ded9ed65b30806d4d505a0903279
 AUX dracut-044-preserve-xattrs-when-copying.patch 2354 BLAKE2B a7195fdf0663e71b5e5eb2f8c9d971f5bd2bdc8b8a49399d836efc8efed2547118399ae7780c93014659d88c0359e7336f2e2a345ce009b5f872468d0412aaf9 SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02
 DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
@@ -10,5 +11,5 @@ DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4
 EBUILD dracut-044-r1.ebuild 7688 BLAKE2B 0746d8c7b1bc07fffceb5fd8e12ecffd663885396fe1d8c849977d4792e0f82ae4db517cc28aa1f676726f843a74cbdaead75305543bac19d99c2afe4cd74f73 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067
 EBUILD dracut-044-r3.ebuild 6939 BLAKE2B 6b9fa5193568f535d127d8001d71d3c257d49ef155082c29d8f876d4de51ac7f3139bf94cebf0dadc883a318f3a788df57a3ef7affe2c30e96d712ce72d0325a SHA512 b49f4a6dea1b6c03b6422b7c4edd7e655a123ca7074ebe38d98bc5ae324060cb0dda3cecbb8dd8caae5209d16d767680aaf4ec740cf65af496545b50c41d7a28
 EBUILD dracut-045-r2.ebuild 4791 BLAKE2B d4a0e55858981783182e43726aa790f824bca8cae4cf050695ac79da31adaee6c90379995b4317b0419fd5414906ffde17191ceff9d0aaeb81f8006b37977c31 SHA512 eccf8ac9c7b4384dd966f78121ae2f15a2bb0ff3ef4a3ff6b1259f5a4416058b3495cc21ae879cf674a59413dd3670b7ca2f4a87776a465077a238615ec1720f
-EBUILD dracut-046.ebuild 4767 BLAKE2B 1531a5ddf873d7ce597563f6049428e095450e0d79b3e2ab0d5565b9633605754b8dab76b5b8ac17f482b42239f63e3b568a39538fb5a6e9763876509a11273a SHA512 8716a1adb52a65ef2a77bb0c5aaa08e834e4fa5e5889e0b5ced2b34a72465196fc7b4a44ecd3e8a08366734d520e8af41dd1116a8a44d0bde1275a1bd3b97e14
+EBUILD dracut-046-r1.ebuild 4806 BLAKE2B 4af94a56e29f6ac94a7a9eed249a00e079c9dbeac907d4431c0451a3532f730ce9aa6d7945404f1d1b65f1bc43ad8d82807dea65374106483515362df68c01ad SHA512 120f2800883c02418e7dade4ce1fc04e6f7f405c53421740b88a569e21dfe1305e5683bdfb6070ce94c7fac156d4bedeeb59f84452c36ea3a27875a9183a30c5
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-046.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
index 8c505a56267c..501ca0187916 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 000000000000..c351275dbebc
--- /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 <dmolkentin@suse.com>
+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
+