6.6.10

3 files changed, 14 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e06d972c4683..c138c8d62e64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = linux-zen-git
 	pkgdesc = Featureful kernel including various new features, code and optimizations to better suit desktops
-	pkgver = 6.4.10+1189592+gcc866abe3fdd
+	pkgver = 6.6.10+1219797+g0c2d40dc6a85
 	pkgrel = 1
 	url = https://github.com/damentz/zen-kernel
+	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = git
@@ -11,7 +12,7 @@ pkgbase = linux-zen-git
 	options = !strip
 	source = linux-zen.conf
 	source = linux-zen.preset
-	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel.git#branch=6.4/main
+	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel.git#branch=6.6/main
 	source = allow-disable-msr-lockdown.patch
 	sha256sums = 6373073ad943e068478ef1373be4eb2a7e473da8743d946f1f50cd364685ab87
 	sha256sums = 18fe6b2664a9a740544c4cb990efe5ec933d6e64caf9e5d0a6ced92af0027c2d
diff --git a/.gitignore b/.gitignore
index 37751cdf015a..485be6162d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-*.pkg.tar
-*.log
 good
 *.pkg.tar.xz
 pkg
diff --git a/PKGBUILD b/PKGBUILD
index 0ef4a0489f87..7638b29d72b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Original PKGBUILD Contributor: Patrick Bartels <p4ddy.b@gmail.com>
 # Thanks to Bregol
 pkgname="linux-zen-git"
-pkgver=6.4.10+1189592+gcc866abe3fdd
+pkgver=6.6.10+1219797+g0c2d40dc6a85
 _kernver=4.19.0+783746+g54d1f99f63e9
 pkgdesc="Featureful kernel including various new features, code and optimizations to better suit desktops"
 url="https://github.com/damentz/zen-kernel"
@@ -10,14 +10,14 @@ license=("GPL2")
 makedepends=("git")
 true && pkgbase="linux-zen-git"
 true && pkgname=("linux-zen-git" "linux-zen-git-headers")
-arch=("x86_64")
+arch=("i686" "x86_64")
 conflicts=("linux-zen")
 provides=("linux-zen")
 pkgrel=1
 options=("!strip")
 source=("linux-zen.conf"
         "linux-zen.preset"
-        'zen-kernel::git+https://github.com/zen-kernel/zen-kernel.git#branch=6.4/main'
+        'zen-kernel::git+https://github.com/zen-kernel/zen-kernel.git#branch=6.6/main'
         'allow-disable-msr-lockdown.patch')
 sha256sums=('6373073ad943e068478ef1373be4eb2a7e473da8743d946f1f50cd364685ab87'
             '18fe6b2664a9a740544c4cb990efe5ec933d6e64caf9e5d0a6ced92af0027c2d'
@@ -35,6 +35,12 @@ PKGEXT='.pkg.tar'
 prepare() {
 	cd "${srcdir}/zen-kernel"
 	
+	# Number of CPU Cores
+	_CORES=$(cat /proc/cpuinfo|grep processor|wc -l)
+	if [ $_CORES -lt 1 ]; then
+		_CORES=2
+	fi
+	
 	git reset --hard
 }
 
@@ -45,14 +51,10 @@ pkgver() {
 }
 
 build() {
-        # Number of CPU Cores
-        _CORES=$(cat /proc/cpuinfo|grep processor|wc -l)
-        if [ $_CORES -lt 1 ]; then
-                _CORES=2
-        fi
-
 	cd "${srcdir}/zen-kernel"
 		
+	patch -Np1 -i "${srcdir}/allow-disable-msr-lockdown.patch"
+		
 	# don't run depmod on 'make install'. We'll do this ourselves in packaging
 	sed -i '2iexit 0' scripts/depmod.sh
 
@@ -90,8 +92,6 @@ build() {
 			warning "Navigate to '${srcdir}/build'"
 			warning "and either run 'make menuconfig' or if you want to use an existing config,"
 			warning "save it as '.config' and run 'make oldconfig' in order to update it."
-			warning "You could also grab the one used for the mainline zen-kernel package from "
-			warning "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux-zen/trunk/config "
 			warning "Having done that you can run 'makepkg' again."
 			plain   ""
 
@@ -102,9 +102,6 @@ build() {
 		fi
 	fi
 
-	msg "Allowing disable of MSR in lockdown mode to allow undervolting and prevent false positives for spectre-meltdown-checker..."
-	patch -Np1 -i "${srcdir}/allow-disable-msr-lockdown.patch"
-
 	msg2 "Updating output directory Makefile..."
 	make -C "${srcdir}/zen-kernel/" O="${srcdir}/build" outputmakefile