kernel overhaul
- fancy functions and variables - removed liquorix - import various patches from linux-tkg - switch from muqss to pds - bump from .20 to .21
This commit is contained in:
parent
4313ea9351
commit
731ce944fc
GPG key ID:
6500251E087653C9
2 changed files with 58 additions and 56 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 5.11.20 Kernel Configuration
|
||||
# Linux/x86 5.11.21 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
|
@ -19,11 +19,10 @@ CONFIG_THREAD_INFO_IN_TASK=y
|
|||
#
|
||||
# General setup
|
||||
#
|
||||
CONFIG_SCHED_MUQSS=y
|
||||
CONFIG_ZEN_INTERACTIVE=y
|
||||
CONFIG_ZENIFY=y
|
||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||
# CONFIG_COMPILE_TEST is not set
|
||||
CONFIG_LOCALVERSION="-lqx-Lava"
|
||||
CONFIG_LOCALVERSION="-tkg-Lava"
|
||||
# CONFIG_LOCALVERSION_AUTO is not set
|
||||
CONFIG_BUILD_SALT=""
|
||||
CONFIG_HAVE_KERNEL_GZIP=y
|
||||
|
|
@ -71,7 +70,6 @@ CONFIG_IRQ_MSI_IOMMU=y
|
|||
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
|
||||
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
|
||||
CONFIG_IRQ_FORCED_THREADING=y
|
||||
# CONFIG_FORCE_IRQ_THREADING is not set
|
||||
CONFIG_SPARSE_IRQ=y
|
||||
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
|
||||
# end of IRQ subsystem
|
||||
|
|
@ -147,7 +145,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
|||
#
|
||||
# Scheduler features
|
||||
#
|
||||
# CONFIG_UCLAMP_TASK is not set
|
||||
CONFIG_SCHED_ALT=y
|
||||
# CONFIG_SCHED_BMQ is not set
|
||||
CONFIG_SCHED_PDS=y
|
||||
# end of Scheduler features
|
||||
|
||||
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
|
||||
|
|
@ -162,6 +162,7 @@ CONFIG_MEMCG_KMEM=y
|
|||
CONFIG_BLK_CGROUP=y
|
||||
CONFIG_CGROUP_WRITEBACK=y
|
||||
CONFIG_CGROUP_SCHED=y
|
||||
CONFIG_FAIR_GROUP_SCHED=y
|
||||
CONFIG_CGROUP_PIDS=y
|
||||
CONFIG_CGROUP_RDMA=y
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
|
|
@ -169,6 +170,7 @@ CONFIG_CGROUP_HUGETLB=y
|
|||
CONFIG_CPUSETS=y
|
||||
CONFIG_PROC_PID_CPUSET=y
|
||||
CONFIG_CGROUP_DEVICE=y
|
||||
# CONFIG_CGROUP_CPUACCT is not set
|
||||
CONFIG_CGROUP_PERF=y
|
||||
CONFIG_CGROUP_BPF=y
|
||||
# CONFIG_CGROUP_DEBUG is not set
|
||||
|
|
@ -178,7 +180,6 @@ CONFIG_UTS_NS=y
|
|||
CONFIG_TIME_NS=y
|
||||
CONFIG_IPC_NS=y
|
||||
CONFIG_USER_NS=y
|
||||
CONFIG_USER_NS_UNPRIVILEGED=y
|
||||
CONFIG_PID_NS=y
|
||||
CONFIG_NET_NS=y
|
||||
CONFIG_CHECKPOINT_RESTORE=y
|
||||
|
|
@ -362,7 +363,6 @@ CONFIG_PARAVIRT_CLOCK=y
|
|||
# CONFIG_MEXCAVATOR is not set
|
||||
# CONFIG_MZEN is not set
|
||||
# CONFIG_MZEN2 is not set
|
||||
# CONFIG_MZEN3 is not set
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_MCORE2 is not set
|
||||
# CONFIG_MATOM is not set
|
||||
|
|
@ -382,13 +382,9 @@ CONFIG_MHASWELL=y
|
|||
# CONFIG_MCASCADELAKE is not set
|
||||
# CONFIG_MCOOPERLAKE is not set
|
||||
# CONFIG_MTIGERLAKE is not set
|
||||
# CONFIG_MSAPPHIRERAPIDS is not set
|
||||
# CONFIG_MALDERLAKE is not set
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
# CONFIG_GENERIC_CPU2 is not set
|
||||
# CONFIG_GENERIC_CPU3 is not set
|
||||
# CONFIG_GENERIC_CPU4 is not set
|
||||
# CONFIG_MNATIVE is not set
|
||||
# CONFIG_MNATIVE_INTEL is not set
|
||||
# CONFIG_MNATIVE_AMD is not set
|
||||
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
CONFIG_X86_INTEL_USERCOPY=y
|
||||
|
|
@ -416,16 +412,8 @@ CONFIG_NR_CPUS_RANGE_END=512
|
|||
CONFIG_NR_CPUS_DEFAULT=64
|
||||
CONFIG_NR_CPUS=384
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_SMT_NICE=y
|
||||
CONFIG_SCHED_MC=y
|
||||
CONFIG_SCHED_MC_PRIO=y
|
||||
# CONFIG_RQ_NONE is not set
|
||||
CONFIG_RQ_SMT=y
|
||||
# CONFIG_RQ_MC is not set
|
||||
# CONFIG_RQ_MC_LLC is not set
|
||||
# CONFIG_RQ_SMP is not set
|
||||
# CONFIG_RQ_ALL is not set
|
||||
CONFIG_SHARERQ=1
|
||||
CONFIG_X86_LOCAL_APIC=y
|
||||
CONFIG_X86_IO_APIC=y
|
||||
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
|
||||
|
|
@ -496,6 +484,8 @@ CONFIG_EFI_MIXED=y
|
|||
CONFIG_HZ_100=y
|
||||
# CONFIG_HZ_250 is not set
|
||||
# CONFIG_HZ_300 is not set
|
||||
# CONFIG_HZ_500 is not set
|
||||
# CONFIG_HZ_750 is not set
|
||||
# CONFIG_HZ_1000 is not set
|
||||
CONFIG_HZ=100
|
||||
CONFIG_SCHED_HRTICK=y
|
||||
|
|
@ -876,7 +866,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
|
|||
CONFIG_MODULE_COMPRESS=y
|
||||
# CONFIG_MODULE_COMPRESS_GZIP is not set
|
||||
CONFIG_MODULE_COMPRESS_XZ=y
|
||||
# CONFIG_MODULE_COMPRESS_ZSTD is not set
|
||||
# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
|
||||
# CONFIG_UNUSED_SYMBOLS is not set
|
||||
# CONFIG_TRIM_UNUSED_KSYMS is not set
|
||||
|
|
@ -935,7 +924,6 @@ CONFIG_BLK_PM=y
|
|||
# IO Schedulers
|
||||
#
|
||||
CONFIG_MQ_IOSCHED_DEADLINE=y
|
||||
# CONFIG_MQ_IOSCHED_DEADLINE_NODEFAULT is not set
|
||||
CONFIG_MQ_IOSCHED_KYBER=y
|
||||
# CONFIG_IOSCHED_BFQ is not set
|
||||
# end of IO Schedulers
|
||||
|
|
@ -1125,7 +1113,6 @@ CONFIG_TCP_CONG_CUBIC=y
|
|||
# CONFIG_TCP_CONG_DCTCP is not set
|
||||
# CONFIG_TCP_CONG_CDG is not set
|
||||
# CONFIG_TCP_CONG_BBR is not set
|
||||
# CONFIG_TCP_CONG_BBR2 is not set
|
||||
CONFIG_DEFAULT_CUBIC=y
|
||||
# CONFIG_DEFAULT_RENO is not set
|
||||
CONFIG_DEFAULT_TCP_CONG="cubic"
|
||||
|
|
@ -2092,7 +2079,6 @@ CONFIG_MEGARAID_NEWGEN=y
|
|||
# CONFIG_SCSI_PMCRAID is not set
|
||||
# CONFIG_SCSI_PM8001 is not set
|
||||
# CONFIG_SCSI_DH is not set
|
||||
# CONFIG_VHBA is not set
|
||||
# end of SCSI device support
|
||||
|
||||
CONFIG_ATA=m
|
||||
|
|
@ -2981,7 +2967,6 @@ CONFIG_I2C_I801=m
|
|||
# CONFIG_I2C_ISCH is not set
|
||||
# CONFIG_I2C_ISMT is not set
|
||||
# CONFIG_I2C_PIIX4 is not set
|
||||
# CONFIG_I2C_NCT6775 is not set
|
||||
# CONFIG_I2C_NFORCE2 is not set
|
||||
# CONFIG_I2C_NVIDIA_GPU is not set
|
||||
# CONFIG_I2C_SIS5595 is not set
|
||||
|
|
|
|||
|
|
@ -1,23 +1,42 @@
|
|||
self: super: {
|
||||
linux-lava = super.linuxPackagesFor ((super.linuxManualConfig {
|
||||
linux-lava = super.linuxPackagesFor ((super.linuxManualConfig (
|
||||
let
|
||||
major = "5";
|
||||
minor = "11";
|
||||
patch = "21";
|
||||
tkg = "467e6c3f41da14ae6f5aa57a1d0490b4244fbce0";
|
||||
|
||||
mm = "${major}.${minor}";
|
||||
mmp = "${major}.${minor}.${patch}";
|
||||
|
||||
kernelUrl = name: sha256: builtins.fetchurl {
|
||||
inherit sha256;
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v${major}.x/${name}.xz";
|
||||
};
|
||||
|
||||
tkgPatch = name: sha256: {
|
||||
inherit name;
|
||||
patch = builtins.fetchurl {
|
||||
inherit sha256;
|
||||
url = "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/${tkg}/linux-tkg-patches/${mm}/${name}.patch";
|
||||
};
|
||||
};
|
||||
in {
|
||||
inherit (super) lib stdenv;
|
||||
version = "5.11.20-lqx-Lava";
|
||||
version = "${major}.${minor}.${patch}-tkg-Lava";
|
||||
allowImportFromDerivation = true;
|
||||
configfile = ./kernel.config;
|
||||
isZen = true;
|
||||
|
||||
src = builtins.fetchurl {
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz";
|
||||
sha256 = "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04";
|
||||
};
|
||||
src = kernelUrl "linux-${mm}.tar" "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04";
|
||||
kernelPatches = [
|
||||
# Kernel version patch
|
||||
{
|
||||
name = "20-lqx1";
|
||||
patch = builtins.fetchurl {
|
||||
url = "https://github.com/zen-kernel/zen-kernel/releases/download/v5.11.20-lqx1/v5.11.20-lqx1.patch.xz";
|
||||
sha256 = "0ff6w8xr3v85gqmdg0qk04hf34rnz4dkvd8xxyvkw78dkjfm4aqm";
|
||||
};
|
||||
name = "patch-${patch}";
|
||||
patch = kernelUrl "patch-${mmp}" "0va01x8hb9ny7hrjbq5kviz6awg2d495zs2fn0vswrjkdi18cq7j";
|
||||
}
|
||||
|
||||
# AMD SI manual clocking
|
||||
{
|
||||
name = "amd";
|
||||
patch = builtins.fetchurl {
|
||||
|
|
@ -25,29 +44,27 @@ self: super: {
|
|||
sha256 = "09vf2scckw2blw75ggyjqk432x33vym6qyjhy61w5zpbgmm75lql";
|
||||
};
|
||||
}
|
||||
|
||||
# Graysky gcc patches
|
||||
{
|
||||
name = "no-extver";
|
||||
name = "graysky-gcc";
|
||||
patch = builtins.fetchurl {
|
||||
url = "https://gist.githubusercontent.com/LavaDesu/98997b93ced7337ef3b6b12c4fc4d9dd/raw/89778e6256bc224abca16943c18f2f961286b941/0001-Remove-EXTRAVERSION.patch";
|
||||
sha256 = "03rrl1dns9r0nq0qmlmxazi4rxgrbflxzzgr1hmlp75ypcy9izyv";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "winesync";
|
||||
patch = builtins.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.11/0007-v5.11-winesync.patch";
|
||||
sha256 = "0lf374ccxhhr8idb8kbpzxzw7pi4s4ghdvnffp4pd6q56qs5j86j";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "bcachefs";
|
||||
patch = builtins.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.11/0008-5.11-bcachefs.patch";
|
||||
sha256 = "06b3c6k56i5zqgmh5i3rixhz7mhq187cckkcnxb7d2g4vxy1v0vc";
|
||||
url = "https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/d2e7942c19ee568638d3795cf52db5274a90ce0a/more-uarches-for-kernel-5.8+.patch";
|
||||
sha256 = "16jbknjlg12jxbj8cjkk01djvr01n9zz7qlzxppcqizmz55vk0wh";
|
||||
};
|
||||
}
|
||||
|
||||
# TK-Glitch patches
|
||||
( tkgPatch "0002-clear-patches" "1h1gx6rq2c961d36z1szqv9xpq1xgz2bhqjsyb03jjdrdzlcv9rm" )
|
||||
( tkgPatch "0003-glitched-base" "1dg177i3y54z5nadc5678hm67angram2vlr314mpxv3jgsh7vj8s" )
|
||||
( tkgPatch "0005-glitched-pds" "0833awp8n9ngyl5spx8znwyw1lj3nacp8vg7ffysw0j5r8akv9pw" )
|
||||
( tkgPatch "0007-v${mm}-fsync" "0mplwdglw58bmkkxix4ccwgax3r02gahax9042dx33mybdnbl0mk" )
|
||||
( tkgPatch "0007-v${mm}-futex2_interface" "15jl2h9fgj9ic93nj5xypmg2f97nl8lwgdgdbkdspacanj57ngh7" )
|
||||
( tkgPatch "0007-v${mm}-winesync" "0lf374ccxhhr8idb8kbpzxzw7pi4s4ghdvnffp4pd6q56qs5j86j" )
|
||||
( tkgPatch "0008-${mm}-bcachefs" "06b3c6k56i5zqgmh5i3rixhz7mhq187cckkcnxb7d2g4vxy1v0vc" )
|
||||
( tkgPatch "0009-prjc_v${mm}-r3" "0q40p9rn6dh3dr2wsmfn15zi33pbjbb7pi0i8fgz85x5wcvlkmjw" )
|
||||
];
|
||||
}).overrideAttrs(o: {
|
||||
})).overrideAttrs(o: {
|
||||
passthru = o.passthru // {
|
||||
features = {
|
||||
efiBootStub = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue