From ea087f500e49d2cb4b070f346dc9855cac069ae9 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 14 May 2021 12:08:50 +0700 Subject: [PATCH] kernel filesystem config changes patch with bcachefs enable bcachefs, exfat, squashfs enable ntfs rw --- cfg/winter/kernel.nix | 3 ++- overlays/kernel.config | 47 +++++++++++++++++++++++++++++++++++------- overlays/linux.nix | 7 +++++++ 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/cfg/winter/kernel.nix b/cfg/winter/kernel.nix index 1e1c77f..74d1c0e 100644 --- a/cfg/winter/kernel.nix +++ b/cfg/winter/kernel.nix @@ -5,6 +5,7 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; + supportedFilesystems = ["bcachefs"]; blacklistedKernelModules = [ "uvcvideo" ]; @@ -21,6 +22,6 @@ "radeon.si_support=0" "intel_pstate=passive" ]; - kernelPackages = pkgs.linux-lava; + kernelPackages = pkgs.lib.mkForce pkgs.linux-lava; }; } diff --git a/overlays/kernel.config b/overlays/kernel.config index c161227..ef9a9fd 100644 --- a/overlays/kernel.config +++ b/overlays/kernel.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.11.19-lqx1-Lava Kernel Configuration +# Linux/x86 5.11.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -19,7 +19,6 @@ CONFIG_THREAD_INFO_IN_TASK=y # # General setup # -CONFIG_WINESYNC=m CONFIG_SCHED_MUQSS=y CONFIG_ZEN_INTERACTIVE=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -956,6 +955,7 @@ CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_QUEUED_SPINLOCKS=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_QUEUED_RWLOCKS=y +CONFIG_SIXLOCKS=y CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y @@ -1955,6 +1955,7 @@ CONFIG_SENSORS_LIS3LV02D=m # CONFIG_PCI_ENDPOINT_TEST is not set # CONFIG_XILINX_SDFEC is not set # CONFIG_PVPANIC is not set +CONFIG_WINESYNC=m # CONFIG_C2PORT is not set # @@ -3511,7 +3512,14 @@ CONFIG_INTEL_MEI_WDT=m CONFIG_SSB_POSSIBLE=y # CONFIG_SSB is not set CONFIG_BCMA_POSSIBLE=y -# CONFIG_BCMA is not set +CONFIG_BCMA=m +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_HOST_SOC is not set +CONFIG_BCMA_DRIVER_PCI=y +# CONFIG_BCMA_DRIVER_GMAC_CMN is not set +# CONFIG_BCMA_DRIVER_GPIO is not set +# CONFIG_BCMA_DEBUG is not set # # Multifunction device drivers @@ -4800,6 +4808,7 @@ CONFIG_USB_EHCI_PCI=m # CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_TEST_MODE is not set # @@ -5607,6 +5616,11 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_REF_VERIFY is not set # CONFIG_NILFS2_FS is not set # CONFIG_F2FS_FS is not set +CONFIG_BCACHEFS_FS=m +CONFIG_BCACHEFS_QUOTA=y +CONFIG_BCACHEFS_POSIX_ACL=y +# CONFIG_BCACHEFS_DEBUG is not set +CONFIG_BCACHEFS_TESTS=y # CONFIG_FS_DAX is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -5669,10 +5683,11 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_EXFAT_FS is not set +CONFIG_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set +CONFIG_NTFS_RW=y # end of DOS/FAT/EXFAT/NT Filesystems # @@ -5695,7 +5710,7 @@ CONFIG_HUGETLB_PAGE=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set -# CONFIG_EFIVAR_FS is not set +CONFIG_EFIVAR_FS=m # end of Pseudo filesystems CONFIG_MISC_FILESYSTEMS=y @@ -5710,7 +5725,21 @@ CONFIG_HFSPLUS_FS=m # CONFIG_EFS_FS is not set # CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set -# CONFIG_SQUASHFS is not set +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_CACHE=y +# CONFIG_SQUASHFS_FILE_DIRECT is not set +CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +# CONFIG_SQUASHFS_XATTR is not set +CONFIG_SQUASHFS_ZLIB=y +# CONFIG_SQUASHFS_LZ4 is not set +# CONFIG_SQUASHFS_LZO is not set +# CONFIG_SQUASHFS_XZ is not set +CONFIG_SQUASHFS_ZSTD=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set CONFIG_MINIX_FS=m # CONFIG_OMFS_FS is not set @@ -6181,7 +6210,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set -# CONFIG_CRC64 is not set +CONFIG_CRC64=m # CONFIG_CRC4 is not set # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=m @@ -6219,6 +6248,7 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_INTERVAL_TREE=y CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_CLOSURES=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y @@ -6435,6 +6465,7 @@ CONFIG_RCU_TRACE=y # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging +# CONFIG_DEBUG_CLOSURES is not set # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set diff --git a/overlays/linux.nix b/overlays/linux.nix index cb34bc8..bf9acc6 100644 --- a/overlays/linux.nix +++ b/overlays/linux.nix @@ -39,6 +39,13 @@ self: super: { 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"; + }; + } ]; }).overrideAttrs(o: { passthru = o.passthru // {