From cda39439600e104c84183f7b59745a150628d880 Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Sun, 17 Sep 2023 10:38:13 +0200 Subject: [PATCH] 6.5.3-1 (clr 6.5.3-1358) add @xstefen's fix for llvm build --- .SRCINFO | 8 ++++---- PKGBUILD | 11 ++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bb2f9ca..a1f34af 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear pkgdesc = Clear Linux - pkgver = 6.5.2 + pkgver = 6.5.3 pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 @@ -14,14 +14,14 @@ pkgbase = linux-clear options = !strip source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.5.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.5.tar.sign - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.5.2.xz - source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.5.2-1357 + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.5.3.xz + source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.5.3-1358 source = more-uarches-20230105.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20230105.tar.gz validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 7a574bbc20802ea76b52ca7faf07267f72045e861b18915c5272a98c27abf884 sha256sums = SKIP - sha256sums = 0ba7a0f678c1a4d5bd45e5b177f0aad23bb09ef71919d558fc88b4a0111636b2 + sha256sums = a9f4c3c9a6026e33cf7e6dd4727016ab7dcb4c0fb7f2f289f227d3b32eed2c33 sha256sums = SKIP sha256sums = 802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23 diff --git a/PKGBUILD b/PKGBUILD index a9e2156..b50d6a6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -86,9 +86,9 @@ ### IMPORTANT: Do no edit below this line unless you know what you're doing _major=6.5 -_minor=2 +_minor=3 _srcname=linux-${_major} -_clr=${_major}.2-1357 +_clr=${_major}.3-1358 _gcc_more_v='20230105' pkgbase=linux-clear pkgver=${_major}.${_minor} @@ -145,6 +145,11 @@ prepare() { ### Add Clearlinux patches for i in $(grep '^Patch' ${srcdir}/$pkgbase/linux.spec |\ grep -Ev '^Patch0132|^Patch0118|^Patch0113|^Patch0138' | sed -n 's/.*: //p'); do + if [ -n "$_use_llvm_lto" ]; then + if [ "${i}" == "0162-extra-optmization-flags.patch" ] ; then + continue + fi + fi echo "Applying patch ${i}..." patch -Np1 -i "$srcdir/$pkgbase/${i}" done @@ -421,7 +426,7 @@ done sha256sums=('7a574bbc20802ea76b52ca7faf07267f72045e861b18915c5272a98c27abf884' 'SKIP' - '0ba7a0f678c1a4d5bd45e5b177f0aad23bb09ef71919d558fc88b4a0111636b2' + 'a9f4c3c9a6026e33cf7e6dd4727016ab7dcb4c0fb7f2f289f227d3b32eed2c33' 'SKIP' '802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23')