arch-patches

2 files changed, 59 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35f8f3798fa8..219debea01b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-cacule-rdb-llvm
 	pkgdesc = Linux-CacULE Kernel-RDB by Hamad Marri and with some other patchsets compiled with FULL-LTO
 	pkgver = 5.14.2
-	pkgrel = 2
-	url = https://github.com/hamadmarri/cacule-cpu-scheduler
+	pkgrel = 4
+	url = https://github.com/ptr1337/linux-cacule
 	arch = x86_64
 	arch = x86_64_v3
 	license = GPL2
@@ -24,41 +24,43 @@ pkgbase = linux-cacule-rdb-llvm
 	options = !strip
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.2.tar.xz
 	source = config
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/CacULE/v5.14/cacule-5.14-full.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/misc/0004-folio-mm.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/misc/0007-string.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/misc/allpollingrate.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/misc/0001-LL-kconfig-add-750Hz-timer-interrupt-kernel-config-o.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/bfq-patches/0001-bfq-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/bbr2-patches/0001-bbr2-5.14-introduce-BBRv2.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/block-patches/0001-block-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/btrfs-patches-v2/0001-btrfs-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/fixes-miscellaneous-v3/0001-fixes-miscellaneous.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/futex-zen-patches/0001-futex-resync-from-gitlab.collabora.com.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/futex2-zen-patches/0001-futex2-resync-from-gitlab.collabora.com.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/lqx-patches/0001-lqx-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/lrng-patches/0001-lrng-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/mm-patches/0001-mm-5.14-protect-mappings-under-memory-pressure.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/pf-patches-v4/0001-pf-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/xanmod-patches/0001-xanmod-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/zen-patches/0001-zen-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/zstd-patches-v2/0001-zstd-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/zstd-upstream-patches-v2/0001-zstd-upstream-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/ntfs3-patches-v4/0001-ntfs3-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/0001-cpu-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/0001-winesync.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/0001-v4l2loopback.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14/0001-ksm.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/arch-patches-v3/0001-arch-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/CacULE/v5.14/cacule-5.14-full.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/0004-folio-mm.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/0007-string.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/allpollingrate.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0002-clang-cfi.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/0001-LL-kconfig-add-750Hz-timer-interrupt-kernel-config-o.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/bfq-patches/0001-bfq-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/bbr2-patches/0001-bbr2-5.14-introduce-BBRv2.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/block-patches/0001-block-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/btrfs-patches-v2/0001-btrfs-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/fixes-miscellaneous-v3/0001-fixes-miscellaneous.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/futex-zen-patches/0001-futex-resync-from-gitlab.collabora.com.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/futex2-zen-patches/0001-futex2-resync-from-gitlab.collabora.com.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/lqx-patches/0001-lqx-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/lrng-patches/0001-lrng-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/mm-patches/0001-mm-5.14-protect-mappings-under-memory-pressure.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/pf-patches-v4/0001-pf-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/xanmod-patches/0001-xanmod-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/zen-patches/0001-zen-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/zstd-patches-v2/0001-zstd-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/zstd-upstream-patches-v2/0001-zstd-upstream-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/ntfs3-patches-v4/0001-ntfs3-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-cpu-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-winesync.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-v4l2loopback.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-ksm.patch
 	source = auto-cpu-optimization.sh
 	md5sums = e111bd84156ac6b19568a495eed46400
 	md5sums = 1c0a09a4686636c79fbc0237a7a6ed3f
-	md5sums = cf26387aadf2a90428350ac246b070c9
+	md5sums = 8a45ded67e2d5235e652fb0f1672f91d
 	md5sums = 024a0126cfcd18e000a2241f35c4d69e
 	md5sums = a804260e2f301ffe2a17d6e3625a9711
 	md5sums = d6e5581b4fade267a28deb8e73d236f5
 	md5sums = f154315498da9bf593c11d88041bde48
+	md5sums = 0c91c9b8b37727593d39e9d874ebc8dc
 	md5sums = f8e172e9ea554bbb1053eb122c3ace35
 	md5sums = a0285c065b902ca625119e4ad43cbab4
 	md5sums = e45c7962a78d6e82a0d3808868cd6ac0
diff --git a/PKGBUILD b/PKGBUILD
index 89c2e5f72aad..ac58f2d43ea1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -54,6 +54,12 @@ _use_optimization=y
 ## Apply Kernel Optimization selecting
 _use_optimization_select=
 
+## Enable CFI (booting seems to be broken at nvidia based systems)
+_use_cfi=
+
+## Enable PGO (patch is failing when cfi is also used)
+_use_pgo=
+
 
 # Only compile active modules to VASTLY reduce the number of modules built and
 # the build time.
@@ -76,25 +82,27 @@ pkgbase=linux-cacule-rdb-llvm
 pkgname=('linux-cacule-rdb-llvm' 'linux-cacule-rdb-llvm-headers')
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver=5.14.2
-pkgrel=2
+pkgrel=4
 arch=(x86_64 x86_64_v3)
 pkgdesc='Linux-CacULE Kernel-RDB by Hamad Marri and with some other patchsets compiled with FULL-LTO'
 _gittag=v${pkgver%.*}-${pkgver##*.}
 arch=('x86_64' 'x86_64_v3')
-url="https://github.com/hamadmarri/cacule-cpu-scheduler"
+url="https://github.com/ptr1337/linux-cacule"
 license=('GPL2')
 options=('!strip')
 makedepends=('kmod' 'bc' 'libelf' 'python-sphinx' 'python-sphinx_rtd_theme'
              'graphviz' 'imagemagick' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'llvm' 'llvm-libs' 'lld')
-_caculepatches="https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/CacULE"
-_patchsource="https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.14"
+_caculepatches="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/CacULE"
+_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14"
 source=("https://cdn.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver}.tar.xz"
         "config"
-        "${_patchsource}/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+#        "${_patchsource}/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+        "${_patchsource}/arch-patches-v3/0001-arch-patches.patch"
         "${_caculepatches}/v5.14/cacule-5.14-full.patch"
         "${_patchsource}/misc/0004-folio-mm.patch"
         "${_patchsource}/misc/0007-string.patch"
         "${_patchsource}/misc/allpollingrate.patch"
+        "${_patchsource}/0002-clang-cfi.patch"
         "${_patchsource}/misc/0001-LL-kconfig-add-750Hz-timer-interrupt-kernel-config-o.patch"
         "${_patchsource}/bfq-patches/0001-bfq-patches.patch"
         "${_patchsource}/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch"
@@ -119,6 +127,12 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver
         "${_patchsource}/0001-ksm.patch"
 	      "auto-cpu-optimization.sh"
         )
+        if [ -n "$_use_cfi" ]; then
+          source+=("${_patchsource}/0002-clang-cfi.patch")
+        fi
+        if [ -n "$_use_pgo" ]; then
+          source+=("${_patchsource}/0001-PGO.patch")
+        fi
 
 BUILD_FLAGS=(
   LLVM=1
@@ -527,11 +541,12 @@ package_linux-cacule-rdb-llvm-headers() {
 
 md5sums=('e111bd84156ac6b19568a495eed46400'
          '1c0a09a4686636c79fbc0237a7a6ed3f'
-         'cf26387aadf2a90428350ac246b070c9'
+         '8a45ded67e2d5235e652fb0f1672f91d'
          '024a0126cfcd18e000a2241f35c4d69e'
          'a804260e2f301ffe2a17d6e3625a9711'
          'd6e5581b4fade267a28deb8e73d236f5'
          'f154315498da9bf593c11d88041bde48'
+         '0c91c9b8b37727593d39e9d874ebc8dc'
          'f8e172e9ea554bbb1053eb122c3ace35'
          'a0285c065b902ca625119e4ad43cbab4'
          'e45c7962a78d6e82a0d3808868cd6ac0'
@@ -555,3 +570,9 @@ md5sums=('e111bd84156ac6b19568a495eed46400'
          '95eb4457f95f3f8dd153983612ee65c0'
          '566435a0444ee45816599f2e0e362c7a'
          '6bfbbe0bbb79379203889ed7df5e5288')
+if [ -n "$_use_cfi" ]; then
+  md5sums+=("SKIP")
+fi
+if [ -n "$_use_pgo" ]; then
+  md5sums+=("SKIP")
+fi