summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-05-28 21:43:18 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-05-28 21:43:18 -0700
commit6e205e6a7e4778ddc77d3b14bccc8b3f58235f95 (patch)
treedf40d15eb2835340f354add0fd638d43170e9027
parentUpdated to 5.6.15.b (diff)
downloadlinux-libre-hardened-6e205e6a7e4778ddc77d3b14bccc8b3f58235f95.tar.xz
Fix gcc patch application and hotfix
-rw-r--r--PKGBUILD8
-rw-r--r--graysky_bdver2-hotfix.patch4
2 files changed, 6 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 419bb33..9597431 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ _minver=15
_hardenedver=b
_gccpatchver='20200527'
_gccpatchger='10.1'
-_gccpatchker='5.6'
+_gccpatchker='v5.5-v5.6'
if [ "$_minver" == "0" ]; then
_pkgver=${_supver}.${_majver}
else
@@ -66,7 +66,7 @@ b2sums=('921a3836ffbd5ababb897b8d923ab3e97c10c39b8d01060fe41742005f8111b5c2c9e76
'SKIP'
'd17fb26b7c99d329d2b8c2980e23528f3abf0ac3930f255172778c697bd5623e93c780c23d35b2c9d701da106a5fa9b874fbbd715b64fb189d26b83615dea7b8'
'SKIP'
- '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e'
+ '76137504bd6eb54b9aa1eb3f3d78ec60b80d607d0554ba5ec60431db2b62963354e1461b57a8de4f89d4399ef7f66041c6b2366b5d9fd53d5f9857a9dabd4188'
'c8a52c056ecaeba55bee0b17c6a264d460792694e883b5654b8c1694b376a25be4aff1e6b86b5e3486c6e3adfc2062f805e91a9cac1156d0104d7e781028bec6'
'2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
@@ -101,11 +101,11 @@ prepare() {
# graysky gcc hotfixes
echo "Applying graysky gcc patch hotfixes"
- patch -p1 -i ../graysky_bdver2-hotfix.patch "$srcdir/kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v${_gccpatchger}+_kernel_v${_gccpatchker}+.patch"
+ patch -p1 -i ../graysky_bdver2-hotfix.patch "$srcdir/kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v${_gccpatchger}+_kernel_${_gccpatchker}.patch"
# graysky gcc patch
echo "Applying graysky cpu patch"
- patch -p1 -i ../kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v${_gccpatchger}+_kernel_v${_gccpatchker}+.patch
+ patch -p1 -i ../kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v${_gccpatchger}+_kernel_${_gccpatchker}.patch
# Ignore ath9k eeprom patch
diff --git a/graysky_bdver2-hotfix.patch b/graysky_bdver2-hotfix.patch
index a8bb127..0b3e809 100644
--- a/graysky_bdver2-hotfix.patch
+++ b/graysky_bdver2-hotfix.patch
@@ -1,5 +1,5 @@
---- a/kernel_gcc_patch-20190822/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch
-+++ b/kernel_gcc_patch-20190822/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch
+--- a/kernel_gcc_patch-20200527/enable_additional_cpu_optimizations_for_gcc_v10.1+_kernel_v5.5-v5.6.patch
++++ b/kernel_gcc_patch-20200527/enable_additional_cpu_optimizations_for_gcc_v10.1+_kernel_v5.5-v5.6.patch
@@ -492,7 +492,7 @@
+ cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
+ cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)