summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD16
-rw-r--r--graysky_bdver2-hotfix.patch11
2 files changed, 5 insertions, 22 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9820838..6f21055 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# # I maintain this because:
# Parabola version patch script does not apply consistently
-# Parabola version lacks graysky gcc patch with bdver2 fix
+# Parabola version lacks graysky gcc patch
# Parabola version lacks ath9k regdom and raid6 algo patches
# Parabola version is 300 Hz
# Parabola version does not disable lockdown eee
@@ -13,8 +13,8 @@
pkgbase=linux-libre
_supver=5
_majver=7
-_minver=2
-_gccpatchver='20200527'
+_minver=3
+_gccpatchver='20200615'
_gccpatchger='10.1'
_gccpatchker='5.7'
if [ "$_minver" == "0" ]; then
@@ -39,7 +39,6 @@ _gnupkgver=${pkgver}-gnu
source=(
https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- graysky_bdver2-hotfix.patch
kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
ath9k-regdom-hack.patch
raid6-default-algo.patch
@@ -55,13 +54,12 @@ validpgpkeys=(
b2sums=('bb65e65c69d1c38943327a0859028c843439590e9f1af66705a0fe01aaf006daf14a5a0adfaef6d1de53511e50b2f6b8ee13caa63dd7cf4065253599fe524998'
'SKIP'
'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e'
- '76137504bd6eb54b9aa1eb3f3d78ec60b80d607d0554ba5ec60431db2b62963354e1461b57a8de4f89d4399ef7f66041c6b2366b5d9fd53d5f9857a9dabd4188'
- 'c8a52c056ecaeba55bee0b17c6a264d460792694e883b5654b8c1694b376a25be4aff1e6b86b5e3486c6e3adfc2062f805e91a9cac1156d0104d7e781028bec6'
+ 'c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c'
'2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
'95cdd67fad8737283e518d32356a961e3aae99832886526222cbc98c29c76eec3f9054d5bc2d03f4f76390aa44c55d4ee6832f25a0f3f6118eee73f5e42774ef'
'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
- '20b691537a67a8da0e585dfaf7f8a939b5ba44d979f0c7858e9c91b09c40cf85ec2a8f0a133e562546ee6b9630acee91d36f85d0bb27afa9c9b9d72ba9341aae'
+ '4d48bdf1cc3b911a2be3999c0092cf1be4f81c186a697f635e8f1892d350b721c54021b6e1712c4fd68922c60db0181d9696b7c1b0750e8ca972f6a416a40c65'
'SKIP')
#export KBUILD_BUILD_HOST=arc4linux
@@ -84,10 +82,6 @@ prepare() {
patch -p1 -i ../sphinx-workaround.patch
- # 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"
-
# 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
diff --git a/graysky_bdver2-hotfix.patch b/graysky_bdver2-hotfix.patch
deleted file mode 100644
index 0b3e809..0000000
--- a/graysky_bdver2-hotfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
- + 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)