diff options
| -rw-r--r-- | PKGBUILD | 21 | ||||
| -rw-r--r-- | config | 19 |
2 files changed, 27 insertions, 13 deletions
@@ -4,7 +4,7 @@ pkgbase=linux-kentdobias _kver=6.6.2 _zver=2.2.1 pkgver="${_kver}_${_zver}" -pkgrel=1 +pkgrel=2 pkgdesc='Linux' url='https://github.com/archlinux/linux' arch=(x86_64) @@ -52,12 +52,12 @@ sha256sums=('73d4f6ad8dd6ac2a41ed52c2928898b7c3f2519ed5dbdb11920209a36999b77e' 'SKIP' '4ff2de43d39710283ae8ff1744aa96e6cdc83c8efe86a715294d4f6bc34a8e8e' 'SKIP' - '887d0e64dac2fef39351c64d1c939a96d44e947a7a4c7b662f756b901b08cc7b') + '362c90577c1c3a516e7057f756f990a9045f514bb715c17c21da318e428ca1aa') b2sums=('88fc55107834d4308d33547211a031674ffaa8e48e23d6612ba39430292b18073d49271bd3ce8c7be01d8c5668482cb1715071abfd9b1f75b06468a09f8f4eec' 'SKIP' 'c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6' 'SKIP' - 'fb56f331d06271b741d18e354a9c8faac6dbbc57b0511f28b25dee3c4dbcaa625c88065b183bacb4f5d02fd7b86bef80755aeba8c59752c763d5a998b1b626e9') + '2294d356cfedecc1c8c2ae414a0fdb7b580b616b12284b464cc9ccb8c04098aae13574a6a04ed6411b7f8fb6f18a4761d5a601d854d0d9278c009f94080dc274') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -87,6 +87,21 @@ prepare() { make prepare cd ../zfs-${_zver} + + echo "diff --git a/config/kernel-inode-times.m4 b/config/kernel-inode-times.m4 +index 412e13b47..aae95abf1 100644 +--- a/config/kernel-inode-times.m4 ++++ b/config/kernel-inode-times.m4 +@@ -47,7 +47,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [ + #include <linux/fs.h> + ],[ + struct inode ip; +- struct timespec64 ts; ++ struct timespec64 ts = {0}; + + memset(&ip, 0, sizeof(ip)); + inode_set_ctime_to_ts(&ip, ts);" | patch -Np1 + ./autogen.sh KERNEL_LLVM=1 CC=clang ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \ --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \ @@ -363,7 +363,7 @@ CONFIG_X86_MPPARSE=y CONFIG_X86_CPU_RESCTRL=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y -CONFIG_X86_AMD_PLATFORM_DEVICE=y +# CONFIG_X86_AMD_PLATFORM_DEVICE is not set CONFIG_IOSF_MBI=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y @@ -397,11 +397,14 @@ CONFIG_ACRN_GUEST=y CONFIG_INTEL_TDX_GUEST=y # CONFIG_MK8 is not set # CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set +CONFIG_MCORE2=y # CONFIG_MATOM is not set -CONFIG_GENERIC_CPU=y +# CONFIG_GENERIC_CPU is not set CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_P6_NOP=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y @@ -434,7 +437,7 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_MCE=y # CONFIG_X86_MCELOG_LEGACY is not set CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y +# CONFIG_X86_MCE_AMD is not set CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MCE_INJECT=m @@ -461,10 +464,9 @@ CONFIG_X86_5LEVEL=y CONFIG_X86_DIRECT_GBPAGES=y CONFIG_X86_CPA_STATISTICS=y CONFIG_X86_MEM_ENCRYPT=y -CONFIG_AMD_MEM_ENCRYPT=y -# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set +# CONFIG_AMD_MEM_ENCRYPT is not set CONFIG_NUMA=y -CONFIG_AMD_NUMA=y +# CONFIG_AMD_NUMA is not set CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set CONFIG_NODES_SHIFT=5 @@ -5793,7 +5795,6 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EDAC=y CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set -# CONFIG_EDAC_DECODE_MCE is not set CONFIG_EDAC_GHES=y # CONFIG_EDAC_E752X is not set # CONFIG_EDAC_I82975X is not set @@ -5988,7 +5989,6 @@ CONFIG_VMGENID=y # CONFIG_NITRO_ENCLAVES is not set # CONFIG_ACRN_HSM is not set # CONFIG_EFI_SECRET is not set -# CONFIG_SEV_GUEST is not set # CONFIG_TDX_GUEST_DRIVER is not set CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=y @@ -7849,7 +7849,6 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y CONFIG_SWIOTLB=y # CONFIG_SWIOTLB_DYNAMIC is not set -CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_CMA=y # CONFIG_DMA_NUMA_CMA is not set |