From 6c43691e1fdfb4a70ece0fbd0ebc27a29e0b70e2 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Sun, 16 Feb 2025 17:04:55 +0300 Subject: [PATCH] Remove NUMA and gconfig/menuconfig settings Signed-off-by: Vasiliy Stelmachenok --- config-option-lib/src/lib.rs | 3 -- lang/cachyos-kernel-manager_cs.ts | 10 ---- lang/cachyos-kernel-manager_de.ts | 15 ------ lang/cachyos-kernel-manager_pl.ts | 15 ------ lang/cachyos-kernel-manager_ru.ts | 10 ---- lang/cachyos-kernel-manager_sk.ts | 15 ------ lang/cachyos-kernel-manager_tr.ts | 10 ---- src/compile_options.json | 3 -- src/conf-options-page.ui | 87 ------------------------------- src/conf-window.cpp | 9 ---- src/config-options.cpp | 6 --- src/config-options.hpp | 3 -- 12 files changed, 186 deletions(-) diff --git a/config-option-lib/src/lib.rs b/config-option-lib/src/lib.rs index 9152786..58c60dd 100644 --- a/config-option-lib/src/lib.rs +++ b/config-option-lib/src/lib.rs @@ -34,11 +34,8 @@ mod ffi { pub cachy_config_check: bool, pub nconfig_check: bool, - pub menuconfig_check: bool, pub xconfig_check: bool, - pub gconfig_check: bool, pub localmodcfg_check: bool, - pub numa_check: bool, pub damon_check: bool, pub builtin_zfs_check: bool, pub builtin_nvidia_check: bool, diff --git a/lang/cachyos-kernel-manager_cs.ts b/lang/cachyos-kernel-manager_cs.ts index bb07df9..1c2a005 100644 --- a/lang/cachyos-kernel-manager_cs.ts +++ b/lang/cachyos-kernel-manager_cs.ts @@ -13,21 +13,11 @@ Tweak kernel options prior to a build via nconfig Upravit možnosti jádra před sestavením přes nconfig - - - Tweak kernel options prior to a build via menuconfig - Upravit možnosti jádra před sestavením přes menuconfig - Tweak kernel options prior to a build via xconfig Upravit možnosti jádra před sestavením přes xconfig - - - Tweak kernel options prior to a build via gconfig - Upravit možnosti jádra před sestavením přes gconfig - Disable NUMA diff --git a/lang/cachyos-kernel-manager_de.ts b/lang/cachyos-kernel-manager_de.ts index 07c8c26..467f7d1 100644 --- a/lang/cachyos-kernel-manager_de.ts +++ b/lang/cachyos-kernel-manager_de.ts @@ -13,26 +13,11 @@ Tweak kernel options prior to a build via nconfig Kernel-Optionen vor einem Build über nconfig anpassen - - - Tweak kernel options prior to a build via menuconfig - Kernel-Optionen vor einem Build über menuconfig anpassen - Tweak kernel options prior to a build via xconfig Kernel-Optionen vor einem Build über xconfig anpassen - - - Tweak kernel options prior to a build via gconfig - Kernel-Optionen vor einem Build über gconfig anpassen - - - - Disable NUMA - NUMA deaktivieren - Use Modprobed-db diff --git a/lang/cachyos-kernel-manager_pl.ts b/lang/cachyos-kernel-manager_pl.ts index 1f02c86..60884b0 100644 --- a/lang/cachyos-kernel-manager_pl.ts +++ b/lang/cachyos-kernel-manager_pl.ts @@ -13,26 +13,11 @@ Tweak kernel options prior to a build via nconfig Dostosuj opcje budowania kernela za pomocą nconfig - - - Tweak kernel options prior to a build via menuconfig - Dostosuj opcje budowania kernela za pomocą menuconfig - Tweak kernel options prior to a build via xconfig Dostosuj opcje budowania kernela za pomocą xconfig - - - Tweak kernel options prior to a build via gconfig - Dostosuj opcje budowania kernela za pomocą gconfig - - - - Disable NUMA - Wyłącz NUMA - Use Modprobed-db diff --git a/lang/cachyos-kernel-manager_ru.ts b/lang/cachyos-kernel-manager_ru.ts index 57ef0c8..e4982ea 100644 --- a/lang/cachyos-kernel-manager_ru.ts +++ b/lang/cachyos-kernel-manager_ru.ts @@ -23,21 +23,11 @@ Tweak kernel options prior to a build via nconfig Выполнить настройку параметров ядра с помощью nconfig - - - Tweak kernel options prior to a build via menuconfig - Выполнить настройку параметров ядра с помощью menuconfig - Tweak kernel options prior to a build via xconfig Выполнить настройку параметров ядра с помощью xconfig - - - Tweak kernel options prior to a build via gconfig - Выполнить настройку параметров ядра с помощью gconfig - Disable NUMA diff --git a/lang/cachyos-kernel-manager_sk.ts b/lang/cachyos-kernel-manager_sk.ts index 789904e..b77ae71 100644 --- a/lang/cachyos-kernel-manager_sk.ts +++ b/lang/cachyos-kernel-manager_sk.ts @@ -13,26 +13,11 @@ Tweak kernel options prior to a build via nconfig Upraviť možnosti jadra pred zostavením cez nconfig - - - Tweak kernel options prior to a build via menuconfig - Upraviť možnosti jadra pred zostavením cez menuconfig - Tweak kernel options prior to a build via xconfig Upraviť možnosti jadra pred zostavením cez xconfig - - - Tweak kernel options prior to a build via gconfig - Upraviť možnosti jadra pred zostavením cez gconfig - - - - Disable NUMA - Zakázať NUMA - Use Modprobed-db diff --git a/lang/cachyos-kernel-manager_tr.ts b/lang/cachyos-kernel-manager_tr.ts index 92e4b21..bb43a99 100644 --- a/lang/cachyos-kernel-manager_tr.ts +++ b/lang/cachyos-kernel-manager_tr.ts @@ -13,21 +13,11 @@ Tweak kernel options prior to a build via nconfig nconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap - - - Tweak kernel options prior to a build via menuconfig - menuconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap - Tweak kernel options prior to a build via xconfig xconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap - - - Tweak kernel options prior to a build via gconfig - gconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap - Disable NUMA diff --git a/src/compile_options.json b/src/compile_options.json index baa5037..97a4e51 100644 --- a/src/compile_options.json +++ b/src/compile_options.json @@ -2,10 +2,7 @@ "option_map": { "cachy_config": "_cachy_config", "nconfig": "_makenconfig", - "menuconfig": "_makemenuconfig", "xconfig": "_makexconfig", - "gconfig": "_makegconfig", - "numa": "_NUMAdisable", "localmodcfg": "_localmodcfg", "hardly": "_cc_harder", "per_gov": "_per_gov", diff --git a/src/conf-options-page.ui b/src/conf-options-page.ui index c7e6209..ce87748 100644 --- a/src/conf-options-page.ui +++ b/src/conf-options-page.ui @@ -115,35 +115,6 @@ - - - - - - - Tweak kernel options prior to a build via menuconfig - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - @@ -173,64 +144,6 @@ - - - - - - - Tweak kernel options prior to a build via gconfig - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - Disable NUMA - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - diff --git a/src/conf-window.cpp b/src/conf-window.cpp index ab91d29..040c6ef 100644 --- a/src/conf-window.cpp +++ b/src/conf-window.cpp @@ -410,11 +410,8 @@ std::string ConfWindow::get_all_set_values() const noexcept { result += convert_to_var_assign_empty_wrapped("cachy_config", checkstate_checked(options_page_ui_obj->cachyconfig_check)); result += convert_to_var_assign_empty_wrapped("nconfig", checkstate_checked(options_page_ui_obj->nconfig_check)); - result += convert_to_var_assign_empty_wrapped("menuconfig", checkstate_checked(options_page_ui_obj->menuconfig_check)); result += convert_to_var_assign_empty_wrapped("xconfig", checkstate_checked(options_page_ui_obj->xconfig_check)); - result += convert_to_var_assign_empty_wrapped("gconfig", checkstate_checked(options_page_ui_obj->gconfig_check)); result += convert_to_var_assign_empty_wrapped("localmodcfg", checkstate_checked(options_page_ui_obj->localmodcfg_check)); - result += convert_to_var_assign_empty_wrapped("numa", checkstate_checked(options_page_ui_obj->numa_check)); result += convert_to_var_assign_empty_wrapped("damon", checkstate_checked(options_page_ui_obj->damon_check)); result += convert_to_var_assign_empty_wrapped("builtin_zfs", checkstate_checked(options_page_ui_obj->builtin_zfs_check)); result += convert_to_var_assign_empty_wrapped("builtin_nvidia", checkstate_checked(options_page_ui_obj->builtin_nvidia_check)); @@ -679,11 +676,8 @@ void ConfWindow::on_save() noexcept { config_options.cachy_config_check = checkstate_checked(options_page_ui_obj->cachyconfig_check); config_options.nconfig_check = checkstate_checked(options_page_ui_obj->nconfig_check); - config_options.menuconfig_check = checkstate_checked(options_page_ui_obj->menuconfig_check); config_options.xconfig_check = checkstate_checked(options_page_ui_obj->xconfig_check); - config_options.gconfig_check = checkstate_checked(options_page_ui_obj->gconfig_check); config_options.localmodcfg_check = checkstate_checked(options_page_ui_obj->localmodcfg_check); - config_options.numa_check = checkstate_checked(options_page_ui_obj->numa_check); config_options.damon_check = checkstate_checked(options_page_ui_obj->damon_check); config_options.builtin_zfs_check = checkstate_checked(options_page_ui_obj->builtin_zfs_check); config_options.builtin_nvidia_check = checkstate_checked(options_page_ui_obj->builtin_nvidia_check); @@ -743,11 +737,8 @@ void ConfWindow::on_load() noexcept { set_checkstate(options_page_ui_obj->cachyconfig_check, config_options->cachy_config_check); set_checkstate(options_page_ui_obj->nconfig_check, config_options->nconfig_check); - set_checkstate(options_page_ui_obj->menuconfig_check, config_options->menuconfig_check); set_checkstate(options_page_ui_obj->xconfig_check, config_options->xconfig_check); - set_checkstate(options_page_ui_obj->gconfig_check, config_options->gconfig_check); set_checkstate(options_page_ui_obj->localmodcfg_check, config_options->localmodcfg_check); - set_checkstate(options_page_ui_obj->numa_check, config_options->numa_check); set_checkstate(options_page_ui_obj->damon_check, config_options->damon_check); set_checkstate(options_page_ui_obj->builtin_zfs_check, config_options->builtin_zfs_check); set_checkstate(options_page_ui_obj->builtin_nvidia_check, config_options->builtin_nvidia_check); diff --git a/src/config-options.cpp b/src/config-options.cpp index a0ad6f3..3f090de 100644 --- a/src/config-options.cpp +++ b/src/config-options.cpp @@ -58,11 +58,8 @@ auto ConfigOptions::parse_from_file(std::string_view filepath) noexcept -> std:: .cachy_config_check = rust_config_options.cachy_config_check, .nconfig_check = rust_config_options.nconfig_check, - .menuconfig_check = rust_config_options.menuconfig_check, .xconfig_check = rust_config_options.xconfig_check, - .gconfig_check = rust_config_options.gconfig_check, .localmodcfg_check = rust_config_options.localmodcfg_check, - .numa_check = rust_config_options.numa_check, .damon_check = rust_config_options.damon_check, .builtin_zfs_check = rust_config_options.builtin_zfs_check, .builtin_nvidia_check = rust_config_options.builtin_nvidia_check, @@ -90,11 +87,8 @@ auto ConfigOptions::write_config_file(const ConfigOptions& config_options, std:: .cachy_config_check = config_options.cachy_config_check, .nconfig_check = config_options.nconfig_check, - .menuconfig_check = config_options.menuconfig_check, .xconfig_check = config_options.xconfig_check, - .gconfig_check = config_options.gconfig_check, .localmodcfg_check = config_options.localmodcfg_check, - .numa_check = config_options.numa_check, .damon_check = config_options.damon_check, .builtin_zfs_check = config_options.builtin_zfs_check, .builtin_nvidia_check = config_options.builtin_nvidia_check, diff --git a/src/config-options.hpp b/src/config-options.hpp index bb9cb50..0778ca1 100644 --- a/src/config-options.hpp +++ b/src/config-options.hpp @@ -31,11 +31,8 @@ struct ConfigOptions { bool cachy_config_check{}; bool nconfig_check{}; - bool menuconfig_check{}; bool xconfig_check{}; - bool gconfig_check{}; bool localmodcfg_check{}; - bool numa_check{}; bool damon_check{}; bool builtin_zfs_check{}; bool builtin_nvidia_check{};