Merge tag 'v1.6.8' into sisyphus
v1.6.8
- lib/{distro,ve,vm}.mk: add branding notes with licenses
- x11: fix condition for kde on p11
- x11: exclude nvidia-xconfig
- live: add mokutil, pesign for rescue mode on x86_64
- education: add latests commits from cas@, fix build on p11
- kworkstation: add latests commits from zerg@, fix build on p11
- alt-server: add latests commits from jqt4@
This commit is contained in:
Anton Midyukov
commit
153f38e475
@ -30,7 +30,7 @@ distro/alt-server: monitoring = $(addprefix server-v/,\
|
||||
|
||||
# FIXME: generalize vm-profile
|
||||
distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \
|
||||
use/bootloader/grub use/rescue/base use/stage2/kms\
|
||||
use/bootloader/grub use/stage2/kms \
|
||||
use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \
|
||||
use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
|
||||
use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
|
||||
@ -43,19 +43,19 @@ distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \
|
||||
@$(call add,MAIN_GROUPS,$(server_groups_virtualbox))
|
||||
@$(call add,MAIN_LISTS,centaurus/disk-dvd)
|
||||
@$(call add,MAIN_LISTS,centaurus/disk-server-light)
|
||||
@$(call add,THE_LISTS,monitoring/zabbix-agent)
|
||||
@$(call add,THE_LISTS,cert-ru)
|
||||
@$(call add,MAIN_LISTS,monitoring/zabbix-agent)
|
||||
@$(call add,MAIN_LISTS,cert-ru)
|
||||
ifneq (,$(filter-out e2k%,$(ARCH)))
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
|
||||
endif
|
||||
@$(call add,STAGE2_BOOTARGS,mpath)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-multipath)
|
||||
@$(call add,SYSTEM_PACKAGES,multipath-tools)
|
||||
@$(call add,SERVICES_ENABLE,multipathd)
|
||||
@$(call add,INSTALL2_PACKAGES,strace)
|
||||
@$(call add,INSTALL2_PACKAGES,fdisk)
|
||||
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
|
||||
@$(call add,INSTALL2_BRANDING,notes)
|
||||
@$(call add,LIVE_PACKAGES,strace)
|
||||
@$(call add,LIVE_PACKAGES,fdisk)
|
||||
@$(call add,LIVE_PACKAGES,btrfs-progs)
|
||||
@$(call add,STAGE2_BRANDING,notes)
|
||||
@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
|
||||
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
|
||||
ifeq (,$(filter-out e2k,$(ARCH)))
|
||||
@ -79,8 +79,6 @@ ifeq (,$(filter-out x86_64 aarch64 loongarch64,$(ARCH)))
|
||||
distro/alt-server:: +efi; @:
|
||||
endif
|
||||
|
||||
distro/alt-server:: use/install2/vnc/listen; @:
|
||||
|
||||
ifeq (,$(filter-out e2k%,$(ARCH)))
|
||||
distro/alt-server:: +power +net-eth; @:
|
||||
endif
|
||||
|
||||
@ -133,10 +133,8 @@ mixin/education-installer: \
|
||||
use/branding/complete \
|
||||
mixin/education-base \
|
||||
use/docs/manual use/docs/indexhtml
|
||||
@$(call add,MAIN_GROUPS,education/00_base)
|
||||
@$(call add,MAIN_GROUPS,education/00_libreoffice)
|
||||
@$(call add,MAIN_GROUPS,education/01_preschool)
|
||||
@$(call add,MAIN_GROUPS,education/02_gradeschool)
|
||||
@$(call add,MAIN_GROUPS,education/03_highschool)
|
||||
@$(call add,MAIN_GROUPS,education/04_secondary_vocational)
|
||||
@$(call add,MAIN_GROUPS,education/05_university)
|
||||
@ -167,7 +165,6 @@ distro/education: distro/alt-education; @:
|
||||
distro/alt-education:: distro/.base \
|
||||
mixin/education \
|
||||
mixin/education-installer \
|
||||
mixin/education-live \
|
||||
use/live/rescue \
|
||||
use/live-install/oem \
|
||||
use/e2k/multiseat/full use/power/acpi \
|
||||
|
||||
@ -3,7 +3,8 @@ ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
mixin/kworkstation-common-deps: \
|
||||
use/kernel/desktop use/kernel/net use/kernel/laptop \
|
||||
use/live/x11 use/live use/live/sound use/live/repo/online \
|
||||
use/live/x11 use/live use/live/sound \
|
||||
use/live/rescue \
|
||||
use/syslinux/ui/gfxboot use/plymouth/full \
|
||||
use/efi/grub use/efi/shell \
|
||||
use/x11/xorg \
|
||||
@ -21,13 +22,12 @@ mixin/kworkstation-common-deps: \
|
||||
use/x11/intel use/x11/radeon use/x11/amdgpu use/x11/nvidia \
|
||||
use/x11/kde-display-manager-lightdm use/x11/wacom \
|
||||
use/memtest \
|
||||
use/init/systemd \
|
||||
use/cleanup/live-no-cleanupdb \
|
||||
use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \
|
||||
use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
|
||||
use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
|
||||
use/alternatives/xvt/konsole \
|
||||
+wireless +pulse +plymouth +systemd-optimal +wireless +vmguest +efi +nm \
|
||||
+wireless +pipewire +plymouth +systemd +systemd-optimal +wireless +vmguest +efi +nm \
|
||||
use/stage2/kms/nvidia
|
||||
|
||||
mixin/kworkstation-common-opts:
|
||||
@ -38,7 +38,8 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
|
||||
endif
|
||||
@$(call set,GRUBTHEME,branding-xalt-kworkstation)
|
||||
@$(call set,DOCS,alt-kworkstation)
|
||||
@$(call try,THE_BROWSER,chromium-gost)
|
||||
@$(call add,PINNED_PACKAGES,systemd)
|
||||
@$(call try,THE_BROWSER,yandex-browser-stable)
|
||||
@$(call add,BASE_KMODULES,kvm virtualbox)
|
||||
@$(call add,THE_KMODULES,staging)
|
||||
@$(call add,BASE_PACKAGES,os-prober)
|
||||
@ -47,8 +48,6 @@ endif
|
||||
@$(call add,THE_PACKAGES,systemd-presets-kdesktop)
|
||||
@$(call add,THE_PACKAGES,systemd-oomd-defaults)
|
||||
@$(call add,THE_PACKAGES,etcnet-defaults-desktop)
|
||||
@$(call add,THE_PACKAGES,btrfs-progs)
|
||||
@$(call set,INSTALL2_FONTS,fonts-ttf-google-croscore-arimo)
|
||||
@$(call set,LIVECD_FONTS,fonts-ttf-google-noto-sans)
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-dejavu)
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans)
|
||||
@ -56,6 +55,8 @@ endif
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans-mono)
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-caladea)
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-carlito)
|
||||
@$(call add,THE_PACKAGES,fonts-otf-google-noto-sans-cjk-hk)
|
||||
@$(call add,THE_PACKAGES,fonts-otf-google-noto-sans-mono-cjk-hk)
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans-symbols)
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans-symbols2)
|
||||
@$(call add,THE_PACKAGES,fonts-ttf-material-icons)
|
||||
@ -108,49 +109,44 @@ endif
|
||||
@$(call set,META_APP_ID,ALT Workstation K $(DISTRO_VERSION)$(STATUS) $(ARCH) $(shell date +%F))
|
||||
|
||||
mixin/kworkstation-install-deps: \
|
||||
distro/.installer mixin/desktop-installer \
|
||||
use/install2/suspend use/install2/net use/install2 use/install2/stage3 use/install2/vnc \
|
||||
use/install2/vmguest \
|
||||
use/stage2/net-install \
|
||||
distro/.base \
|
||||
use/x11/xorg use/x11-autostart \
|
||||
use/stage2/net-install-live \
|
||||
use/grub/localboot_bios.cfg \
|
||||
+installer
|
||||
use/live-install/vnc/listen \
|
||||
use/live-install/suspend \
|
||||
use/live/no-cleanup \
|
||||
+net-eth +vmguest +live-installer-pkg
|
||||
|
||||
mixin/kworkstation-install-opts:
|
||||
@$(call set,GRUB_DEFAULT,harddisk)
|
||||
@$(call set,INSTALLER,centaurus)
|
||||
@$(call set,INSTALLER,kworkstation)
|
||||
@$(call add,STAGE1_MODLISTS,stage2-ntfs)
|
||||
@$(call add,STAGE2_KMODULES,drm-nouveau)
|
||||
@$(call add,THE_PACKAGES,installer-feature-nfs-client-stage3)
|
||||
@$(call add,BASE_PACKAGES,plasma5-welcome)
|
||||
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
|
||||
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-kde-stage2)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-samba-automount-stage2)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-weak-passwd)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-disable-remote-stage2)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-etcissue)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-kdesktop-tmpfs)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-kdesktop-services)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-vmservices)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-online-repo)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-set-tz)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-rootgtktheme-stage2)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-alterator-setup-stage2)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-lightdm-kde)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-packagekit-setup)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-xprofile-clear)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-systemd-oomd)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-webterminal-setup)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-remove-xorgconf)
|
||||
@$(call add,INSTALL2_PACKAGES,apt-scripts-nvidia)
|
||||
@$(call add,INSTALL2_PACKAGES,volumes-profile-kdesktop)
|
||||
@$(call add,INSTALL2_PACKAGES,udev-rules-ioschedulers)
|
||||
@$(call add,INSTALL2_PACKAGES,passwdqc-utils)
|
||||
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-dri-nouveau xorg-drv-nouveau)
|
||||
@$(call add,INSTALL2_CLEANUP_PACKAGES,icon-theme-adwaita fonts-ttf-dejavu fonts-bitmap-misc)
|
||||
@$(call add,INSTALL2_CLEANUP_PACKAGES,libdconf dconf colord)
|
||||
@$(call add,INSTALL2_CLEANUP_PACKAGES,shared-mime-info glib-networking libgtk+3-schemas gtk-update-icon-cache libgtk+3)
|
||||
@$(call add,INSTALL2_CLEANUP_PACKAGES,libat-spi2-core at-spi2-core at-spi2-atk)
|
||||
@$(call add,BASE_PACKAGES,installer-feature-nfs-client-stage3)
|
||||
@$(call add,BASE_PACKAGES,alt-welcome-k)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-samba-usershares-kde-stage2)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-samba-automount-stage2)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-weak-passwd)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-desktop-disable-remote-stage2)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-desktop-etcissue)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-kdesktop-tmpfs)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-kdesktop-services)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-vmservices)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-set-tz)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-rootgtktheme-stage2)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-alterator-setup-stage2)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-packagekit-setup)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-xprofile-clear)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-systemd-oomd)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-webterminal-setup)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-remove-xorgconf)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-swapfile)
|
||||
@$(call add,LIVE_PACKAGES,apt-scripts-nvidia)
|
||||
@$(call add,LIVE_PACKAGES,volumes-profile-kdesktop)
|
||||
@$(call add,LIVE_PACKAGES,udev-rules-ioschedulers)
|
||||
@$(call add,LIVE_PACKAGES,passwdqc-utils)
|
||||
@$(call add,MAIN_GROUPS,$(kworkstation_groups))
|
||||
@$(call add,THE_PROFILES,kworkstation/10-workstation)
|
||||
@$(call add,THE_PROFILES,kworkstation/20-webterminal)
|
||||
@ -163,7 +159,6 @@ mixin/kworkstation-install-opts:
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue x11))
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue extra))
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue crypto))
|
||||
@$(call add,LIVE_LISTS,sound/pulseaudio)
|
||||
@$(call add,LIVE_LISTS,kworkstation/live-rescue)
|
||||
@$(call add,LIVE_LISTS,kworkstation/printing)
|
||||
@$(call add,LIVE_LISTS,kworkstation/scanning)
|
||||
@ -171,7 +166,7 @@ mixin/kworkstation-install-opts:
|
||||
@$(call add,SERVICES_ENABLE,sshd)
|
||||
|
||||
mixin/kworkstation-live-deps: \
|
||||
distro/.base use/rescue \
|
||||
distro/.base \
|
||||
use/x11/xorg use/x11-autostart \
|
||||
use/live/no-cleanup \
|
||||
use/grub/live_rw.cfg \
|
||||
@ -186,10 +181,8 @@ mixin/kworkstation-live-opts:
|
||||
@$(call set,SYSLINUX_DEFAULT,session)
|
||||
@$(call add,LIVE_LISTS,kworkstation/kde5-base)
|
||||
@$(call add,LIVE_LISTS,kworkstation/kde5)
|
||||
@$(call add,LIVE_LISTS,kworkstation/emulators)
|
||||
@$(call add,LIVE_LISTS,kworkstation/graphics-editing)
|
||||
@$(call add,LIVE_LISTS,kworkstation/printing)
|
||||
@$(call add,LIVE_LISTS,kworkstation/publishing)
|
||||
@$(call add,LIVE_LISTS,kworkstation/scanning)
|
||||
@$(call add,LIVE_LISTS,kworkstation/remote-desktop)
|
||||
@$(call add,LIVE_LISTS,kworkstation/sound-editing)
|
||||
@ -202,14 +195,10 @@ mixin/kworkstation-live-opts:
|
||||
|
||||
distro/kworkstation-install: \
|
||||
kworkstation_groups = $(addprefix kworkstation/,\
|
||||
kde5 \
|
||||
games \
|
||||
emulators remote-desktop \
|
||||
printing publishing scanning \
|
||||
video-editing sound-editing graphics-editing \
|
||||
kde5 games emulators printing scanning \
|
||||
z00-add-3dparty 3dparty-flatpak 3dparty-snap \
|
||||
z01-add-clients clients-ad clients-ipa clients-backup clients-cloud clients-monitor \
|
||||
z02-add-additional add-oem add-tablet add-webterminal add-no4k-screen)
|
||||
z02-add-additional add-adm add-oem add-tablet add-webterminal add-no4k-screen)
|
||||
|
||||
distro/kworkstation-install: \
|
||||
mixin/kworkstation-install-deps \
|
||||
@ -240,7 +229,7 @@ mixin/kworkstation-fsin-opts:
|
||||
@$(call add,THE_PACKAGES,openssl-gost-engine)
|
||||
@$(call add,THE_PACKAGES,openvpn-gostcrypto openvpn-plugins-gostcrypto alterator-openvpn-server)
|
||||
@$(call add,THE_PACKAGES,alt-customize-branding)
|
||||
@$(call add,THE_PACKAGES,alterator-kiosk)
|
||||
@$(call add,THE_PACKAGES,alterator-kiosk kiosk-profiles)
|
||||
@$(call add,SERVICES_ENABLE,kiosk)
|
||||
|
||||
distro/kworkstation-install-fsin: \
|
||||
|
||||
@ -12,22 +12,27 @@ mixin/alt-server: server_main_kmodules = bcmwl ch34x dm-secdel drbd9 drm-ancient
|
||||
v4l2loopback vboxsf vhba virtualbox-addition-guest virtualbox-addition \
|
||||
virtualbox-addition-video virtualbox xtables-addons
|
||||
|
||||
mixin/alt-server: +installer +systemd \
|
||||
mixin/alt-server: +systemd \
|
||||
+live-installer-pkg \
|
||||
use/live/rescue \
|
||||
use/live/repo \
|
||||
use/live/suspend \
|
||||
use/live-install/oem \
|
||||
use/live-install/vnc/listen \
|
||||
use/ntp/chrony \
|
||||
use/branding/notes \
|
||||
use/control use/services \
|
||||
use/install2/stage3 \
|
||||
use/install2/vnc use/install2/xfs use/install2/fat \
|
||||
use/install2/oem \
|
||||
use/volumes/alt-server \
|
||||
use/apt-conf/branch \
|
||||
use/fonts/install2 \
|
||||
use/l10n/default/ru_RU use/install2/stage3 \
|
||||
use/l10n/default/ru_RU \
|
||||
use/firmware/full \
|
||||
use/net/etcnet \
|
||||
use/tty
|
||||
@$(call set,INSTALLER,centaurus)
|
||||
@$(call set,BRANDING,alt-server)
|
||||
@$(call set,GRUB_DIRECT,1)
|
||||
@$(call add,GRUB_CFG,defaults fwsetup_efi)
|
||||
@$(call set,THE_APT_CONF,branch-gostcrypto)
|
||||
@$(call set,DISABLE_LANG_MENU,in_grub)
|
||||
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
|
||||
@ -36,8 +41,8 @@ endif
|
||||
@$(call add,THE_BRANDING,alterator)
|
||||
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
|
||||
@$(call set,KFLAVOURS,std-def un-def)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-kernel-stage3)
|
||||
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-cleanup-kernel-stage3)
|
||||
@$(call add,LIVE_PACKAGES,ntfs-3g)
|
||||
@$(call add,BASE_KMODULES,drm)
|
||||
@$(call add,MAIN_GROUPS,centaurus/proxmox-backup-server)
|
||||
@$(call add,MAIN_GROUPS,centaurus/token)
|
||||
@ -53,10 +58,10 @@ endif
|
||||
@$(call add,BASE_LISTS,centaurus/base-server)
|
||||
@$(call add,BASE_LISTS,centaurus/lsb-core)
|
||||
@$(call add,LIVE_LISTS,centaurus/live)
|
||||
@$(call add,LIVE_LISTS,centaurus/remmina)
|
||||
@$(call add,LIVE_LISTS,centaurus/cups)
|
||||
@$(call add,LIVE_LISTS,centaurus/nm)
|
||||
@$(call add,LIVE_LISTS,centaurus/domain-client)
|
||||
@$(call add,MAIN_LISTS,centaurus/remmina)
|
||||
@$(call add,MAIN_LISTS,centaurus/cups)
|
||||
@$(call add,MAIN_LISTS,centaurus/nm)
|
||||
@$(call add,BASE_LISTS,centaurus/domain-client)
|
||||
@$(call add,MAIN_GROUPS,$(server_groups))
|
||||
@$(call add,MAIN_LISTS,centaurus/cppcheck)
|
||||
@$(call add,MAIN_LISTS,centaurus/disk)
|
||||
@ -68,20 +73,20 @@ ifeq (,$(filter-out i586 x86_64 aarch64 loongarch64 e2k%,$(ARCH)))
|
||||
endif
|
||||
@$(call add,THE_PROFILES,minimal)
|
||||
@$(call add,STAGE1_MODLISTS,stage2-mmc)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-other-fs-stage2)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-alphabet-profiles)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-load-tun)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-network-shares-stage3)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-auto-domain)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-multipath)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-desktop-other-fs-stage2)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-alphabet-profiles)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-load-tun)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-network-shares-stage3)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-auto-domain)
|
||||
ifneq (,$(filter-out e2k%,$(ARCH)))
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
|
||||
endif
|
||||
ifeq (,$(filter-out x86_64,$(ARCH)))
|
||||
@$(call add,MAIN_GROUPS,centaurus/jitsi-meet)
|
||||
endif
|
||||
@$(call add,INSTALL2_PACKAGES,fdisk)
|
||||
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
|
||||
@$(call add,LIVE_PACKAGES,fdisk)
|
||||
@$(call add,LIVE_PACKAGES,xorg-conf-synaptics)
|
||||
@$(call add,COMMON_PACKAGES,vim-console)
|
||||
@$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind)
|
||||
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,systemd-networkd.service systemd-resolved.service)
|
||||
|
||||
@ -208,7 +208,7 @@ distro/regular-rescue: distro/.regular-base mixin/regular-rescue use/rescue/rw \
|
||||
|
||||
distro/regular-rescue-live: distro/.regular-base +systemd \
|
||||
use/live/rescue/extra use/live/rescue/rw \
|
||||
use/stage2/kms use/hdt use/stage2/kms use/kernel/latest \
|
||||
use/stage2/kms use/hdt use/kernel/latest use/firmware/full \
|
||||
use/net/etcnet use/net/dhcp use/live/repo +wireless \
|
||||
use/syslinux/sdab.cfg use/grub/sdab_bios.cfg
|
||||
@$(call add,LIVE_PACKAGES,livecd-net-eth)
|
||||
|
||||
@ -105,6 +105,9 @@ endif
|
||||
use/live/rescue: use/live use/grub/live-rescue.cfg use/syslinux/live-rescue.cfg
|
||||
@$(call add,LIVE_PACKAGES,livecd-rescue-utility)
|
||||
@$(call add,LIVE_LISTS,tagged/base+rescue)
|
||||
ifeq (,$(filter-out x86_64,$(ARCH)))
|
||||
@$(call add,LIVE_PACKAGES,pesign mokutil)
|
||||
endif
|
||||
|
||||
use/live/rescue/extra: use/live/rescue
|
||||
@$(call add,LIVE_LISTS,\
|
||||
|
||||
@ -95,7 +95,7 @@ use/x11/nvidia/optimus:: use/x11/nvidia; @:
|
||||
|
||||
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
|
||||
use/x11/nvidia:: use/drm/nvidia
|
||||
@$(call set,NVIDIA_PACKAGES,nvidia-settings nvidia-xconfig)
|
||||
@$(call set,NVIDIA_PACKAGES,nvidia-settings)
|
||||
|
||||
use/x11/nvidia/optimus:: use/drm/nvidia/optimus
|
||||
@$(call add,NVIDIA_PACKAGES,bumblebee)
|
||||
@ -207,7 +207,7 @@ use/x11/leechcraft: use/x11
|
||||
@$(call add,THE_PACKAGES,leechcraft)
|
||||
|
||||
use/x11/kde: use/x11/xorg +pipewire
|
||||
ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
|
||||
ifeq (,$(filter-out sisyphus,$(BRANCH)))
|
||||
@$(call add,THE_PACKAGES,kde)
|
||||
@$(call add,THE_PACKAGES,kde-volume-control-7-pipewire)
|
||||
@$(call add,PINNED_PACKAGES,kde-volume-control-7-pipewire)
|
||||
|
||||
@ -23,7 +23,7 @@ endif
|
||||
|
||||
# NB: the last flavour in KFLAVOURS gets to be the default one;
|
||||
# the kernel packages regexp evaluation has to take place at build stage
|
||||
distro/.base: distro/.boot use/kernel
|
||||
distro/.base: distro/.boot use/kernel use/branding/notes
|
||||
@$(call try,META_SYSTEM_ID,LINUX)
|
||||
|
||||
# this one should not be fundamental as it appears (think armh)
|
||||
|
||||
@ -7,7 +7,7 @@ endif
|
||||
ifeq (ve,$(IMAGE_CLASS))
|
||||
|
||||
# no package management and networking
|
||||
ve/.bare: profile/bare
|
||||
ve/.bare: profile/bare use/branding/notes
|
||||
@$(call add,BASE_PACKAGES,basesystem)
|
||||
|
||||
# add package management
|
||||
|
||||
@ -6,7 +6,7 @@ endif
|
||||
|
||||
ifeq (vm,$(IMAGE_CLASS))
|
||||
|
||||
vm/.bare: profile/bare
|
||||
vm/.bare: profile/bare use/branding/notes
|
||||
@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
|
||||
|
||||
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Office packages
|
||||
X-Alterator-PackageList=centaurus/gnome-office
|
||||
X-Alterator-PackageList=centaurus/libreoffice
|
||||
X-Alterator-Parent=centaurus/80-desktop
|
||||
X-Alterator-Required=no
|
||||
Name[ru_RU]=Офисный пакет
|
||||
|
||||
12
pkg.in/groups/kworkstation/add-adm.directory
Normal file
12
pkg.in/groups/kworkstation/add-adm.directory
Normal file
@ -0,0 +1,12 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
X-Alterator-PackageList=kworkstation/add-adm
|
||||
X-Alterator-Required=no
|
||||
X-Alterator-Parent=kworkstation/z02-add-additional
|
||||
Categories=KDE;GNOME;XFCE
|
||||
|
||||
Name=Administration tools
|
||||
Name[ru_RU]=Инструменты администрирования
|
||||
Comment=Misc administration tools.
|
||||
Comment[ru_RU]=Различные инструменты администрирования.
|
||||
@ -8,4 +8,4 @@ Categories=KDE;GNOME;XFCE
|
||||
Name=WEB-terminal
|
||||
Name[ru_RU]=Веб-терминал
|
||||
Comment=WEB-browser only desktop environment.
|
||||
Comment[ru_RU]=Рабочая среда, состоящая из одного Веб-браузера.
|
||||
Comment[ru_RU]=Рабочая среда, состоящая из одного веб-браузера.
|
||||
|
||||
@ -6,6 +6,6 @@ X-Alterator-Parent=kworkstation/z01-add-clients
|
||||
Categories=KDE;GNOME;XFCE
|
||||
|
||||
Name=Active Directory
|
||||
Name[ru_RU]=Активный каталог(AD)
|
||||
Name[ru_RU]=Активный каталог (AD)
|
||||
Comment=Active Directory client.
|
||||
Comment[ru_RU]=Клиент службы каталогов Active Directory.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
Type=Directory
|
||||
Name=Plasma (recommended)
|
||||
Comment=Vital KDE Plasma workspace components and applications, without which it may be difficult to work with the system.
|
||||
X-Alterator-PackageList=kworkstation/kde5
|
||||
X-Alterator-PackageList=kworkstation/kde5;kworkstation/publishing;kworkstation/remote-desktop;kworkstation/graphics-editing;kworkstation/sound-editing;kworkstation/video-editing;
|
||||
X-Alterator-Required=yes
|
||||
Categories=KDE;
|
||||
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
# tags: gnome, office, dvd
|
||||
|
||||
dia
|
||||
LibreOffice
|
||||
LibreOffice-langpack-ru
|
||||
#libreoffice-langpack-tt
|
||||
LibreOffice-langpack-uk
|
||||
LibreOffice-gnome
|
||||
18
pkg.in/lists/centaurus/libreoffice
Normal file
18
pkg.in/lists/centaurus/libreoffice
Normal file
@ -0,0 +1,18 @@
|
||||
dia
|
||||
LibreOffice@E2K
|
||||
LibreOffice-langpack-ru@E2K
|
||||
LibreOffice-langpack-uk@E2K
|
||||
LibreOffice-gtk3@E2K
|
||||
|
||||
LibreOffice-still@!E2K
|
||||
LibreOffice-still-langpack-ru@!E2K
|
||||
LibreOffice-still-gtk3@!E2K
|
||||
LibreOffice-still-common@!E2K
|
||||
|
||||
java-17-openjdk@!E2K
|
||||
java-1.8.0-openjdk@E2K
|
||||
libreoffice-languagetool
|
||||
libcmis
|
||||
libwps
|
||||
|
||||
projectlibre
|
||||
@ -3,7 +3,6 @@ xdg-user-dirs
|
||||
|
||||
livecd-gnome-nowarn-space
|
||||
|
||||
livecd-install
|
||||
installer-feature-desktop-suspend-stage2@X86
|
||||
|
||||
synaptic
|
||||
|
||||
@ -277,7 +277,7 @@ htop
|
||||
avplay
|
||||
cabextract
|
||||
cheese
|
||||
libsqlite
|
||||
libsqlite3
|
||||
lm_sensors3-utils
|
||||
man-pages-ru
|
||||
media-player-info
|
||||
@ -289,7 +289,7 @@ system-report
|
||||
zbar
|
||||
audit
|
||||
vixie-cron
|
||||
screenfetch
|
||||
neofetch
|
||||
debhelper
|
||||
xdg-user-dirs-gtk
|
||||
libgtk2-engine-adwaita
|
||||
@ -330,3 +330,6 @@ xauthority-hostname-updater
|
||||
|
||||
# Additional repositories
|
||||
apt-conf-r7@x86_64
|
||||
|
||||
# Yandex Browser
|
||||
yandex-browser-stable@x86_64
|
||||
|
||||
2
pkg.in/lists/kworkstation/add-adm
Normal file
2
pkg.in/lists/kworkstation/add-adm
Normal file
@ -0,0 +1,2 @@
|
||||
admc
|
||||
gpui
|
||||
@ -1,3 +1,4 @@
|
||||
alterator-kiosk
|
||||
chromium-gost
|
||||
kiosk-profiles
|
||||
yandex-browser-stable
|
||||
webterminal-session
|
||||
|
||||
@ -4,6 +4,9 @@ kde5-autofs-shares
|
||||
krb5-ticket-watcher
|
||||
task-auth-ldap-sssd
|
||||
alterator-gpupdate
|
||||
gpui
|
||||
admc
|
||||
admx-basealt
|
||||
admx-firefox
|
||||
admx-chromium
|
||||
admx-yandex-browser
|
||||
admx-msi-setup
|
||||
admx-samba
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
bacula11-client
|
||||
bacula13-client
|
||||
#alterator-bacula-client
|
||||
urbackup-client
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
systemd-sysvinit
|
||||
task-auth-freeipa
|
||||
installer-feature-sudo-enable-by-default-stage3
|
||||
#installer-feature-sudo-enable-by-default-kde5su-stage3
|
||||
kde5-autofs-shares
|
||||
krb5-ticket-watcher
|
||||
task-auth-ldap-sssd
|
||||
alterator-gpupdate
|
||||
admc
|
||||
|
||||
@ -11,10 +11,10 @@ gnupg2
|
||||
# 1C
|
||||
#1c-preinstall-full@X86 # ms-fonts license
|
||||
1c-preinstall@X86
|
||||
postgresql15-1C
|
||||
postgresql15-1C-server
|
||||
postgresql15-1C-contrib
|
||||
haspd@IA32
|
||||
postgresql16-1C
|
||||
postgresql16-1C-server
|
||||
postgresql16-1C-contrib
|
||||
#haspd@IA32
|
||||
# VipNet CSP
|
||||
vipnetcsp4-preinstall
|
||||
libjcpkcs11
|
||||
@ -38,12 +38,11 @@ libp11-kit
|
||||
# misc preinstalls
|
||||
kesl10-preinstall
|
||||
# FSIN
|
||||
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
|
||||
#openvpn-gostcrypto openvpn-plugins-gostcrypto alterator-openvpn-server ### removed from repo
|
||||
#
|
||||
alterator-openvpn-server alterator-ca
|
||||
#
|
||||
@ -51,16 +50,13 @@ freeipa-server freeipa-server-dns
|
||||
#
|
||||
alt-customize-branding
|
||||
task-samba-dc bind-utils tdb-utils installer-feature-sambaDC-stage3
|
||||
admc admx-basealt admx-samba admx-chromium admx-firefox admx-msi-setup
|
||||
#
|
||||
alterator-kiosk
|
||||
alterator-kiosk kiosk-profiles
|
||||
alterator-net-domain
|
||||
#
|
||||
# KDE
|
||||
#kde5-maxi@META
|
||||
kde5-kfloppy
|
||||
#kde5-telepathy
|
||||
# MISC
|
||||
dnf
|
||||
exim
|
||||
admc
|
||||
vsftpd
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
alsa-plugins-pulse@IA32
|
||||
libtxc_dxtn@IA32
|
||||
libd3d@IA32
|
||||
steam@IA32
|
||||
gamemode
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
|
||||
pam0_kwallet5
|
||||
pam_fprintd
|
||||
fprintd
|
||||
|
||||
catdoc
|
||||
gdb
|
||||
systemd-coredump
|
||||
fuse-cryfs
|
||||
libnss-mdns
|
||||
nvidia-modprobe
|
||||
nvidia-smi
|
||||
plasma5-libkscreen-utils
|
||||
|
||||
nvidia-modprobe
|
||||
nvidia-smi
|
||||
libnvidia-encode
|
||||
libcuda
|
||||
libnvoptix
|
||||
@ -35,6 +38,7 @@ synaptic-kde@META
|
||||
plasma5-discover-fwupd
|
||||
plasma5-discover-kns
|
||||
openssl-gost-engine
|
||||
gostsum
|
||||
kde5-kreslimit
|
||||
kde5-file-actions-gost
|
||||
|
||||
@ -58,7 +62,10 @@ kde5-k3b
|
||||
#kmymoney
|
||||
#kmymoney-i18n
|
||||
#kde5-plasma-yawp
|
||||
# kde5-konsole to override xterm as /usr/bin/xvt
|
||||
kde5-konsole
|
||||
alt-app-starter
|
||||
kde5-plasma-addon-alt-weather
|
||||
|
||||
qstardict
|
||||
stardict-mueller7
|
||||
@ -83,6 +90,7 @@ LibreOffice-plugin-altcsp
|
||||
document-templates-odf
|
||||
|
||||
kamoso
|
||||
kde5-kcm-wacomtablet
|
||||
|
||||
kde5-ktorrent
|
||||
#eiskaltdcpp-qt
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
|
||||
firsttime-lightdm-kde
|
||||
|
||||
sysctl-conf-userns
|
||||
firmware-alsa-sof
|
||||
firmware-wireless-regdb
|
||||
@ -10,6 +12,7 @@ pavucontrol
|
||||
plasma5-discover-packagekit@META
|
||||
|
||||
alt-kworkstation-addon
|
||||
alterator-audit
|
||||
alterator-roles-common
|
||||
alterator-standalone
|
||||
alterator-auth
|
||||
@ -28,7 +31,8 @@ alterator-net-routing
|
||||
alterator-net-shares
|
||||
alterator-notes
|
||||
alterator-osec
|
||||
alterator-ports-access
|
||||
alterator-usbguard
|
||||
alterator-usbmount
|
||||
alterator-quota
|
||||
alterator-secsetup
|
||||
alterator-services
|
||||
@ -48,7 +52,6 @@ apt-rsync
|
||||
apt-repo
|
||||
apt-scripts
|
||||
arj
|
||||
audit
|
||||
avahi-daemon
|
||||
bash-completion
|
||||
bc
|
||||
@ -89,16 +92,14 @@ pciutils
|
||||
pcmciautils
|
||||
pinfo
|
||||
pm-utils
|
||||
polkit-rule-admin-root
|
||||
#polkit-rule-admin-root
|
||||
power-profiles-daemon
|
||||
pulseaudio-bluez
|
||||
quota
|
||||
rpminstall
|
||||
rng-tools
|
||||
screen
|
||||
smartmontools
|
||||
strace
|
||||
sudo
|
||||
system-report
|
||||
systemd-analyze
|
||||
tcpdump
|
||||
@ -121,7 +122,6 @@ xinput
|
||||
xfsprogs
|
||||
xorg-conf-synaptics
|
||||
xorg-conf-libinput-touchpad
|
||||
xsetup
|
||||
|
||||
libva-driver-intel@X86
|
||||
libva-intel-media-driver@x86_64
|
||||
@ -132,12 +132,12 @@ vulkan-amdgpu@X86
|
||||
orca at-spi2-core
|
||||
|
||||
ca-certificates-digital.gov.ru
|
||||
chromium-gost
|
||||
yandex-browser-stable
|
||||
|
||||
openvpn-gostcrypto
|
||||
kde5-display-manager-lightdm
|
||||
#openvpn-gostcrypto ### removed from repo
|
||||
kde5-network-manager-etcnet
|
||||
openssh openssh-clients openssh-askpass-common openssh-server openssh-common openssh-server-control
|
||||
openssh-clients openssh-askpass-common openssh-server openssh-common openssh-server-control
|
||||
systemd-ssh-agent
|
||||
NetworkManager-ssh
|
||||
kde5-network-manager-nm
|
||||
|
||||
@ -3,7 +3,7 @@ kde5-plasma-applet-places-widget
|
||||
|
||||
altmediawriter
|
||||
kamoso
|
||||
plasma5-kinfocenter
|
||||
plasma5-kinfocenter-maxi
|
||||
plasma5-bluedevil
|
||||
plasma5-disks
|
||||
kde5-khelpcenter
|
||||
|
||||
@ -2,6 +2,7 @@ kde5-printing@META
|
||||
|
||||
cups
|
||||
cups-ppd
|
||||
gutenprint-cups-ppds
|
||||
samba-client-cups
|
||||
printer-drivers-base
|
||||
printer-drivers-X11
|
||||
|
||||
@ -10,6 +10,7 @@ hplip-sane
|
||||
libsane-gphoto2
|
||||
sane-airscan
|
||||
imagescan-sane
|
||||
ipp-usb
|
||||
iscan-free
|
||||
iscan-data
|
||||
firmware-iscan
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# core
|
||||
phosh
|
||||
phosh-tour
|
||||
phosh-gsk-renderer-gl
|
||||
phosh-gsk-renderer-gl@!X86
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-wlr
|
||||
xorg-xwayland
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
sudo
|
||||
su
|
||||
passwd
|
||||
rsyslog-classic
|
||||
|
||||
@ -30,5 +30,4 @@ vim-console
|
||||
screen
|
||||
rsync
|
||||
|
||||
sudo
|
||||
su
|
||||
|
||||
@ -4,5 +4,4 @@ xinitrc
|
||||
livecd-setlocale
|
||||
livecd-timezone
|
||||
os-prober
|
||||
sudo
|
||||
su
|
||||
|
||||
Loading…
Reference in New Issue
Block a user