From 3a654766c226718f9bcdde1f74c5510410bd0911 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Thu, 21 Jul 2022 10:34:14 +0200 Subject: [PATCH] Cleaning, smoothing and adding some comments again Signed-off-by: Piotr Gorski --- .SRCINFO | 5 +---- PKGBUILD | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ca1db4d..ee7d9bd 100755 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,12 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements pkgver = 5.18.12 - pkgrel = 2 + pkgrel = 4 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 license = GPL2 makedepends = bc - makedepends = texlive-latexextra makedepends = libelf makedepends = pahole makedepends = cpio @@ -15,8 +14,6 @@ pkgbase = linux-cachyos makedepends = tar makedepends = xz makedepends = zstd - makedepends = xmlto - makedepends = git makedepends = gcc makedepends = gcc-libs makedepends = glibc diff --git a/PKGBUILD b/PKGBUILD index 4eaf9e4..3d13899 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -103,6 +103,7 @@ _disable_debug=y ## Enable zram/zswap ZSTD compression _zstd_compression=y +# Enable FULLCONENAT _nf_cone=y # Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin". @@ -116,6 +117,12 @@ _build_zfs= # Enable bcachefs _bcachefs= +# Enable aufsfs +_aufs= + +# Enable spadefs +_spadfs= + if [ -n "$_use_llvm_lto" ]; then pkgsuffix=cachyos-lto pkgbase=linux-$pkgsuffix @@ -135,13 +142,14 @@ _stable=${_major}.${_minor} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=4 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') options=('!strip') -makedepends=('bc' 'texlive-latexextra' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'xmlto' 'git' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch') +makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch') +# LLVM makedepends if [ -n "$_use_llvm_lto" ]; then makedepends+=(clang llvm lld python) BUILD_FLAGS=( @@ -151,6 +159,11 @@ if [ -n "$_use_llvm_lto" ]; then LLVM_IAS=1 ) fi +# ZFS makedepends +if [ -n "$_build_zfs" ]; then + makedepends+=(git) + +fi _patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}" source=( "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz" @@ -189,6 +202,14 @@ if [ -n "$_bcachefs" ]; then source+=("${_patchsource}/0001-bcachefs-after-lru.patch") fi +if [ -n "$_aufs" ]; then +source+=("${_patchsource}/0001-aufs-20220620.patch") +fi + +if [ -n "$_spadfs" ]; then +source+=("${_patchsource}/0001-spadfs-5.18-merge-v1.0.16.patch") +fi + export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"