summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2024-08-29 19:01:23 +0200
committerPiotr Gorski2024-08-29 19:01:23 +0200
commit99c0f47ca9cf3c85f0f035dd23fd0f969aee1ee5 (patch)
treefda8b7a9833a8ee1b4f122de556a8e86cfa3e296
parent2910e165369918055039054a7c5cc5660ae72b56 (diff)
downloadaur-99c0f47ca9cf3c85f0f035dd23fd0f969aee1ee5.tar.gz
Bump to 6.10.7
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD87
2 files changed, 48 insertions, 49 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f2ca81b3509d..84010a87b2ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 6.10.6
- pkgrel = 2
+ pkgver = 6.10.7
+ pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
license = GPL-2.0-only
@@ -22,15 +22,15 @@ pkgbase = linux-cachyos-bore
options = !strip
options = !debug
options = !lto
- source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.10.6.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.10.7.tar.xz
source = config
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.10/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.10/sched/0001-bore-cachy.patch
- b2sums = e0e2c2419b6da1a6c5caaf9df669a362bdef3d6fb19742da6c5300a6f6d0994259ea2acde7f6a4a20d1e2b71528bbed0e7fd51cbca33ddbf78f2d832a291148f
+ b2sums = a177df46c43bef6a529e50af64103a40eabc9d7301f93c8e1a4ed3e6b0e03bec195838c6085f3df798b7d941c0943ba31b23b1717150785ef52cfa8bd2dc028d
b2sums = 7740fa64764be51df1e3433b02f549dcb187373f790f61a6886fe0cf9ffcfa495c3bbaa123c7f7d4d9ae5726c435c5090140ea735b68caf5efa7f02a4f4f5849
b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667
- b2sums = 078169cd2449a144a7e4a3892865c5b0a527df9ae6121b9f7b70af88d93e09dcc83794bf2ad837faf73d58c378705e802e79b83d122e3e0cdfb6438657298dcc
+ b2sums = 61d2e4e49e05af401e846fd4e5a524ce2c8728e22a3e33e8e1876673250ae3e7c4c6aa01e966f88dc6a7cdf36e3a1f75094b066b9a342c933635c37341e7f103
b2sums = bade8bcf441a868b5ac1dc18c0cccf0a7a2b663124dcf3b5d2b51e7ccbeb84458b0e49fe7bbd8e107bf84afd388308b3551297a7ebcf90d96a8149b7765eddcf
pkgname = linux-cachyos-bore
diff --git a/PKGBUILD b/PKGBUILD
index 46a3843f7844..c2c58c86725c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -145,15 +145,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-${_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
+_minor=7
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -163,9 +163,9 @@ _stable=${_major}.${_minor}
_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}"
+pkgrel=1
+_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" in
esac
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
@@ -296,7 +295,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
@@ -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" in
100|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-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
@@ -512,20 +510,21 @@ 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 reuse
echo "Save configuration for later reuse..."
- cat .config > "${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}"
@@ -545,8 +544,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
@@ -559,7 +558,7 @@ build() {
)
cd "${srcdir}/${_nv_pkg}/kernel"
- make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
+ make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
fi
@@ -572,7 +571,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
@@ -583,11 +582,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
}
@@ -601,7 +600,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 +622,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 +706,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 +736,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 +753,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}"
@@ -778,8 +777,8 @@ for _p in "${pkgname[@]}"; do
}"
done
-b2sums=('e0e2c2419b6da1a6c5caaf9df669a362bdef3d6fb19742da6c5300a6f6d0994259ea2acde7f6a4a20d1e2b71528bbed0e7fd51cbca33ddbf78f2d832a291148f'
+b2sums=('a177df46c43bef6a529e50af64103a40eabc9d7301f93c8e1a4ed3e6b0e03bec195838c6085f3df798b7d941c0943ba31b23b1717150785ef52cfa8bd2dc028d'
'7740fa64764be51df1e3433b02f549dcb187373f790f61a6886fe0cf9ffcfa495c3bbaa123c7f7d4d9ae5726c435c5090140ea735b68caf5efa7f02a4f4f5849'
'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667'
- '078169cd2449a144a7e4a3892865c5b0a527df9ae6121b9f7b70af88d93e09dcc83794bf2ad837faf73d58c378705e802e79b83d122e3e0cdfb6438657298dcc'
+ '61d2e4e49e05af401e846fd4e5a524ce2c8728e22a3e33e8e1876673250ae3e7c4c6aa01e966f88dc6a7cdf36e3a1f75094b066b9a342c933635c37341e7f103'
'bade8bcf441a868b5ac1dc18c0cccf0a7a2b663124dcf3b5d2b51e7ccbeb84458b0e49fe7bbd8e107bf84afd388308b3551297a7ebcf90d96a8149b7765eddcf')