diff options
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | bdver2-fix-for-graysky.patch | 11 | ||||
| -rw-r--r-- | graysky_bdver2-hotfix.patch | 11 |
3 files changed, 22 insertions, 19 deletions
@@ -6,7 +6,8 @@ # # I maintain this because: # Arch version patch script does not apply consistently -# Arch version lacks ath9k, bdver2, greysky2, and raid6 patches +# Arch version lacks graysky gcc patch with bdver2 fix +# Arch version lacks ath9k regdom and raid6 algo patches # Arch version allows SEED, SM3, SM4, and Streebog # Arch version is 300 Hz # Arch version supports Intel ME @@ -34,8 +35,8 @@ options=('!strip') source=( https://www.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar.{xz,sign} 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch + graysky_bdver2-hotfix.patch enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz - bdver2-fix-for-graysky.patch ath9k-regdom-hack.patch raid6-default-algo.patch config.x86_64 # the main kernel config files @@ -46,8 +47,8 @@ source=( sha256sums=('d79f90f5ca97befbfee4e247204b2ac4f45e7bb03d63a79184bc748cf3cf6ddb' 'SKIP' '91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3' + '229e063a578db0a278108f37b24da20c2a2a18d825e98a67e426cb0f4b492e4a' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' - 'd35338c92d0dbf27ffedaf100bd852dd13fd9b5d49b12a10b91194a2ae654447' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb' '8ecfdf3c165289a328cca66230a36c58b88a200e58f799c7f2c89da5b35a52ba' @@ -74,13 +75,15 @@ prepare() { msg2 "Applying hotfixes" patch -p1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - # graysky2 gcc patch - msg2 "Applying graysky2 cpu patch" + + # graysky gcc hotfixes + msg2 "Applying graysky gcc patch hotfixes" + patch -p1 -i ../graysky_bdver2-hotfix.patch "$srcdir/kernel_gcc_patch-${_gcc_more_v}/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch" + + # graysky gcc patch + msg2 "Applying graysky cpu patch" patch -p1 -i ../kernel_gcc_patch-${_gcc_more_v}/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch - # Fix stack warnings and ldconfig segfaults on bdver2 with graysky2 gcc patch - msg2 "Applying bdver2 fix for graysky2 cpu patch" - patch -p1 -i ../bdver2-fix-for-graysky.patch # Ignore ath9k eeprom patch msg2 "Applying ath9k patch" diff --git a/bdver2-fix-for-graysky.patch b/bdver2-fix-for-graysky.patch deleted file mode 100644 index b7e5402..0000000 --- a/bdver2-fix-for-graysky.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/x86/Makefile -+++ b/arch/x86/Makefile -@@ -492,7 +492,7 @@ - cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1) - cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2) - cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1) -- cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2) -+ cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2) $(call cc-option,-mno-tbm) - cflags-$(CONFIG_MSTEAMROLLER) += $(call cc-option,-march=bdver3) - cflags-$(CONFIG_MEXCAVATOR) += $(call cc-option,-march=bdver4) - cflags-$(CONFIG_MZEN) += $(call cc-option,-march=znver1) diff --git a/graysky_bdver2-hotfix.patch b/graysky_bdver2-hotfix.patch new file mode 100644 index 0000000..5cd9dbc --- /dev/null +++ b/graysky_bdver2-hotfix.patch @@ -0,0 +1,11 @@ +--- a/kernel_gcc_patch-20180509/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch ++++ b/kernel_gcc_patch-20180509/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch +@@ -492,7 +492,7 @@ + cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona) + + cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1) + + cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2) + + cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1) +-+ cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2) +++ cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2) $(call cc-option,-mno-tbm) + + cflags-$(CONFIG_MSTEAMROLLER) += $(call cc-option,-march=bdver3) + + cflags-$(CONFIG_MEXCAVATOR) += $(call cc-option,-march=bdver4) + + cflags-$(CONFIG_MZEN) += $(call cc-option,-march=znver1) |