Skip to content

Commit 9a6587a

Browse files
ventureooventureoo
authored
Remove NUMA and gconfig/menuconfig settings (#42)
Signed-off-by: Vasiliy Stelmachenok <ventureo@cachyos.org>
1 parent 90c1384 commit 9a6587a

12 files changed

Lines changed: 0 additions & 186 deletions

‎config-option-lib/src/lib.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ mod ffi {
3232

3333
pub cachy_config_check: bool,
3434
pub nconfig_check: bool,
35-
pub menuconfig_check: bool,
3635
pub xconfig_check: bool,
37-
pub gconfig_check: bool,
3836
pub localmodcfg_check: bool,
39-
pub numa_check: bool,
4037
pub damon_check: bool,
4138
pub builtin_zfs_check: bool,
4239
pub builtin_nvidia_check: bool,

‎lang/cachyos-kernel-manager_cs.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,11 @@
1313
<source>Tweak kernel options prior to a build via nconfig</source>
1414
<translation>Upravit možnosti jádra před sestavením přes nconfig</translation>
1515
</message>
16-
<message>
17-
<location filename="../src/conf-options-page.ui" line="124"/>
18-
<source>Tweak kernel options prior to a build via menuconfig</source>
19-
<translation>Upravit možnosti jádra před sestavením přes menuconfig</translation>
20-
</message>
2116
<message>
2217
<location filename="../src/conf-options-page.ui" line="153"/>
2318
<source>Tweak kernel options prior to a build via xconfig</source>
2419
<translation>Upravit možnosti jádra před sestavením přes xconfig</translation>
2520
</message>
26-
<message>
27-
<location filename="../src/conf-options-page.ui" line="182"/>
28-
<source>Tweak kernel options prior to a build via gconfig</source>
29-
<translation>Upravit možnosti jádra před sestavením přes gconfig</translation>
30-
</message>
3121
<message>
3222
<location filename="../src/conf-options-page.ui" line="211"/>
3323
<source>Disable NUMA</source>

‎lang/cachyos-kernel-manager_de.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,11 @@
1313
<source>Tweak kernel options prior to a build via nconfig</source>
1414
<translation>Kernel-Optionen vor einem Build über nconfig anpassen</translation>
1515
</message>
16-
<message>
17-
<location filename="../src/conf-options-page.ui" line="124"/>
18-
<source>Tweak kernel options prior to a build via menuconfig</source>
19-
<translation>Kernel-Optionen vor einem Build über menuconfig anpassen</translation>
20-
</message>
2116
<message>
2217
<location filename="../src/conf-options-page.ui" line="153"/>
2318
<source>Tweak kernel options prior to a build via xconfig</source>
2419
<translation>Kernel-Optionen vor einem Build über xconfig anpassen</translation>
2520
</message>
26-
<message>
27-
<location filename="../src/conf-options-page.ui" line="182"/>
28-
<source>Tweak kernel options prior to a build via gconfig</source>
29-
<translation>Kernel-Optionen vor einem Build über gconfig anpassen</translation>
30-
</message>
31-
<message>
32-
<location filename="../src/conf-options-page.ui" line="211"/>
33-
<source>Disable NUMA</source>
34-
<translation>NUMA deaktivieren</translation>
35-
</message>
3621
<message>
3722
<location filename="../src/conf-options-page.ui" line="240"/>
3823
<source>Use Modprobed-db</source>

‎lang/cachyos-kernel-manager_pl.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,11 @@
1313
<source>Tweak kernel options prior to a build via nconfig</source>
1414
<translation>Dostosuj opcje budowania kernela za pomocą nconfig</translation>
1515
</message>
16-
<message>
17-
<location filename="../src/conf-options-page.ui" line="124"/>
18-
<source>Tweak kernel options prior to a build via menuconfig</source>
19-
<translation>Dostosuj opcje budowania kernela za pomocą menuconfig</translation>
20-
</message>
2116
<message>
2217
<location filename="../src/conf-options-page.ui" line="153"/>
2318
<source>Tweak kernel options prior to a build via xconfig</source>
2419
<translation>Dostosuj opcje budowania kernela za pomocą xconfig</translation>
2520
</message>
26-
<message>
27-
<location filename="../src/conf-options-page.ui" line="182"/>
28-
<source>Tweak kernel options prior to a build via gconfig</source>
29-
<translation>Dostosuj opcje budowania kernela za pomocą gconfig</translation>
30-
</message>
31-
<message>
32-
<location filename="../src/conf-options-page.ui" line="211"/>
33-
<source>Disable NUMA</source>
34-
<translation>Wyłącz NUMA</translation>
35-
</message>
3621
<message>
3722
<location filename="../src/conf-options-page.ui" line="240"/>
3823
<source>Use Modprobed-db</source>

‎lang/cachyos-kernel-manager_ru.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,11 @@
2323
<source>Tweak kernel options prior to a build via nconfig</source>
2424
<translation>Выполнить настройку параметров ядра с помощью nconfig</translation>
2525
</message>
26-
<message>
27-
<location filename="../src/conf-options-page.ui" line="124"/>
28-
<source>Tweak kernel options prior to a build via menuconfig</source>
29-
<translation>Выполнить настройку параметров ядра с помощью menuconfig</translation>
30-
</message>
3126
<message>
3227
<location filename="../src/conf-options-page.ui" line="153"/>
3328
<source>Tweak kernel options prior to a build via xconfig</source>
3429
<translation>Выполнить настройку параметров ядра с помощью xconfig</translation>
3530
</message>
36-
<message>
37-
<location filename="../src/conf-options-page.ui" line="182"/>
38-
<source>Tweak kernel options prior to a build via gconfig</source>
39-
<translation>Выполнить настройку параметров ядра с помощью gconfig</translation>
40-
</message>
4131
<message>
4232
<location filename="../src/conf-options-page.ui" line="211"/>
4333
<source>Disable NUMA</source>

‎lang/cachyos-kernel-manager_sk.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,11 @@
1313
<source>Tweak kernel options prior to a build via nconfig</source>
1414
<translation>Upraviť možnosti jadra pred zostavením cez nconfig</translation>
1515
</message>
16-
<message>
17-
<location filename="../src/conf-options-page.ui" line="124"/>
18-
<source>Tweak kernel options prior to a build via menuconfig</source>
19-
<translation>Upraviť možnosti jadra pred zostavením cez menuconfig</translation>
20-
</message>
2116
<message>
2217
<location filename="../src/conf-options-page.ui" line="153"/>
2318
<source>Tweak kernel options prior to a build via xconfig</source>
2419
<translation>Upraviť možnosti jadra pred zostavením cez xconfig</translation>
2520
</message>
26-
<message>
27-
<location filename="../src/conf-options-page.ui" line="182"/>
28-
<source>Tweak kernel options prior to a build via gconfig</source>
29-
<translation>Upraviť možnosti jadra pred zostavením cez gconfig</translation>
30-
</message>
31-
<message>
32-
<location filename="../src/conf-options-page.ui" line="211"/>
33-
<source>Disable NUMA</source>
34-
<translation>Zakázať NUMA</translation>
35-
</message>
3621
<message>
3722
<location filename="../src/conf-options-page.ui" line="240"/>
3823
<source>Use Modprobed-db</source>

‎lang/cachyos-kernel-manager_tr.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,11 @@
1313
<source>Tweak kernel options prior to a build via nconfig</source>
1414
<translation>nconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
1515
</message>
16-
<message>
17-
<location filename="../src/conf-options-page.ui" line="124"/>
18-
<source>Tweak kernel options prior to a build via menuconfig</source>
19-
<translation>menuconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
20-
</message>
2116
<message>
2217
<location filename="../src/conf-options-page.ui" line="153"/>
2318
<source>Tweak kernel options prior to a build via xconfig</source>
2419
<translation>xconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
2520
</message>
26-
<message>
27-
<location filename="../src/conf-options-page.ui" line="182"/>
28-
<source>Tweak kernel options prior to a build via gconfig</source>
29-
<translation>gconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
30-
</message>
3121
<message>
3222
<location filename="../src/conf-options-page.ui" line="211"/>
3323
<source>Disable NUMA</source>

‎src/compile_options.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
"option_map": {
33
"cachy_config": "_cachy_config",
44
"nconfig": "_makenconfig",
5-
"menuconfig": "_makemenuconfig",
65
"xconfig": "_makexconfig",
7-
"gconfig": "_makegconfig",
8-
"numa": "_NUMAdisable",
96
"localmodcfg": "_localmodcfg",
107
"hardly": "_cc_harder",
118
"per_gov": "_per_gov",

‎src/conf-options-page.ui‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -115,35 +115,6 @@
115115
</layout>
116116
</widget>
117117
</item>
118-
<item>
119-
<widget class="QWidget" name="menuconfig_widget" native="true">
120-
<layout class="QHBoxLayout" name="menuconfig_horizontal_layout">
121-
<item>
122-
<widget class="QLabel" name="menuconfig_label">
123-
<property name="text">
124-
<string>Tweak kernel options prior to a build via menuconfig</string>
125-
</property>
126-
</widget>
127-
</item>
128-
<item>
129-
<spacer name="menuconfig_horizontal_spacer">
130-
<property name="orientation">
131-
<enum>Qt::Horizontal</enum>
132-
</property>
133-
<property name="sizeHint" stdset="0">
134-
<size>
135-
<width>40</width>
136-
<height>20</height>
137-
</size>
138-
</property>
139-
</spacer>
140-
</item>
141-
<item>
142-
<widget class="QCheckBox" name="menuconfig_check"/>
143-
</item>
144-
</layout>
145-
</widget>
146-
</item>
147118
<item>
148119
<widget class="QWidget" name="xconfig_widget" native="true">
149120
<layout class="QHBoxLayout" name="xconfig_horizontal_layout">
@@ -173,64 +144,6 @@
173144
</layout>
174145
</widget>
175146
</item>
176-
<item>
177-
<widget class="QWidget" name="gconfig_widget" native="true">
178-
<layout class="QHBoxLayout" name="gconfig_horizontal_layout">
179-
<item>
180-
<widget class="QLabel" name="gconfig_label">
181-
<property name="text">
182-
<string>Tweak kernel options prior to a build via gconfig</string>
183-
</property>
184-
</widget>
185-
</item>
186-
<item>
187-
<spacer name="gconfig_horizontal_spacer">
188-
<property name="orientation">
189-
<enum>Qt::Horizontal</enum>
190-
</property>
191-
<property name="sizeHint" stdset="0">
192-
<size>
193-
<width>40</width>
194-
<height>20</height>
195-
</size>
196-
</property>
197-
</spacer>
198-
</item>
199-
<item>
200-
<widget class="QCheckBox" name="gconfig_check"/>
201-
</item>
202-
</layout>
203-
</widget>
204-
</item>
205-
<item>
206-
<widget class="QWidget" name="numa_widget" native="true">
207-
<layout class="QHBoxLayout" name="numa_horizontal_layout">
208-
<item>
209-
<widget class="QLabel" name="numa_label">
210-
<property name="text">
211-
<string>Disable NUMA</string>
212-
</property>
213-
</widget>
214-
</item>
215-
<item>
216-
<spacer name="numa_horizontal_spacer">
217-
<property name="orientation">
218-
<enum>Qt::Horizontal</enum>
219-
</property>
220-
<property name="sizeHint" stdset="0">
221-
<size>
222-
<width>40</width>
223-
<height>20</height>
224-
</size>
225-
</property>
226-
</spacer>
227-
</item>
228-
<item>
229-
<widget class="QCheckBox" name="numa_check"/>
230-
</item>
231-
</layout>
232-
</widget>
233-
</item>
234147
<item>
235148
<widget class="QWidget" name="localmodcfg_widget" native="true">
236149
<layout class="QHBoxLayout" name="localmodcfg_horizontal_layout">

‎src/conf-window.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -413,11 +413,8 @@ std::string ConfWindow::get_all_set_values() const noexcept {
413413

414414
result += convert_to_var_assign_empty_wrapped("cachy_config", checkstate_checked(options_page_ui_obj->cachyconfig_check));
415415
result += convert_to_var_assign_empty_wrapped("nconfig", checkstate_checked(options_page_ui_obj->nconfig_check));
416-
result += convert_to_var_assign_empty_wrapped("menuconfig", checkstate_checked(options_page_ui_obj->menuconfig_check));
417416
result += convert_to_var_assign_empty_wrapped("xconfig", checkstate_checked(options_page_ui_obj->xconfig_check));
418-
result += convert_to_var_assign_empty_wrapped("gconfig", checkstate_checked(options_page_ui_obj->gconfig_check));
419417
result += convert_to_var_assign_empty_wrapped("localmodcfg", checkstate_checked(options_page_ui_obj->localmodcfg_check));
420-
result += convert_to_var_assign_empty_wrapped("numa", checkstate_checked(options_page_ui_obj->numa_check));
421418
result += convert_to_var_assign_empty_wrapped("damon", checkstate_checked(options_page_ui_obj->damon_check));
422419
result += convert_to_var_assign_empty_wrapped("builtin_zfs", checkstate_checked(options_page_ui_obj->builtin_zfs_check));
423420
result += convert_to_var_assign_empty_wrapped("builtin_nvidia", checkstate_checked(options_page_ui_obj->builtin_nvidia_check));
@@ -684,11 +681,8 @@ void ConfWindow::on_save() noexcept {
684681

685682
config_options.cachy_config_check = checkstate_checked(options_page_ui_obj->cachyconfig_check);
686683
config_options.nconfig_check = checkstate_checked(options_page_ui_obj->nconfig_check);
687-
config_options.menuconfig_check = checkstate_checked(options_page_ui_obj->menuconfig_check);
688684
config_options.xconfig_check = checkstate_checked(options_page_ui_obj->xconfig_check);
689-
config_options.gconfig_check = checkstate_checked(options_page_ui_obj->gconfig_check);
690685
config_options.localmodcfg_check = checkstate_checked(options_page_ui_obj->localmodcfg_check);
691-
config_options.numa_check = checkstate_checked(options_page_ui_obj->numa_check);
692686
config_options.damon_check = checkstate_checked(options_page_ui_obj->damon_check);
693687
config_options.builtin_zfs_check = checkstate_checked(options_page_ui_obj->builtin_zfs_check);
694688
config_options.builtin_nvidia_check = checkstate_checked(options_page_ui_obj->builtin_nvidia_check);
@@ -748,11 +742,8 @@ void ConfWindow::on_load() noexcept {
748742

749743
set_checkstate(options_page_ui_obj->cachyconfig_check, config_options->cachy_config_check);
750744
set_checkstate(options_page_ui_obj->nconfig_check, config_options->nconfig_check);
751-
set_checkstate(options_page_ui_obj->menuconfig_check, config_options->menuconfig_check);
752745
set_checkstate(options_page_ui_obj->xconfig_check, config_options->xconfig_check);
753-
set_checkstate(options_page_ui_obj->gconfig_check, config_options->gconfig_check);
754746
set_checkstate(options_page_ui_obj->localmodcfg_check, config_options->localmodcfg_check);
755-
set_checkstate(options_page_ui_obj->numa_check, config_options->numa_check);
756747
set_checkstate(options_page_ui_obj->damon_check, config_options->damon_check);
757748
set_checkstate(options_page_ui_obj->builtin_zfs_check, config_options->builtin_zfs_check);
758749
set_checkstate(options_page_ui_obj->builtin_nvidia_check, config_options->builtin_nvidia_check);

0 commit comments

Comments
 (0)