stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workstation: Reoder lists to avoid conflicts

Browse Source 
Package openssh-gostcrypto from extras list conflicts with openssh
which pulled by openuds-client from raccess list and gtk2-ssh-askpass
from kvm list. Thus, these lists are moved as far apart as possible.
This commit is contained in:
Mikhail Efremov 2021-09-22 17:07:01 +03:00 committed by Anton Midyukov
parent c79b38400d
commit 37cd07400c
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/basealt.mk
View File

@ -1,8 +1,8 @@
ifeq (distro,$(IMAGE_CLASS))
distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
3rdparty clamav cloud-clients freecad \
gtk-dictionary kvm smartcard voip-clients vlc)
3rdparty kvm clamav cloud-clients freecad \
gtk-dictionary smartcard voip-clients vlc)
distro/alt-workstation: distro/.base +vmguest +wireless +efi \
mixin/desktop-installer mixin/alt-workstation \

4
conf.d/mixin-basealt.mk
View File

@ -2,8 +2,8 @@
mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
agents emulators ganttproject gnome-peer-to-peer graphics-editing \
libreoffice mate-usershare pidgin raccess scanning scribus \
raccess agents emulators ganttproject gnome-peer-to-peer graphics-editing \
libreoffice mate-usershare pidgin scanning scribus \
sound-editing thunderbird freeipa-client admc)
mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \

19
pkg.in/lists/workstation/extras
View File

@ -1,14 +1,6 @@
# GOST encryption
openssl-engines
# gostcrypo repo component is needed
openssh-gostcrypto
openssh-clients-gostcrypto openssh-askpass-common-gostcrypto
openssh-server-gostcrypto openssh-server-control-gostcrypto
openssh-common-gostcrypto
openvpn-gostcrypto openvpn-plugins-gostcrypto
alterator-openvpn-server
# for AltHa
alterator-secsetup
@ -30,3 +22,14 @@ kernel-headers-un-def
chromium
chromium-gost
# gostcrypo repo component is needed
openvpn-gostcrypto openvpn-plugins-gostcrypto
alterator-openvpn-server
openssh-gostcrypto
openssh-common-gostcrypto
openssh-askpass-common-gostcrypto
openssh-clients-gostcrypto
openssh-server-control-gostcrypto
openssh-server-gostcrypto

2
pkg.in/lists/workstation/raccess
View File

@ -1,6 +1,6 @@
openuds-client
remmina
remmina-plugins
rdesktop
connector
ansible
openuds-client