diff --git a/.SRCINFO b/.SRCINFO index f30125b983f2..f510ad2b1358 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-cachyos-lts pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.6.47 + pkgver = 6.6.48 pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 @@ -22,12 +22,12 @@ pkgbase = linux-cachyos-lts options = !strip options = !debug options = !lto - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.47.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.48.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch - sha256sums = d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50 + sha256sums = 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 sha256sums = 692977cbef1ce2d669e19492bc607f5fb2c6fac0f73c1f37be6c0c5b753c5a08 sha256sums = a91249420d61edb17b8659ab3feca86d24cf3b1c941b14f232c47064fa4f4ce7 sha256sums = 6516e23cf0daed0d565766840342276e00516c732a0e70f996b0e8319221f8c2 diff --git a/PKGBUILD b/PKGBUILD index 989d9e80ef7f..8c6b71e2b83d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -165,15 +165,15 @@ _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 +_minor=48 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -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 @@ fi export 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() { fi scripts/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" in 100|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-db if [ -n "$_localmodcfg" ]; then - if [ -e $HOME/.config/modprobed.db ]; then + if [ -e "$HOME/.config/modprobed.db" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make ${BUILD_FLAGS[*]} LSMOD=$HOME/.config/modprobed.db localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig else - echo "No modprobed.db data found" - exit + _die "No modprobed.db data found" fi fi ### Rewrite configuration echo "Rewrite configuration..." - make ${BUILD_FLAGS[*]} prepare - yes "" | make ${BUILD_FLAGS[*]} config >/dev/null + make "${BUILD_FLAGS[@]}" prepare + yes "" | make "${BUILD_FLAGS[@]}" config >/dev/null diff -u ../config .config || : ### Prepared version @@ -580,20 +578,21 @@ prepare() { echo "Prepared $pkgbase version $( "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}" + local basedir="$(dirname "$(readlink "${srcdir}/config")")" + cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}" if [ -n "$_build_nvidia" ]; then cd "${srcdir}" @@ -613,8 +612,8 @@ prepare() { } build() { - cd ${srcdir}/${_srcname} - make ${BUILD_FLAGS[*]} -j$(nproc) all + cd "$_srcname" + make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 if [ -n "$_build_nvidia" ]; then @@ -627,7 +626,7 @@ build() { ) cd "${srcdir}/${_nv_pkg}/kernel" - make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules + make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi @@ -640,7 +639,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)" modules fi if [ -n "$_build_zfs" ]; then @@ -651,11 +650,11 @@ build() { ./autogen.sh sed -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 +668,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/$(