Update versioning stuff

This commit is contained in:
JeremyStar™ 2024-03-11 17:24:09 +01:00
parent 177de76b16
commit 46d93e4bba
2 changed files with 34 additions and 32 deletions

View file

@ -91,13 +91,14 @@
### BUILD OPTIONS END ### BUILD OPTIONS END
_major=6.7 _kerneloptimized_version=ko1
_minor=9 _kernel_major=6.7
_srcname=linux-${_major} _kernel_minor=9
_clr=${_major}.8-1413
_gcc_more_v='20240221.2' _gcc_more_v='20240221.2'
_srcname_linux=linux-${_kernel_major}
_srcname_clpatches=${_kernel_major}.8-1413
pkgbase=linux-jstm-optimized pkgbase=linux-jstm-optimized
pkgver=${_major}.${_minor} pkgver=linux${_kernel_major}.${_kernel_minor}-clear${_srcname_clpatches}-${_kerneloptimized_version}
pkgrel=1 pkgrel=1
pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM." pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM."
arch=('x86_64') arch=('x86_64')
@ -109,10 +110,10 @@ if [ -n "$_use_llvm_lto" ]; then
fi fi
options=('!strip') options=('!strip')
source=( source=(
"https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_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.sign"
"https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" "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" "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() { prepare() {
echo ":: prepare: prepare() called" echo ":: prepare: prepare() called"
echo ":: prepare: cding into \"${_srcname}\"" echo ":: prepare: cding into \"${_srcname_linux}\""
cd "${_srcname}" || exit 1 cd "${_srcname_linux}" || exit 1
### Add upstream patches ### Add upstream patches
echo ":: prepare: adding upstream patches" echo ":: prepare: adding upstream patches"
@ -238,8 +239,8 @@ prepare() {
build() { build() {
echo ":: build: build() called" echo ":: build: build() called"
echo ":: build: cding into \"${_srcname}\"" echo ":: build: cding into \"${_srcname_linux}\""
cd "${_srcname}" || exit 1 cd "${_srcname_linux}" || exit 1
echo ":: build: starting compilation (make ${BUILD_FLAGS[*]} all)" echo ":: build: starting compilation (make ${BUILD_FLAGS[*]} all)"
make ${BUILD_FLAGS[*]} all make ${BUILD_FLAGS[*]} all
echo ":: build: build() finished" echo ":: build: build() finished"
@ -256,8 +257,8 @@ _package() {
provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE) provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
install=linux.install install=linux.install
echo ":: _package: cding into \"${_srcname}\"" echo ":: _package: cding into \"${_srcname_linux}\""
cd "$_srcname" || exit 1 cd "$_srcname_linux" || exit 1
local modulesdir="$pkgdir/usr/lib/modules/$(<version)" local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
@ -285,8 +286,8 @@ _package-headers() {
pkgdesc="${pkgdesc} This package includes various headers and scripts for building modules." pkgdesc="${pkgdesc} This package includes various headers and scripts for building modules."
depends=(pahole) depends=(pahole)
echo ":: _package-headers: cding into \"${_srcname}\"" echo ":: _package-headers: cding into \"${_srcname_linux}\""
cd "${_srcname}" || exit 1 cd "${_srcname_linux}" || exit 1
local builddir="$pkgdir/usr/lib/modules/$(<version)/build" local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo ":: _package-headers: installing build files" echo ":: _package-headers: installing build files"

View file

@ -7,13 +7,14 @@
# All build options have been removed as this PKGBUILD is exclusively used for buildtool.sh. # All build options have been removed as this PKGBUILD is exclusively used for buildtool.sh.
# If you want to build linux-jstm-optimized without using buildtool.sh use the other PKGBUILD file instead. # If you want to build linux-jstm-optimized without using buildtool.sh use the other PKGBUILD file instead.
_major=6.7 _kerneloptimized_version=ko1
_minor=9 _kernel_major=6.7
_srcname=linux-${_major} _kernel_minor=9
_clr=${_major}.8-1413
_gcc_more_v='20240221.2' _gcc_more_v='20240221.2'
_srcname_linux=linux-${_kernel_major}
_srcname_clpatches=${_kernel_major}.8-1413
pkgbase=linux-jstm-optimized pkgbase=linux-jstm-optimized
pkgver=${_major}.${_minor} pkgver=linux${_kernel_major}.${_kernel_minor}-clear${_srcname_clpatches}-${_kerneloptimized_version}
pkgrel=1 pkgrel=1
pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM." pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by JeremyStarTM."
arch=('x86_64') arch=('x86_64')
@ -25,10 +26,10 @@ if [ -n "$_use_llvm_lto" ]; then
fi fi
options=('!strip') options=('!strip')
source=( source=(
"https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_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.sign"
"https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" "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" "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz"
) )
@ -45,8 +46,8 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
prepare() { prepare() {
echo ":: prepare: prepare() called" echo ":: prepare: prepare() called"
echo ":: prepare: cding into \"${_srcname}\"" echo ":: prepare: cding into \"${_srcname_linux}\""
cd "${_srcname}" || exit 1 cd "${_srcname_linux}" || exit 1
### Add upstream patches ### Add upstream patches
echo ":: prepare: adding upstream patches" echo ":: prepare: adding upstream patches"
@ -154,8 +155,8 @@ prepare() {
build() { build() {
echo ":: build: build() called" echo ":: build: build() called"
echo ":: build: cding into \"${_srcname}\"" echo ":: build: cding into \"${_srcname_linux}\""
cd "${_srcname}" || exit 1 cd "${_srcname_linux}" || exit 1
echo ":: build: starting compilation (make ${BUILD_FLAGS[*]} all)" echo ":: build: starting compilation (make ${BUILD_FLAGS[*]} all)"
make ${BUILD_FLAGS[*]} all make ${BUILD_FLAGS[*]} all
echo ":: build: build() finished" echo ":: build: build() finished"
@ -172,8 +173,8 @@ _package() {
provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE) provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
install=linux.install install=linux.install
echo ":: _package: cding into \"${_srcname}\"" echo ":: _package: cding into \"${_srcname_linux}\""
cd "$_srcname" || exit 1 cd "$_srcname_linux" || exit 1
local modulesdir="$pkgdir/usr/lib/modules/$(<version)" local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
@ -201,8 +202,8 @@ _package-headers() {
pkgdesc="${pkgdesc} This package includes various headers and scripts for building modules." pkgdesc="${pkgdesc} This package includes various headers and scripts for building modules."
depends=(pahole) depends=(pahole)
echo ":: _package-headers: cding into \"${_srcname}\"" echo ":: _package-headers: cding into \"${_srcname_linux}\""
cd "${_srcname}" || exit 1 cd "${_srcname_linux}" || exit 1
local builddir="$pkgdir/usr/lib/modules/$(<version)/build" local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo ":: _package-headers: installing build files" echo ":: _package-headers: installing build files"