6.4.5

3 files changed, 104 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d9511dd1150..6cbea82d247b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-manjaro-xanmod
 	pkgdesc = Linux Xanmod
-	pkgver = 6.3.5
+	pkgver = 6.4.5
 	pkgrel = 1
 	url = http://www.xanmod.org/
 	arch = x86_64
@@ -17,21 +17,21 @@ pkgbase = linux-manjaro-xanmod
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.sign
-	source = https://github.com/xanmod/linux/releases/download/6.3.5-xanmod1/patch-6.3.5-xanmod1.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.sign
+	source = https://github.com/xanmod/linux/releases/download/6.4.5-xanmod1/patch-6.4.5-xanmod1.xz
 	source = choose-gcc-optimization.sh
-	source = https://gitlab.manjaro.org/packages/core/linux63/-/archive/00ef030daa80b01c1e56f9ba20cf7c627d7c5791/linux63-00ef030daa80b01c1e56f9ba20cf7c627d7c5791.tar.gz
+	source = https://gitlab.manjaro.org/packages/core/linux64/-/archive/b7f9ddcc394c11061450ef3f813701454865b1bd/linux64-b7f9ddcc394c11061450ef3f813701454865b1bd.tar.gz
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
+	sha256sums = 8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3
 	sha256sums = SKIP
-	sha256sums = 81aec306b4bae742f3fa8fdc6ea156224d5fdf281d08382519d594c5826059d5
-	sha256sums = 5c84bfe7c1971354cff3f6b3f52bf33e7bbeec22f85d5e7bfde383b54c679d30
-	sha256sums = c916ebd9d2553ce4452146c779804dd2e858c5cd267bb624c9f683e136e9edf7
+	sha256sums = 225f7f1c616f4796eade829f8f7c5543f9e4075441482c55fd84373c2ac93bf4
+	sha256sums = a8b38eb482eb685944757182c4886404abc12703e5e56ec39c7d61298d17d71f
+	sha256sums = 7c528562d20c01035277d4897eaafd5245865cffbfa8d542c0e0bfa47dde8997
 
 pkgname = linux-manjaro-xanmod
-	pkgdesc = The Linux kernel and modules with Xanmod and Manjaro patches (Bootsplash support). Ashmem and binder are enabled
+	pkgdesc = The Linux kernel and modules with Xanmod and Manjaro patches
 	depends = coreutils
 	depends = linux-firmware
 	depends = kmod
diff --git a/PKGBUILD b/PKGBUILD
index eddb1ea9e593..67644f8df8fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,10 +33,10 @@ if [ -z ${use_numa+x} ]; then
   use_numa=y
 fi
 
-## For performance you can disable FUNCTION_TRACER/GRAPH_TRACER. Limits debugging and analyzing of the kernel.
-## Stock Archlinux and Xanmod have this enabled.
-## Set variable "use_tracers" to: n to disable (possibly increase performance)
-##                                y to enable  (stock default)
+## Since upstream disabled CONFIG_STACK_TRACER (limits debugging and analyzing of the kernel)
+## you can enable them setting this option. Caution, because they have an impact in performance.
+## Stock Archlinux has this enabled.
+## Set variable "use_tracers" to: n to disable (possibly increase performance, XanMod default)
 if [ -z ${use_tracers+x} ]; then
   use_tracers=y
 fi
@@ -83,7 +83,7 @@ fi
 
 pkgbase=linux-manjaro-xanmod
 pkgname=("${pkgbase}" "${pkgbase}-headers")
-_major=6.3
+_major=6.4
 pkgver=${_major}.5
 _branch=6.x
 xanmod=1
@@ -92,7 +92,7 @@ pkgdesc='Linux Xanmod'
 url="http://www.xanmod.org/"
 arch=(x86_64)
 
-__commit="00ef030daa80b01c1e56f9ba20cf7c627d7c5791" # 6.3.5-2
+__commit="b7f9ddcc394c11061450ef3f813701454865b1bd" # 6.4.5
 
 license=(GPL2)
 makedepends=(
@@ -119,11 +119,11 @@ for _patch in ${_patches[@]}; do
     source+=("${_patch}::https://raw.githubusercontent.com/archlinux/svntogit-packages/${_commit}/trunk/${_patch}")
 done
         
-sha256sums=('ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e'  # kernel tar.xz
+sha256sums=('8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3'  # kernel tar.xz
             'SKIP'                                                              #        tar.sign
-            '81aec306b4bae742f3fa8fdc6ea156224d5fdf281d08382519d594c5826059d5'  # xanmod
-            '5c84bfe7c1971354cff3f6b3f52bf33e7bbeec22f85d5e7bfde383b54c679d30'  # choose-gcc-optimization.sh
-            'c916ebd9d2553ce4452146c779804dd2e858c5cd267bb624c9f683e136e9edf7') # manjaro
+            '225f7f1c616f4796eade829f8f7c5543f9e4075441482c55fd84373c2ac93bf4'  # xanmod
+            'a8b38eb482eb685944757182c4886404abc12703e5e56ec39c7d61298d17d71f'  # choose-gcc-optimization.sh
+            '7c528562d20c01035277d4897eaafd5245865cffbfa8d542c0e0bfa47dde8997') # manjaro
 
 validpgpkeys=(
     'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
@@ -158,6 +158,8 @@ prepare() {
   
   # remove conflicting ones
   rm ../linux${_major//.}-$__commit/0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch
+  rm ../linux${_major//.}-$__commit/0102-netfilter-nf_tables-unbind_non-anonymous.patch
+  rm ../linux${_major//.}-$__commit/0202-amd-drm-fixes-6.4-2023-06-23.patch
   
   local _patch
   for _patch in ../linux${_major//.}-$__commit/*; do
@@ -165,7 +167,6 @@ prepare() {
       msg2 "Applying patch: $_patch..."
       patch -Np1 < "../linux${_major//.}-$__commit/$_patch"
   done 
-  git apply -p1 < "../linux${_major//.}-$__commit/0413-bootsplash.gitpatch"
   
   
   # Applying configuration
@@ -176,7 +177,6 @@ prepare() {
     scripts/config --enable LTO_CLANG_THIN
   fi
   
-  scripts/config --enable CONFIG_BOOTSPLASH
   
   # CONFIG_STACK_VALIDATION gives better stack traces. Also is enabled in all official kernel packages by Archlinux team
   scripts/config --enable CONFIG_STACK_VALIDATION
@@ -273,7 +273,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The Linux kernel and modules with Xanmod and Manjaro patches (Bootsplash support). Ashmem and binder are enabled"
+  pkgdesc="The Linux kernel and modules with Xanmod and Manjaro patches"
   depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs')
   optdepends=('crda: to set the correct wireless channels of your country'
               'linux-firmware: firmware images needed for some devices'
diff --git a/choose-gcc-optimization.sh b/choose-gcc-optimization.sh
index fe05516c66c6..38772443028a 100755
--- a/choose-gcc-optimization.sh
+++ b/choose-gcc-optimization.sh
@@ -11,54 +11,44 @@ cat << EOF
 
     Available CPU microarchitectures:
 
-    1) AMD K6/K6-II/K6-III
-    2) AMD Athlon/Duron/K7
-    3) AMD Opteron/Athlon64/Hammer/K8
-    4) AMD Opteron/Athlon64/Hammer/K8 with SSE3
-    5) AMD 61xx/7x50/PhenomX3/X4/II/K10
-    6) AMD Family 10h (Barcelona)
-    7) AMD Family 14h (Bobcat)
-    8) AMD Family 16h (Jaguar)
-    9) AMD Family 15h (Bulldozer)
-   10) AMD Family 15h (Piledriver)
-   11) AMD Family 15h (Steamroller)
-   12) AMD Family 15h (Excavator)
-   13) AMD Family 17h (Zen)
-   14) AMD Family 17h (Zen 2)
-   15) AMD Family 19h Zen 3 processors (Zen 3)
-   16) Transmeta Crusoe
-   17) Transmeta Efficeon
-   18) IDT Winchip C6
-   19) Winchip-2/Winchip-2A/Winchip-3
-   20) AMD Elan
-   21) Geode GX1 (Cyrix MediaGX)
-   22) AMD Geode GX and LX
-   23) Cyrix III or C3
-   24) VIA C3 "Nehemiah"
-   25) VIA C7
-   26) Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit
-   27) Intel Atom
-   28) Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
-   29) Intel 1st Gen Core i3/i5/i7-family (Nehalem)
-   30) Intel 1.5 Gen Core i3/i5/i7-family (Westmere)
-   31) Intel Silvermont
-   32) Intel Goldmont (Apollo Lake and Denverton)
-   33) Intel Goldmont Plus (Gemini Lake)
-   34) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge)
-   35) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge)
-   36) Intel 4th Gen Core i3/i5/i7-family (Haswell)
-   37) Intel 5th Gen Core i3/i5/i7-family (Broadwell)
-   38) Intel 6th Gen Core i3/i5/i7-family (Skylake)
-   39) Intel 6th Gen Core i7/i9-family (Skylake X)
-   40) Intel 8th Gen Core i3/i5/i7-family (Cannon Lake)
-   41) Intel 8th Gen Core i7/i9-family (Ice Lake)
-   42) Xeon processors in the Cascade Lake family
-   43) Intel Xeon (Cooper Lake)
-   44) Intel 3rd Gen 10nm++ i3/i5/i7/i9-family (Tiger Lake)
-   45) Intel Sapphire Rapids
-   46) Intel Rocket Lake
-   47) Intel Alder Lake
+    1) AMD Opteron/Athlon64/Hammer/K8
+    2) AMD Opteron/Athlon64/Hammer/K8 with SSE3
+    3) AMD 61xx/7x50/PhenomX3/X4/II/K10
+    4) AMD Family 10h (Barcelona)
+    5) AMD Family 14h (Bobcat)
+    6) AMD Family 16h (Jaguar)
+    7) AMD Family 15h (Bulldozer)
+    8) AMD Family 15h (Piledriver)
+    9) AMD Family 15h (Steamroller)
+   10) AMD Family 15h (Excavator)
+   11) AMD Family 17h (Zen)
+   12) AMD Family 17h (Zen 2)
+   13) AMD Family 19h (Zen 3)
+   14) AMD Family 19h (Zen 4)
+   15) Intel P4 / older Netburst based Xeon
+   16) Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
+   17) Intel Atom
+   18) Intel 1st Gen Core i3/i5/i7-family (Nehalem)
+   19) Intel 1.5 Gen Core i3/i5/i7-family (Westmere)
+   20) Intel Silvermont
+   21) Intel Goldmont (Apollo Lake and Denverton)
+   22) Intel Goldmont Plus (Gemini Lake)
+   23) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge)
+   24) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge)
+   25) Intel 4th Gen Core i3/i5/i7-family (Haswell)
+   26) Intel 5th Gen Core i3/i5/i7-family (Broadwell)
+   27) Intel 6th Gen Core i3/i5/i7-family (Skylake)
+   28) Intel 6th Gen Core i7/i9-family (Skylake X)
+   29) Intel 8th Gen Core i3/i5/i7-family (Cannon Lake)
+   30) Intel 8th Gen Core i7/i9-family (Ice Lake)
+   31) Xeon processors in the Cascade Lake family
+   32) Intel Xeon (Cooper Lake)
+   33) Intel 3rd Gen 10nm++ i3/i5/i7/i9-family (Tiger Lake)
+   34) Intel Sapphire Rapids
+   35) Intel Rocket Lake
+   36) Intel Alder Lake
 
+   91) Generic-x86-64-v1 (LEGACY < 2003. Not supported by XanMod project)
    92) Generic-x86-64-v2 (Nehalem and newer)
    93) Generic-x86-64-v3 (Haswell and newer)
    94) Generic-x86-64-v4 (AVX512 CPUs)
@@ -66,7 +56,7 @@ cat << EOF
    98) Intel-Native optimizations autodetected by GCC
    99) AMD-Native optimizations autodetected by GCC
 
-    0) Generic x64-v1 (default)
+    0) Generic x64-v2 (default)
     
 EOF
 
@@ -74,59 +64,49 @@ sleep 1
 answer=$1
 
 case $answer in
-    1) Microarchitecture=CONFIG_MK6 ;;
-    2) Microarchitecture=CONFIG_MK7 ;;
-    3) Microarchitecture=CONFIG_MK8 ;;
-    4) Microarchitecture=CONFIG_MK8SSE3 ;;
-    5) Microarchitecture=CONFIG_MK10 ;;
-    6) Microarchitecture=CONFIG_MBARCELONA ;;
-    7) Microarchitecture=CONFIG_MBOBCAT ;;
-    8) Microarchitecture=CONFIG_MJAGUAR ;;
-    9) Microarchitecture=CONFIG_MBULLDOZER ;;
-   10) Microarchitecture=CONFIG_MPILEDRIVER ;;
-   11) Microarchitecture=CONFIG_MSTEAMROLLER ;;
-   12) Microarchitecture=CONFIG_MEXCAVATOR ;;
-   13) Microarchitecture=CONFIG_MZEN ;;
-   14) Microarchitecture=CONFIG_MZEN2 ;;
-   15) Microarchitecture=CONFIG_MZEN3 ;;
-   16) Microarchitecture=CONFIG_MCRUSOE ;;
-   17) Microarchitecture=CONFIG_MEFFICEON ;;
-   18) Microarchitecture=CONFIG_MWINCHIPC6 ;;
-   19) Microarchitecture=CONFIG_MWINCHIP3D ;;
-   20) Microarchitecture=CONFIG_MELAN ;;
-   21) Microarchitecture=CONFIG_MGEODEGX1 ;;
-   22) Microarchitecture=CONFIG_MGEODE_LX ;;
-   23) Microarchitecture=CONFIG_MCYRIXIII ;;
-   24) Microarchitecture=CONFIG_MVIAC3_2 ;;
-   25) Microarchitecture=CONFIG_MVIAC7 ;;
-   26) Microarchitecture=CONFIG_MPSC ;;
-   27) Microarchitecture=CONFIG_MATOM ;;
-   28) Microarchitecture=CONFIG_MCORE2 ;;
-   29) Microarchitecture=CONFIG_MNEHALEM ;;
-   30) Microarchitecture=CONFIG_MWESTMERE ;;
-   31) Microarchitecture=CONFIG_MSILVERMONT ;;
-   32) Microarchitecture=CONFIG_MGOLDMONT ;;
-   33) Microarchitecture=CONFIG_MGOLDMONTPLUS ;;
-   34) Microarchitecture=CONFIG_MSANDYBRIDGE ;;
-   35) Microarchitecture=CONFIG_MIVYBRIDGE ;;
-   36) Microarchitecture=CONFIG_MHASWELL ;;
-   37) Microarchitecture=CONFIG_MBROADWELL ;;
-   38) Microarchitecture=CONFIG_MSKYLAKE ;;
-   39) Microarchitecture=CONFIG_MSKYLAKEX ;;
-   40) Microarchitecture=CONFIG_MCANNONLAKE ;;
-   41) Microarchitecture=CONFIG_MICELAKE ;;
-   42) Microarchitecture=CONFIG_MCASCADELAKE ;;
-   43) Microarchitecture=CONFIG_MCOOPERLAKE ;;
-   44) Microarchitecture=CONFIG_MTIGERLAKE ;;
-   45) Microarchitecture=CONFIG_MSAPPHIRERAPIDS ;;
-   46) Microarchitecture=CONFIG_MROCKETLAKE ;;
-   47) Microarchitecture=CONFIG_MALDERLAKE ;;
-   92) Microarchitecture=CONFIG_GENERIC_CPU2 ;;
-   93) Microarchitecture=CONFIG_GENERIC_CPU3 ;;
-   94) Microarchitecture=CONFIG_GENERIC_CPU4 ;;
-   98) Microarchitecture=CONFIG_MNATIVE_INTEL ;;
-   99) Microarchitecture=CONFIG_MNATIVE_AMD ;;
-    *) default=CONFIG_GENERIC_CPU ;;
+     1) Microarchitecture=CONFIG_MK8 ;;
+     2) Microarchitecture=CONFIG_MK8SSE3 ;;
+     3) Microarchitecture=CONFIG_MK10 ;;
+     4) Microarchitecture=CONFIG_MBARCELONA ;;
+     5) Microarchitecture=CONFIG_MBOBCAT ;;
+     6) Microarchitecture=CONFIG_MJAGUAR ;;
+     7) Microarchitecture=CONFIG_MBULLDOZER ;;
+     8) Microarchitecture=CONFIG_MPILEDRIVER ;;
+     9) Microarchitecture=CONFIG_MSTEAMROLLER ;;
+    10) Microarchitecture=CONFIG_MEXCAVATOR ;;
+    11) Microarchitecture=CONFIG_MZEN ;;
+    12) Microarchitecture=CONFIG_MZEN2 ;;
+    13) Microarchitecture=CONFIG_MZEN3 ;;
+    14) Microarchitecture=CONFIG_MZEN4 ;;
+    15) Microarchitecture=CONFIG_MPSC ;;
+    16) Microarchitecture=CONFIG_MCORE2 ;;
+    17) Microarchitecture=CONFIG_MATOM ;;
+    18) Microarchitecture=CONFIG_MNEHALEM ;;
+    19) Microarchitecture=CONFIG_MWESTMERE ;;
+    20) Microarchitecture=CONFIG_MSILVERMONT ;;
+    21) Microarchitecture=CONFIG_MGOLDMONT ;;
+    22) Microarchitecture=CONFIG_MGOLDMONTPLUS ;;
+    23) Microarchitecture=CONFIG_MSANDYBRIDGE ;;
+    24) Microarchitecture=CONFIG_MIVYBRIDGE ;;
+    25) Microarchitecture=CONFIG_MHASWELL ;;
+    26) Microarchitecture=CONFIG_MBROADWELL ;;
+    27) Microarchitecture=CONFIG_MSKYLAKE ;;
+    28) Microarchitecture=CONFIG_MSKYLAKEX ;;
+    29) Microarchitecture=CONFIG_MCANNONLAKE ;;
+    30) Microarchitecture=CONFIG_MICELAKE ;;
+    31) Microarchitecture=CONFIG_MCASCADELAKE ;;
+    32) Microarchitecture=CONFIG_MCOOPERLAKE ;;
+    33) Microarchitecture=CONFIG_MTIGERLAKE ;;
+    34) Microarchitecture=CONFIG_MSAPPHIRERAPIDS ;;
+    35) Microarchitecture=CONFIG_MROCKETLAKE ;;
+    36) Microarchitecture=CONFIG_MALDERLAKE ;;
+    91) Microarchitecture=CONFIG_GENERIC_CPU ;;
+    92) Microarchitecture=CONFIG_GENERIC_CPU2 ;;
+    93) Microarchitecture=CONFIG_GENERIC_CPU3 ;;
+    94) Microarchitecture=CONFIG_GENERIC_CPU4 ;;
+    98) Microarchitecture=CONFIG_MNATIVE_INTEL ;;
+    99) Microarchitecture=CONFIG_MNATIVE_AMD ;;
+     *) default=CONFIG_GENERIC_CPU2 ;;
 esac
 
 warning "According to PKGBUILD variable _microarchitecture, your choice is $answer"