From 5f07619206f7bca6dc04657196533fa4bdfdecc1 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Tue, 14 May 2019 21:14:01 -0400
Subject: [PATCH] sys-firmware/intel-microcode: apply CoreOS changes

- Add PVR to sub-slot
- Don't blacklist 06-4f-01; we have a new enough kernel
- Revert 933df6d841020ef50bea24836ea854f6e4474cf7 RESTRICTs
---
 .../intel-microcode-20190514_p20190512.ebuild              | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20190514_p20190512.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20190514_p20190512.ebuild
index c383838725..17d9d9808f 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20190514_p20190512.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20190514_p20190512.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/arc
 	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
 
 LICENSE="intel-ucode"
-SLOT="0"
+SLOT="0/${PVR}"
 KEYWORDS="-* amd64 x86"
 IUSE="hostonly initramfs +split-ucode vanilla"
 REQUIRED_USE="|| ( initramfs split-ucode )"
@@ -29,13 +29,12 @@ DEPEND="sys-apps/iucode_tool"
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
 
-RESTRICT="binchecks bindist mirror strip"
+RESTRICT="binchecks strip"
 
 S=${WORKDIR}
 
 # Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
+MICROCODE_BLACKLIST_DEFAULT=""
 
 # In case we want to set some defaults ...
 MICROCODE_SIGNATURES_DEFAULT=""