summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jung2022-06-15 14:07:56 +0200
committerPeter Jung2022-06-15 14:07:56 +0200
commit2802b2e03b0243aab835c65e6746a0cfe3b814a5 (patch)
tree0c89495fbf4a8885b3fd7fef739ca689f543e4d0
parent21bae4b6def5d3c47802ca985a75710c0b764165 (diff)
downloadaur-2802b2e03b0243aab835c65e6746a0cfe3b814a5.tar.gz
5.18.4-2
-rwxr-xr-x.SRCINFO22
-rw-r--r--PKGBUILD56
-rw-r--r--config25
3 files changed, 61 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2f7111f7e41d..cfc1285297cc 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cacule
pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.3
+ pkgver = 5.18.4
pkgrel = 2
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.3.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.4.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
@@ -42,27 +42,25 @@ pkgbase = linux-cacule
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 = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
- sha256sums = 83425e8b1553f4ad0d8fdadbad3980b71f7a36742b3238813ff4d00cd3bf08f8
+ sha256sums = 4b7193476f79c56b0d9988f68777dd0f885a1965e6fd55ec015922aa789492dd
+ sha256sums = 0eef0883fcf7d1e6f9d8c9c5ea50066004e19d08d3ed183ad92e5d8f76ef1fbf
sha256sums = 616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e
sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
- sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
+ sha256sums = 2d89b2b95cc61623cbd5d0a7bbce68711cb1c9c77f338cd7201cf4d9ab24a1a2
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
- sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 6b6c8d1fbefe7aa165fc62aef527665777d474133e2507e1dc9d09b12282f857
- sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
+ sha256sums = 71c33bf75dbf84673ad26a35c20b0f9ae0fa9944d91cd93a0b128752ca2eab0e
+ sha256sums = adace5a6666cee4ec5fccde405bc99d06b395bc9812c31b046826cc93f7d364c
+ sha256sums = 5d1e60a13e2dfe002d31392172ca8df758b822ecd784f9c35c18202a33874d6f
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
- sha256sums = 344806f8ea9f0f7da883e2c27835153944df7a4b15bb3f97ec6b7b7709682f5d
- sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
+ sha256sums = b14fc8ef91b4558220920d129808f42462f0c05b315e532a60423cd164752e9b
+ sha256sums = 73baad17b251566783730e4ff881fe38d6b9566a0c1acd95ada354166e65e4f3
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
- sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
sha256sums = ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f
pkgname = linux-cacule
diff --git a/PKGBUILD b/PKGBUILD
index c87d67bb868a..b68ae4ccc722 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -73,7 +73,7 @@ _kyber_disable=y
_lru_enable=y
## Enable DAMON
-_damon=
+_damon=y
## enable SPECULATIVE_PAGE_FAULT
_spf_enable=y
@@ -123,6 +123,9 @@ _use_kcfi=
# Build the zfs module builtin in to the kernel
_build_zfs=
+# Enable bcachefs
+_bcachefs=
+
if [ -n "$_use_llvm_lto" ]; then
pkgsuffix=${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -132,7 +135,7 @@ else
pkgbase=linux-$pkgsuffix
fi
_major=5.18
-_minor=3
+_minor=4
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@@ -164,7 +167,7 @@ source=(
"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")
+ source+=("git+https://github.com/ptr1337/zfs.git#commit=24414b85f1b0fce4b13c10be4af47ebb826fef27")
fi
if [ "$_cpusched" = "bmq" ]; then
source+=("${_patchsource}/sched/0001-prjc.patch")
@@ -211,7 +214,6 @@ source+=(
"${_patchsource}/0001-lru-le9-spf.patch"
"${_patchsource}/0001-ksm.patch"
"${_patchsource}/0001-zram-entropy-calculation.patch"
- "${_patchsource}/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch"
"auto-cpu-optimization.sh"
)
@@ -225,6 +227,10 @@ if [ -n "$_use_kcfi" ]; then
)
fi
+if [ -n "$_bcachefs" ]; then
+ source+=("${_patchsource}/0001-bcachefs.patch")
+fi
+
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
@@ -492,7 +498,8 @@ prepare() {
--enable DAMON_DBGFS \
--enable DAMON_SYSFS \
--enable DAMON_PADDR \
- --enable DAMON_RECLAIM
+ --enable DAMON_RECLAIM \
+ --enable DAMON_LRU_SORT
fi
if [ -n "$_lrng_enable" ]; then
@@ -812,23 +819,22 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
- '83425e8b1553f4ad0d8fdadbad3980b71f7a36742b3238813ff4d00cd3bf08f8'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '6b6c8d1fbefe7aa165fc62aef527665777d474133e2507e1dc9d09b12282f857'
- 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- '344806f8ea9f0f7da883e2c27835153944df7a4b15bb3f97ec6b7b7709682f5d'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
- 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
-'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f')
+sha256sums=('4b7193476f79c56b0d9988f68777dd0f885a1965e6fd55ec015922aa789492dd'
+ '0eef0883fcf7d1e6f9d8c9c5ea50066004e19d08d3ed183ad92e5d8f76ef1fbf'
+ '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '2d89b2b95cc61623cbd5d0a7bbce68711cb1c9c77f338cd7201cf4d9ab24a1a2'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '71c33bf75dbf84673ad26a35c20b0f9ae0fa9944d91cd93a0b128752ca2eab0e'
+ 'adace5a6666cee4ec5fccde405bc99d06b395bc9812c31b046826cc93f7d364c'
+ '5d1e60a13e2dfe002d31392172ca8df758b822ecd784f9c35c18202a33874d6f'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ 'b14fc8ef91b4558220920d129808f42462f0c05b315e532a60423cd164752e9b'
+ '73baad17b251566783730e4ff881fe38d6b9566a0c1acd95ada354166e65e4f3'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f')
diff --git a/config b/config
index a0f768b8d5fa..e0827da2c2b1 100644
--- a/config
+++ b/config
@@ -524,7 +524,7 @@ CONFIG_ARCH_RANDOM=y
CONFIG_X86_SMAP=y
CONFIG_X86_UMIP=y
CONFIG_CC_HAS_IBT=y
-# CONFIG_X86_KERNEL_IBT is not set
+CONFIG_X86_KERNEL_IBT=y
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
# CONFIG_X86_INTEL_TSX_MODE_ON is not set
@@ -854,7 +854,7 @@ CONFIG_HAS_LTO_CLANG=y
CONFIG_LTO_NONE=y
# CONFIG_LTO_CLANG_FULL is not set
# CONFIG_LTO_CLANG_THIN is not set
-CONFIG_LTO_CLANG_THIN_CACHEDIR="/tmp"
+CONFIG_LTO_CLANG_THIN_CACHEDIR=""
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y
@@ -1159,6 +1159,12 @@ CONFIG_ANON_VMA_NAME=y
# Data Access Monitoring
#
# CONFIG_DAMON is not set
+# CONFIG_DAMON_VADDR is not set
+# CONFIG_DAMON_PADDR is not set
+# CONFIG_DAMON_SYSFS is not set
+# CONFIG_DAMON_DBGFS is not set
+# CONFIG_DAMON_RECLAIM is not set
+# CONFIG_DAMON_LRU_SORT is not set
# end of Data Access Monitoring
# CONFIG_ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT is not set
@@ -2388,6 +2394,7 @@ CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_RUNTIME_MAP=y
# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_SOFT_RESERVE=y
CONFIG_EFI_RUNTIME_WRAPPERS=y
CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
CONFIG_EFI_BOOTLOADER_CONTROL=m
@@ -3947,14 +3954,19 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
+CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
@@ -9732,8 +9744,6 @@ CONFIG_NVDIMM_DAX=y
CONFIG_DAX=y
CONFIG_DEV_DAX=m
CONFIG_DEV_DAX_PMEM=m
-CONFIG_DEV_DAX_HMEM=m
-CONFIG_DEV_DAX_HMEM_DEVICES=y
CONFIG_DEV_DAX_KMEM=m
CONFIG_NVMEM=y
CONFIG_NVMEM_SYSFS=y
@@ -9919,6 +9929,11 @@ CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_OVERLAY_FS_INDEX=y
CONFIG_OVERLAY_FS_XINO_AUTO=y
CONFIG_OVERLAY_FS_METACOPY=y
+CONFIG_BCACHEFS_FS=y
+CONFIG_BCACHEFS_QUOTA=y
+CONFIG_BCACHEFS_POSIX_ACL=y
+# CONFIG_BCACHEFS_DEBUG is not set
+# CONFIG_BCACHEFS_TESTS is not set
#
# Caches
@@ -10763,7 +10778,7 @@ CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_INFO_NONE is not set
# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_DWARF5 is not set
+CONFIG_DEBUG_INFO_DWARF5=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set