From 6317a4add1f6f870bb9fe6b2792e54719824b63b Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Tue, 21 Feb 2023 13:11:03 +0100 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 6 +++--- PKGBUILD | 10 +++++----- config | 28 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 620dc5c..4346edd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements pkgver = 6.2.0 - pkgrel = 3 + pkgrel = 4 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -28,9 +28,9 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/misc/0001-Add-latency-priority-for-CFS-class.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.2/sched/0001-bore-cachy.patch sha256sums = 74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1 - sha256sums = 7f0b634e7b02a7a7dafd5fcb9c2be4f4bcacfa972c2be2ff1505ecaaf7c2c71a + sha256sums = b33cf9e4f29262a9992ad71d1aa87ed2655d3430048ad81f5e4a2a32966a7571 sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106 - sha256sums = a1c60f813230da4ee5beb6c2dbab12c9fd9a7e84a4021dd3ccb08d9c32ee6543 + sha256sums = 7bb11fde3c16933b84059ae69333232426ff8e5280a3e13ec354156f06cc5b2f sha256sums = 91fd56593928155841b161e608d249af725bbde65d19415fd98d55efc322ef89 sha256sums = 200b0b5469fc26e7c77857a13b2e79e85d87e9c8c5461a25ffd58be402a20631 diff --git a/PKGBUILD b/PKGBUILD index 0d14bd3..b6587ba 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -203,7 +203,7 @@ _stable=${_major} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=3 +pkgrel=4 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -600,8 +600,8 @@ prepare() { [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again." case "$_zstd_level_value" in - ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;; - normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;; + ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMPRESSION_LEVEL 22;; + normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMPRESSION_LEVEL 19;; *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";; esac @@ -842,8 +842,8 @@ for _p in "${pkgname[@]}"; do done sha256sums=('74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1' - '7f0b634e7b02a7a7dafd5fcb9c2be4f4bcacfa972c2be2ff1505ecaaf7c2c71a' + 'b33cf9e4f29262a9992ad71d1aa87ed2655d3430048ad81f5e4a2a32966a7571' '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106' - 'a1c60f813230da4ee5beb6c2dbab12c9fd9a7e84a4021dd3ccb08d9c32ee6543' + '7bb11fde3c16933b84059ae69333232426ff8e5280a3e13ec354156f06cc5b2f' '91fd56593928155841b161e608d249af725bbde65d19415fd98d55efc322ef89' '200b0b5469fc26e7c77857a13b2e79e85d87e9c8c5461a25ffd58be402a20631') diff --git a/config b/config index 6fac0a5..da6c870 100644 --- a/config +++ b/config @@ -53,7 +53,7 @@ CONFIG_KERNEL_ZSTD=y # # ZSTD compression options # -CONFIG_ZSTD_COMP_VAL=19 +CONFIG_ZSTD_COMPRESSION_LEVEL=19 # end of ZSTD compression options CONFIG_DEFAULT_INIT="" @@ -176,11 +176,11 @@ CONFIG_RCU_EXPERT=y CONFIG_SRCU=y CONFIG_TREE_SRCU=y CONFIG_TASKS_RCU_GENERIC=y -CONFIG_FORCE_TASKS_RCU=y +# CONFIG_FORCE_TASKS_RCU is not set CONFIG_TASKS_RCU=y -CONFIG_FORCE_TASKS_RUDE_RCU=y +# CONFIG_FORCE_TASKS_RUDE_RCU is not set CONFIG_TASKS_RUDE_RCU=y -CONFIG_FORCE_TASKS_TRACE_RCU=y +# CONFIG_FORCE_TASKS_TRACE_RCU is not set CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y @@ -193,7 +193,7 @@ CONFIG_RCU_NOCB_CPU=y 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 is not set +CONFIG_RCU_LAZY=y # end of RCU Subsystem CONFIG_IKCONFIG=y @@ -2622,7 +2622,9 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_CDROM_PKTCDVD is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_BLKDEV_BACKEND=m @@ -5565,7 +5567,7 @@ CONFIG_BCMA_DRIVER_GPIO=y # CONFIG_MFD_CORE=y CONFIG_MFD_AS3711=y -CONFIG_MFD_SMPRO=y +CONFIG_MFD_SMPRO=m CONFIG_PMIC_ADP5520=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_BCM590XX=m @@ -6656,7 +6658,6 @@ CONFIG_DRM=y CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set -CONFIG_DRM_USE_DYNAMIC_DEBUG=y CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 @@ -10283,11 +10284,11 @@ CONFIG_CRAMFS_MTD=y CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_FILE_CACHE is not set CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI=y CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y -# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set -# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set -# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set -CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y +CONFIG_SQUASHFS_MOUNT_DECOMP_THREADS=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y CONFIG_SQUASHFS_LZ4=y @@ -10367,8 +10368,7 @@ CONFIG_NFS_DEBUG=y # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m -CONFIG_NFSD_V2=y -CONFIG_NFSD_V2_ACL=y +# CONFIG_NFSD_V2 is not set CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y