cleanup patches in the repo

4 files changed, 398 insertions, 0 deletions

diff --git a/gentoox-patches/0001-kernel-config-cfs-r7.patch b/gentoox-patches/0001-kernel-config-cfs-r7.patch
new file mode 100644
index 0000000..b759679
--- /dev/null
+++ b/gentoox-patches/0001-kernel-config-cfs-r7.patch
@@ -0,0 +1,310 @@
+--- .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/0011-ZFS-fix.patch b/gentoox-patches/0011-ZFS-fix.patch
new file mode 100644
index 0000000..af71d04
--- /dev/null
+++ b/gentoox-patches/0011-ZFS-fix.patch
@@ -0,0 +1,43 @@
+From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Thu, 2 May 2019 05:28:08 +0100
+Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with
+ EXPORT_SYMBOL_GPL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We need these symbols in zfs as the fpu implementation breaks userspace:
+
+https://github.com/zfsonlinux/zfs/issues/9346
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ arch/x86/kernel/fpu/core.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
+index 12c70840980e..352538b3bb5d 100644
+--- a/arch/x86/kernel/fpu/core.c
++++ b/arch/x86/kernel/fpu/core.c
+@@ -102,7 +102,7 @@ void kernel_fpu_begin(void)
+ 	}
+ 	__cpu_invalidate_fpregs_state();
+ }
+-EXPORT_SYMBOL_GPL(kernel_fpu_begin);
++EXPORT_SYMBOL(kernel_fpu_begin);
+ 
+ void kernel_fpu_end(void)
+ {
+@@ -111,7 +111,7 @@ void kernel_fpu_end(void)
+ 	this_cpu_write(in_kernel_fpu, false);
+ 	preempt_enable();
+ }
+-EXPORT_SYMBOL_GPL(kernel_fpu_end);
++EXPORT_SYMBOL(kernel_fpu_end);
+ 
+ /*
+  * Save the FPU state (mark it for reload if necessary):
+-- 
+2.23.0
+
+
diff --git a/gentoox-patches/portage-change-rsync-to-git-repos.diff b/gentoox-patches/portage-change-rsync-to-git-repos.diff
new file mode 100644
index 0000000..bd6a8ea
--- /dev/null
+++ b/gentoox-patches/portage-change-rsync-to-git-repos.diff
@@ -0,0 +1,23 @@
+--- /etc/portage/repos.conf/gentoo.conf	2021-02-11 20:25:13.857112972 -0600
++++ /etc/portage/repos.conf/gentoo.conf	2020-08-17 11:18:01.000000000 -0500
+@@ -3,12 +3,15 @@
+ 
+ [gentoo]
+ location = /var/db/repos/gentoo
+-sync-type = rsync
+-sync-uri = rsync://rsync.gentoo.org/gentoo-portage
++#sync-type = rsync
++#sync-uri = rsync://rsync.gentoo.org/gentoo-portage
+ auto-sync = yes
+-sync-rsync-verify-jobs = 1
+-sync-rsync-verify-metamanifest = yes
+-sync-rsync-verify-max-age = 24
++sync-depth = 1
++sync-type = git
++sync-uri = https://github.com/gentoo-mirror/gentoo.git
++#sync-rsync-verify-jobs = 1
++#sync-rsync-verify-metamanifest = yes
++#sync-rsync-verify-max-age = 24
+ sync-openpgp-key-path = /usr/share/openpgp-keys/gentoo-release.asc
+ sync-openpgp-keyserver = hkps://keys.gentoo.org
+ sync-openpgp-key-refresh-retry-count = 40
diff --git a/gentoox-patches/zfs-ungpl-rcu_read_unlock-export.diff b/gentoox-patches/zfs-ungpl-rcu_read_unlock-export.diff
new file mode 100644
index 0000000..c31a103
--- /dev/null
+++ b/gentoox-patches/zfs-ungpl-rcu_read_unlock-export.diff
@@ -0,0 +1,22 @@
+diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
+index fa08d55f7040c0aa6a9976b328cb8c49195824d6..360428642c9bd34670683eb587110baf2ef24bd2 100644
+--- a/kernel/rcu/tree_plugin.h
++++ b/kernel/rcu/tree_plugin.h
+@@ -360,7 +360,7 @@ void __rcu_read_lock(void)
+ 		WARN_ON_ONCE(current->rcu_read_lock_nesting > RCU_NEST_PMAX);
+ 	barrier();  /* critical section after entry code. */
+ }
+-EXPORT_SYMBOL_GPL(__rcu_read_lock);
++EXPORT_SYMBOL(__rcu_read_lock);
+ 
+ /*
+  * Preemptible RCU implementation for rcu_read_unlock().
+@@ -390,7 +390,7 @@ void __rcu_read_unlock(void)
+ 		WARN_ON_ONCE(rrln < 0 && rrln > RCU_NEST_NMAX);
+ 	}
+ }
+-EXPORT_SYMBOL_GPL(__rcu_read_unlock);
++EXPORT_SYMBOL(__rcu_read_unlock);
+ 
+ /*
+  * Advance a ->blkd_tasks-list pointer to the next entry, instead