Skip to content

Commit

Permalink
6.6: Fix ZFS module in LTO kernels (fix #195)
Browse files Browse the repository at this point in the history
Signed-off-by: Piotr Gorski <[email protected]>
  • Loading branch information
sirlucjan committed Nov 6, 2023
1 parent 4893e9c commit 7250ef4
Show file tree
Hide file tree
Showing 27 changed files with 76 additions and 93 deletions.
4 changes: 2 additions & 2 deletions linux-bore/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Thu Nov 2 22:06:43 UTC 2023
# Mon Nov 6 19:42:34 UTC 2023
pkgbase = linux-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.0
Expand Down Expand Up @@ -30,7 +30,7 @@ pkgbase = linux-bore
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore.patch
b2sums = 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
b2sums = c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df
b2sums = 98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa
b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
b2sums = b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924
b2sums = 9f338dc2939661e6250ddc9a1ab2a8c02a96fea38534191aeda78c43a8cdf4a07596e08bdf8a749ccc87e5019782d6c92ed19b844a58ddfc73cff99120296454
Expand Down
11 changes: 4 additions & 7 deletions linux-bore/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,6 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi

### Prevent ZFS and LTO building at the same time
# More infos here: https://github.com/openzfs/zfs/issues/15384
if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then
_die "ZFS and LTO support cannot be built at the same time. "
fi

### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
Expand Down Expand Up @@ -685,6 +679,9 @@ build() {
local CONFIGURE_FLAGS=()
[ "$_use_llvm_lto" != "none" ] && CONFIGURE_FLAGS+=("KERNEL_LLVM=1")

export KCPPFLAGS+=' -Wno-error=uninitialized'
export KCFLAGS+=' -Wno-error=uninitialized'

./autogen.sh
sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
Expand Down Expand Up @@ -869,7 +866,7 @@ for _p in "${pkgname[@]}"; do
done

b2sums=('5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2'
'c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df'
'98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa'
'11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
'b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924'
'9f338dc2939661e6250ddc9a1ab2a8c02a96fea38534191aeda78c43a8cdf4a07596e08bdf8a749ccc87e5019782d6c92ed19b844a58ddfc73cff99120296454')
1 change: 1 addition & 0 deletions linux-bore/config
Original file line number Diff line number Diff line change
Expand Up @@ -10371,6 +10371,7 @@ CONFIG_F2FS_UNFAIR_RWSEM=y
CONFIG_BCACHEFS_FS=y
CONFIG_BCACHEFS_QUOTA=y
CONFIG_BCACHEFS_POSIX_ACL=y
# CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set
# CONFIG_BCACHEFS_DEBUG is not set
# CONFIG_BCACHEFS_TESTS is not set
CONFIG_BCACHEFS_LOCK_TIME_STATS=y
Expand Down
4 changes: 2 additions & 2 deletions linux-cachyos-bore/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Thu Nov 2 22:07:46 UTC 2023
# Mon Nov 6 19:42:59 UTC 2023
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.0
Expand Down Expand Up @@ -30,7 +30,7 @@ pkgbase = linux-cachyos-bore
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore.patch
b2sums = 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
b2sums = c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df
b2sums = 98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa
b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
b2sums = b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924
b2sums = 9f338dc2939661e6250ddc9a1ab2a8c02a96fea38534191aeda78c43a8cdf4a07596e08bdf8a749ccc87e5019782d6c92ed19b844a58ddfc73cff99120296454
Expand Down
11 changes: 4 additions & 7 deletions linux-cachyos-bore/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,6 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi

### Prevent ZFS and LTO building at the same time
# More infos here: https://github.com/openzfs/zfs/issues/15384
if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then
_die "ZFS and LTO support cannot be built at the same time. "
fi

### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
Expand Down Expand Up @@ -685,6 +679,9 @@ build() {
local CONFIGURE_FLAGS=()
[ "$_use_llvm_lto" != "none" ] && CONFIGURE_FLAGS+=("KERNEL_LLVM=1")

export KCPPFLAGS+=' -Wno-error=uninitialized'
export KCFLAGS+=' -Wno-error=uninitialized'

./autogen.sh
sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
Expand Down Expand Up @@ -869,7 +866,7 @@ for _p in "${pkgname[@]}"; do
done

b2sums=('5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2'
'c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df'
'98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa'
'11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
'b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924'
'9f338dc2939661e6250ddc9a1ab2a8c02a96fea38534191aeda78c43a8cdf4a07596e08bdf8a749ccc87e5019782d6c92ed19b844a58ddfc73cff99120296454')
1 change: 1 addition & 0 deletions linux-cachyos-bore/config
Original file line number Diff line number Diff line change
Expand Up @@ -10371,6 +10371,7 @@ CONFIG_F2FS_UNFAIR_RWSEM=y
CONFIG_BCACHEFS_FS=y
CONFIG_BCACHEFS_QUOTA=y
CONFIG_BCACHEFS_POSIX_ACL=y
# CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set
# CONFIG_BCACHEFS_DEBUG is not set
# CONFIG_BCACHEFS_TESTS is not set
CONFIG_BCACHEFS_LOCK_TIME_STATS=y
Expand Down
4 changes: 2 additions & 2 deletions linux-cachyos-eevdf/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Thu Nov 2 22:08:50 UTC 2023
# Mon Nov 6 19:47:32 UTC 2023
pkgbase = linux-cachyos-eevdf
pkgdesc = Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.0
Expand Down Expand Up @@ -29,7 +29,7 @@ pkgbase = linux-cachyos-eevdf
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
b2sums = 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
b2sums = c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df
b2sums = 98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa
b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
b2sums = b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924

Expand Down
11 changes: 4 additions & 7 deletions linux-cachyos-eevdf/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,6 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi

### Prevent ZFS and LTO building at the same time
# More infos here: https://github.com/openzfs/zfs/issues/15384
if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then
_die "ZFS and LTO support cannot be built at the same time. "
fi

### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
Expand Down Expand Up @@ -685,6 +679,9 @@ build() {
local CONFIGURE_FLAGS=()
[ "$_use_llvm_lto" != "none" ] && CONFIGURE_FLAGS+=("KERNEL_LLVM=1")

export KCPPFLAGS+=' -Wno-error=uninitialized'
export KCFLAGS+=' -Wno-error=uninitialized'

./autogen.sh
sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
Expand Down Expand Up @@ -869,6 +866,6 @@ for _p in "${pkgname[@]}"; do
done

b2sums=('5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2'
'c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df'
'98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa'
'11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
'b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924')
1 change: 1 addition & 0 deletions linux-cachyos-eevdf/config
Original file line number Diff line number Diff line change
Expand Up @@ -10371,6 +10371,7 @@ CONFIG_F2FS_UNFAIR_RWSEM=y
CONFIG_BCACHEFS_FS=y
CONFIG_BCACHEFS_QUOTA=y
CONFIG_BCACHEFS_POSIX_ACL=y
# CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set
# CONFIG_BCACHEFS_DEBUG is not set
# CONFIG_BCACHEFS_TESTS is not set
CONFIG_BCACHEFS_LOCK_TIME_STATS=y
Expand Down
4 changes: 2 additions & 2 deletions linux-cachyos-rc/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Thu Nov 2 22:09:54 UTC 2023
# Mon Nov 6 19:43:55 UTC 2023
pkgbase = linux-cachyos-rc
pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS and with some other patches and other improvements
pkgver = 6.6.rc7
Expand Down Expand Up @@ -30,7 +30,7 @@ pkgbase = linux-cachyos-rc
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch
b2sums = cedf29ec54e17a7425e659fbac3f6ca9878656ab3edab86e210c74ba33a93d4cca96a3ff9867a2fc516889d462c4dd2e0e1b2f79e59ecfcba88ddf7a5ea52c6a
b2sums = 8b7ec28c10a3e9b722e481470d0d9d3c092ef6681cd2e26c5fe7d4eccfcdc0ad2b7227527c3d91310ece20f064e8a7b99659cfc9d82ee5cc8e96224ecee3a8ab
b2sums = 98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa
b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
b2sums = b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924
b2sums = caedeef9cf148961a2fc1a06f175682c401448276e57921221c54ffaf7b27135de9d6b8e22f12cdc14b31a042493ffc8970211d68819264d202b811cd7db0c36
Expand Down
11 changes: 4 additions & 7 deletions linux-cachyos-rc/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,6 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi

### Prevent ZFS and LTO building at the same time
# More infos here: https://github.com/openzfs/zfs/issues/15384
if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then
_die "ZFS and LTO support cannot be built at the same time. "
fi

### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
Expand Down Expand Up @@ -684,6 +678,9 @@ build() {
local CONFIGURE_FLAGS=()
[ "$_use_llvm_lto" != "none" ] && CONFIGURE_FLAGS+=("KERNEL_LLVM=1")

export KCPPFLAGS+=' -Wno-error=uninitialized'
export KCFLAGS+=' -Wno-error=uninitialized'

./autogen.sh
sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
Expand Down Expand Up @@ -871,7 +868,7 @@ for _p in "${pkgname[@]}"; do
done

b2sums=('cedf29ec54e17a7425e659fbac3f6ca9878656ab3edab86e210c74ba33a93d4cca96a3ff9867a2fc516889d462c4dd2e0e1b2f79e59ecfcba88ddf7a5ea52c6a'
'8b7ec28c10a3e9b722e481470d0d9d3c092ef6681cd2e26c5fe7d4eccfcdc0ad2b7227527c3d91310ece20f064e8a7b99659cfc9d82ee5cc8e96224ecee3a8ab'
'98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa'
'11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
'b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924'
'caedeef9cf148961a2fc1a06f175682c401448276e57921221c54ffaf7b27135de9d6b8e22f12cdc14b31a042493ffc8970211d68819264d202b811cd7db0c36')
26 changes: 12 additions & 14 deletions linux-cachyos-rc/config
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ CONFIG_BPF_JIT=y
CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_JIT_DEFAULT_ON=y
CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
CONFIG_USERMODE_DRIVER=y
CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
# CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_LSM=y
# end of BPF subsystem

Expand Down Expand Up @@ -187,7 +185,7 @@ CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y
# CONFIG_RCU_NOCB_CPU_CB_BOOST is not set
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
CONFIG_RCU_LAZY=y
# CONFIG_RCU_DOUBLE_CHECK_CB_TIME is not set
CONFIG_RCU_DOUBLE_CHECK_CB_TIME=y
# end of RCU Subsystem

CONFIG_IKCONFIG=y
Expand Down Expand Up @@ -1160,7 +1158,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLAB_FREELIST_HARDENED=y
# CONFIG_SLUB_STATS is not set
CONFIG_SLUB_CPU_PARTIAL=y
CONFIG_RANDOM_KMALLOC_CACHES=y
# CONFIG_RANDOM_KMALLOC_CACHES is not set
# end of SLAB allocator options

CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
Expand Down Expand Up @@ -2348,7 +2346,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# Firmware loader
#
CONFIG_FW_LOADER=y
# CONFIG_FW_LOADER_DEBUG is not set
CONFIG_FW_LOADER_DEBUG=y
CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_FW_LOADER_SYSFS=y
CONFIG_EXTRA_FIRMWARE=""
Expand Down Expand Up @@ -3158,8 +3156,7 @@ CONFIG_AMT=m
CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETCONSOLE_EXTENDED_LOG=y
# CONFIG_NETCONSOLE_PREPEND_RELEASE is not set
# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETPOLL=y
CONFIG_NET_POLL_CONTROLLER=y
CONFIG_NTB_NETDEV=m
Expand Down Expand Up @@ -7263,7 +7260,7 @@ CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
CONFIG_SND_SPI=y
CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
# CONFIG_SND_USB_AUDIO_MIDI_V2 is not set
CONFIG_SND_USB_AUDIO_MIDI_V2=y
CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
CONFIG_SND_USB_UA101=m
CONFIG_SND_USB_USX2Y=m
Expand Down Expand Up @@ -8881,7 +8878,7 @@ CONFIG_UIO_MF624=m
CONFIG_UIO_HV_GENERIC=m
CONFIG_UIO_DFL=m
CONFIG_VFIO=m
# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_DEVICE_CDEV=y
CONFIG_VFIO_GROUP=y
CONFIG_VFIO_CONTAINER=y
CONFIG_VFIO_IOMMU_TYPE1=m
Expand Down Expand Up @@ -10336,10 +10333,10 @@ CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
CONFIG_XFS_DRAIN_INTENTS=y
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_ONLINE_SCRUB_STATS=y
# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_REPAIR=y
CONFIG_XFS_DEBUG=y
CONFIG_XFS_ASSERT_FATAL=y
# CONFIG_XFS_WARN is not set
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_DLM=y
CONFIG_OCFS2_FS=m
Expand Down Expand Up @@ -10374,6 +10371,7 @@ CONFIG_F2FS_UNFAIR_RWSEM=y
CONFIG_BCACHEFS_FS=y
CONFIG_BCACHEFS_QUOTA=y
CONFIG_BCACHEFS_POSIX_ACL=y
# CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set
# CONFIG_BCACHEFS_DEBUG is not set
# CONFIG_BCACHEFS_TESTS is not set
CONFIG_BCACHEFS_LOCK_TIME_STATS=y
Expand Down Expand Up @@ -11543,7 +11541,7 @@ CONFIG_FTRACE=y
CONFIG_BOOTTIME_TRACING=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_FUNCTION_GRAPH_RETVAL is not set
CONFIG_FUNCTION_GRAPH_RETVAL=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
Expand Down
4 changes: 3 additions & 1 deletion linux-cachyos-rt-bore/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Generated by makepkg 6.0.2
# Mon Nov 6 19:44:20 UTC 2023
pkgbase = linux-cachyos-rt-bore
pkgdesc = Linux kernel with BORE-RT patches by CachyOS with other patches and improvements
pkgver = 6.6.0
Expand Down Expand Up @@ -30,7 +32,7 @@ pkgbase = linux-cachyos-rt-bore
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy-rt.patch
source = linux-cachyos-rt.install
b2sums = 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
b2sums = c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df
b2sums = 98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa
b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
b2sums = b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924
b2sums = 2e8e5ab4edfd169e1971ccadddcf3837bbda853572cc39a23d1cc2ce10a51e73b22dff55494fff2a54a04bb4600973b1ac65de1dacd6c9e09689946a9aec034b
Expand Down
11 changes: 4 additions & 7 deletions linux-cachyos-rt-bore/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,6 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi

### Prevent ZFS and LTO building at the same time
# More infos here: https://github.com/openzfs/zfs/issues/15384
if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then
_die "ZFS and LTO support cannot be built at the same time. "
fi

### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
Expand Down Expand Up @@ -685,6 +679,9 @@ build() {
local CONFIGURE_FLAGS=()
[ "$_use_llvm_lto" != "none" ] && CONFIGURE_FLAGS+=("KERNEL_LLVM=1")

export KCPPFLAGS+=' -Wno-error=uninitialized'
export KCFLAGS+=' -Wno-error=uninitialized'

./autogen.sh
sed -i "s|\$(uname -r)|${pkgver}-${pkgsuffix}|g" configure
./configure ${CONFIGURE_FLAGS[*]} --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
Expand Down Expand Up @@ -869,7 +866,7 @@ for _p in "${pkgname[@]}"; do
done

b2sums=('5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2'
'c3f5d4f7eaf8b95b6a7f371e985abb0d2a0981b855558a305048f5c9fa2e79dbbd9f1f0eca3707d9f9c73d3ac969839a2641727a7787470b1da6994d0ce377df'
'98efc768a2048843086a0a0ee495d992b615fcc0dc3003f71e9828a2595dde2be0302739d99d84fdae69531be4f0a3277328b06985f40e811593764e907257aa'
'11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
'b99458e40605388759bfc3d07233acb5ae29c4c0ff3b10c2532f11a5a946a752ec1a654ba2a51670afc415e90ac2ce48a24c0977a92fe8acf691345171d95924'
'2e8e5ab4edfd169e1971ccadddcf3837bbda853572cc39a23d1cc2ce10a51e73b22dff55494fff2a54a04bb4600973b1ac65de1dacd6c9e09689946a9aec034b'
Expand Down
1 change: 1 addition & 0 deletions linux-cachyos-rt-bore/config
Original file line number Diff line number Diff line change
Expand Up @@ -10371,6 +10371,7 @@ CONFIG_F2FS_UNFAIR_RWSEM=y
CONFIG_BCACHEFS_FS=y
CONFIG_BCACHEFS_QUOTA=y
CONFIG_BCACHEFS_POSIX_ACL=y
# CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set
# CONFIG_BCACHEFS_DEBUG is not set
# CONFIG_BCACHEFS_TESTS is not set
CONFIG_BCACHEFS_LOCK_TIME_STATS=y
Expand Down
Loading

0 comments on commit 7250ef4

Please sign in to comment.