From 666d54b056021f87d797b68fb98b2a9e6d829922 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 28 May 2020 14:41:34 -0700 Subject: Fix gcc patch application and hotfix --- PKGBUILD | 6 +++--- graysky_bdver2-hotfix.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index d847745..a85220e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -24,7 +24,7 @@ _majver=6 _minver=15 _gccpatchver='20200527' _gccpatchger='10.1' -_gccpatchker='5.6' +_gccpatchker='v5.5-v5.6' _ckpatchversion=ck1 if [ "$_minver" == "0" ]; then pkgver=${_supver}.${_majver} @@ -100,11 +100,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) -- cgit v1.2.1