summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD57
2 files changed, 38 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6c7168904b4..724d42512f94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-clear
- pkgver = 5.1.19
+ pkgver = 5.2.2
pkgrel = 1
url = https://github.com/clearlinux-pkgs/linux
arch = x86_64
@@ -12,12 +12,12 @@ pkgbase = linux-clear
makedepends = linux-firmware
makedepends = xmlto
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.1.tar.xz
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.1.tar.sign
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.1.19.xz
- source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.1.16-795
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.sign
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.2.2.xz
+ source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.2.2-802
source = intel-ucode-20190618.tar.gz::https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190618.tar.gz
- source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz
+ source = enable_additional_cpu_optimizations-20190714.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190714.tar.gz
source = add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio
source = 60-linux.hook
source = 90-linux.hook
@@ -25,12 +25,12 @@ pkgbase = linux-clear
source = linux.preset
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = d06a7be6e73f97d1350677ad3bae0ce7daecb79c2c2902aaabe806f7fa94f041
+ sha256sums = 54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7
sha256sums = SKIP
- sha256sums = 9ecde5b77ab4d7a7d42e739e96d3fa0c8360eb2f57fd51e9fbf06c3f4c41cdbb
+ sha256sums = 729084da258dd41195aae7f6c897b92f2e9355c0f9d28beec1fb8e67984afdf0
sha256sums = SKIP
sha256sums = 74ec7415988d40fa53686d994cf8cb27accdbd35c5373c4c3afc2e93372ebba5
- sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d
+ sha256sums = 2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b
sha256sums = dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
diff --git a/PKGBUILD b/PKGBUILD
index c1a6bf7b57d7..ad643575965f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _enable_gcc_more_v="y"
# Optionally select a sub architecture by number if building in a clean chroot
# Leaving this entry blank will require user interaction during the build
# which will cause a failure to build if using makechrootpkg. Note that the
-# generic (default) option is 26.
+# generic (default) option is 27.
#
# 1. AMD Opteron/Athlon64/Hammer/K8 (MK8)
# 2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3)
@@ -24,23 +24,24 @@ _enable_gcc_more_v="y"
# 9. AMD Steamroller (MSTEAMROLLER)
# 10. AMD Excavator (MEXCAVATOR)
# 11. AMD Zen (MZEN)
-# 12. Intel P4 / older Netburst based Xeon (MPSC)
-# 13. Intel Atom (MATOM)
-# 14. Intel Core 2 (MCORE2)
-# 15. Intel Nehalem (MNEHALEM)
-# 16. Intel Westmere (MWESTMERE)
-# 17. Intel Silvermont (MSILVERMONT)
-# 18. Intel Sandy Bridge (MSANDYBRIDGE)
-# 19. Intel Ivy Bridge (MIVYBRIDGE)
-# 20. Intel Haswell (MHASWELL)
-# 21. Intel Broadwell (MBROADWELL)
-# 22. Intel Skylake (MSKYLAKE)
-# 23. Intel Skylake X (MSKYLAKEX)
-# 24. Intel Cannon Lake (MCANNONLAKE)
-# 25. Intel Ice Lake (MICELAKE)
-# 26. Generic-x86-64 (GENERIC_CPU)
-# 27. Native optimizations autodetected by GCC (MNATIVE)
-_subarch=27
+# 12. AMD Zen 2 (MZEN2)
+# 13. Intel P4 / older Netburst based Xeon (MPSC)
+# 14. Intel Atom (MATOM)
+# 15. Intel Core 2 (MCORE2)
+# 16. Intel Nehalem (MNEHALEM)
+# 17. Intel Westmere (MWESTMERE)
+# 18. Intel Silvermont (MSILVERMONT)
+# 19. Intel Sandy Bridge (MSANDYBRIDGE)
+# 20. Intel Ivy Bridge (MIVYBRIDGE)
+# 21. Intel Haswell (MHASWELL)
+# 22. Intel Broadwell (MBROADWELL)
+# 23. Intel Skylake (MSKYLAKE)
+# 24. Intel Skylake X (MSKYLAKEX)
+# 25. Intel Cannon Lake (MCANNONLAKE)
+# 26. Intel Ice Lake (MICELAKE)
+# 27. Generic-x86-64 (GENERIC_CPU)
+# 28. Native optimizations autodetected by GCC (MNATIVE)
+_subarch=28
# Compile ONLY probed modules
# Build in only the modules that you currently have probed in your system VASTLY
@@ -61,10 +62,10 @@ _enable_acs_override="y"
### IMPORTANT: Do no edit below this line unless you know what you're doing
-_major=5.1
-_minor=19
+_major=5.2
+_minor=2
_srcname=linux-${_major}
-_clr=${_major}.16-795
+_clr=${_major}.2-802
pkgbase=linux-clear
pkgver=${_major}.${_minor}
pkgrel=1
@@ -74,7 +75,7 @@ license=('GPL2')
makedepends=('bc' 'git' 'inetutils' 'kmod' 'libelf' 'linux-firmware' 'xmlto')
options=('!strip')
_ucode='20190618'
-_gcc_more_v='20180509'
+_gcc_more_v='20190714'
source=(
"https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
"https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign"
@@ -106,7 +107,7 @@ prepare() {
echo "$_kernelname" > localversion.20-pkgname
### Add Clearlinux patches
- for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0126|^Patch0009' | sed -n 's/.*: //p'); do
+ for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0125' | sed -n 's/.*: //p'); do
msg2 "Applying patch ${i}..."
patch -Np1 -i "$srcdir/clearlinux/${i}"
done
@@ -138,8 +139,8 @@ CONFIG_MODULE_COMPRESS_XZ=y|' ./.config
### Patch source to unlock additional gcc CPU optimizations
# https://github.com/graysky2/kernel_gcc_patch
if [ "${_enable_gcc_more_v}" = "y" ]; then
- msg2 "Enabling additional gcc CPU optimizations..."
- patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch"
+ msg2 "Applying enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch ..."
+ patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch"
fi
### Enable ACS override patch
@@ -338,12 +339,12 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha256sums=('d06a7be6e73f97d1350677ad3bae0ce7daecb79c2c2902aaabe806f7fa94f041'
+sha256sums=('54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7'
'SKIP'
- '9ecde5b77ab4d7a7d42e739e96d3fa0c8360eb2f57fd51e9fbf06c3f4c41cdbb'
+ '729084da258dd41195aae7f6c897b92f2e9355c0f9d28beec1fb8e67984afdf0'
'SKIP'
'74ec7415988d40fa53686d994cf8cb27accdbd35c5373c4c3afc2e93372ebba5'
- '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
+ '2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b'
'dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'