From 0b0a677bc22ae37f6f9b156095ed77ba114afbb5 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 14 Aug 2018 18:02:07 -0400 Subject: [PATCH 1/2] sys-firmware/intel-microcode: import Gentoo's latest stable version --- .../sys-firmware/intel-microcode/Manifest | 4 ++-- ... => intel-microcode-20180807_p20180808.ebuild} | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/{intel-microcode-20180703.ebuild => intel-microcode-20180807_p20180808.ebuild} (95%) 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 a473005982..727072e8de 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,2 +1,2 @@ -DIST intel-microcode-collection-20180630.tar.xz 4456400 BLAKE2B 493229bb8ce65c62b4a894a219bd89e677a5908a774e1104389335f88fe27479de8e117bbd3b1c5bd1d9e70ed0f1c79ddba684357138dbb559141d48d5a3c456 SHA512 66a1217514c43dcc308cc1e9e4737041c48cad85cd846a9adaabd5885197ffffca3fef71c43ccdaaf25d10df747a3c3e837d95ae332d53961579e4bb3c1f0bed -DIST microcode-20180703.tgz 1550181 BLAKE2B edf86dcc8dedeffd22a9b608cc11e5b043d36617ae6325e14326d402388f42ead29c8483a0312ab9ea2015604803cc07506d6f119b314b922639a71f9d65a39d SHA512 25af4158f97fba2fb88f05a44f42ed7d2415001ccc58f573d366f405ff198472517468f619628f4f6e5a371793c41ea8faf5a932d2362b2a51726bb5c84e0eed +DIST intel-microcode-collection-20180808.tar.xz 4463768 BLAKE2B bf04d00db7e11b7ef6da9b4221aa2dfae1a20a39ab2f99ad78e735c9cf0f1d9a949b81ceba740238da98d34a934d8829b6882714ec21a1ffa3c1a7dfcfbfdcc6 SHA512 e5607127464c71e3ed413ca3b66cde0b5b994d837655208997841ec5358c32bb197f4ad0123b19bae4254aa35770cfec32cf2780f2cb5dd5f0a00d1ca14cf93c +DIST microcode-20180807.tgz 1629357 BLAKE2B ce60ef5a5ba794cb4a618739a6134e3b0a660d5e2a09c39ff1fcd7312a3d0b5e763674fb8f8cd39899544d1136253b98930a0160db9c937135effbb912823b58 SHA512 a69576afb6c8ec401e9e169ee208be7d57ee3292ec6689c783729d3fa624b1fdaa74803874c2afa09768c8ee955da913c2cbabeb3d7c7a1dc1f7965d950ccdfb diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180807_p20180808.ebuild similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180807_p20180808.ebuild index 1e4f677126..e698c926d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180807_p20180808.ebuild @@ -6,18 +6,18 @@ EAPI="6" inherit linux-info toolchain-funcs mount-boot # Find updates by searching and clicking the first link (hopefully it's the one): -# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File +# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File -COLLECTION_SNAPSHOT="20180630" -INTEL_SNAPSHOT="20180703" -NUM="27945" +COLLECTION_SNAPSHOT="${PV##*_p}" +INTEL_SNAPSHOT="${PV/_p*}" +NUM="28039" DESCRIPTION="Intel IA32/IA64 microcode update data" HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}" SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz 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 )" @@ -28,10 +28,13 @@ DEPEND="sys-apps/iucode_tool" RDEPEND="! Date: Tue, 14 Aug 2018 18:09:51 -0400 Subject: [PATCH 2/2] sys-firmware/intel-microcode: apply CoreOS changes - Add PVR to sub-slot - Don't blacklist 06-4f-01; we have a new enough kernel --- .../intel-microcode-20180807_p20180808.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180807_p20180808.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180807_p20180808.ebuild index e698c926d1..2a853a4958 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180807_p20180808.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/intel-microcode/intel-microcode-20180807_p20180808.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT} 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 )" @@ -33,8 +33,7 @@ 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="" MICROCODE_BLACKLIST="${MICROCODE_BLACKLIST:=${MICROCODE_BLACKLIST_DEFAULT}}" # In case we want to set some defaults ...