From 35be4fff866669a087828a0b4b2fcd0b853d7329 Mon Sep 17 00:00:00 2001
From: Josip Ponjavic <josipponjavic@gmail.com>
Date: Wed, 27 Mar 2019 13:16:21 +0100
Subject: [PATCH] 5.0.5-1 (clr 5.0.4-722) update intel-ucode-20190312

---
 .SRCINFO | 12 ++++++------
 PKGBUILD | 17 +++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 7bdc84d..f078b32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-clear
-	pkgver = 5.0.4
+	pkgver = 5.0.5
 	pkgrel = 1
 	url = https://github.com/clearlinux-pkgs/linux
 	arch = x86_64
@@ -14,9 +14,9 @@ pkgbase = linux-clear
 	options = !strip
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.0.tar.xz
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.0.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.0.4.xz
-	source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.0.3-721
-	source = https://downloadmirror.intel.com/28087/eng/microcode-20180807a.tgz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.0.5.xz
+	source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.0.4-722
+	source = intel-ucode-20190312.tar.gz::https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190312.tar.gz
 	source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz
 	source = 60-linux.hook
 	source = 90-linux.hook
@@ -26,9 +26,9 @@ pkgbase = linux-clear
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = 437b141a6499159f5a7282d5eb4b2be055f8e862ccce44d7464e8759c31a2e43
 	sha256sums = SKIP
-	sha256sums = f83a9669cc5d7fa0c8f4f235ebe5a33029c9153f6d1607be3a78e933949aeb9a
+	sha256sums = 70051be96455f84e13af8a3e487a6da2ed3274843bbd26049004d4e7578365ea
 	sha256sums = SKIP
-	sha256sums = 46ab18699ec42eb6cc01ee1846ec4d7ca979766dee2156f92d69e2f6df548137
+	sha256sums = 2a4438a66ed1a9b82be943d6d19366c006787ba5af302f425674ca6d8c928099
 	sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
diff --git a/PKGBUILD b/PKGBUILD
index 0e1bf90..2f43750 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,9 +65,9 @@ _rev_override="n"
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 _major=5.0
-_minor=4
+_minor=5
 _srcname=linux-${_major}
-_clr=${_major}.3-721
+_clr=${_major}.4-722
 pkgbase=linux-clear
 pkgver=${_major}.${_minor}
 pkgrel=1
@@ -76,13 +76,14 @@ url="https://github.com/clearlinux-pkgs/linux"
 license=('GPL2')
 makedepends=('bc' 'git' 'inetutils' 'kmod' 'libelf' 'linux-firmware' 'xmlto')
 options=('!strip')
+_ucode='20190312'
 _gcc_more_v='20180509'
 source=(
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign"
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
   "clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}"
-  'https://downloadmirror.intel.com/28087/eng/microcode-20180807a.tgz'
+  "intel-ucode-${_ucode}.tar.gz::https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${_ucode}.tar.gz"
   "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
   '60-linux.hook'  # pacman hook for depmod
   '90-linux.hook'  # pacman hook for initramfs regeneration
@@ -130,10 +131,10 @@ CONFIG_MODULE_COMPRESS_XZ=y|' ./.config
         fi
 
     ### Copying i915 firmware and intel-ucode
-        msg2 "Copying i915 firmware and intel-ucode..."
+        msg2 "Copying i915 firmware and intel-ucode-${_ucode}..."
         cp -a /usr/lib/firmware/i915 firmware/
-        cp -a ${srcdir}/intel-ucode firmware/
-        cp  ${srcdir}/intel-ucode-with-caveats/06* firmware/intel-ucode/
+        cp -a ${srcdir}/Intel-Linux-Processor-Microcode-Data-Files-microcode-${_ucode}/intel-ucode firmware/
+        cp  ${srcdir}/Intel-Linux-Processor-Microcode-Data-Files-microcode-${_ucode}/intel-ucode-with-caveats/06* firmware/intel-ucode/
         rm -f firmware/intel-ucode/0f*
 
     ### Patch source to unlock additional gcc CPU optimizations
@@ -332,9 +333,9 @@ done
 
 sha256sums=('437b141a6499159f5a7282d5eb4b2be055f8e862ccce44d7464e8759c31a2e43'
             'SKIP'
-            'f83a9669cc5d7fa0c8f4f235ebe5a33029c9153f6d1607be3a78e933949aeb9a'
+            '70051be96455f84e13af8a3e487a6da2ed3274843bbd26049004d4e7578365ea'
             'SKIP'
-            '46ab18699ec42eb6cc01ee1846ec4d7ca979766dee2156f92d69e2f6df548137'
+            '2a4438a66ed1a9b82be943d6d19366c006787ba5af302f425674ca6d8c928099'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'