Merge branch 'develop' of https://git.staropensource.de/JeremyStarTM/kernel-optimized into JeremyStarTM-develop

.SRCINFO

@@ -1,43 +0,0 @@
-pkgbase = linux-jstm-optimized
-	pkgdesc = Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM.
-	pkgver = 6.7.9
-	pkgrel = 1
-	url = https://git.staropensource.de/JeremyStarTM/kernel-optimized
-	arch = x86_64
-	license = GPL2
-	makedepends = bc
-	makedepends = cpio
-	makedepends = git
-	makedepends = libelf
-	makedepends = pahole
-	makedepends = xmlto
-	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.7.9.xz
-	source = cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.7.8-1413
-	source = more-uarches-20240221.2.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20240221.2.tar.gz
-	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
-	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069
-	sha256sums = SKIP
-	sha256sums = e7562c6344c936de81e49e8613d4ac1be5f8941332e4dcf58caab8591c10f8c1
-	sha256sums = SKIP
-	sha256sums = 1d3ac3e581cbc5108f882fcdc75d74f7f069654c71bad65febe5ba15a7a3a14f
-
-pkgname = linux-jstm-optimized
-	pkgdesc = Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM. This package includes the kernel and compiled modules.
-	install = linux.install
-	depends = coreutils
-	depends = kmod
-	depends = initramfs
-	optdepends = wireless-regdb: to set the correct wireless channels of your country
-	optdepends = linux-firmware: firmware images needed for some devices
-	optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
-	provides = VIRTUALBOX-GUEST-MODULES
-	provides = WIREGUARD-MODULE
-	provides = KSMBD-MODULE
-
-pkgname = linux-jstm-optimized-headers
-	pkgdesc = Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM. This package includes various headers and scripts for building modules.
-	depends = pahole

PKGBUILD

@@ -92,7 +92,7 @@
 ### BUILD OPTIONS END
 
 _serverkernel_version=sk1
-_kerneloptimized_version=ko1
+_kerneloptimized_version=ko2
 _kernel_major=6.7
 _kernel_minor=9
 _gcc_more_v='20240221.2'

PKGBUILD.buildtool

@@ -8,7 +8,7 @@
 # If you want to build linux-jstm-optimized without using buildtool.sh use the other PKGBUILD file instead.
 
 _serverkernel_version=sk1
-_kerneloptimized_version=ko1
+_kerneloptimized_version=ko2
 _kernel_major=6.7
 _kernel_minor=9
 _gcc_more_v='20240221.2'

buildtool.sh

@@ -320,7 +320,8 @@ function ask_clonedir_conflictresolution() {
 		if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
 			diagh "src/ directory present, appending \"--noextract\""
 			export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
-		elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
+		fi
+		if [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
 			diagh "pkg/ directory present, appending \"--force\""
 			export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
 		fi

kconfig

@@ -4839,7 +4839,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 # end of Console display driver support
 
 CONFIG_LOGO=y