From f8a69e271b6fd6925024a35c9dd0366bcc73c7b4 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Fri, 22 Mar 2024 13:14:35 +0100 Subject: [PATCH] Bump kernel to version 6.8.1 --- PKGBUILD | 20 +++++++++++--------- PKGBUILD.buildtool | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index b02a6bd..43826fa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -92,23 +92,25 @@ ### BUILD OPTIONS END _kerneloptimized_version=ko2 -_kernel_major=6.7 -_kernel_minor=9 +_kernel_major=6.8 +_kernel_minor=1 _gcc_more_v='20240221.2' _srcname_linux=linux-${_kernel_major} -_srcname_clpatches=${_kernel_major}.8-1413 +_srcname_clpatches=${_kernel_major}.1-1418 pkgbase=linux-jstm-optimized pkgver=linux${_kernel_major}.${_kernel_minor}+clear${_srcname_clpatches//-/_}+${_kerneloptimized_version} pkgrel=1 pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM." arch=('x86_64') url="https://git.staropensource.de/JeremyStarTM/kernel-optimized" -license=('GPL2') +license=(GPL-2.0-only) makedepends=('bc' 'cpio' 'git' 'libelf' 'pahole' 'xmlto') if [ -n "$_use_llvm_lto" ]; then makedepends+=(clang llvm lld python) fi -options=('!strip') +options=(!strip !debug) +if [ "${_debug}" == "y" ]; then + options=(!strip) source=( "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.sign" @@ -145,7 +147,7 @@ prepare() { ### Add Clear Linux patches echo ":: prepare: patching kernel with Clear Linux patches" # shellcheck disable=SC2013 - for i in $(grep '^Patch' "${srcdir}"/cl-linux/linux.spec | grep -Ev '^Patch0132|^Patch0118|^Patch0113|^Patch0138|^Patch0139' | sed -n 's/.*: //p'); do + for i in $(grep '^Patch' "${srcdir}"/cl-linux/linux.spec|grep -Ev '^Patch0132|^Patch0109|^Patch0118|^Patch0113|^Patch0138|^Patch0139|^Patch0147' | sed -n 's/.*: //p'); do if [ -n "$_use_llvm_lto" ]; then if [ "${i}" == "0162-extra-optmization-flags.patch" ] ; then continue @@ -194,7 +196,7 @@ prepare() { # https://github.com/graysky2/kernel_compiler_patch # make sure to apply after olddefconfig to allow the next section echo ":: prepare: patching kernel with kernel_compiler_patch" - patch -Np1 -i "$srcdir/kernel_compiler_patch-$_gcc_more_v/more-uarches-for-kernel-6.1.79-6.8-rc3.patch" + patch -Np1 -i "$srcdir/kernel_compiler_patch-$_gcc_more_v/more-uarches-for-kernel-6.8-rc4+.patch" if [ -n "$_subarch" ]; then # user wants a subarch so apply choice defined above interactively via 'yes' @@ -377,9 +379,9 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069' +sha256sums=('c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3' 'SKIP' - 'e7562c6344c936de81e49e8613d4ac1be5f8941332e4dcf58caab8591c10f8c1' + 'dfdfbf3045be48db3b99038a72eb2e6906a31dc11672230b4f45597de2e8cf11' 'SKIP' '1d3ac3e581cbc5108f882fcdc75d74f7f069654c71bad65febe5ba15a7a3a14f') diff --git a/PKGBUILD.buildtool b/PKGBUILD.buildtool index b8b468b..5b8a0c9 100644 --- a/PKGBUILD.buildtool +++ b/PKGBUILD.buildtool @@ -8,23 +8,25 @@ # If you want to build linux-jstm-optimized without using buildtool.sh use the other PKGBUILD file instead. _kerneloptimized_version=ko2 -_kernel_major=6.7 -_kernel_minor=9 +_kernel_major=6.8 +_kernel_minor=1 _gcc_more_v='20240221.2' _srcname_linux=linux-${_kernel_major} -_srcname_clpatches=${_kernel_major}.8-1413 +_srcname_clpatches=${_kernel_major}.1-1418 pkgbase=linux-jstm-optimized pkgver=linux${_kernel_major}.${_kernel_minor}+clear${_srcname_clpatches//-/_}+${_kerneloptimized_version} pkgrel=1 pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM." arch=('x86_64') url="https://git.staropensource.de/JeremyStarTM/kernel-optimized" -license=('GPL2') +license=(GPL-2.0-only) makedepends=('bc' 'cpio' 'git' 'libelf' 'pahole' 'xmlto') if [ -n "$_use_llvm_lto" ]; then makedepends+=(clang llvm lld python) fi -options=('!strip') +options=(!strip !debug) +if [ "${_debug}" == "y" ]; then + options=(!strip) source=( "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.sign" @@ -61,7 +63,7 @@ prepare() { ### Add Clear Linux patches echo ":: prepare: patching kernel with Clear Linux patches" # shellcheck disable=SC2013 - for i in $(grep '^Patch' "${srcdir}"/cl-linux/linux.spec | grep -Ev '^Patch0132|^Patch0118|^Patch0113|^Patch0138|^Patch0139' | sed -n 's/.*: //p'); do + for i in $(grep '^Patch' "${srcdir}"/cl-linux/linux.spec|grep -Ev '^Patch0132|^Patch0109|^Patch0118|^Patch0113|^Patch0138|^Patch0139|^Patch0147' | sed -n 's/.*: //p'); do if [ -n "$_use_llvm_lto" ]; then if [ "${i}" == "0162-extra-optmization-flags.patch" ] ; then continue @@ -110,7 +112,7 @@ prepare() { # https://github.com/graysky2/kernel_compiler_patch # make sure to apply after olddefconfig to allow the next section echo ":: prepare: patching kernel with kernel_compiler_patch" - patch -Np1 -i "$srcdir/kernel_compiler_patch-$_gcc_more_v/more-uarches-for-kernel-6.1.79-6.8-rc3.patch" + patch -Np1 -i "$srcdir/kernel_compiler_patch-$_gcc_more_v/more-uarches-for-kernel-6.8-rc4+.patch" if [ -n "$_subarch" ]; then # user wants a subarch so apply choice defined above interactively via 'yes' @@ -293,9 +295,9 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069' +sha256sums=('c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3' 'SKIP' - 'e7562c6344c936de81e49e8613d4ac1be5f8941332e4dcf58caab8591c10f8c1' + 'dfdfbf3045be48db3b99038a72eb2e6906a31dc11672230b4f45597de2e8cf11' 'SKIP' '1d3ac3e581cbc5108f882fcdc75d74f7f069654c71bad65febe5ba15a7a3a14f')