From b3b0359dadcec2e89d15ec98752b9b88e683f251 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 18 Nov 2021 01:00:02 -0600 Subject: update patches for kernel 5.15.2 --- gentoox-patches/0001-kernel-config-cfs-r7.patch | 310 --------------------- gentoox-patches/0001-kernel-config-cfs-r8.patch | 350 ++++++++++++++++++++++++ gentoox_build.sh | 62 +++-- 3 files changed, 383 insertions(+), 339 deletions(-) delete mode 100644 gentoox-patches/0001-kernel-config-cfs-r7.patch create mode 100644 gentoox-patches/0001-kernel-config-cfs-r8.patch diff --git a/gentoox-patches/0001-kernel-config-cfs-r7.patch b/gentoox-patches/0001-kernel-config-cfs-r7.patch deleted file mode 100644 index b759679..0000000 --- a/gentoox-patches/0001-kernel-config-cfs-r7.patch +++ /dev/null @@ -1,310 +0,0 @@ ---- .config.orig 2021-02-16 02:51:05.825082850 -0600 -+++ .config 2021-02-16 02:59:06.190108916 -0600 -@@ -179,7 +179,7 @@ - CONFIG_CGROUP_SCHED=y - CONFIG_FAIR_GROUP_SCHED=y - CONFIG_CFS_BANDWIDTH=y --# CONFIG_RT_GROUP_SCHED is not set -+CONFIG_RT_GROUP_SCHED=y - CONFIG_UCLAMP_TASK_GROUP=y - CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_RDMA=y -@@ -198,7 +198,6 @@ - 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 -@@ -215,7 +214,8 @@ - CONFIG_RD_LZ4=y - CONFIG_RD_ZSTD=y - CONFIG_BOOT_CONFIG=y --CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -+# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set -+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set - CONFIG_LD_ORPHAN_WARN=y - CONFIG_SYSCTL=y -@@ -367,12 +367,41 @@ - CONFIG_JAILHOUSE_GUEST=y - CONFIG_ACRN_GUEST=y - # CONFIG_MK8 is not set -+# CONFIG_MK8SSE3 is not set -+# CONFIG_MK10 is not set -+# CONFIG_MBARCELONA is not set -+# CONFIG_MBOBCAT is not set -+# CONFIG_MJAGUAR is not set -+# CONFIG_MBULLDOZER is not set -+# CONFIG_MPILEDRIVER is not set -+# CONFIG_MSTEAMROLLER is not set -+# CONFIG_MEXCAVATOR is not set -+# CONFIG_MZEN is not set -+# CONFIG_MZEN2 is not set - # CONFIG_MPSC is not set --# CONFIG_MCORE2 is not set - # CONFIG_MATOM is not set --CONFIG_GENERIC_CPU=y -+# CONFIG_MCORE2 is not set -+# CONFIG_MNEHALEM is not set -+# CONFIG_MWESTMERE is not set -+# CONFIG_MSILVERMONT is not set -+# CONFIG_MGOLDMONT is not set -+# CONFIG_MGOLDMONTPLUS is not set -+CONFIG_MSANDYBRIDGE=y -+# CONFIG_MIVYBRIDGE is not set -+# CONFIG_MHASWELL is not set -+# CONFIG_MBROADWELL is not set -+# CONFIG_MSKYLAKE is not set -+# CONFIG_MSKYLAKEX is not set -+# CONFIG_MCANNONLAKE is not set -+# CONFIG_MICELAKE is not set -+# CONFIG_MCASCADELAKE is not set -+# CONFIG_GENERIC_CPU is not set -+# CONFIG_MNATIVE 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 -@@ -468,9 +497,9 @@ - CONFIG_EFI_MIXED=y - # CONFIG_HZ_100 is not set - # CONFIG_HZ_250 is not set --CONFIG_HZ_300=y --# CONFIG_HZ_1000 is not set --CONFIG_HZ=300 -+# CONFIG_HZ_300 is not set -+CONFIG_HZ_1000=y -+CONFIG_HZ=1000 - CONFIG_SCHED_HRTICK=y - CONFIG_KEXEC=y - CONFIG_KEXEC_FILE=y -@@ -496,7 +525,7 @@ - # CONFIG_CMDLINE_BOOL is not set - CONFIG_MODIFY_LDT_SYSCALL=y - CONFIG_HAVE_LIVEPATCH=y --# CONFIG_LIVEPATCH is not set -+CONFIG_LIVEPATCH=y - # end of Processor type and features - - CONFIG_ARCH_HAS_ADD_PAGES=y -@@ -699,7 +728,7 @@ - # - # EFI (Extensible Firmware Interface) Support - # --# CONFIG_EFI_VARS is not set -+CONFIG_EFI_VARS=y - CONFIG_EFI_ESRT=y - CONFIG_EFI_VARS_PSTORE=y - # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set -@@ -897,8 +926,8 @@ - CONFIG_MODULE_SIG_SHA512=y - CONFIG_MODULE_SIG_HASH="sha512" - CONFIG_MODULE_COMPRESS=y --# CONFIG_MODULE_COMPRESS_GZIP is not set --CONFIG_MODULE_COMPRESS_XZ=y -+CONFIG_MODULE_COMPRESS_GZIP=y -+# CONFIG_MODULE_COMPRESS_XZ is not set - CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y - CONFIG_UNUSED_SYMBOLS=y - CONFIG_MODULES_TREE_LOOKUP=y -@@ -6354,7 +6383,10 @@ - CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y - # end of Console display driver support - --# CONFIG_LOGO is not set -+CONFIG_LOGO=y -+CONFIG_LOGO_LINUX_MONO=y -+CONFIG_LOGO_LINUX_VGA16=y -+CONFIG_LOGO_LINUX_CLUT224=y - # end of Graphics support - - CONFIG_SOUND=m -@@ -6951,7 +6983,7 @@ - CONFIG_HID=y - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y --CONFIG_UHID=m -+CONFIG_UHID=y - CONFIG_HID_GENERIC=y - - # -@@ -7074,7 +7106,7 @@ - # - # USB HID support - # --CONFIG_USB_HID=m -+CONFIG_USB_HID=y - CONFIG_HID_PID=y - CONFIG_USB_HIDDEV=y - # end of USB HID support -@@ -7128,7 +7160,7 @@ - CONFIG_USB_C67X00_HCD=m - CONFIG_USB_XHCI_HCD=y - # CONFIG_USB_XHCI_DBGCAP is not set --CONFIG_USB_XHCI_PCI=m -+CONFIG_USB_XHCI_PCI=y - CONFIG_USB_XHCI_PCI_RENESAS=m - CONFIG_USB_XHCI_PLATFORM=m - CONFIG_USB_EHCI_HCD=y -@@ -9026,14 +9058,14 @@ - CONFIG_FS_IOMAP=y - # CONFIG_EXT2_FS is not set - # CONFIG_EXT3_FS is not set --CONFIG_EXT4_FS=m -+CONFIG_EXT4_FS=y - CONFIG_EXT4_USE_FOR_EXT2=y - CONFIG_EXT4_FS_POSIX_ACL=y - CONFIG_EXT4_FS_SECURITY=y - # CONFIG_EXT4_DEBUG is not set --CONFIG_JBD2=m -+CONFIG_JBD2=y - # CONFIG_JBD2_DEBUG is not set --CONFIG_FS_MBCACHE=m -+CONFIG_FS_MBCACHE=y - CONFIG_REISERFS_FS=m - # CONFIG_REISERFS_CHECK is not set - CONFIG_REISERFS_PROC_INFO=y -@@ -9045,7 +9077,7 @@ - CONFIG_JFS_SECURITY=y - # CONFIG_JFS_DEBUG is not set - CONFIG_JFS_STATISTICS=y --CONFIG_XFS_FS=m -+CONFIG_XFS_FS=y - CONFIG_XFS_SUPPORT_V4=y - CONFIG_XFS_QUOTA=y - CONFIG_XFS_POSIX_ACL=y -@@ -9062,7 +9094,7 @@ - CONFIG_OCFS2_FS_STATS=y - CONFIG_OCFS2_DEBUG_MASKLOG=y - # CONFIG_OCFS2_DEBUG_FS is not set --CONFIG_BTRFS_FS=m -+CONFIG_BTRFS_FS=y - CONFIG_BTRFS_FS_POSIX_ACL=y - # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set - # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -@@ -9070,7 +9102,7 @@ - # CONFIG_BTRFS_ASSERT is not set - # CONFIG_BTRFS_FS_REF_VERIFY is not set - CONFIG_NILFS2_FS=m --CONFIG_F2FS_FS=m -+CONFIG_F2FS_FS=y - CONFIG_F2FS_STAT_FS=y - CONFIG_F2FS_FS_XATTR=y - CONFIG_F2FS_FS_POSIX_ACL=y -@@ -9142,15 +9174,15 @@ - CONFIG_ISO9660_FS=m - CONFIG_JOLIET=y - CONFIG_ZISOFS=y --CONFIG_UDF_FS=m -+CONFIG_UDF_FS=y - # end of CD-ROM/DVD Filesystems - - # - # DOS/FAT/EXFAT/NT Filesystems - # --CONFIG_FAT_FS=m --CONFIG_MSDOS_FS=m --CONFIG_VFAT_FS=m -+CONFIG_FAT_FS=y -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y - CONFIG_FAT_DEFAULT_CODEPAGE=437 - CONFIG_FAT_DEFAULT_IOCHARSET="ascii" - CONFIG_FAT_DEFAULT_UTF8=y -@@ -9498,7 +9530,7 @@ - # end of Kernel hardening options - # end of Security options - --CONFIG_XOR_BLOCKS=m -+CONFIG_XOR_BLOCKS=y - CONFIG_ASYNC_CORE=m - CONFIG_ASYNC_MEMCPY=m - CONFIG_ASYNC_XOR=m -@@ -9593,9 +9625,9 @@ - # - # Digest - # --CONFIG_CRYPTO_CRC32C=m -+CONFIG_CRYPTO_CRC32C=y - CONFIG_CRYPTO_CRC32C_INTEL=m --CONFIG_CRYPTO_CRC32=m -+CONFIG_CRYPTO_CRC32=y - CONFIG_CRYPTO_CRC32_PCLMUL=m - CONFIG_CRYPTO_XXHASH=m - CONFIG_CRYPTO_BLAKE2B=m -@@ -9767,7 +9799,7 @@ - # - # Library routines - # --CONFIG_RAID6_PQ=m -+CONFIG_RAID6_PQ=y - # CONFIG_RAID6_PQ_BENCHMARK is not set - CONFIG_LINEAR_RANGES=y - CONFIG_PACKING=y -@@ -9785,7 +9817,7 @@ - CONFIG_ARCH_HAS_FAST_MULTIPLIER=y - CONFIG_ARCH_USE_SYM_ANNOTATIONS=y - CONFIG_CRC_CCITT=y --CONFIG_CRC16=m -+CONFIG_CRC16=y - CONFIG_CRC_T10DIF=y - CONFIG_CRC_ITU_T=m - CONFIG_CRC32=y -@@ -9797,7 +9829,7 @@ - CONFIG_CRC64=m - CONFIG_CRC4=m - CONFIG_CRC7=m --CONFIG_LIBCRC32C=m -+CONFIG_LIBCRC32C=y - CONFIG_CRC8=m - CONFIG_XXHASH=y - # CONFIG_RANDOM32_SELFTEST is not set -@@ -9932,12 +9964,12 @@ - # - # Compile-time checks and compiler options - # --CONFIG_DEBUG_INFO=y -+# CONFIG_DEBUG_INFO is not set - # CONFIG_DEBUG_INFO_REDUCED is not set - # CONFIG_DEBUG_INFO_COMPRESSED is not set - # CONFIG_DEBUG_INFO_SPLIT is not set --CONFIG_DEBUG_INFO_DWARF4=y --CONFIG_DEBUG_INFO_BTF=y -+# CONFIG_DEBUG_INFO_DWARF4 is not set -+# CONFIG_DEBUG_INFO_BTF is not set - # CONFIG_GDB_SCRIPTS is not set - CONFIG_FRAME_WARN=2048 - CONFIG_STRIP_ASM_SYMS=y -@@ -10243,6 +10275,7 @@ - # CONFIG_TEST_STATIC_KEYS is not set - # CONFIG_TEST_KMOD is not set - # CONFIG_TEST_MEMCAT_P is not set -+# CONFIG_TEST_LIVEPATCH is not set - # CONFIG_TEST_OBJAGG is not set - # CONFIG_TEST_STACKINIT is not set - # CONFIG_TEST_MEMINIT is not set -@@ -10253,3 +10286,18 @@ - # CONFIG_HYPERV_TESTING is not set - # end of Kernel Testing and Coverage - # end of Kernel hacking -+ -+# -+# Gentoo Linux -+# -+CONFIG_GENTOO_LINUX=y -+CONFIG_GENTOO_LINUX_UDEV=y -+CONFIG_GENTOO_LINUX_PORTAGE=y -+ -+# -+# Support for init systems, system and service managers -+# -+CONFIG_GENTOO_LINUX_INIT_SCRIPT=y -+# CONFIG_GENTOO_LINUX_INIT_SYSTEMD is not set -+# end of Support for init systems, system and service managers -+# end of Gentoo Linux diff --git a/gentoox-patches/0001-kernel-config-cfs-r8.patch b/gentoox-patches/0001-kernel-config-cfs-r8.patch new file mode 100644 index 0000000..a5c911b --- /dev/null +++ b/gentoox-patches/0001-kernel-config-cfs-r8.patch @@ -0,0 +1,350 @@ +--- .config.orig 2021-11-18 05:29:19.277559285 -0000 ++++ .config 2021-11-18 05:35:00.029598573 -0000 +@@ -226,7 +226,6 @@ + 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 +@@ -243,7 +242,9 @@ + CONFIG_RD_LZ4=y + CONFIG_RD_ZSTD=y + CONFIG_BOOT_CONFIG=y +-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y ++# CONFIG_CC_OPTIMIZE_BASAL is not set ++# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set ++CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y + # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set + CONFIG_LD_ORPHAN_WARN=y + CONFIG_SYSCTL=y +@@ -386,12 +387,51 @@ + CONFIG_JAILHOUSE_GUEST=y + CONFIG_ACRN_GUEST=y + # CONFIG_MK8 is not set ++# CONFIG_MK8SSE3 is not set ++# CONFIG_MK10 is not set ++# CONFIG_MBARCELONA is not set ++# CONFIG_MBOBCAT is not set ++# CONFIG_MJAGUAR is not set ++# CONFIG_MBULLDOZER is not set ++# CONFIG_MPILEDRIVER is not set ++# CONFIG_MSTEAMROLLER is not set ++# 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 +-CONFIG_GENERIC_CPU=y ++# CONFIG_MNEHALEM is not set ++# CONFIG_MWESTMERE is not set ++# CONFIG_MSILVERMONT is not set ++# CONFIG_MGOLDMONT is not set ++# CONFIG_MGOLDMONTPLUS is not set ++CONFIG_MSANDYBRIDGE=y ++# CONFIG_MIVYBRIDGE is not set ++# CONFIG_MHASWELL is not set ++# CONFIG_MBROADWELL is not set ++# CONFIG_MSKYLAKE is not set ++# CONFIG_MSKYLAKEX is not set ++# CONFIG_MCANNONLAKE is not set ++# CONFIG_MICELAKE is not set ++# CONFIG_MCASCADELAKE is not set ++# CONFIG_MCOOPERLAKE is not set ++# CONFIG_MTIGERLAKE is not set ++# CONFIG_MSAPPHIRERAPIDS is not set ++# CONFIG_MROCKETLAKE 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_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 ++CONFIG_X86_USE_PPRO_CHECKSUM=y ++CONFIG_X86_P6_NOP=y + CONFIG_X86_TSC=y + CONFIG_X86_CMPXCHG64=y + CONFIG_X86_CMOV=y +@@ -486,9 +526,9 @@ + CONFIG_EFI_MIXED=y + # CONFIG_HZ_100 is not set + # CONFIG_HZ_250 is not set +-CONFIG_HZ_300=y +-# CONFIG_HZ_1000 is not set +-CONFIG_HZ=300 ++# CONFIG_HZ_300 is not set ++CONFIG_HZ_1000=y ++CONFIG_HZ=1000 + CONFIG_SCHED_HRTICK=y + CONFIG_KEXEC=y + CONFIG_KEXEC_FILE=y +@@ -514,7 +554,7 @@ + # CONFIG_CMDLINE_BOOL is not set + CONFIG_MODIFY_LDT_SYSCALL=y + CONFIG_HAVE_LIVEPATCH=y +-# CONFIG_LIVEPATCH is not set ++CONFIG_LIVEPATCH=y + # end of Processor type and features + + CONFIG_ARCH_HAS_ADD_PAGES=y +@@ -867,10 +907,10 @@ + # CONFIG_MODULE_SIG_SHA384 is not set + CONFIG_MODULE_SIG_SHA512=y + CONFIG_MODULE_SIG_HASH="sha512" +-# CONFIG_MODULE_COMPRESS_NONE is not set ++CONFIG_MODULE_COMPRESS_NONE=y + # CONFIG_MODULE_COMPRESS_GZIP is not set + # CONFIG_MODULE_COMPRESS_XZ is not set +-CONFIG_MODULE_COMPRESS_ZSTD=y ++# CONFIG_MODULE_COMPRESS_ZSTD is not set + CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y + CONFIG_MODPROBE_PATH="/sbin/modprobe" + CONFIG_MODULES_TREE_LOOKUP=y +@@ -6502,7 +6542,10 @@ + CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y + # end of Console display driver support + +-# CONFIG_LOGO is not set ++CONFIG_LOGO=y ++CONFIG_LOGO_LINUX_MONO=y ++CONFIG_LOGO_LINUX_VGA16=y ++CONFIG_LOGO_LINUX_CLUT224=y + # end of Graphics support + + CONFIG_SOUND=m +@@ -7116,7 +7159,7 @@ + CONFIG_HID=y + CONFIG_HID_BATTERY_STRENGTH=y + CONFIG_HIDRAW=y +-CONFIG_UHID=m ++CONFIG_UHID=y + CONFIG_HID_GENERIC=y + + # +@@ -7243,7 +7286,7 @@ + # + # USB HID support + # +-CONFIG_USB_HID=m ++CONFIG_USB_HID=y + CONFIG_HID_PID=y + CONFIG_USB_HIDDEV=y + # end of USB HID support +@@ -9418,14 +9461,14 @@ + CONFIG_FS_IOMAP=y + # CONFIG_EXT2_FS is not set + # CONFIG_EXT3_FS is not set +-CONFIG_EXT4_FS=m ++CONFIG_EXT4_FS=y + CONFIG_EXT4_USE_FOR_EXT2=y + CONFIG_EXT4_FS_POSIX_ACL=y + CONFIG_EXT4_FS_SECURITY=y + # CONFIG_EXT4_DEBUG is not set +-CONFIG_JBD2=m ++CONFIG_JBD2=y + # CONFIG_JBD2_DEBUG is not set +-CONFIG_FS_MBCACHE=m ++CONFIG_FS_MBCACHE=y + CONFIG_REISERFS_FS=m + # CONFIG_REISERFS_CHECK is not set + CONFIG_REISERFS_PROC_INFO=y +@@ -9437,7 +9480,7 @@ + CONFIG_JFS_SECURITY=y + # CONFIG_JFS_DEBUG is not set + CONFIG_JFS_STATISTICS=y +-CONFIG_XFS_FS=m ++CONFIG_XFS_FS=y + CONFIG_XFS_SUPPORT_V4=y + CONFIG_XFS_QUOTA=y + CONFIG_XFS_POSIX_ACL=y +@@ -9454,7 +9497,7 @@ + CONFIG_OCFS2_FS_STATS=y + CONFIG_OCFS2_DEBUG_MASKLOG=y + # CONFIG_OCFS2_DEBUG_FS is not set +-CONFIG_BTRFS_FS=m ++CONFIG_BTRFS_FS=y + CONFIG_BTRFS_FS_POSIX_ACL=y + # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set + # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +@@ -9462,7 +9505,7 @@ + # CONFIG_BTRFS_ASSERT is not set + # CONFIG_BTRFS_FS_REF_VERIFY is not set + CONFIG_NILFS2_FS=m +-CONFIG_F2FS_FS=m ++CONFIG_F2FS_FS=y + CONFIG_F2FS_STAT_FS=y + CONFIG_F2FS_FS_XATTR=y + CONFIG_F2FS_FS_POSIX_ACL=y +@@ -9484,7 +9527,7 @@ + CONFIG_EXPORTFS_BLOCK_OPS=y + CONFIG_FILE_LOCKING=y + CONFIG_FS_ENCRYPTION=y +-CONFIG_FS_ENCRYPTION_ALGS=m ++CONFIG_FS_ENCRYPTION_ALGS=y + CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y + CONFIG_FS_VERITY=y + # CONFIG_FS_VERITY_DEBUG is not set +@@ -9530,25 +9573,25 @@ + # + # CD-ROM/DVD Filesystems + # +-CONFIG_ISO9660_FS=m ++CONFIG_ISO9660_FS=y + CONFIG_JOLIET=y + CONFIG_ZISOFS=y +-CONFIG_UDF_FS=m ++CONFIG_UDF_FS=y + # end of CD-ROM/DVD Filesystems + + # + # DOS/FAT/EXFAT/NT Filesystems + # +-CONFIG_FAT_FS=m +-CONFIG_MSDOS_FS=m +-CONFIG_VFAT_FS=m ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y + CONFIG_FAT_DEFAULT_CODEPAGE=437 + CONFIG_FAT_DEFAULT_IOCHARSET="ascii" + CONFIG_FAT_DEFAULT_UTF8=y +-CONFIG_EXFAT_FS=m ++CONFIG_EXFAT_FS=y + CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" + # CONFIG_NTFS_FS is not set +-CONFIG_NTFS3_FS=m ++CONFIG_NTFS3_FS=y + # CONFIG_NTFS3_64BIT_CLUSTER is not set + CONFIG_NTFS3_LZX_XPRESS=y + CONFIG_NTFS3_FS_POSIX_ACL=y +@@ -9897,7 +9940,7 @@ + # end of Kernel hardening options + # end of Security options + +-CONFIG_XOR_BLOCKS=m ++CONFIG_XOR_BLOCKS=y + CONFIG_ASYNC_CORE=m + CONFIG_ASYNC_MEMCPY=m + CONFIG_ASYNC_XOR=m +@@ -9992,12 +10035,12 @@ + # + # Digest + # +-CONFIG_CRYPTO_CRC32C=m ++CONFIG_CRYPTO_CRC32C=y + CONFIG_CRYPTO_CRC32C_INTEL=m +-CONFIG_CRYPTO_CRC32=m ++CONFIG_CRYPTO_CRC32=y + CONFIG_CRYPTO_CRC32_PCLMUL=m +-CONFIG_CRYPTO_XXHASH=m +-CONFIG_CRYPTO_BLAKE2B=m ++CONFIG_CRYPTO_XXHASH=y ++CONFIG_CRYPTO_BLAKE2B=y + CONFIG_CRYPTO_BLAKE2S=m + CONFIG_CRYPTO_BLAKE2S_X86=m + CONFIG_CRYPTO_CRCT10DIF=y +@@ -10077,8 +10120,8 @@ + CONFIG_CRYPTO_DRBG_CTR=y + CONFIG_CRYPTO_DRBG=m + CONFIG_CRYPTO_JITTERENTROPY=y +-CONFIG_CRYPTO_USER_API=m +-CONFIG_CRYPTO_USER_API_HASH=m ++CONFIG_CRYPTO_USER_API=y ++CONFIG_CRYPTO_USER_API_HASH=y + CONFIG_CRYPTO_USER_API_SKCIPHER=m + CONFIG_CRYPTO_USER_API_RNG=m + # CONFIG_CRYPTO_USER_API_RNG_CAVP is not set +@@ -10168,7 +10211,7 @@ + # + # Library routines + # +-CONFIG_RAID6_PQ=m ++CONFIG_RAID6_PQ=y + # CONFIG_RAID6_PQ_BENCHMARK is not set + CONFIG_LINEAR_RANGES=y + CONFIG_PACKING=y +@@ -10186,9 +10229,9 @@ + CONFIG_ARCH_HAS_FAST_MULTIPLIER=y + CONFIG_ARCH_USE_SYM_ANNOTATIONS=y + CONFIG_CRC_CCITT=y +-CONFIG_CRC16=m ++CONFIG_CRC16=y + CONFIG_CRC_T10DIF=y +-CONFIG_CRC_ITU_T=m ++CONFIG_CRC_ITU_T=y + CONFIG_CRC32=y + # CONFIG_CRC32_SELFTEST is not set + CONFIG_CRC32_SLICEBY8=y +@@ -10198,7 +10241,7 @@ + CONFIG_CRC64=m + CONFIG_CRC4=m + CONFIG_CRC7=m +-CONFIG_LIBCRC32C=m ++CONFIG_LIBCRC32C=y + CONFIG_CRC8=m + CONFIG_XXHASH=y + # CONFIG_RANDOM32_SELFTEST is not set +@@ -10209,7 +10252,7 @@ + CONFIG_LZO_COMPRESS=y + CONFIG_LZO_DECOMPRESS=y + CONFIG_LZ4_COMPRESS=y +-CONFIG_LZ4HC_COMPRESS=m ++CONFIG_LZ4HC_COMPRESS=y + CONFIG_LZ4_DECOMPRESS=y + CONFIG_ZSTD_COMPRESS=y + CONFIG_ZSTD_DECOMPRESS=y +@@ -10335,16 +10378,7 @@ + # + # Compile-time checks and compiler options + # +-CONFIG_DEBUG_INFO=y +-# CONFIG_DEBUG_INFO_REDUCED is not set +-# CONFIG_DEBUG_INFO_COMPRESSED is not set +-# CONFIG_DEBUG_INFO_SPLIT is not set +-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +-CONFIG_DEBUG_INFO_DWARF4=y +-CONFIG_DEBUG_INFO_BTF=y +-CONFIG_PAHOLE_HAS_SPLIT_BTF=y +-CONFIG_DEBUG_INFO_BTF_MODULES=y +-# CONFIG_GDB_SCRIPTS is not set ++# CONFIG_DEBUG_INFO is not set + CONFIG_FRAME_WARN=2048 + CONFIG_STRIP_ASM_SYMS=y + # CONFIG_READABLE_ASM is not set +@@ -10659,6 +10693,7 @@ + # CONFIG_TEST_STATIC_KEYS is not set + # CONFIG_TEST_KMOD is not set + # CONFIG_TEST_MEMCAT_P is not set ++# CONFIG_TEST_LIVEPATCH is not set + # CONFIG_TEST_OBJAGG is not set + # CONFIG_TEST_STACKINIT is not set + # CONFIG_TEST_MEMINIT is not set +@@ -10671,3 +10706,21 @@ + # CONFIG_HYPERV_TESTING is not set + # end of Kernel Testing and Coverage + # end of Kernel hacking ++ ++# ++# Gentoo Linux ++# ++CONFIG_GENTOO_LINUX=y ++CONFIG_GENTOO_LINUX_UDEV=y ++CONFIG_GENTOO_LINUX_PORTAGE=y ++ ++# ++# Support for init systems, system and service managers ++# ++CONFIG_GENTOO_LINUX_INIT_SCRIPT=y ++CONFIG_GENTOO_LINUX_INIT_SYSTEMD=y ++# end of Support for init systems, system and service managers ++ ++# CONFIG_GENTOO_KERNEL_SELF_PROTECTION is not set ++CONFIG_GENTOO_PRINT_FIRMWARE_INFO=y ++# end of Gentoo Linux diff --git a/gentoox_build.sh b/gentoox_build.sh index 95d3265..7fb2afe 100755 --- a/gentoox_build.sh +++ b/gentoox_build.sh @@ -16,8 +16,8 @@ username=gentoox userpassword=gentoox builddate="$(date +%Y%m%d).graphite" builddir="build-$(date +%Y%m%d)" -stage3tarball="stage3-amd64-20210504.graphite.tar.xz" -KERNEL_CONFIG_DIFF="0001-kernel-config-cfs-r7.patch" +stage3tarball="stage3-amd64-20211117.graphite.tar.xz" +KERNEL_CONFIG_DIFF="0001-kernel-config-cfs-r8.patch" binpkgs="$(pwd)/var/cache/binpkgs/" distfiles="$(pwd)/var/cache/distfiles/" @@ -233,32 +233,33 @@ KERNELVERSION=\$(qlist -Iv gentoo-sources | tr '-' ' ' | awk '{print \$4}') #echo -e '\nPLYMOUTH="yes" #PLYMOUTH_THEME="fade-in"' >> /etc/genkernel.conf #echo -e '\nrc_interactive="NO"' >> /etc/rc.conf +eselect kernel set 1 cd /usr/src/linux/ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then - wget --quiet 'https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux' -O .config + wget --quiet 'https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux/trunk/config' -O .config #wget --quiet -m -np -c 'ck.kolivas.org/patches/5.0/5.12/5.12-ck1/patches/' - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/btrfs-patches-v2/0001-btrfs-patches.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/clearlinux-patches/0001-clearlinux-patches.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/cpu-patches/0001-cpu-patches.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/fixes-miscellaneous/0001-fixes-miscellaneous.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/mm-patches/0001-mm-5.12-protect-file-mappings-under-memory-pressure.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/initramfs-patches/0001-initramfs-patches.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/futex-trunk-patches/0001-futex-resync-from-gitlab.collabora.com.patch - #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/futex2-dev-trunk-patches-v4/0001-futex2-resync-from-gitlab.collabora.com.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/ntfs3-patches/0001-ntfs3-patches.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/zstd-patches/0001-zstd-patches.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/zstd-dev-patches-v3/0001-zstd-dev-patches.patch - #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/zswap-patches-v2/0001-zswap-patches.patch - wget --quiet https://raw.githubusercontent.com/hamadmarri/cacule-cpu-scheduler/master/patches/CacULE/v5.12/cacule-5.12.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/xanmod-patches/0001-sched-autogroup-Add-kernel-parameter-and-config-opti.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/android-patches-v2/0001-android-export-symbold-and-enable-building-ashmem-an.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/btrfs-patches-v3/0001-btrfs-patches.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/clearlinux-patches/0001-clearlinux-patches.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/cpu-patches-v2/0001-cpu-patches.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/fixes-miscellaneous-v5/0001-fixes-miscellaneous.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/mm-patches/0001-mm-protect-mappings-under-memory-pressure.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/futex-patches/0001-futex-resync-from-gitlab.collabora.com.patch + #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/futex2-patches/0001-futex2-resync-from-gitlab.collabora.com.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/zstd-patches/0001-zstd-patches.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/zstd-dev-patches-v3/0001-zstd-dev-patches.patch + #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/cacule-patches/0001-cacule-patches.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/xanmod-patches/0001-xanmod-patches.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/lru-patches-le9-v3/0001-lru-patches.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/bbr2-patches/0001-bbr2-5.15-introduce-BBRv2.patch + #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/bcachefs-patches/0001-bcachefs-5.15-introduce-bcachefs-patchset.patch #wget --quiet https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git/patch/?id=86ad60a65f29dd862a11c22bb4b5be28d6c5cef1 -O x86_aes-ni-xts_use_direct_calls_to_and_4-way_stride.patch #wget --quiet https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git/patch/?id=2481104fe98d5b016fdd95d649b1235f21e491ba -O x86_aes-ni-xts_rewrite_and_drop_indirections_via_glue_helper.patch - #for f in ck.kolivas.org/patches/5.0/5.11/5.11-ck1/patches/*.patch; do patch -p1 < "\$f"; done + #for f in ck.kolivas.org/patches/5.0/5.12/5.12-ck1/patches/*.patch; do patch -p1 < "\$f"; done patch -p1 < 0001-cpu-patches.patch patch -p0 < ../$KERNEL_CONFIG_DIFF @@ -285,26 +286,26 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then patch -p1 < 0001-btrfs-patches.patch patch -p1 < 0001-clearlinux-patches.patch patch -p1 < 0001-fixes-miscellaneous.patch - patch -p1 < 0001-mm-5.12-protect-file-mappings-under-memory-pressure.patch - patch -p1 < 0001-initramfs-patches.patch patch -p1 < 0001-futex-resync-from-gitlab.collabora.com.patch #patch -p1 < 0001-futex2-resync-from-gitlab.collabora.com.patch patch -p1 < ../0011-ZFS-fix.patch patch -p1 < ../zfs-ungpl-rcu_read_unlock-export.diff - patch -p1 < 0001-ntfs3-patches.patch patch -p1 < 0001-zstd-dev-patches.patch patch -p1 < 0001-zstd-patches.patch - #patch -p1 < 0001-zswap-patches.patch - patch -p1 < cacule-5.12.patch - patch -p1 < 0001-sched-autogroup-Add-kernel-parameter-and-config-opti.patch + #patch -p1 < 0001-cacule-patches.patch + patch -p1 < 0001-xanmod-patches.patch + patch -p1 < 0001-lru-patches.patch + patch -p1 < 0001-mm-protect-mappings-under-memory-pressure.patch + patch -p1 < 0001-bbr2-5.15-introduce-BBRv2.patch + #patch -p1 < 0001-bcachefs-5.15-introduce-bcachefs-patchset.patch #patch -p1 < x86_aes-ni-xts_use_direct_calls_to_and_4-way_stride.patch #patch -p1 < x86_aes-ni-xts_rewrite_and_drop_indirections_via_glue_helper.patch # Linux Random Number Generator patch. http://www.chronox.de/lrng.html - git clone --depth 1 --filter=blob:none --sparse https://github.com/smuellerDD/lrng.git lrng-5.12; cd lrng-5.12 - git sparse-checkout init --cone; git sparse-checkout set kernel_patches/v5.12; cd .. - for f in lrng-5.12/kernel_patches/v5.12/*.patch; do patch -p1 < "\$f"; done + git clone --depth 1 --filter=blob:none --sparse https://github.com/smuellerDD/lrng.git lrng-5.15; cd lrng-5.15 + git sparse-checkout init --cone; git sparse-checkout set kernel_patches/v5.15; cd .. + for f in lrng-5.15/kernel_patches/v5.15/*.patch; do patch -p1 < "\$f"; done echo 'CONFIG_LRNG=y CONFIG_LRNG_CONTINUOUS_COMPRESSION_DISABLED=y CONFIG_LRNG_SWITCHABLE_CONTINUOUS_COMPRESSION=y @@ -315,6 +316,7 @@ CONFIG_LRNG_KCAPI_HASH=y CONFIG_LRNG_DRBG=y CONFIG_LRNG_RCT_CUTOFF=31 CONFIG_LRNG_APT_CUTOFF=325 +CONFIG_LRNG_JENT=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_DRBG=y' >> .config @@ -327,6 +329,8 @@ CONFIG_CRYPTO_DRBG=y' >> .config sed -i 's/CONFIG_NET_UDP_TUNNEL=y/CONFIG_NET_UDP_TUNNEL=m/' .config sed -i 's/EXTRAVERSION = -gentoo-r1/EXTRAVERSION = -gentoo/' Makefile make oldconfig + find . -name "*.orig" -exec rm -f {} \; + find . -name "*.rej" -exec rm -f {} \; touch /tmp/gentoox-kernelpatches-applied fi -- cgit v1.2.3