From 46d93e4bbac3b0afeab37b95dd00dc92825fec03 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Mon, 11 Mar 2024 17:24:09 +0100 Subject: [PATCH] Update versioning stuff --- PKGBUILD | 33 +++++++++++++++++---------------- PKGBUILD.buildtool | 33 +++++++++++++++++---------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7e9260f..f58eb15 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -91,13 +91,14 @@ ### BUILD OPTIONS END -_major=6.7 -_minor=9 -_srcname=linux-${_major} -_clr=${_major}.8-1413 +_kerneloptimized_version=ko1 +_kernel_major=6.7 +_kernel_minor=9 _gcc_more_v='20240221.2' +_srcname_linux=linux-${_kernel_major} +_srcname_clpatches=${_kernel_major}.8-1413 pkgbase=linux-jstm-optimized -pkgver=${_major}.${_minor} +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') @@ -109,10 +110,10 @@ if [ -n "$_use_llvm_lto" ]; then fi options=('!strip') 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" + "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" "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" - "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}" + "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_srcname_clpatches}" "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz" ) @@ -129,8 +130,8 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP prepare() { echo ":: prepare: prepare() called" - echo ":: prepare: cding into \"${_srcname}\"" - cd "${_srcname}" || exit 1 + echo ":: prepare: cding into \"${_srcname_linux}\"" + cd "${_srcname_linux}" || exit 1 ### Add upstream patches echo ":: prepare: adding upstream patches" @@ -238,8 +239,8 @@ prepare() { build() { echo ":: build: build() called" - echo ":: build: cding into \"${_srcname}\"" - cd "${_srcname}" || exit 1 + echo ":: build: cding into \"${_srcname_linux}\"" + cd "${_srcname_linux}" || exit 1 echo ":: build: starting compilation (make ${BUILD_FLAGS[*]} all)" make ${BUILD_FLAGS[*]} all echo ":: build: build() finished" @@ -256,8 +257,8 @@ _package() { provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE) install=linux.install - echo ":: _package: cding into \"${_srcname}\"" - cd "$_srcname" || exit 1 + echo ":: _package: cding into \"${_srcname_linux}\"" + cd "$_srcname_linux" || exit 1 local modulesdir="$pkgdir/usr/lib/modules/$(