5.16.2-2

2 files changed, 37 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d7ae4d570e2..c854c3713f32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cacule
 	pkgdesc = Linux cacULE scheduler Kernel by CachyOS and with some other patches and other improvements
-	pkgver = 5.16.1
-	pkgrel = 1
+	pkgver = 5.16.2
+	pkgrel = 2
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	arch = x86_64_v3
@@ -19,12 +19,11 @@ pkgbase = linux-cacule
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.16.1.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.16.2.tar.xz
 	source = config
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/sched/0001-cacULE-5.16-full.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-lru-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-arch-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-sched-perf-fix.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-blk-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-pm.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-anbox.patch
@@ -32,11 +31,11 @@ pkgbase = linux-cacule
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-bfq-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-btrfs.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-lrng.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cfi.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cpu.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-clearlinux.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-f2fs-xfs-ext4-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-misc.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-lqx-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-net-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-fixes-miscellaneous.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-pf-patches.patch
@@ -46,14 +45,13 @@ pkgbase = linux-cacule
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-rcu.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-zstd-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-v4l2loopback.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/next/0002-mm-next.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/next/0001-mm-next.patch
 	source = auto-cpu-optimization.sh
-	md5sums = 121e4f65cf16ff76527020ea596fa431
+	md5sums = fd00badc3b53d42da3d84a7cf6f53f17
 	md5sums = 6048a8eb052a7b2a22b4ab159278b903
 	md5sums = 02e7cbd91491ad357bf2d507d58e21a0
 	md5sums = 76b9d9fa00184d10e7949bb948ca846d
 	md5sums = 3d8d1eeebba7d038f6d890619233e605
-	md5sums = d6feae0f2dd1b24a853d335da003cb51
 	md5sums = 194c8e20ad30973c32159cb23f3be4c9
 	md5sums = 2faaa79055263c1cdeeaa2896e641696
 	md5sums = 80e419d6847d4122a23a141fd3a40e52
@@ -61,21 +59,21 @@ pkgbase = linux-cacule
 	md5sums = b5b3d9d1cefc3955a82ec895f891abf3
 	md5sums = e9dff9b551b8fa7c0b47ae5ac0b16365
 	md5sums = 9f86c3b9e6271cfc4440864a6857b256
+	md5sums = 0a353926bf4a790374e0f946a7039b40
 	md5sums = d4c38ce51fb9a69aa92ad9b9e0199122
 	md5sums = a687c26c262ccb9ad7cb54697a1476bc
-	md5sums = 2249b7ca0a7dfb0b2f835a8cc4058f1e
+	md5sums = a35a6dea9bc12029b3a837d86d4b842a
 	md5sums = 80920e501b9b87bfe587edff445e6efe
-	md5sums = 231fa80a33e7a926ba832d3bd66d2ce6
 	md5sums = bf010dff1d7a48191d491eba2dde1227
-	md5sums = b7867c9203f9f1ec1e3d6648a4659624
+	md5sums = 34a583709ee18ad075f497a1733aa8db
 	md5sums = be1e00d93e9c2ba91ee6017b82e64194
 	md5sums = 28dcc1fe3029c6c316773bbcbe82954d
-	md5sums = 0714c9817397ac7568afc3e327a20ddd
+	md5sums = 8fa4524671e6901bbdb47aaf8ecc0de8
 	md5sums = 12ad5085b7f01793980f137f2c9451cb
 	md5sums = 167a4267269e6a709c54e7b9ea8bf8d5
 	md5sums = bf58290793d3a095ef95fb1fac2de89a
 	md5sums = cb9384ce179d08be6c90df6d0a0977a1
-	md5sums = 1613d4689c58d19417a9cd7177f6454b
+	md5sums = 6bb03b7a1b9207aaf77fb886d42bab74
 	md5sums = 21c98f19e883879dd3336c1fa143fd31
 
 pkgname = linux-cacule
@@ -90,6 +88,6 @@ pkgname = linux-cacule
 	provides = WIREGUARD-MODULE
 
 pkgname = linux-cacule-headers
-	pkgdesc = Headers and scripts for building modules for the Linux cacULE scheduler Kernel by CachyOS and with some other patches and other improvements
-	depends = linux-cacule=5.16.1
+	pkgdesc = Headers and scripts for building modules for the Linux cacULE scheduler Kernel by CachyOS and with some other patches and other improvements kernel
+	depends = linux-cacule=5.16.2
 	depends = pahole
diff --git a/PKGBUILD b/PKGBUILD
index 3f09e8c6f343..e74a4efc35ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -122,7 +122,7 @@ else
   pkgbase=linux-cacule
 fi
 _major=5.16
-_minor=1
+_minor=2
 #_minorc=$((_minor+1))
 #_rcver=rc8
 pkgver=${_major}.${_minor}
@@ -133,7 +133,7 @@ _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 arch=(x86_64 x86_64_v3)
 pkgdesc='Linux cacULE scheduler Kernel by CachyOS and with some other patches and other improvements'
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL2')
@@ -143,20 +143,16 @@ makedepends=('kmod' 'bc' 'libelf' 'python-sphinx' 'python-sphinx_rtd_theme'
 if [ -n "$_use_llvm_lto" ]; then
   depends=(clang llvm lld python)
 fi
-if [ -n "$_use_llvm_lto" ]; then
-  makedepends+=(clang llvm lld python)
-fi
 _patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16"
 source=(
   "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
   "config"
-  #  "${_patchsource}/sched/0001-pjrc.patch"
+  #  "${_patchsource}/sched/0001-pjrc.patch" ## not released for 5.16 right now
   "${_patchsource}/sched/0001-cacULE-5.16-full.patch"
   #  "${_patchsource}/sched/0001-bore-sched.patch"
   #  "${_patchsource}/sched/0001-tt.patch"
   "${_patchsource}/0001-lru-patches.patch"
   "${_patchsource}/0001-arch-patches.patch"
-  "${_patchsource}/0001-sched-perf-fix.patch"
   "${_patchsource}/0001-blk-patches.patch"
   "${_patchsource}/0001-pm.patch"
   "${_patchsource}/0001-anbox.patch"
@@ -164,12 +160,11 @@ source=(
   "${_patchsource}/0001-bfq-patches.patch"
   "${_patchsource}/0001-btrfs.patch"
   "${_patchsource}/0001-lrng.patch"
-#  "${_patchsource}/0001-cfi.patch"
+  "${_patchsource}/0001-cfi.patch"
   "${_patchsource}/0001-cpu.patch"
   "${_patchsource}/0001-clearlinux.patch"
   "${_patchsource}/0001-f2fs-xfs-ext4-patches.patch"
   "${_patchsource}/0001-misc.patch"
-  "${_patchsource}/0001-lqx-patches.patch"
   "${_patchsource}/0001-net-patches.patch"
   "${_patchsource}/0001-fixes-miscellaneous.patch"
   "${_patchsource}/0001-pf-patches.patch"
@@ -178,10 +173,10 @@ source=(
   "${_patchsource}/0001-ksmbd.patch"
   "${_patchsource}/0001-rcu.patch"
   "${_patchsource}/0001-zstd-patches.patch"
-#  "${_patchsource}/0001-zen-patches.patch"
+  #  "${_patchsource}/0001-zen-patches.patch"
   "${_patchsource}/0001-v4l2loopback.patch"
-  "${_patchsource}/next/0002-mm-next.patch"
-#  "${_patchsource}/0001-FG-KASLR.patch"
+  #  "${_patchsource}/0001-FG-KASLR.patch"
+  "${_patchsource}/next/0001-mm-next.patch"
   "auto-cpu-optimization.sh"
 )
 
@@ -287,11 +282,11 @@ prepare() {
     exit
   fi
 
-#  if [ -n "$_use_cfi" ] && [ -n "$_use_llvm_lto" ]; then
-#    echo "Enabling CFI"
-#    scripts/config --enable CONFIG_ARCH_SUPPORTS_CFI_CLANG
-#    scripts/config --enable CONFIG_CFI_CLANG
-#  fi
+  #  if [ -n "$_use_cfi" ] && [ -n "$_use_llvm_lto" ]; then
+  #    echo "Enabling CFI"
+  #    scripts/config --enable CONFIG_ARCH_SUPPORTS_CFI_CLANG
+  #    scripts/config --enable CONFIG_CFI_CLANG
+  #  fi
 
   if [ -n "$_use_llvm_lto" ]; then
     echo "Enable LLVM LTO"
@@ -541,9 +536,10 @@ build() {
   make $LLVMOPTS -j$(nproc) all
 }
 
+
 _package() {
   pkgdesc="The $pkgdesc kernel and modules"
-  depends=('coreutils' 'kmod' 'initramfs')
+  depends=(coreutils kmod initramfs)
   optdepends=('crda: to set the correct wireless channels of your country'
     'linux-firmware: firmware images needed for some devices'
   'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
@@ -570,8 +566,9 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Headers and scripts for building modules for the ${pkgdesc}"
+  pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
   depends=("${pkgbase}=${pkgver}" "pahole")
+
   cd $_srcname
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
 
@@ -653,17 +650,16 @@ _package-headers() {
 pkgname=("$pkgbase" "$pkgbase-headers")
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {
-             $(declare -f "_package${_p#$pkgbase}")
-             _package${_p#$pkgbase}
+    $(declare -f "_package${_p#$pkgbase}")
+    _package${_p#$pkgbase}
   }"
 done
 
-md5sums=('121e4f65cf16ff76527020ea596fa431'
+md5sums=('fd00badc3b53d42da3d84a7cf6f53f17'
          '6048a8eb052a7b2a22b4ab159278b903'
          '02e7cbd91491ad357bf2d507d58e21a0'
          '76b9d9fa00184d10e7949bb948ca846d'
          '3d8d1eeebba7d038f6d890619233e605'
-         'd6feae0f2dd1b24a853d335da003cb51'
          '194c8e20ad30973c32159cb23f3be4c9'
          '2faaa79055263c1cdeeaa2896e641696'
          '80e419d6847d4122a23a141fd3a40e52'
@@ -671,19 +667,19 @@ md5sums=('121e4f65cf16ff76527020ea596fa431'
          'b5b3d9d1cefc3955a82ec895f891abf3'
          'e9dff9b551b8fa7c0b47ae5ac0b16365'
          '9f86c3b9e6271cfc4440864a6857b256'
+         '0a353926bf4a790374e0f946a7039b40'
          'd4c38ce51fb9a69aa92ad9b9e0199122'
          'a687c26c262ccb9ad7cb54697a1476bc'
-         '2249b7ca0a7dfb0b2f835a8cc4058f1e'
+         'a35a6dea9bc12029b3a837d86d4b842a'
          '80920e501b9b87bfe587edff445e6efe'
-         '231fa80a33e7a926ba832d3bd66d2ce6'
          'bf010dff1d7a48191d491eba2dde1227'
-         'b7867c9203f9f1ec1e3d6648a4659624'
+         '34a583709ee18ad075f497a1733aa8db'
          'be1e00d93e9c2ba91ee6017b82e64194'
          '28dcc1fe3029c6c316773bbcbe82954d'
-         '0714c9817397ac7568afc3e327a20ddd'
+         '8fa4524671e6901bbdb47aaf8ecc0de8'
          '12ad5085b7f01793980f137f2c9451cb'
          '167a4267269e6a709c54e7b9ea8bf8d5'
          'bf58290793d3a095ef95fb1fac2de89a'
          'cb9384ce179d08be6c90df6d0a0977a1'
-         '1613d4689c58d19417a9cd7177f6454b'
+         '6bb03b7a1b9207aaf77fb886d42bab74'
          '21c98f19e883879dd3336c1fa143fd31')