From 862d542c2d55551d8cfd9781795d7f1d8a80d5cf Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <sayan@kinvolk.io>
Date: Thu, 11 Feb 2021 13:18:36 +0530
Subject: [PATCH 1/2] sys-firmware/intel-microcode: Sync with upstream

Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
---
 .../sys-firmware/intel-microcode/Manifest             |  4 ++--
 ...d => intel-microcode-20201112_p20201116-r1.ebuild} | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/{intel-microcode-20200609_p20200601-r1.ebuild => intel-microcode-20201112_p20201116-r1.ebuild} (96%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/Manifest
index 6bc452dd5c..20d2f36ff0 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/Manifest
@@ -1,3 +1,3 @@
-DIST intel-microcode-collection-20200601.tar.xz 6163976 BLAKE2B eb17605a09f771562189924b916b0d2426d6c2b6f9d76447d05d614679f097acf71fc70dd96132c0ad9d3f1a954f5809456fa951ca42fa0db2373da2288417b7 SHA512 60e798dd357ce85d8bd1f78e0447d983d6916aec87bf8a3f375091e4c57ffa8fb654459a8ed7d2d83184a828060509e16aa37e3a23f70684ac1b170736a12d54
+DIST intel-microcode-collection-20201116.tar.xz 6506624 BLAKE2B b74ec0ddafe9681ae94d6a0df1de51655004eecae83c413fa824c9ad25cf68a25059627e2809a3b8cd5b3cb18647455385de0be2b2a7fcc6bc6c30e2ccabd1af SHA512 3a1aab0af9ff6dc95778276964b457a4429aa12f13499f6f89fa48285cf8aef9a0990099a80e360b76b2d4b6a836f2528f984aab17f12d905cf237dbab2a8b33
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
-DIST microcode-20200609.tar.gz 3043809 BLAKE2B 08e69e8cf0c6932d6cb9909f18c1c55f359491ed29ad296c28111e6301c9f6371ec25c4ce1c8884a50900b9ba9dfcab38e77c7f3ebb58f3a3d8518ed839c8d22 SHA512 bfcaaea2811214b79445d632e256cd35af82d62f748799d47f7bc2490c5a6fd53f020bcaa3331a96b54c91ded1d17dfd9946b40174694b9a7ad17810f58293ae
+DIST microcode-20201112.tar.gz 3610834 BLAKE2B 4212924f1673afded961266a25fe6063ec6cdafaa26c8bee1c42372eb8ab5f278dc2501615b23e09e2f9809bf2792a8db317c98c170bf0c5e1dd62b7dc80a084 SHA512 0875675d065a83ee14fa34a31022ee34e46aee579d1ff192414e79861af157ae269ca7c2c462f03b3accbd45590c76e5cbf4f53d7a6ed237e410213a96459211
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20200609_p20200601-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20200609_p20200601-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
index 5dfcab4344..a162e73196 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20200609_p20200601-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
@@ -20,17 +20,17 @@ 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/${PVR}"
+SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE="hostonly initramfs +split-ucode vanilla"
 REQUIRED_USE="|| ( initramfs split-ucode )"
 
-BDEPEND="sys-apps/iucode_tool"
+BDEPEND=">=sys-apps/iucode_tool-2.3"
 
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
 
-RESTRICT="binchecks strip"
+RESTRICT="binchecks bindist mirror strip"
 
 S=${WORKDIR}
 
@@ -44,6 +44,9 @@ MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
 # https://bugs.gentoo.org/722768
 MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
 
+# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
+MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
+
 # In case we want to set some defaults ...
 MICROCODE_SIGNATURES_DEFAULT=""
 
@@ -122,7 +125,7 @@ src_install() {
 		"${MICROCODE_SRC[@]}" \
 		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
 
-	dodoc releasenote
+	dodoc releasenote.md
 }
 
 pkg_preinst() {

From eae0b6de2dbb6d0c5e7a7fb2018f1519e805d5a7 Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <sayan@kinvolk.io>
Date: Thu, 11 Feb 2021 17:13:55 +0530
Subject: [PATCH 2/2] sys-firmware/intel-microcode: Apply Flatcar patches

Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
---
 .../intel-microcode-20201112_p20201116-r1.ebuild              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
index a162e73196..d04a597625 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
@@ -20,7 +20,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 )"
@@ -30,7 +30,7 @@ BDEPEND=">=sys-apps/iucode_tool-2.3"
 # !<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}