diff options
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 51 | ||||
-rw-r--r-- | config | 72 |
3 files changed, 64 insertions, 73 deletions
@@ -1,7 +1,7 @@ pkgbase = linux-cachyos-cfs pkgdesc = Linux CFS scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.3.0 - pkgrel = 5 + pkgver = 6.3.1 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -21,14 +21,14 @@ pkgbase = linux-cachyos-cfs makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.1.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.3/all/0001-cachyos-base-all.patch - sha256sums = ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e - sha256sums = 54d0470901596286036c20b1537754ba71885cad51452bcb9bf42b92b2175cbe - sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106 - sha256sums = a81babd189054ed217e58688612ad274ffc06f9912094b29be7f1442aa067d42 + b2sums = 91c7ac2fb2bdeed323b6f0812582bd82c78f62ce3754063716a8769b30c41e35ae06b042ef27fb3c59a63ca17ec764313d7971ba2ddf84f8cf9fe5885ffe0644 + b2sums = 59b0697d3dce7b3bc75f9a096ada379a71cfd472775d9ebbb54c658a5aae756a631ec4b238b4b3dd9e503bda07b31ce5716643b8c57b21f45959f5f57eac7c1b + b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0 + b2sums = c935d5008fe006e6fe0e6c2e04a3bdb71602472274cfd47bae8b877f95b3df5fb5a8c9aedbcef2b5761f22487f662e043ec74de4e63cf40e3e3bb4b9b37a2a72 pkgname = linux-cachyos-cfs pkgdesc = The Linux CFS scheduler Kernel by CachyOS with other patches and improvements kernel and modules @@ -130,9 +130,6 @@ _use_auto_optimization=${_use_auto_optimization-y} # disable debug to lower the size of the kernel _disable_debug=${_disable_debug-} -## Enable zram/zswap ZSTD compression -_zstd_compression=${_zstd_compression-} - ### Selecting the ZSTD kernel and modules compression level # ATTENTION - one of two predefined values should be selected! # 'ultra' - highest compression ratio @@ -196,17 +193,17 @@ else pkgbase=linux-$pkgsuffix fi _major=6.3 -_minor=0 +_minor=1 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -#_stable=${_major}.${_minor} -_stable=${_major} +_stable=${_major}.${_minor} +#_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux CFS scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=5 +pkgrel=1 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -280,12 +277,21 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP _die() { error "$@" ; exit; } +_make() { + test -s version + make KERNELRELEASE="$(<version)" "$@" +} + prepare() { cd ${srcdir}/$_srcname + echo "Setting version..." echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname + make ${BUILD_FLAGS[*]} defconfig + make ${BUILD_FLAGS[*]} -s kernelrelease > version + make ${BUILD_FLAGS[*]} mrproper local src for src in "${source[@]}"; do @@ -585,17 +591,6 @@ prepare() { -d LRNG_RUNTIME_FORCE_SEEDING_DISABLE fi - ### Enable zram/zswap ZSTD compression - if [ -n "$_zstd_compression" ]; then - echo "Enabling zram/swap ZSTD compression..." - scripts/config -d ZRAM_DEF_COMP_LZORLE \ - -e ZRAM_DEF_COMP_ZSTD \ - --set-str ZRAM_DEF_COMP zstd \ - -d ZSWAP_COMPRESSOR_DEFAULT_LZ4 \ - -e ZSWAP_COMPRESSOR_DEFAULT_ZSTD \ - --set-str ZSWAP_COMPRESSOR_DEFAULT zstd - fi - ### Selecting the ZSTD modules and kernel compression level [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again." @@ -658,12 +653,11 @@ prepare() { ### Rewrite configuration echo "Rewrite configuration..." - make ${BUILD_FLAGS[*]} prepare - yes "" | make ${BUILD_FLAGS[*]} config >/dev/null + _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)" ### Running make nconfig @@ -715,19 +709,18 @@ _package() { cd ${srcdir}/$_srcname - local kernver="$(<version)" - local modulesdir="$pkgdir/usr/lib/modules/$kernver" + local modulesdir="$pkgdir/usr/lib/modules/$(<version)" echo "Installing boot image..." # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 - install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" + install -Dm644 "$(_make -s image_name)" "$modulesdir/vmlinuz" # Used by mkinitcpio to name the kernel echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase" echo "Installing modules..." - make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \ + _make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \ DEPMOD=/doesnt/exist modules_install # Suppress depmod # remove build and source links @@ -841,7 +834,7 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e' - '54d0470901596286036c20b1537754ba71885cad51452bcb9bf42b92b2175cbe' - '41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106' - 'a81babd189054ed217e58688612ad274ffc06f9912094b29be7f1442aa067d42') +b2sums=('91c7ac2fb2bdeed323b6f0812582bd82c78f62ce3754063716a8769b30c41e35ae06b042ef27fb3c59a63ca17ec764313d7971ba2ddf84f8cf9fe5885ffe0644' + '59b0697d3dce7b3bc75f9a096ada379a71cfd472775d9ebbb54c658a5aae756a631ec4b238b4b3dd9e503bda07b31ce5716643b8c57b21f45959f5f57eac7c1b' + '11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0' + 'c935d5008fe006e6fe0e6c2e04a3bdb71602472274cfd47bae8b877f95b3df5fb5a8c9aedbcef2b5761f22487f662e043ec74de4e63cf40e3e3bb4b9b37a2a72') @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.3.0-rc7 Kernel Configuration +# Linux/x86 6.3.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230311" CONFIG_CC_IS_GCC=y @@ -218,7 +218,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y @@ -449,7 +448,6 @@ CONFIG_GENERIC_CPU=y # CONFIG_MNATIVE_AMD is not set CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y @@ -1127,18 +1125,18 @@ CONFIG_ZSWAP_DEFAULT_ON=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set -CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set -# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set -CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lz4" +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd" # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y CONFIG_Z3FOLD=y CONFIG_ZSMALLOC=y -# CONFIG_ZSMALLOC_STAT is not set +CONFIG_ZSMALLOC_STAT=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # @@ -2603,13 +2601,13 @@ CONFIG_BLK_DEV_FD=m CONFIG_CDROM=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m -CONFIG_ZRAM_DEF_COMP_LZORLE=y -# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZORLE is not set +CONFIG_ZRAM_DEF_COMP_ZSTD=y # CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set # CONFIG_ZRAM_DEF_COMP_842 is not set -CONFIG_ZRAM_DEF_COMP="lzo-rle" +CONFIG_ZRAM_DEF_COMP="zstd" CONFIG_ZRAM_WRITEBACK=y # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y @@ -2994,14 +2992,14 @@ CONFIG_PATA_PARPORT_DSTR=m CONFIG_PATA_PARPORT_FIT2=m CONFIG_PATA_PARPORT_FIT3=m CONFIG_PATA_PARPORT_EPAT=m -# CONFIG_PATA_PARPORT_EPATC8 is not set -# CONFIG_PATA_PARPORT_EPIA is not set -# CONFIG_PATA_PARPORT_FRIQ is not set -# CONFIG_PATA_PARPORT_FRPW is not set -# CONFIG_PATA_PARPORT_KBIC is not set -# CONFIG_PATA_PARPORT_KTTI is not set -# CONFIG_PATA_PARPORT_ON20 is not set -# CONFIG_PATA_PARPORT_ON26 is not set +CONFIG_PATA_PARPORT_EPATC8=y +CONFIG_PATA_PARPORT_EPIA=m +CONFIG_PATA_PARPORT_FRIQ=m +CONFIG_PATA_PARPORT_FRPW=m +CONFIG_PATA_PARPORT_KBIC=m +CONFIG_PATA_PARPORT_KTTI=m +CONFIG_PATA_PARPORT_ON20=m +CONFIG_PATA_PARPORT_ON26=m # # Generic fallback / legacy drivers @@ -3179,7 +3177,7 @@ CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m -# CONFIG_NET_DSA_MICROCHIP_KSZ_PTP is not set +CONFIG_NET_DSA_MICROCHIP_KSZ_PTP=y CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_MV88E6XXX_PTP=y @@ -3847,8 +3845,8 @@ CONFIG_ATH11K_DEBUGFS=y # CONFIG_ATH11K_TRACING is not set CONFIG_ATH11K_SPECTRAL=y CONFIG_ATH12K=m -# CONFIG_ATH12K_DEBUG is not set -# CONFIG_ATH12K_TRACING is not set +CONFIG_ATH12K_DEBUG=y +CONFIG_ATH12K_TRACING=y CONFIG_WLAN_VENDOR_ATMEL=y CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -5343,7 +5341,7 @@ CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m -# CONFIG_SENSORS_MPQ7932_REGULATOR is not set +CONFIG_SENSORS_MPQ7932_REGULATOR=y CONFIG_SENSORS_MPQ7932=m CONFIG_SENSORS_PIM4328=m CONFIG_SENSORS_PLI1209BC=m @@ -5353,7 +5351,7 @@ CONFIG_SENSORS_PXE1610=m CONFIG_SENSORS_Q54SJ108A2=m CONFIG_SENSORS_STPDDC60=m CONFIG_SENSORS_TDA38640=m -# CONFIG_SENSORS_TDA38640_REGULATOR is not set +CONFIG_SENSORS_TDA38640_REGULATOR=y CONFIG_SENSORS_TPS40422=m CONFIG_SENSORS_TPS53679=m CONFIG_SENSORS_TPS546D24=m @@ -6990,7 +6988,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y # CONFIG_LOGO is not set # end of Graphics support -# CONFIG_DRM_ACCEL is not set +CONFIG_DRM_ACCEL=y +CONFIG_DRM_ACCEL_HABANALABS=m +CONFIG_DRM_ACCEL_IVPU=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -8945,7 +8945,7 @@ CONFIG_VIDEO_ATOMISP_LM3554=m CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y -# CONFIG_DVB_BUDGET_PATCH is not set +CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_SP8870=m CONFIG_VIDEO_IPU3_IMGU=m # CONFIG_STAGING_MEDIA_DEPRECATED is not set @@ -10049,10 +10049,7 @@ CONFIG_USB4=m # # Android # -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_BINDERFS=y -CONFIG_ANDROID_BINDER_DEVICES="" -# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set +# CONFIG_ANDROID_BINDER_IPC is not set # end of Android CONFIG_LIBNVDIMM=y @@ -10427,7 +10424,8 @@ CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_ZIP=y CONFIG_EROFS_FS_ZIP_LZMA=y CONFIG_EROFS_FS_ONDEMAND=y -# CONFIG_EROFS_FS_PCPU_KTHREAD is not set +CONFIG_EROFS_FS_PCPU_KTHREAD=y +CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI=y CONFIG_VBOXSF_FS=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -10474,8 +10472,8 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set +CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y +CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_CEPH_FS=m @@ -10824,7 +10822,7 @@ CONFIG_CRYPTO_CRC64_ROCKSOFT=y CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_842=m -CONFIG_CRYPTO_LZ4=y +CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_ZSTD=y # end of Compression @@ -11022,7 +11020,7 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=y +CONFIG_LZ4_COMPRESS=m CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y CONFIG_ZSTD_COMMON=y |