summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle K <kylek389@gmail.com>2020-08-12 06:03:48 -0500
committerKyle K <kylek389@gmail.com>2020-08-12 06:03:48 -0500
commit63cef83b71c3b8fe4642e2dfda84d27b305a2ae5 (patch)
tree39c67e25060bf2963ace24f1acf58d1aaaff5100
parent408d95e097fd999d6b04e4209d606cd945a0c146 (diff)
downloadgentoox-63cef83b71c3b8fe4642e2dfda84d27b305a2ae5.tar.gz
gentoox-63cef83b71c3b8fe4642e2dfda84d27b305a2ae5.tar.bz2
gentoox-63cef83b71c3b8fe4642e2dfda84d27b305a2ae5.zip
prep scripts for gcc 10.2.0
-rw-r--r--0001-kernel-config-cfs-r5.patch346
-rw-r--r--0001-kernel-config-cfs-r6.patch362
-rwxr-xr-xgentoox_build.sh90
-rw-r--r--package.mask/llvm-clang12
-rw-r--r--patches/sys-libs/compiler-rt-sanitizers/fix-compile-with-glibc-2.31.patch11
5 files changed, 780 insertions, 41 deletions
diff --git a/0001-kernel-config-cfs-r5.patch b/0001-kernel-config-cfs-r5.patch
new file mode 100644
index 0000000..ef12e76
--- /dev/null
+++ b/0001-kernel-config-cfs-r5.patch
@@ -0,0 +1,346 @@
+--- .config.orig 2020-08-10 12:41:20.809622607 -0000
++++ .config 2020-08-10 12:47:39.011612697 -0000
+@@ -2,9 +2,9 @@
+ # Automatically generated file; DO NOT EDIT.
+ # Linux/x86 5.8.0-arch1 Kernel Configuration
+ #
+-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.1.0"
++CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
+ CONFIG_CC_IS_GCC=y
+-CONFIG_GCC_VERSION=100100
++CONFIG_GCC_VERSION=100200
+ CONFIG_LD_VERSION=234000000
+ CONFIG_CLANG_VERSION=0
+ CONFIG_CC_CAN_LINK=y
+@@ -32,9 +32,9 @@
+ # CONFIG_KERNEL_GZIP is not set
+ # CONFIG_KERNEL_BZIP2 is not set
+ # CONFIG_KERNEL_LZMA is not set
+-CONFIG_KERNEL_XZ=y
++# CONFIG_KERNEL_XZ is not set
+ # CONFIG_KERNEL_LZO is not set
+-# CONFIG_KERNEL_LZ4 is not set
++CONFIG_KERNEL_LZ4=y
+ CONFIG_DEFAULT_INIT=""
+ CONFIG_DEFAULT_HOSTNAME="archlinux"
+ CONFIG_SWAP=y
+@@ -173,7 +173,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
+@@ -192,7 +192,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
+@@ -208,7 +207,8 @@
+ CONFIG_RD_LZO=y
+ CONFIG_RD_LZ4=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_SYSCTL=y
+ CONFIG_HAVE_UID16=y
+@@ -360,12 +360,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
+@@ -462,9 +491,9 @@
+ CONFIG_SECCOMP=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
+@@ -490,7 +519,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
+@@ -705,7 +734,9 @@
+ # 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_RUNTIME_MAP=y
+ # CONFIG_EFI_FAKE_MEMMAP is not set
+ CONFIG_EFI_SOFT_RESERVE=y
+@@ -890,8 +921,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
+@@ -6796,7 +6827,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
+@@ -7374,11 +7408,11 @@
+ #
+ # HID support
+ #
+-CONFIG_HID=m
++CONFIG_HID=y
+ CONFIG_HID_BATTERY_STRENGTH=y
+ CONFIG_HIDRAW=y
+-CONFIG_UHID=m
+-CONFIG_HID_GENERIC=m
++CONFIG_UHID=y
++CONFIG_HID_GENERIC=y
+
+ #
+ # Special HID drivers
+@@ -7499,16 +7533,9 @@
+ #
+ # USB HID support
+ #
+-CONFIG_USB_HID=m
++CONFIG_USB_HID=y
+ CONFIG_HID_PID=y
+ CONFIG_USB_HIDDEV=y
+-
+-#
+-# USB HID Boot Protocol drivers
+-#
+-# CONFIG_USB_KBD is not set
+-# CONFIG_USB_MOUSE is not set
+-# end of USB HID Boot Protocol drivers
+ # end of USB HID support
+
+ #
+@@ -7552,22 +7579,22 @@
+ # USB Host Controller Drivers
+ #
+ CONFIG_USB_C67X00_HCD=m
+-CONFIG_USB_XHCI_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=m
++CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_EHCI_ROOT_HUB_TT=y
+ CONFIG_USB_EHCI_TT_NEWSCHED=y
+-CONFIG_USB_EHCI_PCI=m
++CONFIG_USB_EHCI_PCI=y
+ CONFIG_USB_EHCI_FSL=m
+ CONFIG_USB_EHCI_HCD_PLATFORM=m
+ CONFIG_USB_OXU210HP_HCD=m
+ CONFIG_USB_ISP116X_HCD=m
+ CONFIG_USB_FOTG210_HCD=m
+ CONFIG_USB_MAX3421_HCD=m
+-CONFIG_USB_OHCI_HCD=m
++CONFIG_USB_OHCI_HCD=y
+ CONFIG_USB_OHCI_HCD_PCI=m
+ # CONFIG_USB_OHCI_HCD_SSB is not set
+ CONFIG_USB_OHCI_HCD_PLATFORM=m
+@@ -9811,14 +9838,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
+@@ -9830,7 +9857,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_QUOTA=y
+ CONFIG_XFS_POSIX_ACL=y
+ CONFIG_XFS_RT=y
+@@ -9846,7 +9873,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
+@@ -9854,7 +9881,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
+@@ -9931,9 +9958,9 @@
+ #
+ # 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="iso8859-1"
+ CONFIG_FAT_DEFAULT_UTF8=y
+@@ -10278,7 +10305,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
+@@ -10372,9 +10399,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
+@@ -10551,7 +10578,7 @@
+ #
+ # Library routines
+ #
+-CONFIG_RAID6_PQ=m
++CONFIG_RAID6_PQ=y
+ CONFIG_RAID6_PQ_BENCHMARK=y
+ CONFIG_LINEAR_RANGES=y
+ CONFIG_PACKING=y
+@@ -10569,7 +10596,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
+@@ -10581,7 +10608,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
+@@ -11008,6 +11035,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
+@@ -11016,3 +11044,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/0001-kernel-config-cfs-r6.patch b/0001-kernel-config-cfs-r6.patch
new file mode 100644
index 0000000..16ff4ef
--- /dev/null
+++ b/0001-kernel-config-cfs-r6.patch
@@ -0,0 +1,362 @@
+--- .config.orig 2020-08-11 18:40:16.000000000 -0000
++++ .config 2020-08-11 11:39:41.759455660 -0000
+@@ -2,9 +2,9 @@
+ # Automatically generated file; DO NOT EDIT.
+ # Linux/x86 5.8.0-arch1 Kernel Configuration
+ #
+-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.1.0"
++CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
+ CONFIG_CC_IS_GCC=y
+-CONFIG_GCC_VERSION=100100
++CONFIG_GCC_VERSION=100200
+ CONFIG_LD_VERSION=234000000
+ CONFIG_CLANG_VERSION=0
+ CONFIG_CC_CAN_LINK=y
+@@ -32,9 +32,9 @@
+ # CONFIG_KERNEL_GZIP is not set
+ # CONFIG_KERNEL_BZIP2 is not set
+ # CONFIG_KERNEL_LZMA is not set
+-CONFIG_KERNEL_XZ=y
++# CONFIG_KERNEL_XZ is not set
+ # CONFIG_KERNEL_LZO is not set
+-# CONFIG_KERNEL_LZ4 is not set
++CONFIG_KERNEL_LZ4=y
+ CONFIG_DEFAULT_INIT=""
+ CONFIG_DEFAULT_HOSTNAME="archlinux"
+ CONFIG_SWAP=y
+@@ -173,7 +173,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
+@@ -192,7 +192,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
+@@ -208,7 +207,8 @@
+ CONFIG_RD_LZO=y
+ CONFIG_RD_LZ4=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_SYSCTL=y
+ CONFIG_HAVE_UID16=y
+@@ -360,12 +360,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
+@@ -462,9 +491,9 @@
+ CONFIG_SECCOMP=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
+@@ -490,7 +519,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
+@@ -705,7 +734,9 @@
+ # 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_RUNTIME_MAP=y
+ # CONFIG_EFI_FAKE_MEMMAP is not set
+ CONFIG_EFI_SOFT_RESERVE=y
+@@ -890,8 +921,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
+@@ -6796,7 +6827,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
+@@ -7374,11 +7408,11 @@
+ #
+ # HID support
+ #
+-CONFIG_HID=m
++CONFIG_HID=y
+ CONFIG_HID_BATTERY_STRENGTH=y
+ CONFIG_HIDRAW=y
+-CONFIG_UHID=m
+-CONFIG_HID_GENERIC=m
++CONFIG_UHID=y
++CONFIG_HID_GENERIC=y
+
+ #
+ # Special HID drivers
+@@ -7499,16 +7533,9 @@
+ #
+ # USB HID support
+ #
+-CONFIG_USB_HID=m
++CONFIG_USB_HID=y
+ CONFIG_HID_PID=y
+ CONFIG_USB_HIDDEV=y
+-
+-#
+-# USB HID Boot Protocol drivers
+-#
+-# CONFIG_USB_KBD is not set
+-# CONFIG_USB_MOUSE is not set
+-# end of USB HID Boot Protocol drivers
+ # end of USB HID support
+
+ #
+@@ -7552,22 +7579,22 @@
+ # USB Host Controller Drivers
+ #
+ CONFIG_USB_C67X00_HCD=m
+-CONFIG_USB_XHCI_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=m
++CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_EHCI_ROOT_HUB_TT=y
+ CONFIG_USB_EHCI_TT_NEWSCHED=y
+-CONFIG_USB_EHCI_PCI=m
++CONFIG_USB_EHCI_PCI=y
+ CONFIG_USB_EHCI_FSL=m
+ CONFIG_USB_EHCI_HCD_PLATFORM=m
+ CONFIG_USB_OXU210HP_HCD=m
+ CONFIG_USB_ISP116X_HCD=m
+ CONFIG_USB_FOTG210_HCD=m
+ CONFIG_USB_MAX3421_HCD=m
+-CONFIG_USB_OHCI_HCD=m
++CONFIG_USB_OHCI_HCD=y
+ CONFIG_USB_OHCI_HCD_PCI=m
+ # CONFIG_USB_OHCI_HCD_SSB is not set
+ CONFIG_USB_OHCI_HCD_PLATFORM=m
+@@ -9811,14 +9838,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
+@@ -9830,7 +9857,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_QUOTA=y
+ CONFIG_XFS_POSIX_ACL=y
+ CONFIG_XFS_RT=y
+@@ -9846,7 +9873,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
+@@ -9854,7 +9881,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
+@@ -9931,9 +9958,9 @@
+ #
+ # 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="iso8859-1"
+ CONFIG_FAT_DEFAULT_UTF8=y
+@@ -10278,7 +10305,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
+@@ -10372,9 +10399,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
+@@ -10551,7 +10578,7 @@
+ #
+ # Library routines
+ #
+-CONFIG_RAID6_PQ=m
++CONFIG_RAID6_PQ=y
+ CONFIG_RAID6_PQ_BENCHMARK=y
+ CONFIG_LINEAR_RANGES=y
+ CONFIG_PACKING=y
+@@ -10569,7 +10596,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
+@@ -10581,7 +10608,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
+@@ -10704,12 +10731,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_ENABLE_MUST_CHECK is not set
+ CONFIG_FRAME_WARN=2048
+@@ -11008,6 +11035,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
+@@ -11016,3 +11044,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_build.sh b/gentoox_build.sh
index 43005f2..d744d17 100755
--- a/gentoox_build.sh
+++ b/gentoox_build.sh
@@ -15,6 +15,10 @@ fi
# dependencies
# base install: genkernel btrfs-progs portage-utils gentoolkit cpuid2cpuflags cryptsetup lvm2 mdadm dev-vcs/git
#
+# problem packages
+# apache, calamares, avidemux: fail to build
+# phoronix-test-suite: depends on apache
+# qt-creator: pulls llvm9, masked
#
gitprefix="https://gitgud.io/cloveros/cloveros/raw/master"
@@ -24,7 +28,7 @@ userpassword=gentoox
builddate="$(date +%Y%m%d).graphite"
builddir="build-$(date +%Y%m%d)"
stage3tarball="stage3-amd64-20200504.graphite.tar.xz"
-KERNEL_CONFIG_DIFF="0001-kernel-config-cfs-r5.patch"
+KERNEL_CONFIG_DIFF="0001-kernel-config-cfs-r6.patch"
binpkgs="$(pwd)/var/cache/binpkgs/"
distfiles="$(pwd)/var/cache/distfiles/"
@@ -62,7 +66,7 @@ if [[ ! -f 'image/etc/gentoo-release' ]]; then
cp -r ../../patches/* etc/portage/patches/
mkdir -p etc/portage/patches/app-crypt/efitools
cp ../../efitools-1.9.2-fixup-UNKNOWN_GLYPH.patch etc/portage/patches/app-crypt/efitools/
- cp ../../qt-creator-use-llvm9.patch usr/src/
+ #cp ../../qt-creator-use-llvm9.patch usr/src/
mkdir -p etc/portage/patches/www-client/firefox
wget --quiet -P etc/portage/patches/www-client/firefox/ 'https://raw.githubusercontent.com/bmwiedemann/openSUSE/master/packages/m/MozillaFirefox/firefox-branded-icons.patch'
@@ -71,6 +75,7 @@ if [[ ! -f 'image/etc/gentoo-release' ]]; then
wget --quiet -P etc/portage/patches/www-client/firefox/ 'http://bazaar.launchpad.net/~mozillateam/firefox/firefox-trunk.head/download/head:/unitymenubar.patch-20130215095938-1n6mqqau8tdfqwhg-1/unity-menubar.patch'
mkdir -p etc/portage/package.mask
+ mkdir -p etc/portage/package.unmask
cp ../../package.mask/* etc/portage/package.mask/
cp ../../arch-chroot usr/local/sbin/
@@ -170,7 +175,23 @@ media-libs/avidemux-core nolto.conf
dev-qt/qtcore nolto.conf
app-office/libreoffice nolto.conf
sys-auth/passwdqc O2nolto.conf
-www-client/firefox O3nolto.conf' > /etc/portage/package.env
+www-client/firefox O3nolto.conf
+dev-util/pkgconf nolto.conf
+net-misc/curl nolto.conf
+sys-devel/gettext nolto.conf
+dev-libs/fribidi nolto.conf
+sys-auth/polkit nolto.conf
+net-dns/avahi nolto.conf
+x11-libs/pango nolto.conf
+gnome-base/librsvg nolto.conf
+app-pda/libplist O2nolto.conf
+media-libs/gavl nolto.conf
+media-libs/libbluray nolto.conf
+net-im/telepathy-mission-control nolto.conf
+net-libs/gupnp-igd nolto.conf
+app-accessibility/speech-dispatcher nolto.conf
+dev-python/pygobject nolto.conf
+dev-python/pygtk nolto.conf' > /etc/portage/package.env
echo 'sys-devel/gcc graphite
sys-devel/llvm gold
@@ -191,6 +212,7 @@ sys-apps/xdg-desktop-portal screencast
dev-vcs/git tk
dev-libs/libjcat pkcs7 gpg
dev-libs/libdbusmenu gtk3
+net-misc/curl http2
*/* PYTHON_TARGETS: python2_7 python3_7
*/* PYTHON_SINGLE_TARGET: -* python3_7
dev-python/certifi python_targets_python3_6
@@ -202,6 +224,12 @@ dev-python/cython python_targets_python3_6
dev-python/requests python_targets_python3_6
dev-python/idna python_targets_python3_6
dev-python/cryptography python_targets_python3_6
+dev-python/chardet python_targets_python3_6
+dev-python/urllib3 python_targets_python3_6
+dev-python/pycparser python_targets_python3_6
+dev-python/ply python_targets_python3_6
+dev-python/PySocks python_targets_python3_6
+dev-python/pyopenssl python_targets_python3_6
dev-libs/libnatspec python_single_target_python2_7
dev-lang/yasm python_single_target_python2_7
media-libs/libcaca python_single_target_python2_7
@@ -234,22 +262,24 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then
wget --quiet 'https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux' -O .config
git clone https://github.com/graysky2/kernel_gcc_patch.git
wget --quiet https://gitlab.com/post-factum/pf-kernel/commit/6401ed9bdf5c3d13b959c938e5d38a3b03cfa062.diff -O O3-always-available.diff
- #wget --quiet -m -np -c 'ck.kolivas.org/patches/5.0/5.7/5.7-ck1/patches/'
- wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.7/aufs-patches/0001-aufs-20200518.patch
- wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux56-rc-tkg/linux56-tkg-patches/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.7/clearlinux-patches/0001-clearlinux-patches.patch
- wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.7/fixes-miscellaneous/0001-fixes-miscellaneous.patch
+ #wget --quiet -m -np -c 'ck.kolivas.org/patches/5.0/5.8/5.8-ck1/patches/'
+ #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.7/aufs-patches/0001-aufs-20200622.patch
+ #wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux56-rc-tkg/linux56-tkg-patches/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+ wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.8/clearlinux-patches/0001-clearlinux-patches.patch
+ #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.8/fixes-miscellaneous/0001-fixes-miscellaneous.patch
+ wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.8/fixes-miscellaneous-v3/0001-fixes-miscellaneous.patch
+ # https://aur.archlinux.org/cgit/aur.git/plain/futex-wait-multiple-5.2.1.patch?h=linux-fsync
wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux56-rc-tkg/linux56-tkg-patches/0007-v5.6-fsync.patch
wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux56-rc-tkg/linux56-tkg-patches/0011-ZFS-fix.patch
- patch -p1 < kernel_gcc_patch/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v5.7+.patch
+ patch -p1 < kernel_gcc_patch/enable_additional_cpu_optimizations_for_gcc_v10.1+_kernel_v5.8+.patch
patch -p1 < O3-always-available.diff
- #for f in ck.kolivas.org/patches/5.0/5.7/5.7-ck1/patches/*.patch; do patch -p1 < "\$f"; done
+ #for f in ck.kolivas.org/patches/5.0/5.8/5.8-ck1/patches/*.patch; do patch -p1 < "\$f"; done
patch -p0 < ../$KERNEL_CONFIG_DIFF
- patch -p1 < 0001-aufs-20200518.patch
- echo -e "CONFIG_AUFS_FS=y\nCONFIG_AUFS_BRANCH_MAX_127=y\nCONFIG_AUFS_BRANCH_MAX_511=n\nCONFIG_AUFS_BRANCH_MAX_1023=n\nCONFIG_AUFS_BRANCH_MAX_32767=n\nCONFIG_AUFS_HNOTIFY=y\nCONFIG_AUFS_EXPORT=n\nCONFIG_AUFS_XATTR=y\nCONFIG_AUFS_FHSM=y\nCONFIG_AUFS_RDU=n\nCONFIG_AUFS_DIRREN=n\nCONFIG_AUFS_SHWH=n\nCONFIG_AUFS_BR_RAMFS=y\nCONFIG_AUFS_BR_FUSE=n\nCONFIG_AUFS_BR_HFSPLUS=n\nCONFIG_AUFS_DEBUG=n" >> .config
- sed -i "s/CONFIG_ISO9660_FS=m/CONFIG_ISO9660_FS=y/" .config
- patch -p1 < 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+ #patch -p1 < 0001-aufs-20200622.patch
+ #echo -e "CONFIG_AUFS_FS=y\nCONFIG_AUFS_BRANCH_MAX_127=y\nCONFIG_AUFS_BRANCH_MAX_511=n\nCONFIG_AUFS_BRANCH_MAX_1023=n\nCONFIG_AUFS_BRANCH_MAX_32767=n\nCONFIG_AUFS_HNOTIFY=y\nCONFIG_AUFS_EXPORT=n\nCONFIG_AUFS_XATTR=y\nCONFIG_AUFS_FHSM=y\nCONFIG_AUFS_RDU=n\nCONFIG_AUFS_DIRREN=n\nCONFIG_AUFS_SHWH=n\nCONFIG_AUFS_BR_RAMFS=y\nCONFIG_AUFS_BR_FUSE=n\nCONFIG_AUFS_BR_HFSPLUS=n\nCONFIG_AUFS_DEBUG=n" >> .config
+ #sed -i "s/CONFIG_ISO9660_FS=m/CONFIG_ISO9660_FS=y/" .config
+ #patch -p1 < 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
patch -p1 < 0001-clearlinux-patches.patch
patch -p1 < 0001-fixes-miscellaneous.patch
patch -p1 < 0007-v5.6-fsync.patch
@@ -259,12 +289,13 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then
sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-x86_64"/' .config
sed -i 's/CONFIG_NET_IP_TUNNEL=y/CONFIG_NET_IP_TUNNEL=m/' .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
touch /tmp/gentoox-kernelpatches-applied
fi
cd /usr/src
-rm -f $KERNEL_CONFIG_DIFF
+#rm -f $KERNEL_CONFIG_DIFF
#mkdir -p /usr/share/genkernel/distfiles/
#wget https://www.busybox.net/downloads/busybox-1.20.2.tar.bz2 -d /usr/share/genkernel/distfiles/
#echo -e '\nMAKEOPTS="-j12"' >> /etc/genkernel.conf
@@ -363,15 +394,17 @@ gnome-base/gvfs afp archive bluray fuse gphoto2 ios mtp nfs samba zeroconf
net-irc/telepathy-idle python_single_target_python2_7' >> /etc/portage/package.use/gentoox
# enable flatpak backend in discover, patch qt-creator to use clang9 effectively dropping clang8
-sed -i "s/DBUILD_FlatpakBackend=OFF/DBUILD_FlatpakBackend=ON/" /var/db/repos/gentoo/kde-plasma/discover/discover-5.18.5.1.ebuild
-ebuild /var/db/repos/gentoo/kde-plasma/discover/discover-5.18.5.ebuild manifest
-patch -p1 /var/db/repos/gentoo/dev-qt/qt-creator/qt-creator-4.10.1.ebuild /usr/src/qt-creator-use-llvm9.patch
-ebuild /var/db/repos/gentoo/dev-qt/qt-creator/qt-creator-4.10.1.ebuild manifest
+sed -i "s/DBUILD_FlatpakBackend=OFF/DBUILD_FlatpakBackend=ON/" /var/db/repos/gentoo/kde-plasma/discover/discover-5.19.4.ebuild
+ebuild /var/db/repos/gentoo/kde-plasma/discover/discover-5.19.4.ebuild manifest
+#patch -p1 /var/db/repos/gentoo/dev-qt/qt-creator/qt-creator-4.10.1.ebuild /usr/src/qt-creator-use-llvm9.patch
+#ebuild /var/db/repos/gentoo/dev-qt/qt-creator/qt-creator-4.10.1.ebuild manifest
-emerge -v --jobs=2 --keep-going=y --autounmask=y --autounmask-write=y --deep --newuse kde-plasma/plasma-meta kde-apps/kde-apps-meta kde-apps/kmail kde-apps/knotes \
-latte-dock calamares plasma-sdk qt-creator libdbusmenu gvfs
-emerge --noreplace dev-qt/qt-creator
+# mask qt-creator, it pulls llvm9 and we don't want that
echo 'dev-qt/qt-creator' >> /etc/portage/package.mask/gentoox
+emerge -v --jobs=2 --keep-going=y --autounmask=y --autounmask-write=y --deep --newuse kde-plasma/plasma-meta kde-apps/kde-apps-meta kde-apps/kmail kde-apps/knotes \
+latte-dock plasma-sdk libdbusmenu gvfs #calamares
+#emerge --noreplace dev-qt/qt-creator
+#echo 'dev-qt/qt-creator' >> /etc/portage/package.mask/gentoox
yes | layman -o https://raw.githubusercontent.com/fosero/flatpak-overlay/master/repositories.xml -f -a flatpak-overlay -q
emerge -v sys-apps/flatpak
@@ -455,7 +488,14 @@ echo '*/*::bobwya' >> /etc/portage/package.mask/lowprio
echo 'app-benchmarks/phoronix-test-suite::bobwya' >> /etc/portage/package.unmask/wanted
echo 'dev-php/fpdf::bobwya' >> /etc/portage/package.unmask/wanted
-emerge -v gimp avidemux blender tuxkart phoronix-test-suite keepassxc libreoffice firefox adobe-flash mpv audacious-plugins audacious net-irc/hexchat virtualbox-guest-additions smartmontools
+echo -e '\nmedia-libs/avidemux-core::mv
+media-video/avidemux::mv
+media-libs/avidemux-plugins::mv' >> /etc/portage/package.mask/lowprio
+
+echo 'www-servers/apache O3nolto.conf
+media-gfx/gimp nolto.conf' >> /etc/portage/package.env
+
+emerge -v gimp avidemux blender tuxkart keepassxc libreoffice firefox adobe-flash mpv audacious-plugins audacious net-irc/hexchat smartmontools libisoburn #phoronix-test-suite virtualbox-guest-additions
touch /tmp/gentoox-extra-done
HEREDOC
exit 0
@@ -583,7 +623,9 @@ fi
if [[ ! -z $build_iso ]]; then
cat <<HEREDOC | chroot .
- rm -f /tmp/*
+ #eclean-dist --deep
+ #eclean-pkg --deep
+ #rm -f /tmp/*
rm -rf /var/tmp/portage/*
rm -f /usr/src/linux/.tmp*
find /usr/src/linux/ -name "*.o" -exec rm -f {} \;
diff --git a/package.mask/llvm-clang b/package.mask/llvm-clang
index c9561b9..04fb2cf 100644
--- a/package.mask/llvm-clang
+++ b/package.mask/llvm-clang
@@ -1,6 +1,6 @@
->=sys-devel/llvm-10
->=sys-devel/llvm-common-10
->=sys-devel/clang-10
->=sys-devel/clang-common-10
->=sys-devel/llvmgold-10
->=sys-libs/libomp-10
+#>=sys-devel/llvm-10
+#>=sys-devel/llvm-common-10
+#>=sys-devel/clang-10
+#>=sys-devel/clang-common-10
+#>=sys-devel/llvmgold-10
+#>=sys-libs/libomp-10
diff --git a/patches/sys-libs/compiler-rt-sanitizers/fix-compile-with-glibc-2.31.patch b/patches/sys-libs/compiler-rt-sanitizers/fix-compile-with-glibc-2.31.patch
deleted file mode 100644
index 358f020..0000000
--- a/patches/sys-libs/compiler-rt-sanitizers/fix-compile-with-glibc-2.31.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2020-03-11 20:35:37.099808821 +0100
-+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2020-03-11 20:36:08.279808758 +0100
-@@ -1128,7 +1128,7 @@
- CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
- #if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
- /* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
--CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
-+//CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
- #endif
-
- CHECK_TYPE_SIZE(shmid_ds);