diff --git a/linux-cachyos-lts/.CI/config b/linux-cachyos-lts/.CI/config index 66bee94775..27b4db01be 100644 --- a/linux-cachyos-lts/.CI/config +++ b/linux-cachyos-lts/.CI/config @@ -1 +1 @@ -CI_PKGBUILD_SOURCE=aur +CI_PKGBUILD_SOURCE=custom diff --git a/linux-cachyos-lts/.CI/update.sh b/linux-cachyos-lts/.CI/update.sh new file mode 100644 index 0000000000..16a4a520a1 --- /dev/null +++ b/linux-cachyos-lts/.CI/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +UPSTREAM_REPO="https://github.com/CachyOS/linux-cachyos.git" +TMPDIR=$(mktemp -d) + +git clone "$UPSTREAM_REPO" "$TMPDIR" &>/dev/null || echo "Failed to clone upstream repository" + +_PKG="linux-cachyos-lts" + +# Run this before comparing to avoid unnecessary diffs +shfmt -w "$TMPDIR/$_PKG/PKGBUILD" + +if [[ $(diff -ruN ungoogled-chromium/PKGBUILD "$TMPDIR/PKGBUILD") != "" ]]; then + rsync -a --exclude "aur" "$TMPDIR/$_PKG/" "$_PKG" || echo "Failed to copy files" +fi diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO index 62c01c9764..cc4b122b5a 100644 --- a/linux-cachyos-lts/.SRCINFO +++ b/linux-cachyos-lts/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-cachyos-lts pkgdesc = Linux BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements - Long Term Service - pkgver = 6.12.12 + pkgver = 6.12.13 pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 @@ -18,12 +18,12 @@ pkgbase = linux-cachyos-lts options = !strip options = !debug options = !lto - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.12.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.13.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-bore-cachy.patch - b2sums = e32d607f2732c5ad719aa2f31c7f42f6243d7e9d52447dc923563d2982a68a3bed836acac116e1e30f15e4eceb87671a96db507a7019d00eaf52f36c9340b07f + b2sums = 6c1f22d80bd5226a08c5ef80e9ab2ba553d00b49b4795b8ccb227381a7275ec89534267354318fa9b938fe99c4d91f0bf6b1d55263ea57eccc3aea1a9ce1d611 b2sums = f2836dc202ee935e098b1d160bd74587e5b536e59a8eb5bbb85c52c77b6b319a4244fa9cb410c4205bb9d6458699a7d60cd734346821b57704c7506cb2d78089 b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab b2sums = 290fbcd5d38c724db22e49c173170017f264191996739dbf991ba0e3d967e38eda3c6ef00b66101b46c6b90ce433265f8487baef62cd7c0b2582ab1d4aa12286 @@ -43,6 +43,7 @@ pkgname = linux-cachyos-lts provides = KSMBD-MODULE provides = UKSMD-BUILTIN provides = NTSYNC-MODULE + provides = VHBA-MODULE pkgname = linux-cachyos-lts-headers pkgdesc = Headers and scripts for building modules for the Linux BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements - Long Term Service kernel diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index f7c3759f1d..a1e900eb0b 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -25,21 +25,9 @@ ### Tweak kernel options prior to a build via nconfig : "${_makenconfig:=no}" -### Tweak kernel options prior to a build via menuconfig -: "${_makemenuconfig:=no}" - ### Tweak kernel options prior to a build via xconfig : "${_makexconfig:=no}" -### Tweak kernel options prior to a build via gconfig -: "${_makegconfig:=no}" - -# NUMA is optimized for multi-socket motherboards. -# A single multi-core CPU actually runs slower with NUMA enabled. -# See, https://bugs.archlinux.org/task/31187 -# It seems that in 2023 this is not really a huge regression anymore -: "${_NUMAdisable:=no}" - # Compile ONLY used modules to VASTLYreduce the number of modules built # and the build time. # @@ -159,7 +147,7 @@ fi pkgbase="linux-$_pkgsuffix" _major=6.12 -_minor=12 +_minor=13 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -346,24 +334,6 @@ prepare() { echo "Setting tick rate to ${_HZ_ticks}Hz..." - ### Disable NUMA - if [ "$_NUMAdisable" = "yes" ]; then - echo "Disabling NUMA from kernel config..." - scripts/config -d NUMA \ - -d AMD_NUMA \ - -d X86_64_ACPI_NUMA \ - -d NODES_SPAN_OTHER_NODES \ - -d NUMA_EMU \ - -d USE_PERCPU_NUMA_NODE_ID \ - -d ACPI_NUMA \ - -d ARCH_SUPPORTS_NUMA_BALANCING \ - -d NODES_SHIFT \ - -u NODES_SHIFT \ - -d NEED_MULTIPLE_NODES \ - -d NUMA_BALANCING \ - -d NUMA_BALANCING_DEFAULT_ENABLED - fi - ### Select performance governor if [ "$_per_gov" = "yes" ]; then echo "Setting performance governor..." @@ -483,15 +453,9 @@ prepare() { ### Running make nconfig [ "$_makenconfig" = "yes" ] && make "${BUILD_FLAGS[@]}" nconfig - ### Running make menuconfig - [ "$_makemenuconfig" = "yes" ] && make "${BUILD_FLAGS[@]}" menuconfig - ### Running make xconfig [ "$_makexconfig" = "yes" ] && make "${BUILD_FLAGS[@]}" xconfig - ### Running make gconfig - [ "$_makegconfig" = "yes" ] && make "${BUILD_FLAGS[@]}" gconfig - ### Save configuration for later reuse echo "Save configuration for later reuse..." local basedir="$(dirname "$(readlink "${srcdir}/config")")" @@ -561,7 +525,7 @@ _package() { 'linux-firmware: firmware images needed for some devices' 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig' 'scx-scheds: to use sched-ext schedulers') - provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN NTSYNC-MODULE) + provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN NTSYNC-MODULE VHBA-MODULE) cd "$_srcname" @@ -741,7 +705,7 @@ for _p in "${pkgname[@]}"; do }" done -b2sums=('e32d607f2732c5ad719aa2f31c7f42f6243d7e9d52447dc923563d2982a68a3bed836acac116e1e30f15e4eceb87671a96db507a7019d00eaf52f36c9340b07f' +b2sums=('6c1f22d80bd5226a08c5ef80e9ab2ba553d00b49b4795b8ccb227381a7275ec89534267354318fa9b938fe99c4d91f0bf6b1d55263ea57eccc3aea1a9ce1d611' 'f2836dc202ee935e098b1d160bd74587e5b536e59a8eb5bbb85c52c77b6b319a4244fa9cb410c4205bb9d6458699a7d60cd734346821b57704c7506cb2d78089' '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab' '290fbcd5d38c724db22e49c173170017f264191996739dbf991ba0e3d967e38eda3c6ef00b66101b46c6b90ce433265f8487baef62cd7c0b2582ab1d4aa12286'