From be8efffb767b6bdfe90c88a69747816696b6ba3f Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Sat, 23 Sep 2023 12:23:21 +0200 Subject: [PATCH] 6.5.5-1 (clr 6.5.4-1363) sync with Arch Linux --- .SRCINFO | 6 +++--- PKGBUILD | 22 +++++++--------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 546cde1..f7c7b58 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear pkgdesc = Clear Linux - pkgver = 6.5.4 + pkgver = 6.5.5 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.4.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.5.5.xz source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.5.4-1363 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 = 14e8569a800595a7bf22d005fbaf72b70f81b86346be27fc9bfaa14c78480f8e + sha256sums = 22ad68c6c5f194f879fded9c44a205e394438fd505439e5f23e13e22ae1b7fe0 sha256sums = SKIP sha256sums = 802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23 diff --git a/PKGBUILD b/PKGBUILD index f08bab6..62c9f3a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -86,7 +86,7 @@ ### IMPORTANT: Do no edit below this line unless you know what you're doing _major=6.5 -_minor=4 +_minor=5 _srcname=linux-${_major} _clr=${_major}.4-1363 _gcc_more_v='20230105' @@ -121,11 +121,6 @@ export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_make() { - test -s version - make KERNELRELEASE="$( localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname - make defconfig - make -s kernelrelease > version - make mrproper - ### Add Clearlinux patches for i in $(grep '^Patch' ${srcdir}/$pkgbase/linux.spec |\ grep -Ev '^Patch0132|^Patch0118|^Patch0113|^Patch0138' | sed -n 's/.*: //p'); do @@ -247,7 +238,7 @@ prepare() { -d DEBUG_INFO_BTF_MODULES fi - _make ${BUILD_FLAGS[*]} olddefconfig + make ${BUILD_FLAGS[*]} olddefconfig diff -u $srcdir/$pkgbase/config .config || : # https://github.com/graysky2/kernel_compiler_patch @@ -290,6 +281,7 @@ prepare() { fi fi + make -s kernelrelease > version echo "Prepared $pkgbase version $(