diff options
| -rw-r--r-- | 0001-kernel-config-cfs-r4.patch | 343 | ||||
| -rwxr-xr-x | gentoox_build.sh | 24 |
2 files changed, 356 insertions, 11 deletions
diff --git a/0001-kernel-config-cfs-r4.patch b/0001-kernel-config-cfs-r4.patch new file mode 100644 index 0000000..1877888 --- /dev/null +++ b/0001-kernel-config-cfs-r4.patch @@ -0,0 +1,343 @@ +--- .config.orig 2020-04-10 16:48:51.287156269 -0500 ++++ .config 2020-04-10 17:02:06.636220097 -0500 +@@ -13,6 +13,7 @@ + CONFIG_CC_HAS_ASM_GOTO=y + CONFIG_CC_HAS_ASM_INLINE=y + CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y ++CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED=y + CONFIG_IRQ_WORK=y + CONFIG_BUILDTIME_TABLE_SORT=y + CONFIG_THREAD_INFO_IN_TASK=y +@@ -34,9 +35,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_HOSTNAME="artixlinux" + CONFIG_SWAP=y + CONFIG_SYSVIPC=y +@@ -170,7 +171,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 +@@ -189,7 +190,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 +@@ -205,7 +205,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 +@@ -357,12 +358,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 +@@ -460,9 +490,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 +@@ -488,7 +518,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 +@@ -702,7 +732,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 +@@ -889,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 +@@ -6650,7 +6682,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 +@@ -7216,11 +7251,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 +@@ -7339,16 +7374,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 + + # +@@ -7392,23 +7420,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_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 + CONFIG_USB_UHCI_HCD=m + CONFIG_USB_U132_HCD=m +@@ -9585,14 +9612,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 +@@ -9604,7 +9631,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 +@@ -9620,7 +9647,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 +@@ -9628,7 +9655,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 +@@ -9703,9 +9730,9 @@ + # + # DOS/FAT/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 +@@ -10043,7 +10070,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 +@@ -10137,9 +10164,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 +@@ -10315,7 +10342,7 @@ + # + # Library routines + # +-CONFIG_RAID6_PQ=m ++CONFIG_RAID6_PQ=y + CONFIG_RAID6_PQ_BENCHMARK=y + CONFIG_PACKING=y + CONFIG_BITREVERSE=y +@@ -10330,7 +10357,7 @@ + CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y + CONFIG_ARCH_HAS_FAST_MULTIPLIER=y + CONFIG_CRC_CCITT=y +-CONFIG_CRC16=m ++CONFIG_CRC16=y + CONFIG_CRC_T10DIF=y + CONFIG_CRC_ITU_T=m + CONFIG_CRC32=y +@@ -10342,7 +10369,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 +@@ -10753,6 +10780,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 +@@ -10760,3 +10788,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 c9a53f8..0bba5ba 100755 --- a/gentoox_build.sh +++ b/gentoox_build.sh @@ -25,7 +25,7 @@ userpassword=gentoox builddate="20200210.graphite" #builddir="build-$(date +%Y%m%d)" builddir="build-20200210" -KERNEL_CONFIG_DIFF="0001-kernel-config-cfs-r3.patch" +KERNEL_CONFIG_DIFF="0001-kernel-config-cfs-r4.patch" binpkgs=/root/var/cache/binpkgs/ distfiles=/root/var/cache/distfiles/ @@ -164,6 +164,7 @@ sys-apps/kmod lzma sys-kernel/linux-firmware initramfs redistributable unknown-license x11-libs/libdrm libkms media-libs/mesa d3d9 lm-sensors opencl -vaapi vdpau vulkan vulkan-overlay xa xvmc +media-libs/libsdl2 gles2 www-client/firefox -system-libvpx hwaccel pgo lto wayland dev-libs/boost python dev-libs/boost python_targets_python3_7 @@ -205,19 +206,19 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then git clone https://github.com/graysky2/kernel_gcc_patch.git wget --quiet https://gitlab.com/post-factum/pf-kernel/commit/cf7a8ad26e0bd6ca8afba89f53d2e9dc43ee2598.diff -O O3-always-available.diff #wget --quiet -m -np -c 'ck.kolivas.org/patches/5.0/5.5/5.5-ck1/patches/' - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.5/aufs-patches/0001-aufs-20200203.patch - wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0002-clear-patches.patch - wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0006-add-acs-overrides_iommu.patch - wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0007-v5.5-fsync.patch - wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0011-ZFS-fix.patch - wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.5/wireguard-patches/0001-WireGuard-20200205.patch + wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.6/aufs-patches/0001-aufs-20200302.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://git.froggi.es/tkg/PKGBUILDS/raw/master/linux56-rc-tkg/linux56-tkg-patches/0002-clear-patches.patch + wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux56-rc-tkg/linux56-tkg-patches/0006-add-acs-overrides_iommu.patch + 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 + #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.5/wireguard-patches/0001-WireGuard-20200205.patch patch -p1 < kernel_gcc_patch/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v5.5+.patch patch -p1 < O3-always-available.diff #for f in ck.kolivas.org/patches/5.0/5.5/5.5-ck1/patches/*.patch; do patch -p1 < "\$f"; done patch -p0 < ../$KERNEL_CONFIG_DIFF - patch -p1 < 0001-aufs-20200203.patch + patch -p1 < 0001-aufs-20200302.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 @@ -226,7 +227,7 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then patch -p1 < 0007-v5.5-fsync.patch patch -p1 < 0011-ZFS-fix.patch patch -p1 < ../zfs-ungpl-rcu_read_unlock-export.diff - patch -p1 < 0001-WireGuard-20200205.patch + #patch -p1 < 0001-WireGuard-20200205.patch sed -i 's/CONFIG_DEFAULT_HOSTNAME="artixlinux"/CONFIG_DEFAULT_HOSTNAME="gentoox"/' .config sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-x86_64"/' .config sed -i 's/CONFIG_NET_IP_TUNNEL=y/CONFIG_NET_IP_TUNNEL=m/' .config @@ -382,7 +383,8 @@ x11-libs/libxshmfence abi_x86_32 x11-libs/libXv abi_x86_32 x11-libs/libXvMC abi_x86_32 x11-libs/libXxf86vm abi_x86_32 -media-libs/libglvnd abi_x86_32' >> /etc/portage/package.use/gentoox +media-libs/libglvnd abi_x86_32 +virtual/opencl abi_x86_32' >> /etc/portage/package.use/gentoox emerge -av steam-meta touch /tmp/gentoox-steam-done HEREDOC |