From a6bd778dc3d6652de019f3b96a0c0039628f5339 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 7 Jan 2025 18:48:01 -0500 Subject: Update gentoo hosts --- hosts/iroha/gentoo/make.conf | 22 +++-- hosts/iroha/gentoo/package.accept_keywords/bpftool | 1 + hosts/iroha/gentoo/package.accept_keywords/libbpf | 1 + hosts/iroha/gentoo/package.use/libdrm | 1 + hosts/iroha/gentoo/package.use/smartmontools | 1 + hosts/iroha/kernel_config | 97 ++++++++++++++++++---- hosts/iroha/scripts/gen-dracut | 2 +- hosts/moyo/gentoo/make.conf | 20 +++-- hosts/moyo/kernel_config | 11 +-- hosts/moyo/scripts/gen-dracut | 2 +- 10 files changed, 120 insertions(+), 38 deletions(-) create mode 100644 hosts/iroha/gentoo/package.accept_keywords/bpftool create mode 100644 hosts/iroha/gentoo/package.accept_keywords/libbpf create mode 100644 hosts/iroha/gentoo/package.use/libdrm create mode 100644 hosts/iroha/gentoo/package.use/smartmontools (limited to 'hosts') diff --git a/hosts/iroha/gentoo/make.conf b/hosts/iroha/gentoo/make.conf index da38ead..0d0da3e 100644 --- a/hosts/iroha/gentoo/make.conf +++ b/hosts/iroha/gentoo/make.conf @@ -1,14 +1,22 @@ -COMMON_FLAGS="-march=native -mtune=native -O2 -fomit-frame-pointer -flto=auto -fuse-linker-plugin -pipe" +WARNING_FLAGS="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing" +COMMON_FLAGS="-O2 -pipe -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto ${WARNING_FLAGS}" + CFLAGS="${COMMON_FLAGS}" -CXXFLAGS="${CFLAGS}" +CXXFLAGS="${COMMON_FLAGS}" FCFLAGS="${COMMON_FLAGS}" FFLAGS="${COMMON_FLAGS}" -RUSTFLAGS="-C opt-level=2 -C target-cpu=native" -MAKEOPTS="-j16" +CGO_CFLAGS="${COMMON_FLAGS}" +CGO_CXXFLAGS="${COMMON_FLAGS}" +CGO_FFLAGS="${COMMON_FLAGS}" +CGO_LDFLAGS="${LDFLAGS}" + +RUSTFLAGS="-C opt-level=2 -C target-cpu=znver2" + +MAKEOPTS="-j18" EMERGE_DEFAULT_OPTS="--jobs 3" -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby32" PERL_FEATURES="" @@ -20,11 +28,11 @@ KERNEL="linux" ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="-* @FREE @BINARY-REDISTRIBUTABLE MS-TOU" -USE="orc lto pgo native-extensions dbus udev policykit acl -systemd -consolekit -X -wayland -gtk -gnome -kde -qt5 -qt6 -alsa -jack -pulseaudio -bluetooth -introspection -nls -numa -selinux -caps -filecaps -sysprof -pie -pic -unwind -ssp -hardened -sanitize -debug -cpudetection" +USE="lto pgo orc native-extensions dbus udev policykit acl -systemd -consolekit -X -wayland -gtk -gnome -kde -qt5 -qt6 -alsa -jack -pulseaudio -bluetooth -introspection -nls -numa -selinux -caps -filecaps -sysprof -pie -pic -unwind -ssp -hardened -sanitize -debug -cpudetection" GRUB_PLATFORMS="efi-64" -VIDEO_CARDS="radeon radeonsi amdgpu intel virgl" +VIDEO_CARDS="radeonsi amdgpu intel virgl" INPUT_DEVICES="keyboard" L10N="en" diff --git a/hosts/iroha/gentoo/package.accept_keywords/bpftool b/hosts/iroha/gentoo/package.accept_keywords/bpftool new file mode 100644 index 0000000..57c1aa6 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/bpftool @@ -0,0 +1 @@ +dev-util/bpftool ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/libbpf b/hosts/iroha/gentoo/package.accept_keywords/libbpf new file mode 100644 index 0000000..ceebff3 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/libbpf @@ -0,0 +1 @@ +dev-libs/libbpf ~amd64 diff --git a/hosts/iroha/gentoo/package.use/libdrm b/hosts/iroha/gentoo/package.use/libdrm new file mode 100644 index 0000000..dcc7d0c --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libdrm @@ -0,0 +1 @@ +x11-libs/libdrm video_cards_radeon diff --git a/hosts/iroha/gentoo/package.use/smartmontools b/hosts/iroha/gentoo/package.use/smartmontools new file mode 100644 index 0000000..c6747b6 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/smartmontools @@ -0,0 +1 @@ +sys-apps/smartmontools -daemon diff --git a/hosts/iroha/kernel_config b/hosts/iroha/kernel_config index 323e348..3fbb776 100644 --- a/hosts/iroha/kernel_config +++ b/hosts/iroha/kernel_config @@ -1,18 +1,18 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.12.0-rc7 Kernel Configuration +# Linux/x86 6.12.8-gentoo Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.2.1_p20241026 p1) 14.2.1 20241026" +CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.2.1_p20241221 p7) 14.2.1 20241221" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140201 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=108100 -CONFIG_RUSTC_LLVM_VERSION=180107 +CONFIG_RUSTC_VERSION=108200 +CONFIG_RUSTC_LLVM_VERSION=190101 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y @@ -46,8 +46,8 @@ CONFIG_HAVE_KERNEL_ZSTD=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_LZ4=y -# CONFIG_KERNEL_ZSTD is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_KERNEL_ZSTD=y CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y @@ -84,7 +84,6 @@ CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_INIT=y -CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y @@ -185,6 +184,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # Scheduler features # # CONFIG_UCLAMP_TASK is not set +# CONFIG_SCHED_ALT is not set # end of Scheduler features CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y @@ -367,14 +367,51 @@ CONFIG_PARAVIRT_CLOCK=y # CONFIG_JAILHOUSE_GUEST is not set # CONFIG_ACRN_GUEST is not set # CONFIG_INTEL_TDX_GUEST is not set -CONFIG_MK8=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=y +# CONFIG_MZEN3 is not set +# CONFIG_MZEN4 is not set +# CONFIG_MZEN5 is not set # CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set # CONFIG_MATOM is not set +# 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 is not set +# 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_MRAPTORLAKE is not set +# CONFIG_MMETEORLAKE is not set +# CONFIG_MEMERALDRAPIDS is not set # CONFIG_GENERIC_CPU 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_TSC=y CONFIG_X86_HAVE_PAE=y @@ -482,6 +519,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG_FORCE=y CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y +CONFIG_ARCH_DEFAULT_CRASH_DUMP=y CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y @@ -882,7 +920,12 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS is not set +CONFIG_MODULE_COMPRESS=y +# CONFIG_MODULE_COMPRESS_GZIP is not set +# CONFIG_MODULE_COMPRESS_XZ is not set +CONFIG_MODULE_COMPRESS_ZSTD=y +CONFIG_MODULE_COMPRESS_ALL=y +# CONFIG_MODULE_DECOMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_TRIM_UNUSED_KSYMS is not set @@ -1946,6 +1989,8 @@ CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_COCO_SECRET is not set # end of EFI (Extensible Firmware Interface) Support +# CONFIG_IMX_SCMI_MISC_DRV is not set + # # Qualcomm firmware drivers # @@ -1975,7 +2020,6 @@ CONFIG_BLK_DEV=y CONFIG_CDROM=m # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_ZRAM is not set -CONFIG_ZRAM_DEF_COMP="unset-value" CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 # CONFIG_BLK_DEV_DRBD is not set @@ -5213,7 +5257,7 @@ CONFIG_RAS=y # Android # CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_BINDERFS=y +# CONFIG_ANDROID_BINDERFS is not set CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set # end of Android @@ -6019,7 +6063,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MISC=y +# CONFIG_DEBUG_MISC is not set # # Compile-time checks and compiler options @@ -6150,7 +6194,6 @@ CONFIG_SCHED_INFO=y # CONFIG_SCHEDSTATS is not set # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set # CONFIG_DEBUG_PREEMPT is not set # @@ -6247,7 +6290,7 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_PROBE_EVENTS_BTF_ARGS=y +# CONFIG_PROBE_EVENTS_BTF_ARGS is not set CONFIG_KPROBE_EVENTS=y CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y @@ -6325,3 +6368,21 @@ CONFIG_ARCH_USE_MEMTEST=y # end of Kernel hacking # CONFIG_INT_POW_TEST is not set + +# +# 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/hosts/iroha/scripts/gen-dracut b/hosts/iroha/scripts/gen-dracut index da32002..8347f31 100755 --- a/hosts/iroha/scripts/gen-dracut +++ b/hosts/iroha/scripts/gen-dracut @@ -1,2 +1,2 @@ #! /usr/bin/env sh -dracut -a lvm --kver=6.12.0-rc7 --force +dracut -a lvm --kver=6.12.8-gentoo --force diff --git a/hosts/moyo/gentoo/make.conf b/hosts/moyo/gentoo/make.conf index c4778b9..22b2cde 100644 --- a/hosts/moyo/gentoo/make.conf +++ b/hosts/moyo/gentoo/make.conf @@ -1,14 +1,22 @@ -COMMON_FLAGS="-march=native -mtune=native -O2 -fomit-frame-pointer -flto=auto -fuse-linker-plugin -pipe" +WARNING_FLAGS="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing" +COMMON_FLAGS="-O2 -pipe -march=znver1 -mtune=znver1 -fno-semantic-interposition -flto ${WARNING_FLAGS}" + CFLAGS="${COMMON_FLAGS}" -CXXFLAGS="${CFLAGS}" +CXXFLAGS="${COMMON_FLAGS}" FCFLAGS="${COMMON_FLAGS}" FFLAGS="${COMMON_FLAGS}" -RUSTFLAGS="-C opt-level=2 -C target-cpu=native" + +CGO_CFLAGS="${COMMON_FLAGS}" +CGO_CXXFLAGS="${COMMON_FLAGS}" +CGO_FFLAGS="${COMMON_FLAGS}" +CGO_LDFLAGS="${LDFLAGS}" + +RUSTFLAGS="-C opt-level=2 -C target-cpu=znver1" MAKEOPTS="-j4" EMERGE_DEFAULT_OPTS="--jobs 2" -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby32" LUA_SINGLE_TARGET="luajit" LUA_TARGETS="luajit" @@ -18,11 +26,11 @@ KERNEL="linux" ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="-* @FREE @BINARY-REDISTRIBUTABLE" -USE="custom-cflags orc lto pgo native-extensions dbus udev policykit acl -systemd -consolekit -X -wayland -gtk -gnome -kde -qt5 -qt6 -alsa -jack -pulseaudio -bluetooth -introspection -nls -numa -selinux -caps -filecaps -sysprof -pie -pic -unwind -ssp -hardened -sanitize -debug -cpudetection" +USE="lto pgo orc native-extensions dbus udev policykit acl -systemd -consolekit -X -wayland -gtk -gnome -kde -qt5 -qt6 -alsa -jack -pulseaudio -bluetooth -introspection -nls -numa -selinux -caps -filecaps -sysprof -pie -pic -unwind -ssp -hardened -sanitize -debug -cpudetection" GRUB_PLATFORMS="efi-64" -VIDEO_CARDS="radeon" +VIDEO_CARDS="amdgpu radeonsi" INPUT_DEVICES="keyboard" L10N="en" diff --git a/hosts/moyo/kernel_config b/hosts/moyo/kernel_config index 72fcdcd..ae04fe0 100644 --- a/hosts/moyo/kernel_config +++ b/hosts/moyo/kernel_config @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.58-gentoo-r1 Kernel Configuration +# Linux/x86 6.6.67-gentoo Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Gentoo 13.3.1_p20241025 p1) 13.3.1 20241024" +CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.2.1_p20241221 p7) 14.2.1 20241221" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130301 +CONFIG_GCC_VERSION=140201 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -5168,6 +5168,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y diff --git a/hosts/moyo/scripts/gen-dracut b/hosts/moyo/scripts/gen-dracut index d4cd33a..ad9d4dd 100755 --- a/hosts/moyo/scripts/gen-dracut +++ b/hosts/moyo/scripts/gen-dracut @@ -1,2 +1,2 @@ #! /usr/bin/env sh -dracut -a lvm --kver=6.6.58-gentoo-r1 --force +dracut -a lvm --kver=6.6.67-gentoo --force -- cgit v1.2.3-101-g0448