Updated to 5.4.15.a

1 files changed, 13 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 556f720..429e3db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # Parabola version lacks graysky gcc patch with bdver2 fix
 # Parabola version lacks ath9k regdom and raid6 algo patches
 # Parabola version is 300 Hz
-# Parabola version supports Intel ME
+# Parabola version does not disable lockdown eee
 # Parabola version allows insecure filesystems
 # Parabola version enables ISDN and Infiniband
 # Parabola version enables VMware and HyperV
@@ -19,7 +19,7 @@ _pkgbase=linux-hardened
 pkgbase=linux-libre-hardened
 _supver=5
 _majver=4
-_minver=14
+_minver=15
 _hardenedver=a
 _gccpatchver='20190822'
   if [ "$_minver" == "0" ]; then
@@ -45,7 +45,6 @@ _gnumajver=${_supver}.${_majver}-gnu
 _gnupkgver=${_pkgver}-gnu
 source=(
   https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
-  https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign}
   0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
   0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
   0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -55,10 +54,8 @@ source=(
   0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
   0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
   0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
-  0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
-  0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
-  0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
-  0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
+  0011-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+  0012-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
   https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.patch{,.sig}
   graysky_bdver2-hotfix.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
@@ -66,14 +63,15 @@ source=(
   raid6-default-algo.patch
   config         # the main kernel config file
 )
+  if [ "$_minver" != "0" ]; then
+    source+=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign})
+  fi
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7'  # Alexandre Oliva
   'E240B57E2C4630BA768E2F26FC1B547C8D8172C8'  # Levente Polyak
 )
 b2sums=('43270fe22aeaba6f8c4fc72423176d7eea993ec85b561695f624fbca9702dfabae0a3ee15cb3881d0c7a5b80f979f307e5a39a4ec0fcd28456ece2012bb30e0e'
         'SKIP'
-        'cca8289ddb66c3c3437bccaec2b5d6fe9c5702dbc92b5f72fc1e8065a65a30eaf2eb7fef11d90f406ac83ab264bcc22c600302ef75e98e7f5116fa87d2a5b3d2'
-        'SKIP'
         '5427a9283a9ccb38a63ba5bd680e331245bd134501ce66e912cb07c250e37810a895f4ae78371db2b0cfcbfcb1bee96daafc0e5c71f40ec9b8643d3a88a80bab'
         'fab987c7c77e07ae2db83d148e8d423e6aadbcfc84498a60a6396418c69108c0a38a426eca57c1e94f2540f25cbcd084eafe3d124ac9d0ce2ab4efff28852a16'
         'c5cd99138e9436ede9136e5f958a15a10e07ab51e77dc716158b1ff774d9fa06f4ec2b7a1ba171f4ea86c16ea61fb685b54cadb85411b1c7c468d984b495585d'
@@ -83,17 +81,17 @@ b2sums=('43270fe22aeaba6f8c4fc72423176d7eea993ec85b561695f624fbca9702dfabae0a3ee
         'ab7c15c8a219a7e895b39a10a452005252bb018749607676a7e436263a0876d096a5716c9bcbf30e2ff6bc4e525be22ac3838ab3d363373945d5bf5ce43648d4'
         'bb35fce00e121769f4a85c01a799efa7e3eccae8fdd29993d5bbd574a2af50cabeafcf6a9bebf5713223cdb64a53fd7bbf41de7f0a84023531b160e0fe88dc52'
         '26082d1d89d9a6e44ea29be9056029f4af228cf22d6c4f6c9f32ed552859bcb8982dc57f63bcb216e220590a029800aeade0bf47356f7ef3ebbe9c0261674379'
-        'aba17d1a3a4638d997c33ea385cfd4ac4008a13f31c026e86342169117aa6b238cdebdc4ddbe234e54c68816386ac0e401ecd9e5b49bd42e1ef60eecdf3ad89a'
-        'd4878831fa03c17b590001d15ddbbfeb1a8747c961503c26aee330d213c0fbf6c2eab7226456083f52a5fb4b4ffd9bf7b2db741de7c7476a15873f2a8d9f7b74'
         '76bb50a23b822de85f3381a511b42bb46110a39d31ede81bd168cb708882b93be525576b1805da5383f35f6f18fab817ad195aa870ab75e7775855a150d172a1'
         '726d89aeb1f5df51cfa395e01edb4b8b36460b1f75611ee921d057dfb28cd2d6c41990bca4b40512b9398e0558c4028845252442d9ec1d8f13847a0ed9903a1d'
-        '20ebec6408a9d441f69c7bcb7ecb00fbe774b01f76e3c72f8364c9bfae1072f2dc29b16349d3cf265dc8c5d4e175b87e60b7e54b66b3be6515702597af3413e6'
+        '6bac86f63d0a4dfeb130e62b213c244355369421bc2ee04a60511cbcae0869de8e26bce97ce0e45d606c9c3d6d78c0f368d2f7177ad9e5294844e4932ede50ab'
         'SKIP'
         '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e'
         '0b11c09e01a7480466d5237a8792c941c9af3e8d6584ffd84285cd9569f5355c10879566ce5846ef9263535020c53e1aa6c58100a571b537ccb7f2431baf7996'
         '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
-        '00761b14dd1cf24c0643f5094646d5c46302ec95b305d1c3e1cfdf2a010f36a7b9e90183f13d13c9d240bba6eee7166a924f3db75c8b71bb03b6e3cf30869684')
+        '00761b14dd1cf24c0643f5094646d5c46302ec95b305d1c3e1cfdf2a010f36a7b9e90183f13d13c9d240bba6eee7166a924f3db75c8b71bb03b6e3cf30869684'
+        'dc5adfab9884d112d9d08aa0da281089ab9d402558d7fb692da6b3f2633f1e447e463ab09afd80034ca3eec5b62dde3911155dbd01d2d1a4e4198e55aef1bfb6'
+        'SKIP')
 
 export KBUILD_BUILD_HOST=$pkgbase
 export KBUILD_BUILD_USER=$pkgbase
@@ -120,10 +118,8 @@ prepare() {
   patch -p1 -i ../0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
   patch -p1 -i ../0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
   patch -p1 -i ../0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
-  patch -p1 -i ../0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
-  patch -p1 -i ../0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
-  patch -p1 -i ../0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
-  patch -p1 -i ../0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
+  patch -p1 -i ../0011-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+  patch -p1 -i ../0012-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
 
 
   # linux hardened patch