Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

5.18.3-dev

Peter Jungac98f711ef8b
diff --git a/.backup/.SRCINFO b/.backup/.SRCINFO
new file mode 100644
index 00000000..e69de29b
diff --git a/zfs/.SRCINFO b/.backup/zfs/.SRCINFO
similarity index 66%
rename from zfs/.SRCINFO
rename to .backup/zfs/.SRCINFO
index 12ae4740..a6d4e263 100644
--- a/zfs/.SRCINFO
+++ b/.backup/zfs/.SRCINFO
@@ -1,20 +1,20 @@
-pkgbase = linux-cachyos-zfs
+pkgbase = linux-cachyos-hardened-zfs
pkgdesc = Kernel modules for the Zettabyte File System.
pkgver = 2.1.5
- pkgrel = 8
+ pkgrel = 9
url = http://zfsonlinux.org/
install = zfs.install
arch = x86_64
arch = x86_64_v3
license = CDDL
- makedepends = linux-cachyos-headers
- depends = linux-cachyos=5.18.2-1
+ makedepends = linux-cachyos-hardened-headers
+ depends = linux-cachyos-hardened=5.18.2-2
depends = kmod
depends = zfs-utils=2.1.5
provides = zfs=2.1.5
source = https://github.com/openzfs/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zfs-2.1.5-staging.patch
sha256sums = 3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6
- sha256sums = 7c507461a31da8739822885d778bd68621aaeee44045a4bab585a3195ba66a9d
+ sha256sums = 84e7cc4a6ef33c1ddc88a300be640bb997ac5c2e73a2f3b7418dc1b586843b20
-pkgname = linux-cachyos-zfs
+pkgname = linux-cachyos-hardened-zfs
diff --git a/zfs/PKGBUILD b/.backup/zfs/PKGBUILD
similarity index 98%
rename from zfs/PKGBUILD
rename to .backup/zfs/PKGBUILD
index 28888579..fa195a38 100644
--- a/zfs/PKGBUILD
+++ b/.backup/zfs/PKGBUILD
@@ -58,7 +58,7 @@ install=zfs.install
source=("https://github.com/openzfs/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz"
"https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zfs-2.1.5-staging.patch")
sha256sums=('3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6'
- '7c507461a31da8739822885d778bd68621aaeee44045a4bab585a3195ba66a9d')
+ '84e7cc4a6ef33c1ddc88a300be640bb997ac5c2e73a2f3b7418dc1b586843b20')
if [ -n "$_use_llvm_lto" ]; then
depends+=(clang llvm lld python)
BUILD_FLAGS=(
diff --git a/zfs/build-zfs.sh b/.backup/zfs/build-zfs.sh
similarity index 100%
rename from zfs/build-zfs.sh
rename to .backup/zfs/build-zfs.sh
diff --git a/zfs/zfs.install b/.backup/zfs/zfs.install
similarity index 100%
rename from zfs/zfs.install
rename to .backup/zfs/zfs.install
diff --git a/linux-bore/.SRCINFO b/linux-bore/.SRCINFO
index c1e1f314..8c412912 100755
--- a/linux-bore/.SRCINFO
+++ b/linux-bore/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-bore
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-migrate.patch
@@ -39,34 +39,34 @@ pkgbase = linux-bore
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
- sha256sums = 7a6dfa314da62e69f87c816cf407e0bff2673d3359ff29732a93c64a821f0851
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
+ sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-bore
@@ -86,3 +86,4 @@ pkgname = linux-bore
pkgname = linux-bore-headers
pkgdesc = Headers and scripts for building modules for the Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-bore
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index 2e16ff84..28b2f23b 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=${_cpusched}-lto
-else
- _linuxpostfix=${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-${_cpusched}-lto
+ pkgsuffix=${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-${_cpusched}
+ pkgsuffix=${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
-"config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -624,70 +621,63 @@ prepare() {
fi
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
-
- if [ -n "$_build_zfs" ] && [ -n "$_use_llvm_lto" ]; then
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure KERNEL_LLVM=1 --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
- if [ -n "$_build_zfs" ] ;then
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -702,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -790,37 +777,52 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ '7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271'
+ 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-bore/config b/linux-bore/config
index 2a7800ed..9591f434 100644
--- a/linux-bore/config
+++ b/linux-bore/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cachyos-bmq/.SRCINFO b/linux-cachyos-bmq/.SRCINFO
index 8ea509e4..bfd6deb4 100755
--- a/linux-cachyos-bmq/.SRCINFO
+++ b/linux-cachyos-bmq/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-bmq
pkgdesc = Linux BMQ scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-bmq
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-prjc.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
@@ -38,33 +38,33 @@ pkgbase = linux-cachyos-bmq
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
sha256sums = c6c332c3cd44bdbb82923cdeb6b8c6bfc539ed42e439b11d82093d575c79bbc0
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-cachyos-bmq
@@ -84,3 +84,4 @@ pkgname = linux-cachyos-bmq
pkgname = linux-cachyos-bmq-headers
pkgdesc = Headers and scripts for building modules for the Linux BMQ scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-bmq
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index 057c3a40..764227d8 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=cachyos-${_cpusched}-lto
-else
- _linuxpostfix=cachyos-${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-cachyos-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux BMQ scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,51 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ 'c6c332c3cd44bdbb82923cdeb6b8c6bfc539ed42e439b11d82093d575c79bbc0'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cachyos-bmq/config b/linux-cachyos-bmq/config
index 2a7800ed..9591f434 100644
--- a/linux-cachyos-bmq/config
+++ b/linux-cachyos-bmq/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO
index 5b2a4b46..23b5110c 100755
--- a/linux-cachyos-bore/.SRCINFO
+++ b/linux-cachyos-bore/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-bore
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-migrate.patch
@@ -39,34 +39,34 @@ pkgbase = linux-cachyos-bore
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
- sha256sums = 7a6dfa314da62e69f87c816cf407e0bff2673d3359ff29732a93c64a821f0851
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
+ sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-cachyos-bore
@@ -86,3 +86,4 @@ pkgname = linux-cachyos-bore
pkgname = linux-cachyos-bore-headers
pkgdesc = Headers and scripts for building modules for the Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-bore
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 6d66144b..07fea0c4 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=cachyos-${_cpusched}-lto
-else
- _linuxpostfix=cachyos-${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-cachyos-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,52 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ '7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271'
+ 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cachyos-bore/config b/linux-cachyos-bore/config
index 2a7800ed..9591f434 100644
--- a/linux-cachyos-bore/config
+++ b/linux-cachyos-bore/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cachyos-cacule/.SRCINFO b/linux-cachyos-cacule/.SRCINFO
index b7e62df2..2f0f4126 100755
--- a/linux-cachyos-cacule/.SRCINFO
+++ b/linux-cachyos-cacule/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-cacule
pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-cacule
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-cacULE-5.18.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
@@ -38,33 +38,33 @@ pkgbase = linux-cachyos-cacule
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
sha256sums = 616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-cachyos-cacule
@@ -84,3 +84,4 @@ pkgname = linux-cachyos-cacule
pkgname = linux-cachyos-cacule-headers
pkgdesc = Headers and scripts for building modules for the Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-cacule
diff --git a/linux-cachyos-cacule/PKGBUILD b/linux-cachyos-cacule/PKGBUILD
index 245c8753..b7198b76 100644
--- a/linux-cachyos-cacule/PKGBUILD
+++ b/linux-cachyos-cacule/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=cachyos-${_cpusched}-lto
-else
- _linuxpostfix=cachyos-${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-cachyos-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux cacULE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,51 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cachyos-cacule/config b/linux-cachyos-cacule/config
index 2a7800ed..9591f434 100644
--- a/linux-cachyos-cacule/config
+++ b/linux-cachyos-cacule/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cachyos-cfs/.SRCINFO b/linux-cachyos-cfs/.SRCINFO
index c1d03e95..01f44133 100755
--- a/linux-cachyos-cfs/.SRCINFO
+++ b/linux-cachyos-cfs/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-cfs
pkgdesc = Linux CFS scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-cfs
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-migrate.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
@@ -38,33 +38,33 @@ pkgbase = linux-cachyos-cfs
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-cachyos-cfs
@@ -84,3 +84,4 @@ pkgname = linux-cachyos-cfs
pkgname = linux-cachyos-cfs-headers
pkgdesc = Headers and scripts for building modules for the Linux CFS scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-cfs
diff --git a/linux-cachyos-cfs/PKGBUILD b/linux-cachyos-cfs/PKGBUILD
index 30ea7fd3..0e7abcf9 100644
--- a/linux-cachyos-cfs/PKGBUILD
+++ b/linux-cachyos-cfs/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=cachyos-${_cpusched}-lto
-else
- _linuxpostfix=cachyos-${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-cachyos-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux CFS scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,51 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cachyos-cfs/config b/linux-cachyos-cfs/config
index 2a7800ed..9591f434 100644
--- a/linux-cachyos-cfs/config
+++ b/linux-cachyos-cfs/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO
index b5c67705..5b642810 100755
--- a/linux-cachyos-hardened/.SRCINFO
+++ b/linux-cachyos-hardened/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-hardened
- pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
- pkgrel = 2
+ pkgdesc = Linux hardened kernel with the BORE scheduler Kernel by CachyOS with other patches and improvements
+ pkgver = 5.18.3
+ pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -24,40 +24,40 @@ pkgbase = linux-cachyos-hardened
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-migrate.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-stable-rc.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-amd-perf.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-arch.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-bbr2.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-cachy.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-clearlinux.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-cpu.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-fixes.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-fs-patches.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-futex-winesync.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-hwmon.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-hardened.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-kbuild.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-lrng.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-lru-le9-spf.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-ksm.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardened.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-arch.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-bbr2.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cachy.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-clearlinux.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cpu.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fixes.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = 9e1a2ed6b7c0057112dad7787b29471f46025da50492a446b5144e472417c576
- sha256sums = 7a6dfa314da62e69f87c816cf407e0bff2673d3359ff29732a93c64a821f0851
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 67d3496c8c737618f2ef5e0b03fd7767153fd2a2e967c818727f2fb7670a9966
+ sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65
- sha256sums = 6705db6d11e22ed9bb56a0ac3f22918667d52a835bb2ab678ac2c93d2902045d
+ sha256sums = 65b5a8d23387a4a9831505777f25614e345e26671fc8a237f8ac4521f0713c52
+ sha256sums = 81673b0f46bee5bffa8807e5f87208457a43cc46668738e80d7ea1f8ee8d071e
sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
- sha256sums = 88b98a96038860219eb668682c88532206e35a0b70001820504be4b2ef8b23ed
- sha256sums = 0b5bfe97f6d8803da05da3c8137b92771930c66b419c63ff5205b8b9ad9497c4
+ sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
+ sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
@@ -65,8 +65,6 @@ pkgbase = linux-cachyos-hardened
sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = 65b5a8d23387a4a9831505777f25614e345e26671fc8a237f8ac4521f0713c52
- sha256sums = 81673b0f46bee5bffa8807e5f87208457a43cc46668738e80d7ea1f8ee8d071e
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
@@ -76,7 +74,7 @@ pkgbase = linux-cachyos-hardened
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-cachyos-hardened
- pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
+ pkgdesc = The Linux hardened kernel with the BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
depends = coreutils
depends = kmod
depends = initramfs
@@ -90,5 +88,6 @@ pkgname = linux-cachyos-hardened
provides = UKSMD-BUILTIN
pkgname = linux-cachyos-hardened-headers
- pkgdesc = Headers and scripts for building modules for the Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel
+ pkgdesc = Headers and scripts for building modules for the Linux hardened kernel with the BORE scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-hardened
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 6e55c69d..f386b8ec 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=cachyos-${_cpusched}-lto
-else
- _linuxpostfix=cachyos-${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-cachyos-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -139,8 +135,9 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
arch=(x86_64 x86_64_v3)
-pkgdesc='Linux hardened kernel with the bore scheduler Kernel by CachyOS with other patches and improvements'
+pkgdesc='Linux hardened kernel with the BORE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,54 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '67d3496c8c737618f2ef5e0b03fd7767153fd2a2e967c818727f2fb7670a9966'
+ '7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271'
+ 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
+ '65b5a8d23387a4a9831505777f25614e345e26671fc8a237f8ac4521f0713c52'
+ '81673b0f46bee5bffa8807e5f87208457a43cc46668738e80d7ea1f8ee8d071e'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cachyos-hardened/config b/linux-cachyos-hardened/config
index 8b3ddfc3..ffb500e7 100644
--- a/linux-cachyos-hardened/config
+++ b/linux-cachyos-hardened/config
@@ -307,7 +307,7 @@ CONFIG_PERF_EVENTS=y
# end of Kernel Performance Events And Counters
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
@@ -1007,7 +1007,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -3662,6 +3666,7 @@ CONFIG_ATH5K_TRACER=y
CONFIG_ATH5K_PCI=y
CONFIG_ATH9K_HW=m
CONFIG_ATH9K_COMMON=m
+# CONFIG_ATH9K_COMMON_DEBUG is not set
CONFIG_ATH9K_BTCOEX_SUPPORT=y
CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
@@ -3680,6 +3685,7 @@ CONFIG_ATH9K_HWRNG=y
CONFIG_ATH9K_COMMON_SPECTRAL=y
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
CONFIG_CARL9170_WPC=y
# CONFIG_CARL9170_HWRNG is not set
CONFIG_ATH6KL=m
@@ -3706,6 +3712,7 @@ CONFIG_ATH11K=m
CONFIG_ATH11K_AHB=m
CONFIG_ATH11K_PCI=m
# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_DEBUGFS is not set
# CONFIG_ATH11K_TRACING is not set
CONFIG_WLAN_VENDOR_ATMEL=y
CONFIG_ATMEL=m
@@ -3776,6 +3783,7 @@ CONFIG_IWL3945=m
# iwl3945 / iwl4965 Debugging Options
#
# CONFIG_IWLEGACY_DEBUG is not set
+# CONFIG_IWLEGACY_DEBUGFS is not set
# end of iwl3945 / iwl4965 Debugging Options
CONFIG_IWLWIFI=m
@@ -3788,6 +3796,7 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEBUGFS is not set
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
# end of Debugging Options
@@ -3890,6 +3899,7 @@ CONFIG_RT2X00_LIB=m
CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
# CONFIG_RT2X00_DEBUG is not set
CONFIG_WLAN_VENDOR_REALTEK=y
CONFIG_RTL8180=m
@@ -10099,6 +10109,8 @@ CONFIG_SLAB_SANITIZE_VERIFY=y
# CONFIG_RANDSTRUCT_NONE is not set
CONFIG_RANDSTRUCT_FULL=y
# CONFIG_RANDSTRUCT_PERFORMANCE is not set
+CONFIG_RANDSTRUCT=y
+CONFIG_GCC_PLUGIN_RANDSTRUCT=y
# end of Kernel hardening options
# end of Security options
@@ -10548,7 +10560,10 @@ CONFIG_DEBUG_MISC=y
#
# Compile-time checks and compiler options
#
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO_NONE=y
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
CONFIG_FRAME_WARN=2048
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
diff --git a/linux-cachyos-pds/.SRCINFO b/linux-cachyos-pds/.SRCINFO
index 4ff6544a..bbada874 100755
--- a/linux-cachyos-pds/.SRCINFO
+++ b/linux-cachyos-pds/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-pds
pkgdesc = Linux PDS scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-pds
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-prjc.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
@@ -38,33 +38,33 @@ pkgbase = linux-cachyos-pds
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
sha256sums = c6c332c3cd44bdbb82923cdeb6b8c6bfc539ed42e439b11d82093d575c79bbc0
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-cachyos-pds
@@ -84,3 +84,4 @@ pkgname = linux-cachyos-pds
pkgname = linux-cachyos-pds-headers
pkgdesc = Headers and scripts for building modules for the Linux PDS scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-pds
diff --git a/linux-cachyos-pds/PKGBUILD b/linux-cachyos-pds/PKGBUILD
index 6fdadb1a..fcc465a8 100644
--- a/linux-cachyos-pds/PKGBUILD
+++ b/linux-cachyos-pds/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=cachyos-${_cpusched}-lto
-else
- _linuxpostfix=cachyos-${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-cachyos-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux PDS scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,51 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ 'c6c332c3cd44bdbb82923cdeb6b8c6bfc539ed42e439b11d82093d575c79bbc0'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cachyos-pds/config b/linux-cachyos-pds/config
index 2a7800ed..9591f434 100644
--- a/linux-cachyos-pds/config
+++ b/linux-cachyos-pds/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cachyos-tt/.SRCINFO b/linux-cachyos-tt/.SRCINFO
index 53f9151e..fad0d361 100755
--- a/linux-cachyos-tt/.SRCINFO
+++ b/linux-cachyos-tt/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cachyos-tt
pkgdesc = Linux TT scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,8 +24,9 @@ pkgbase = linux-cachyos-tt
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-tt-5.18.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-arch.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-bbr2.patch
@@ -37,32 +38,33 @@ pkgbase = linux-cachyos-tt
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
+ sha256sums = 43ac1821d8e492ad5cbff180148d6896f39240d5ba9d9e09b3c67e26a3e27f36
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-cachyos-tt
@@ -82,3 +84,4 @@ pkgname = linux-cachyos-tt
pkgname = linux-cachyos-tt-headers
pkgdesc = Headers and scripts for building modules for the Linux TT scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-tt
diff --git a/linux-cachyos-tt/PKGBUILD b/linux-cachyos-tt/PKGBUILD
index 82f2b949..5c992831 100644
--- a/linux-cachyos-tt/PKGBUILD
+++ b/linux-cachyos-tt/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=cachyos-${_cpusched}-lto
-else
- _linuxpostfix=cachyos-${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-cachyos-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux TT scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,51 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ '43ac1821d8e492ad5cbff180148d6896f39240d5ba9d9e09b3c67e26a3e27f36'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cachyos-tt/config b/linux-cachyos-tt/config
index 2a7800ed..9591f434 100644
--- a/linux-cachyos-tt/config
+++ b/linux-cachyos-tt/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO
index 125321d0..23b5110c 100755
--- a/linux-cachyos/.SRCINFO
+++ b/linux-cachyos/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
- pkgrel = 2
+ pkgver = 5.18.3
+ pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -24,34 +24,32 @@ pkgbase = linux-cachyos-bore
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched-dev.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-migrate.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-stable-rc.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-amd-perf.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-arch.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-bbr2.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cachy.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-clearlinux.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cpu.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-fixes.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-fs-patches.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fixes.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/dev/0001-kbuild.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = e37566b5e26c139629c14fbcae237d1ff15caa592fc10593f1fd15698e5afb71
- sha256sums = 51bcca36288e44282017ed35b41855d22d108508c1a2501b71e5f4ccce885da2
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
+ sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65
- sha256sums = 6705db6d11e22ed9bb56a0ac3f22918667d52a835bb2ab678ac2c93d2902045d
sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 3d657f7e..07fea0c4 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -20,7 +20,7 @@ _cpusched='bore'
# Set these variables to ANYTHING that is not null to enable them
### Tweak kernel options prior to a build via nconfig
-_makenconfig=y
+_makenconfig=
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU actually runs slower with NUMA enabled.
@@ -125,7 +125,7 @@ else
pkgbase=linux-$pkgsuffix
fi
_major=5.18
-_minor=2
+_minor=3
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -136,8 +136,8 @@ _srcname=linux-${_stable}
#_srcname=linux-${_major}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
-_kernelver=$pkgver-${pkgrel}
+pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -172,7 +172,7 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=("${_patchsource}/sched/0001-bore-sched-dev.patch"
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
@@ -189,19 +189,18 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/0001-stable-rc.patch"
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,10 +219,6 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
-source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
@@ -789,7 +784,7 @@ _package-headers() {
_package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
- depends=('pahole' linux-${pkgsuffix}=$pkgver-${pkgrel})
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -809,11 +804,10 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'e37566b5e26c139629c14fbcae237d1ff15caa592fc10593f1fd15698e5afb71'
- '51bcca36288e44282017ed35b41855d22d108508c1a2501b71e5f4ccce885da2'
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ '7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271'
'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
- '6705db6d11e22ed9bb56a0ac3f22918667d52a835bb2ab678ac2c93d2902045d'
'326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
'2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
diff --git a/linux-cachyos/config b/linux-cachyos/config
index 2a7800ed..9591f434 100644
--- a/linux-cachyos/config
+++ b/linux-cachyos/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cacule-rdb/PKGBUILD b/linux-cacule-rdb/PKGBUILD
index 55d05f52..107ff5bd 100644
--- a/linux-cacule-rdb/PKGBUILD
+++ b/linux-cacule-rdb/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=${_cpusched}-lto
-else
- _linuxpostfix=${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-${_cpusched}-lto
+ pkgsuffix=${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-${_cpusched}
+ pkgsuffix=${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,55 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'e37566b5e26c139629c14fbcae237d1ff15caa592fc10593f1fd15698e5afb71'
+ 'SKIP'
+ '51bcca36288e44282017ed35b41855d22d108508c1a2501b71e5f4ccce885da2'
+ 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
+ '6705db6d11e22ed9bb56a0ac3f22918667d52a835bb2ab678ac2c93d2902045d'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22'
+ 'SKIP')
diff --git a/linux-cacule-rdb/config b/linux-cacule-rdb/config
index 2a7800ed..9591f434 100644
--- a/linux-cacule-rdb/config
+++ b/linux-cacule-rdb/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-cacule/.SRCINFO b/linux-cacule/.SRCINFO
index 09f33a7b..2f0f4126 100755
--- a/linux-cacule/.SRCINFO
+++ b/linux-cacule/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = linux-cacule
+pkgbase = linux-cachyos-cacule
pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-cacule
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-cacULE-5.18.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
@@ -38,36 +38,36 @@ pkgbase = linux-cacule
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
sha256sums = 616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
-pkgname = linux-cacule
+pkgname = linux-cachyos-cacule
pkgdesc = The Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
depends = coreutils
depends = kmod
@@ -81,6 +81,7 @@ pkgname = linux-cacule
provides = KSMBD-MODULE
provides = UKSMD-BUILTIN
-pkgname = linux-cacule-headers
+pkgname = linux-cachyos-cacule-headers
pkgdesc = Headers and scripts for building modules for the Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cachyos-cacule
diff --git a/linux-cacule/PKGBUILD b/linux-cacule/PKGBUILD
index caff1813..b7198b76 100644
--- a/linux-cacule/PKGBUILD
+++ b/linux-cacule/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=${_cpusched}-lto
-else
- _linuxpostfix=${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-${_cpusched}-lto
+ pkgsuffix=cachyos-${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-${_cpusched}
+ pkgsuffix=cachyos-${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux cacULE scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,8 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -172,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -187,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -220,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -319,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -595,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -623,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -694,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -782,37 +777,51 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-cacule/config b/linux-cacule/config
index 2a7800ed..9591f434 100644
--- a/linux-cacule/config
+++ b/linux-cacule/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/linux-tt/.SRCINFO b/linux-tt/.SRCINFO
index b10ab98b..dc7ed278 100755
--- a/linux-tt/.SRCINFO
+++ b/linux-tt/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-tt
pkgdesc = Linux TT scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-tt
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-tt-5.18.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
@@ -38,33 +38,33 @@ pkgbase = linux-tt
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
sha256sums = 43ac1821d8e492ad5cbff180148d6896f39240d5ba9d9e09b3c67e26a3e27f36
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
pkgname = linux-tt
@@ -84,3 +84,4 @@ pkgname = linux-tt
pkgname = linux-tt-headers
pkgdesc = Headers and scripts for building modules for the Linux TT scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-tt
diff --git a/linux-tt/PKGBUILD b/linux-tt/PKGBUILD
index d8b2d581..cf451095 100644
--- a/linux-tt/PKGBUILD
+++ b/linux-tt/PKGBUILD
@@ -45,7 +45,7 @@ _localmodcfg=
_use_current=
### Enable KBUILD_CFLAGS -O3
-_cc_harder=y
+_cc_harder=
### Set performance governor as default
_per_gov=y
@@ -113,23 +113,19 @@ _thin_lto_cachedir=
# The packagename is called "llvm-kcfi"
_use_kcfi=
-# Build the zfs module builtin in to the kernel only works with GCC!
+# Build the zfs module builtin in to the kernel
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- _linuxpostfix=${_cpusched}-lto
-else
- _linuxpostfix=${_cpusched}
-fi
-if [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-${_cpusched}-lto
+ pkgsuffix=${_cpusched}-lto
+ pkgbase=linux-$pkgsuffix
+
else
- pkgbase=linux-${_cpusched}
+ pkgsuffix=${_cpusched}
+ pkgbase=linux-$pkgsuffix
fi
_major=5.18
_minor=3
-_kernver=5.18.3-1
-_extramodules=${_kernver}-${_linuxpostfix}
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -141,6 +137,7 @@ _srcname=linux-${_stable}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux TT scheduler Kernel by CachyOS with other patches and improvements'
pkgrel=1
+_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -157,9 +154,11 @@ if [ -n "$_use_llvm_lto" ]; then
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}"
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
- "config"
-"${_patchsource}/0001-stable-rc.patch")
+ "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
+ "config")
+if [ -n "$_build_zfs" ]; then
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4")
+fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
fi
@@ -173,9 +172,8 @@ if [ "$_cpusched" = "cacule-rdb" ]; then
source+=("${_patchsource}/sched/0001-cacULE-5.18.patch")
fi
if [ "$_cpusched" = "bore" ]; then
- source+=(
- "${_patchsource}/sched/0001-bore-sched.patch"
- "${_patchsource}/0001-migrate.patch")
+ source+=("${_patchsource}/sched/0001-bore-sched.patch"
+ "${_patchsource}/0001-migrate.patch")
fi
if [ "$_cpusched" = "cfs" ]; then
source+=("${_patchsource}/0001-migrate.patch")
@@ -188,21 +186,21 @@ if [ "$_cpusched" = "hardened" ]; then
"${_patchsource}/sched/0001-bore-sched.patch"
"${_patchsource}/0001-migrate.patch"
"${_patchsource}/0001-hardening.patch"
- "${_patchsource}/0001-hardened.patch")
+ "${_patchsource}/0001-hardened.patch")
fi
source+=(
- "${_patchsource}/dev/0001-amd-perf.patch"
+ "${_patchsource}/0001-amd-perf.patch"
"${_patchsource}/0001-arch.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch"
- "${_patchsource}/dev/0001-fixes.patch"
- "${_patchsource}/dev/0001-fs-patches.patch"
+ "${_patchsource}/0001-fixes.patch"
+ "${_patchsource}/0001-fs-patches.patch"
"${_patchsource}/0001-futex-winesync.patch"
"${_patchsource}/0001-hwmon.patch"
- "${_patchsource}/dev/0001-kbuild.patch"
+ "${_patchsource}/0001-kbuild.patch"
"${_patchsource}/0001-lrng.patch"
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
@@ -221,31 +219,28 @@ if [ -n "$_use_kcfi" ]; then
)
fi
-if [ -n "$_build_zfs" ]; then
- source+=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5")
-fi
-
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() {
- cd $_srcname
+cd ${srcdir}/$_srcname
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
+# [[ $src = 0001-zfs-2.1.5-staging.patch ]] && continue
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
echo "Setting config..."
cp ../config .config
@@ -320,8 +315,8 @@ prepare() {
--enable HAVE_GCC_PLUGINS
elif [ "$_use_llvm_lto" = "full" ]; then
echo "Enabling LLVM FULL LTO..."
- scripts/config --disable
- --enable LTO \
+ scripts/config \
+ --enable LTO \
--enable LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG \
--enable ARCH_SUPPORTS_LTO_CLANG_THIN \
@@ -596,6 +591,7 @@ prepare() {
scripts/config --enable USER_NS
echo "Enable WINE FASTSYNC"
scripts/config --enable WINESYNC
+
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
if [ -n "$_use_current" ]; then
@@ -624,63 +620,64 @@ prepare() {
fi
fi
-
-
### Rewrite configuration
- echo "Rewrite configuration..."
- make ${BUILD_FLAGS[*]} prepare
- if [ -n "$_build_zfs" ]; then
-
- cd "${srcdir}/zfs"
- ./autogen.sh
- ./configure --with-linux=${srcdir}/$_srcname \
- --with-linux-obj=${srcdir}/$_srcname --enable-linux-builtin \
- --prefix=$pkgdir/usr/lib/modules/$(<version)/build --exec-prefix=$pkgdir/usr/lib/modules/$(<version)/build \
- --with-config=kernel --without-udevdir --disable-sysvinit
- ./copy-builtin ${srcdir}/$_srcname
- cd ${srcdir}/$_srcname
- scripts/config --enable CONFIG_ZFS
- fi
-
- yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
- diff -u ../config .config || :
+ echo "Rewrite configuration..."
+ make ${BUILD_FLAGS[*]} prepare
+ yes "" | make ${BUILD_FLAGS[*]} config >/dev/null
+ diff -u ../config .config || :
- ### Prepared version
- make ${BUILD_FLAGS[*]} -s kernelrelease > version
- echo "Prepared $pkgbase version $(<version)"
+ ### Prepared version
+ make ${BUILD_FLAGS[*]} -s kernelrelease > version
+ echo "Prepared $pkgbase version $(<version)"
- ### Running make nconfig
- [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
+ ### Running make nconfig
+ [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig
- ### Save configuration for later reuse
- echo "Save configuration for later reuse..."
- cat .config > "${startdir}/config.last"
+ ### Save configuration for later reuse
+ echo "Save configuration for later reuse..."
+ cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
### Save configuration for later reuse
- # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
+ # cp -Tf ./.config "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
}
build() {
-
- cd ${srcdir}/$_srcname
- make ${BUILD_FLAGS[*]} -j$(nproc) all
+ cd ${srcdir}/${_srcname}
+ make ${BUILD_FLAGS[*]} -j$(nproc) all
+
+ if [ -n "$_build_zfs" ]; then
+ cd ${srcdir}/"zfs"
+
+ if [ -n "$_use_llvm_lto" ]; then
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure KERNEL_LLVM=1 --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
+ else
+ ./autogen.sh
+ sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
+ ./configure --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
+ fi
+ make ${BUILD_FLAGS[*]}
+ fi
}
_package() {
- pkgdesc="The $pkgdesc kernel and modules"
- depends=('coreutils' 'kmod' 'initramfs')
- optdepends=('wireless-regdb: to set the correct wireless channels of your country'
- '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'
- 'uksmd: Userspace KSM helper daemon')
- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- if [ -n "$_build_zfs" ]; then
- provides+=($pkgbase-zfs)
- optdepends+=('zfs-utils')
- fi
+ pkgdesc="The $pkgdesc kernel and modules"
+ depends=('coreutils' 'kmod' 'initramfs')
+ optdepends=('wireless-regdb: to set the correct wireless channels of your country'
+ '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'
+ 'uksmd: Userspace KSM helper daemon')
+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN)
- cd $_srcname
+ cd ${srcdir}/$_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -695,21 +692,18 @@ _package() {
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
- DEPMOD=/doesnt/exist modules_install # Suppress depmod
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
}
_package-headers() {
- pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
- depends=(pahole)
- if [ -n "$_build_zfs" ]; then
- provides=("zfs-headers" "spl-headers")
- fi
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+ depends=('pahole' linux-${pkgsuffix} )
- cd ${_srcname}
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+ cd ${srcdir}/${_srcname}
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
@@ -783,37 +777,51 @@ _package-headers() {
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
- echo "Adding symlink..."
- mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+ echo "Adding symlink..."
+ mkdir -p "$pkgdir/usr/src"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+}
+
+_package-zfs(){
+ pkgdesc="zfs module for the $pkgdesc kernel"
+ depends=('pahole' linux-$pkgsuffix=$_kernver)
+
+ cd ${srcdir}/"zfs"
+ install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -m644 module/*/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
+# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
pkgname=("$pkgbase" "$pkgbase-headers")
+if [ -n "$_build_zfs" ]; then
+ pkgname+=("$pkgbase-zfs")
+fi
for _p in "${pkgname[@]}"; do
- eval "package_$_p() {
+ eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
- }"
+ }"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c'
+ '43ac1821d8e492ad5cbff180148d6896f39240d5ba9d9e09b3c67e26a3e27f36'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
+ '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
diff --git a/linux-tt/config b/linux-tt/config
index 2a7800ed..9591f434 100644
--- a/linux-tt/config
+++ b/linux-tt/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.2 Kernel Configuration
+# Linux/x86 5.18.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -15,13 +15,15 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=123
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_TT_SCHED is not set
+# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
@@ -157,20 +159,16 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
@@ -189,6 +187,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
+# CONFIG_SCHED_ALT is not set
+# CONFIG_SCHED_BMQ is not set
+# CONFIG_SCHED_PDS is not set
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
@@ -539,6 +540,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -1015,7 +1017,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5688,17 +5694,14 @@ CONFIG_RC_LOOPBACK=m
CONFIG_RC_XBOX_DVD=m
CONFIG_CEC_CORE=y
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
#
# CEC support
#
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -9811,7 +9814,6 @@ CONFIG_PECI_CPU=m
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_FS_IOMAP=y
-CONFIG_ZFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
@@ -10991,7 +10993,7 @@ CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_OBJTOOL=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
CONFIG_HIST_TRIGGERS=y
diff --git a/script.sh b/script.sh
index e9717a99..6eb39bc2 100755
--- a/script.sh
+++ b/script.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_optimization_select=y/_use_optimization_select=/" {}
+find . -name "PKGBUILD" | xargs -I {} sed -i "s/_build_zfs=/_build_zfs=y/" {}
files=$(find . -name "PKGBUILD")