From 343fb68ee26ee0e8dcd6ebc1b4c03ec2ced3d96d Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Tue, 12 Mar 2024 19:28:40 +0100
Subject: [PATCH 1/4] Fix conflict resolution (once again)

---
 buildtool.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildtool.sh b/buildtool.sh
index d4a8956..7f25274 100755
--- a/buildtool.sh
+++ b/buildtool.sh
@@ -321,7 +321,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

From a20878e05047e20f3184b9e4fb6c517c86e89de4 Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Wed, 13 Mar 2024 02:39:15 +0100
Subject: [PATCH 2/4] Remove .SRCINFO

---
 .SRCINFO | 43 -------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 .SRCINFO

diff --git a/.SRCINFO b/.SRCINFO
deleted file mode 100644
index c442f57..0000000
--- a/.SRCINFO
+++ /dev/null
@@ -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

From 3353bf57b67cb1e89d68a9120fa7f2a89af96fb8 Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Fri, 15 Mar 2024 02:31:26 +0100
Subject: [PATCH 3/4] fbcon takes over faster now

---
 kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kconfig b/kconfig
index d3af4f8..d5f98a1 100644
--- a/kconfig
+++ b/kconfig
@@ -6108,7 +6108,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

From c74c96e086a4dce7f917dee4e7780c9e225bc438 Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Fri, 15 Mar 2024 02:31:47 +0100
Subject: [PATCH 4/4] Maybe I should bump this

---
 PKGBUILD           | 2 +-
 PKGBUILD.buildtool | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index f3afc0b..b02a6bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -91,7 +91,7 @@
 
 ### BUILD OPTIONS END
 
-_kerneloptimized_version=ko1
+_kerneloptimized_version=ko2
 _kernel_major=6.7
 _kernel_minor=9
 _gcc_more_v='20240221.2'
diff --git a/PKGBUILD.buildtool b/PKGBUILD.buildtool
index 5e619cf..b8b468b 100644
--- a/PKGBUILD.buildtool
+++ b/PKGBUILD.buildtool
@@ -7,7 +7,7 @@
 # All build options have been removed as this PKGBUILD is exclusively used for buildtool.sh.
 # If you want to build linux-jstm-optimized without using buildtool.sh use the other PKGBUILD file instead.
 
-_kerneloptimized_version=ko1
+_kerneloptimized_version=ko2
 _kernel_major=6.7
 _kernel_minor=9
 _gcc_more_v='20240221.2'