Archive/server-kernel
Archive/server-kernel
Archived
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge upstream release "linux6.7.9-clear6.7.8-1413-ko1" (#1)

Browse source
This commit is contained in:
JeremyStar™ 2024-03-11 18:04:42 +01:00
commit 03a8e65c22
3 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
PKGBUILD
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-server-kernel pkgbase=linux-server-kernel
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 StarOpenSource and upstream (JeremyStarTM)." pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by StarOpenSource and upstream (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-${_kernel_major}.${_kernel_minor}.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,12 +130,12 @@ 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"
patch -Np1 -i ../patch-${pkgver} || true patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
### Setting version ### Setting version
echo ":: prepare: updating version" echo ":: prepare: updating version"
@ -231,15 +232,15 @@ prepare() {
### Save configuration for later reuse ### Save configuration for later reuse
[[ -z "$_copyfinalconfig" ]] || ( [[ -z "$_copyfinalconfig" ]] || (
echo ":: prepare: copying configuration file into kernel-optimized repository" echo ":: prepare: copying configuration file into kernel-optimized repository"
cp -Tf ./.config "${startdir}/finalconfig-${pkgver}-${pkgrel}${pkgbase#linux}" cp -Tf ./.config "${startdir}/kconfig-final"
) )
echo ":: prepare: prepare() finished" echo ":: prepare: prepare() finished"
} }
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"

39
PKGBUILD.buildtool
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-server-kernel pkgbase=linux-server-kernel
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 StarOpenSource and upstream (JeremyStarTM)." pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by StarOpenSource and upstream (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-${_kernel_major}.${_kernel_minor}.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,12 +46,12 @@ 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"
patch -Np1 -i ../patch-${pkgver} || true patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
### Setting version ### Setting version
echo ":: prepare: updating version" echo ":: prepare: updating version"
@ -147,15 +148,15 @@ prepare() {
### Save configuration for later reuse ### Save configuration for later reuse
[[ -z "$_copyfinalconfig" ]] || ( [[ -z "$_copyfinalconfig" ]] || (
echo ":: prepare: copying configuration file into kernel-optimized repository" echo ":: prepare: copying configuration file into kernel-optimized repository"
cp -Tf ./.config "${startdir}/finalconfig-${pkgver}-${pkgrel}${pkgbase#linux}" cp -Tf ./.config "${startdir}/kconfig-final"
) )
echo ":: prepare: prepare() finished" echo ":: prepare: prepare() finished"
} }
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"

8
buildtool.sh
View file

@ -74,8 +74,12 @@ special "|___/\___|_| \_/ \___|_| |_|\_\___|_| |_| |_|\___|_|"
empty empty
# Print environment configuration # Print environment configuration
diagh "\$BUILDTOOL_DEBUG is set, debug mode is enabled" if [ -n "${BUILDTOOL_DEBUG}" ]; then
diagh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory" warnh "\$BUILDTOOL_DEBUG is set, debug mode is enabled"
fi
if [ -n "${BUILDTOOL_LOCALDIR}" ]; then
warnh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory"
fi
# Checks # Checks
## Check for Arch Linux ## Check for Arch Linux