From 593d9f3b569cc71a28c24677205e3f244df9c08d Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 1 May 2019 18:42:38 -0700
Subject: Updated to 5.0.10.a Added bdver2 greysky patch Minor formattting
 changes

---
 PKGBUILD | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 43ee693..af089be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 # # I maintain this because:
 # Parabola version patch script does not apply consistently
-# Parabola version lacks ath9k, greysky2, and raid6 patches
+# Parabola version lacks ath9k, bdver2, greysky2, and raid6 patches
 # Parabola version lacks ck patches
 # Parabola version allows SEED, SM3, SM4, and Streebog
 # Parabola version is 300 Hz
@@ -17,7 +17,7 @@
 
 pkgbase=linux-libre-hardened-ck
 _majver=5.0
-_minver=7
+_minver=10
 _pkgver=${_majver}.${_minver}
 _gnumajver=${_majver}-gnu
 _gnupkgver=${_pkgver}-gnu
@@ -35,33 +35,36 @@ license=('GPL2')
 makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
 conflicts=('linux-hardened-ck')
 options=('!strip')
-source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
+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}
         https://github.com/anthraxx/linux-hardened/releases/download/${pkgver}/linux-hardened-${pkgver}.patch{,.sig}
         remove-excess-ck-extraversion.patch
         modify-ck-for-hardened.patch
         http://ck.kolivas.org/patches/5.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatch}.xz
         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
         60-linux.hook  # pacman hook for depmod
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
-)
+       )
 sha256sums=('7df5025d1960520bfea158054130467770eca379999d5ac48175ed5ee804faa1'
             'SKIP'
-            'e4db17f7499016ae9f073e41ed684fa3eee5fdc0aace5d96b6ea567e613bdc23'
+            '0bfb5916039158d920979229b41acce6d4be0cee67737bc704a6c19cc418135b'
             'SKIP'
-            '250494afb2dce0c4805223b32a3abad2c146d628c7b972c361ae3e7fa3ea8ee6'
+            'da6aff1ea5e2c39987fea2fc5a67b7ef5419a6ba9ed728c94f89ce888b543a12'
             'SKIP'
             '2a551169f8cbb424900372fe698ae9003fbcad3614a46ca3f56b103f9c1ea763'
             'b6defd1ef672b73631ecfa79fc204d6219175f333b53d86af668c1e1a9b6288e'
             '661f64bbd8bf49afcc7c760c4148b2e2108511a1eadcae917cfe6056a83d8476'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
+            'd35338c92d0dbf27ffedaf100bd852dd13fd9b5d49b12a10b91194a2ae654447'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
             '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
-            '42372f522f8655f43d3d95db2aa83edfd9e8210999bcecaed521b37884771277'
+            '4e9a8b97837a16be027b13a2059ac14e33cf6959b91dc3fa7ca95df7c1df7e0d'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -81,7 +84,7 @@ prepare() {
   patch -Np1 < ../patch-${_gnumajver}-${_gnupkgver}
 
   # Hotfixes
-#   msg2 "Applying hotfixes"
+  # msg2 "Applying hotfixes"
 
   # linux hardened patch
   msg2 "Applying hardened patch"
@@ -101,12 +104,16 @@ prepare() {
   msg2 "Applying graysky2 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"
   patch -p1 -i ../ath9k-regdom-hack.patch
 
   # Set default raid6 algo patch
-  msg " Applying raid6 patch"
+  msg2 " Applying raid6 patch"
   patch -p1 -i ../raid6-default-algo.patch
 
 
-- 
cgit v1.2.1