diff --git a/.SRCINFO b/.SRCINFO index 4322aa8..ff7fd02 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,27 +1,28 @@ pkgbase = linux-clear pkgdesc = Clear Linux - pkgver = 6.7.10 + pkgver = 6.8.1 pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 - license = GPL2 + license = GPL-2.0-only makedepends = bc makedepends = cpio makedepends = git makedepends = libelf makedepends = pahole makedepends = xmlto + options = !debug 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.10.xz - source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.7.9-1414 + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.tar.sign + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.8.1.xz + source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.8.1-1418 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 = c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3 sha256sums = SKIP - sha256sums = ad29958911035980290078c708a0a144943484a2f8c2ac408c040a81500393aa + sha256sums = dfdfbf3045be48db3b99038a72eb2e6906a31dc11672230b4f45597de2e8cf11 sha256sums = SKIP sha256sums = 1d3ac3e581cbc5108f882fcdc75d74f7f069654c71bad65febe5ba15a7a3a14f diff --git a/PKGBUILD b/PKGBUILD index 5e6f7df..e2b6f85 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -85,10 +85,10 @@ ### IMPORTANT: Do no edit below this line unless you know what you're doing -_major=6.7 -_minor=10 +_major=6.8 +_minor=1 _srcname=linux-${_major} -_clr=${_major}.9-1414 +_clr=${_major}.1-1418 _gcc_more_v='20240221.2' pkgbase=linux-clear pkgver=${_major}.${_minor} @@ -96,12 +96,15 @@ pkgrel=1 pkgdesc='Clear Linux' arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" -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=(!debug !strip) +if [ "$_debug" == "y" ]; then + options=(!strip) +fi source=( "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.sign" @@ -135,7 +138,7 @@ prepare() { ### Add Clearlinux patches for i in $(grep '^Patch' ${srcdir}/$pkgbase/linux.spec |\ - grep -Ev '^Patch0132|^Patch0118|^Patch0113|^Patch0138|^Patch0139' | sed -n 's/.*: //p'); do + 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 @@ -244,7 +247,7 @@ prepare() { # https://github.com/graysky2/kernel_compiler_patch # make sure to apply after olddefconfig to allow the next section echo "Patching to enable GCC optimization for other uarchs..." - 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' @@ -416,9 +419,9 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069' +sha256sums=('c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3' 'SKIP' - 'ad29958911035980290078c708a0a144943484a2f8c2ac408c040a81500393aa' + 'dfdfbf3045be48db3b99038a72eb2e6906a31dc11672230b4f45597de2e8cf11' 'SKIP' '1d3ac3e581cbc5108f882fcdc75d74f7f069654c71bad65febe5ba15a7a3a14f')