From 1f681e592130ab4795490f5989294a48dd19b1f8 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 23 Aug 2020 13:33:03 +0300 Subject: [PATCH] workstation: organize machine-specific groups Four checkboxes with "Elbrus 801-PC" prefix look a bit too much, let's put these under a parent one; the counter-argument is that selecting that parent checkbox is going to provide message telling that there are conflicts within -- the proper widget would be a dropbox with the number of seats but we don't do that just yet in alterator-pkg. The autologin group goes there too; still a hack that should be replaced by proper alterator-users multiseat support. --- pkg.in/groups/workstation/90-e801.directory | 8 ++++++++ pkg.in/groups/workstation/91-e101.directory | 8 ++++++++ pkg.in/groups/workstation/e101-mga2.directory | 9 +++++---- pkg.in/groups/workstation/e101-modesetting.directory | 9 +++++---- pkg.in/groups/workstation/e801-1seat.directory | 5 +++-- pkg.in/groups/workstation/e801-2seat.directory | 5 +++-- pkg.in/groups/workstation/e801-3seat.directory | 5 +++-- pkg.in/groups/workstation/e801-6seat.directory | 7 ++++--- pkg.in/groups/workstation/z-autologin.directory | 1 + 9 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 pkg.in/groups/workstation/90-e801.directory create mode 100644 pkg.in/groups/workstation/91-e101.directory diff --git a/pkg.in/groups/workstation/90-e801.directory b/pkg.in/groups/workstation/90-e801.directory new file mode 100644 index 00000000..59779d4e --- /dev/null +++ b/pkg.in/groups/workstation/90-e801.directory @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=Multiseat Elbrus 801-PC +Name[ru_RU]=«Горыныч» на «Эльбрус 801-РС» +X-Alterator-Required=no +Comment=Multiple seats on a system with multiple GPUs +Comment[ru_RU]=Многоместная рабочая станция diff --git a/pkg.in/groups/workstation/91-e101.directory b/pkg.in/groups/workstation/91-e101.directory new file mode 100644 index 00000000..f53c9378 --- /dev/null +++ b/pkg.in/groups/workstation/91-e101.directory @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=Elbrus 101-PC videodrivers +Name[ru_RU]=Видеодрайверы для «Эльбрус 101-РС» +X-Alterator-Required=no +Comment=Elbrus 101-PC videodrivers +Comment[ru_RU]=Видеодрайверы для «Эльбрус 101-РС» diff --git a/pkg.in/groups/workstation/e101-mga2.directory b/pkg.in/groups/workstation/e101-mga2.directory index 0395c4f0..32b485b8 100644 --- a/pkg.in/groups/workstation/e101-mga2.directory +++ b/pkg.in/groups/workstation/e101-mga2.directory @@ -1,10 +1,11 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=Elbrus 101-PC (accelerated 3D graphics) -Name[ru_RU]=Эльбрус 101-РС (ускоренный 3D-драйвер) -Comment=mga2/vivante driver for 1C+ -Comment[ru_RU]=Настройка видеодрайвера mga2/vivante для 1С+ +Name=Accelerated 3D graphics +Name[ru_RU]=Ускоренный 3D-драйвер +Comment=mga2/vivante driver setup for Elbrus-1C+ +Comment[ru_RU]=Настройка видеодрайвера mga2/vivante для Эльбрус-1С+ X-Alterator-PackageList=workstation/e101-mga2 X-Alterator-Conflicts=workstation/e101-modesetting X-Alterator-Required=no +X-Alterator-Parent=workstation/91-e101 diff --git a/pkg.in/groups/workstation/e101-modesetting.directory b/pkg.in/groups/workstation/e101-modesetting.directory index e6bf0a41..7427e083 100644 --- a/pkg.in/groups/workstation/e101-modesetting.directory +++ b/pkg.in/groups/workstation/e101-modesetting.directory @@ -1,10 +1,11 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=Elbrus 101-PC (safe graphics, default) -Name[ru_RU]=Эльбрус 101-РС (2D-драйвер, надёжно) -Comment=Modesetting driver for 1C+ -Comment[ru_RU]=Настройка видеодрайвера modesetting для 1С+ +Name=Safe-mode 2D graphics (default) +Name[ru_RU]=2D-драйвер (надёжно) +Comment=Modesetting driver for Elbrus-1C+ +Comment[ru_RU]=Настройка видеодрайвера modesetting для Эльбрус-1С+ X-Alterator-PackageList=workstation/e101-modesetting X-Alterator-Conflicts=workstation/e101-mga2 X-Alterator-Required=no +X-Alterator-Parent=workstation/91-e101 diff --git a/pkg.in/groups/workstation/e801-1seat.directory b/pkg.in/groups/workstation/e801-1seat.directory index e1d68f4c..29e25066 100644 --- a/pkg.in/groups/workstation/e801-1seat.directory +++ b/pkg.in/groups/workstation/e801-1seat.directory @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=Elbrus 801-PC (default) -Name[ru_RU]=Эльбрус 801-РС (штатно) +Name=Single seat +Name[ru_RU]=Одно место Comment=Single-seat Elbrus 801-PC setup Comment[ru_RU]=Одно рабочее место на Эльбрус 801-РС X-Alterator-PackageList=zero @@ -10,3 +10,4 @@ X-Alterator-Required=no X-Alterator-Conflicts=workstation/e801-2seat X-Alterator-Conflicts=workstation/e801-3seat X-Alterator-Conflicts=workstation/e801-6seat +X-Alterator-Parent=workstation/90-e801 diff --git a/pkg.in/groups/workstation/e801-2seat.directory b/pkg.in/groups/workstation/e801-2seat.directory index 55587884..a4b763c1 100644 --- a/pkg.in/groups/workstation/e801-2seat.directory +++ b/pkg.in/groups/workstation/e801-2seat.directory @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=Elbrus 801-PC (dual seat) -Name[ru_RU]=Эльбрус 801-РС (два рабочих места) +Name=Dual seat +Name[ru_RU]=Два места Comment=Dual-seat setup for Elbrus 801-PC with additional GPU Comment[ru_RU]=Два рабочих места на Эльбрус 801-РС с дополнительной видеокартой X-Alterator-PackageList=workstation/e801-2seat @@ -10,3 +10,4 @@ X-Alterator-Required=no X-Alterator-Conflicts=workstation/e801-1seat X-Alterator-Conflicts=workstation/e801-3seat X-Alterator-Conflicts=workstation/e801-6seat +X-Alterator-Parent=workstation/90-e801 diff --git a/pkg.in/groups/workstation/e801-3seat.directory b/pkg.in/groups/workstation/e801-3seat.directory index 419b25fd..356f1278 100644 --- a/pkg.in/groups/workstation/e801-3seat.directory +++ b/pkg.in/groups/workstation/e801-3seat.directory @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=Elbrus 801-PC (triple seat) -Name[ru_RU]=Эльбрус 801-РС (три рабочих места) +Name=Triple seat +Name[ru_RU]=Три места Comment=Triple-seat setup for Elbrus 801-PC with additional GPUs Comment[ru_RU]=Три рабочих места на Эльбрус 801-РС с дополнительными видеокартами X-Alterator-PackageList=workstation/e801-3seat @@ -10,3 +10,4 @@ X-Alterator-Required=no X-Alterator-Conflicts=workstation/e801-1seat X-Alterator-Conflicts=workstation/e801-2seat X-Alterator-Conflicts=workstation/e801-6seat +X-Alterator-Parent=workstation/90-e801 diff --git a/pkg.in/groups/workstation/e801-6seat.directory b/pkg.in/groups/workstation/e801-6seat.directory index 6775faad..13fd9845 100644 --- a/pkg.in/groups/workstation/e801-6seat.directory +++ b/pkg.in/groups/workstation/e801-6seat.directory @@ -1,12 +1,13 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=Elbrus 801-PC (six seats) -Name[ru_RU]=Эльбрус 801-РС (шесть рабочих мест) +Name=Six seats +Name[ru_RU]=Шесть мест Comment=Hexa-seat setup for Elbrus 801-PC with additional GPUs -Comment[ru_RU]=Шесть рабочих мест на Эльбрус 801-РС с дополнительными видеокартами +Comment[ru_RU]=Шесть рабочих мест на Эльбрус 801-РС (.400) с дополнительными видеокартами X-Alterator-PackageList=workstation/e801-6seat X-Alterator-Required=no X-Alterator-Conflicts=workstation/e801-1seat X-Alterator-Conflicts=workstation/e801-2seat X-Alterator-Conflicts=workstation/e801-3seat +X-Alterator-Parent=workstation/90-e801 diff --git a/pkg.in/groups/workstation/z-autologin.directory b/pkg.in/groups/workstation/z-autologin.directory index 45ae98fd..83b7580a 100644 --- a/pkg.in/groups/workstation/z-autologin.directory +++ b/pkg.in/groups/workstation/z-autologin.directory @@ -7,3 +7,4 @@ Comment=This enables autologin in single- or multi-seat configuration Comment[ru_RU]=Включает автоматический вход в систему на всех местах X-Alterator-PackageList=workstation/autologin X-Alterator-Required=no +X-Alterator-Parent=workstation/90-e801