Archlinux Kernel based on different schedulers and some other performance improvements.
Shell archlinuxbaby-schedcachycachy-schedulercachyoscacule-schedkernellinux-kernelperformanceperformance-tuning
Misc PKGBUILD clenaups (#284)
Vasiliy Stelmachenokb18ec31cc6a6
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILDindex 46a3843f..4d4a297b 100644--- a/linux-cachyos-bore/PKGBUILD+++ b/linux-cachyos-bore/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-${_cpusched}-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}-lto"+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-${_cpusched}- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}"+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -545,8 +543,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -559,7 +557,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -572,7 +570,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -583,11 +581,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -601,7 +599,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -623,9 +621,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -707,23 +705,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -737,10 +735,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -754,7 +752,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILDindex 84537136..dc290ffb 100644--- a/linux-cachyos-deckify/PKGBUILD+++ b/linux-cachyos-deckify/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-deckify-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-deckify-lto+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-deckify- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-deckify+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux SCHED-EXT + Cachy Sauce + BORE + Deckify Patches Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -258,14 +258,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -299,7 +298,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -349,7 +348,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -495,19 +494,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -515,20 +513,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -548,8 +546,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -562,7 +560,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -575,7 +573,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -586,11 +584,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -604,7 +602,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -626,9 +624,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -710,23 +708,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -740,10 +738,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -757,7 +755,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILDindex 3d3a5034..0b74e844 100644--- a/linux-cachyos-echo/PKGBUILD+++ b/linux-cachyos-echo/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-${_cpusched}-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}-lto"+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-${_cpusched}- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}"+ pkgbase="linux-$_pkgsuffix"fi_major=6.9_minor=9@@ -165,7 +165,7 @@ _srcname=linux-${_stable}pkgdesc='Linux ECHO scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements'pkgrel=6_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -545,8 +543,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -559,7 +557,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -572,7 +570,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -583,11 +581,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -601,7 +599,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -623,9 +621,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -707,23 +705,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -737,10 +735,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -754,7 +752,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILDindex cc52fa1b..0cf8dea8 100644--- a/linux-cachyos-eevdf/PKGBUILD+++ b/linux-cachyos-eevdf/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-${_cpusched}-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}-lto"+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-${_cpusched}- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}"+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -545,8 +543,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -559,7 +557,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -572,7 +570,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -583,11 +581,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -601,7 +599,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -623,9 +621,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -707,23 +705,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -737,10 +735,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -754,7 +752,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILDindex 02f5ed4a..2cc0ec30 100644--- a/linux-cachyos-hardened/PKGBUILD+++ b/linux-cachyos-hardened/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-${_cpusched}-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}-lto"+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-${_cpusched}- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}"+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux BORE scheduler and hardened Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -558,7 +556,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -571,7 +569,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -582,11 +580,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -600,7 +598,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -622,9 +620,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -706,23 +704,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -736,10 +734,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -753,7 +751,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILDindex 989d9e80..ac6138f7 100644--- a/linux-cachyos-lts/PKGBUILD+++ b/linux-cachyos-lts/PKGBUILD@@ -165,12 +165,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-lts-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-lts-lto+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-lts- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-lts+ pkgbase="linux-$_pkgsuffix"fi_major=6.6_minor=47@@ -185,7 +185,7 @@ _srcname=linux-${_stable}pkgdesc='Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements'pkgrel=1_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -279,14 +279,13 @@ fiexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -320,7 +319,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -368,7 +367,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|750|1000)@@ -560,19 +559,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -580,20 +578,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -613,8 +611,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -627,7 +625,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -640,7 +638,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -651,11 +649,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -669,7 +667,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -691,9 +689,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -775,23 +773,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -805,10 +803,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -822,7 +820,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILDindex f1f24685..f456deb7 100644--- a/linux-cachyos-rc/PKGBUILD+++ b/linux-cachyos-rc/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-rc-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-rc-lto+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-rc- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-rc+ pkgbase="linux-$_pkgsuffix"fi_major=6.11_minor=0@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -256,14 +256,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -298,7 +297,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -348,7 +347,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -494,19 +493,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -514,20 +512,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -549,8 +547,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -563,7 +561,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -576,7 +574,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -587,11 +585,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -605,7 +603,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -627,9 +625,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -711,23 +709,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -741,10 +739,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -758,7 +756,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILDindex cd131170..aa435f29 100644--- a/linux-cachyos-rt-bore/PKGBUILD+++ b/linux-cachyos-rt-bore/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-${_cpusched}-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}-lto"+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-${_cpusched}- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}"+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux BORE-RT + Cachy Sauce Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -545,8 +543,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -559,7 +557,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -572,7 +570,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -583,11 +581,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -601,7 +599,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -623,9 +621,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -707,23 +705,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -737,10 +735,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -754,7 +752,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILDindex 7716c4b2..985c0f11 100644--- a/linux-cachyos-sched-ext/PKGBUILD+++ b/linux-cachyos-sched-ext/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-${_cpusched}-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}-lto"+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-${_cpusched}- pkgbase=linux-$pkgsuffix+ _pkgsuffix="cachyos-${_cpusched}"+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -545,8 +543,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -559,7 +557,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -572,7 +570,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -583,11 +581,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -601,7 +599,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -623,9 +621,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -707,23 +705,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -737,10 +735,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -754,7 +752,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILDindex 04f5fb37..42d416e4 100644--- a/linux-cachyos-server/PKGBUILD+++ b/linux-cachyos-server/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-server-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-server-lto+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos-server- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-server+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux EEVDF scheduler Kernel by CachyOS targeted for Servers workloads'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -545,8 +543,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -559,7 +557,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -572,7 +570,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -583,11 +581,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -601,7 +599,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -623,9 +621,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -707,23 +705,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -737,10 +735,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -754,7 +752,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILDindex eeb00d4c..7afb270c 100644--- a/linux-cachyos/PKGBUILD+++ b/linux-cachyos/PKGBUILD@@ -145,12 +145,12 @@ _build_nvidia_open=${_build_nvidia_open-}_build_debug=${_build_debug-}if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then- pkgsuffix=cachyos-lto- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos-lto+ pkgbase="linux-$_pkgsuffix"elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then- pkgsuffix=cachyos- pkgbase=linux-$pkgsuffix+ _pkgsuffix=cachyos+ pkgbase="linux-$_pkgsuffix"fi_major=6.10_minor=6@@ -164,8 +164,8 @@ _srcname=linux-${_stable}#_srcname=linux-${_major}pkgdesc='Linux SCHED-EXT + BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements'pkgrel=2-_kernver=$pkgver-$pkgrel-_kernuname="${pkgver}-${pkgsuffix}"+_kernver="$pkgver-$pkgrel"+_kernuname="${pkgver}-${_pkgsuffix}"arch=('x86_64')url="https://github.com/CachyOS/linux-cachyos"license=('GPL-2.0-only')@@ -255,14 +255,13 @@ case "$_cpusched" inesacexport KBUILD_BUILD_HOST=cachyos-export KBUILD_BUILD_USER=$pkgbase+export KBUILD_BUILD_USER="$pkgbase"export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"_die() { error "$@" ; exit; }prepare() {-- cd ${srcdir}/$_srcname+ cd "$_srcname"echo "Setting version..."echo "-$pkgrel" > localversion.10-pkgrel@@ -296,7 +295,7 @@ prepare() {fiscripts/config -k -d CONFIG_GENERIC_CPU- scripts/config -k -e CONFIG_${MARCH2}+ scripts/config -k -e "CONFIG_${MARCH2}"fi### Use autooptimization@@ -346,7 +345,7 @@ prepare() {echo "Selecting '$_use_llvm_lto' LLVM level..."### Select tick rate- [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."+ [ -z "$_HZ_ticks" ] && _die "The value is empty. Choose the correct one again."case "$_HZ_ticks" in100|250|500|600|625|750|1000)@@ -492,19 +491,18 @@ prepare() {### Optionally load needed modules for the make localmodconfig# See https://aur.archlinux.org/packages/modprobed-dbif [ -n "$_localmodcfg" ]; then- if [ -e $HOME/.config/modprobed.db ]; then+ if [ -e "$HOME/.config/modprobed.db" ]; thenecho "Running Steven Rostedt's make localmodconfig now"- make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig+ make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfigelse- echo "No modprobed.db data found"- exit+ _die "No modprobed.db data found"fifi### Rewrite configurationecho "Rewrite configuration..."- make ${BUILD_FLAGS[*]} prepare- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null+ make "${BUILD_FLAGS[@]}" prepare+ yes "" | make "${BUILD_FLAGS[@]}" config >/dev/nulldiff -u ../config .config || :### Prepared version@@ -512,20 +510,20 @@ prepare() {echo "Prepared $pkgbase version $(<version)"### Running make nconfig- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig+ [[ -z "$_makenconfig" ]] || make "${BUILD_FLAGS[@]}" nconfig### Running make menuconfig- [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig+ [[ -z "$_makemenuconfig" ]] || make "${BUILD_FLAGS[@]}" menuconfig### Running make xconfig- [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig+ [[ -z "$_makexconfig" ]] || make "${BUILD_FLAGS[@]}" xconfig### Running make gconfig- [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig+ [[ -z "$_makegconfig" ]] || make "${BUILD_FLAGS[@]}" gconfig### Save configuration for later reuseecho "Save configuration for later reuse..."- cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"+ cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"if [ -n "$_build_nvidia" ]; thencd "${srcdir}"@@ -545,8 +543,8 @@ prepare() {}build() {- cd ${srcdir}/${_srcname}- make ${BUILD_FLAGS[*]} -j$(nproc) all+ cd "$_srcname"+ make "${BUILD_FLAGS[@]}" -j"$(nproc)" allmake -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1if [ -n "$_build_nvidia" ]; then@@ -559,7 +557,7 @@ build() {)cd "${srcdir}/${_nv_pkg}/kernel"- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfi@@ -572,7 +570,7 @@ build() {SYSSRC="${srcdir}/${_srcname}"SYSOUT="${srcdir}/${_srcname}")- CFLAGS= CXXFLAGS= LDFLAGS= make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules+ CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modulesfiif [ -n "$_build_zfs" ]; then@@ -583,11 +581,11 @@ build() {./autogen.shsed -i "s|\$(uname -r)|${_kernuname}|g" configure- ./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \+ ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \--with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs --with-config=kernel \- --with-linux=${srcdir}/$_srcname- make ${BUILD_FLAGS[*]}+ --with-linux="${srcdir}/$_srcname"+ make "${BUILD_FLAGS[@]}"fi}@@ -601,7 +599,7 @@ _package() {'uksmd: Userspace KSM helper daemon')provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"@@ -623,9 +621,9 @@ _package() {_package-headers() {pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"- depends=('pahole' ${pkgbase} )+ depends=('pahole' "${pkgbase}")- cd ${srcdir}/${_srcname}+ cd "${_srcname}"local builddir="$pkgdir/usr/lib/modules/$(<version)/build"echo "Installing build files..."@@ -707,23 +705,23 @@ _package-headers() {_package-dbg(){pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"- depends=(${pkgbase}-headers)+ depends=("${pkgbase}-headers")- cd "${srcdir}/${_srcname}"+ cd "${_srcname}"mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux}_package-zfs(){pkgdesc="zfs module for the $pkgdesc kernel"- depends=('pahole' $pkgbase=$_kernver)+ depends=('pahole' "${pkgbase}=${_kernver}")provides=('ZFS-MODULE')license=('CDDL')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd ${srcdir}/"zfs"+ cd "${srcdir}/zfs"install -dm755 "${modulesdir}"install -m644 module/*.ko "${modulesdir}"find "$pkgdir" -name '*.ko' -exec zstd --rm -19 {} +@@ -737,10 +735,10 @@ _package-nvidia(){conflicts=("$pkgbase-nvidia-open")license=('custom')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"- cd "${srcdir}/${_nv_pkg}/"+ cd "${srcdir}/${_nv_pkg}"install -dm755 "${modulesdir}"install -m644 kernel/*.ko "${modulesdir}"install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE@@ -754,7 +752,7 @@ _package-nvidia-open(){conflicts=("$pkgbase-nvidia")license=('MIT AND GPL-2.0-only')- cd ${srcdir}/$_srcname+ cd "$_srcname"local modulesdir="$pkgdir/usr/lib/modules/$(<version)"cd "${srcdir}/${_nv_open_pkg}"