diff --git a/conf.d/kworkstation.mk b/conf.d/kworkstation.mk index 7d3f1917..a321895f 100644 --- a/conf.d/kworkstation.mk +++ b/conf.d/kworkstation.mk @@ -19,7 +19,7 @@ mixin/kworkstation-common-deps: \ use/l10n/default/ru_RU \ use/control use/services \ use/x11/intel use/x11/radeon use/x11/amdgpu use/x11/nvidia \ - use/x11/sddm use/x11/wacom \ + use/x11/kde5-display-manager-lightdm use/x11/wacom \ use/memtest \ use/init/systemd \ use/cleanup/live-no-cleanupdb \ @@ -95,9 +95,13 @@ endif @$(call add,SERVICES_DISABLE,openl2tp) @$(call add,SERVICES_DISABLE,slapd) @$(call add,SERVICES_ENABLE,snapd.socket) + @$(call add,SERVICES_ENABLE,power-profiles-daemon.service) @$(call add,CLEANUP_BASE_PACKAGES,'libwbclient-sssd') @$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*') @$(call add,CLEANUP_PACKAGES,'xterm') + @$(call add,CLEANUP_LIVE_PACKAGES,'xterm') + @$(call add,CLEANUP_PACKAGES,'udev-rule-generator-net') + @$(call add,CLEANUP_LIVE_PACKAGES,'livecd-main-repo') @$(call set,META_VOL_SET,ALT) @$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_VOL_ID,ALT Workstation K $(DISTRO_VERSION)$(STATUS)) @@ -117,6 +121,7 @@ mixin/kworkstation-install-opts: @$(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) @@ -136,6 +141,7 @@ mixin/kworkstation-install-opts: @$(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) diff --git a/conf.d/mixin-alt-server.mk b/conf.d/mixin-alt-server.mk index f90dd8af..e68ad8b0 100644 --- a/conf.d/mixin-alt-server.mk +++ b/conf.d/mixin-alt-server.mk @@ -13,6 +13,7 @@ mixin/alt-server: server_main_kmodules = bcmwl ch34x dm-secdel drbd9 drm-ancient virtualbox-addition-video virtualbox xtables-addons mixin/alt-server: +installer +systemd \ + use/ntp/chrony \ use/branding/notes \ use/control use/services \ use/install2/stage3 \ diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index f9270c75..ea421172 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -89,10 +89,13 @@ mixin/regular-gnustep: use/x11/gnustep use/mediacheck mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm \ use/fonts/ttf/google use/im @$(call add,THE_PACKAGES,xdg-user-dirs-gtk) + @$(call add,THE_PACKAGES,gnome-disk-utility gnome-system-monitor) mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @: mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm + @$(call add,THE_PACKAGES,gnome-terminal) + @$(call add,PINNED_PACKAGES,gnome-terminal:Required) @$(call add,THE_PACKAGES,templates) @$(call add,THE_PACKAGES,chrome-gnome-shell) @$(call add,THE_PACKAGES,qt5-wayland qt6-wayland) diff --git a/conf.d/phone.mk b/conf.d/phone.mk index a15213af..acdf7314 100644 --- a/conf.d/phone.mk +++ b/conf.d/phone.mk @@ -26,7 +26,7 @@ mixin/phosh: use/services +pulse +nm +nm-native ifeq (vm,$(IMAGE_CLASS)) vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \ - mixin/waydroid + mixin/waydroid use/fonts/ttf/google @$(call add,THE_LISTS,mobile/apps) vm/phosh: vm/.phosh use/tty/S0 use/uboot use/phone +efi \ diff --git a/conf.d/regular-vm.mk b/conf.d/regular-vm.mk index 7ea1c1dc..f6dcfdb3 100644 --- a/conf.d/regular-vm.mk +++ b/conf.d/regular-vm.mk @@ -15,8 +15,12 @@ mixin/vm-archdep:: use/auto-resize; @: ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) mixin/vm-archdep:: +efi +ifeq (,$(filter-out p10,$(BRANCH))) + @$(call set,KFLAVOURS,un-def) +else @$(call set,KFLAVOURS,std-def un-def) endif +endif ifeq (,$(filter-out armh,$(ARCH))) mixin/vm-archdep:: diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 3d2352cd..c1c32b5f 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -15,6 +15,11 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \ # base target (for most images) distro/.regular-base: distro/.regular-bare use/vmguest use/memtest \ use/efi/shell use/efi/dtb +efi; @: +ifeq (,$(filter-out p10,$(BRANCH))) +ifeq (,$(filter-out x86_64 aarch64,$(ARCH))) + @$(call set,KFLAVOURS,un-def) +endif +endif # graphical target (not enforcing xorg drivers or blobs) distro/.regular-x11: distro/.regular-base mixin/regular-x11 \ @@ -167,7 +172,8 @@ endif distro/regular-xfce-install: distro/.regular-install-x11-systemd \ mixin/regular-xfce; @: -distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @: +distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv + @$(call set,KFLAVOURS,std-def) ifeq (,$(filter-out i586 x86_64,$(ARCH))) @$(call set,BOOTLOADER,isolinux) endif diff --git a/features.in/alternatives/config.mk b/features.in/alternatives/config.mk index e65456b7..148a3dfb 100644 --- a/features.in/alternatives/config.mk +++ b/features.in/alternatives/config.mk @@ -4,3 +4,6 @@ use/alternatives: use/alternatives/xvt/%: use/alternatives @$(call add,ALTERNATIVES,/usr/bin/xvt:/usr/bin/$*) + +use/alternatives/x-terminal-emulator/%: use/alternatives + @$(call add,ALTERNATIVES,/usr/bin/x-terminal-emulator:/usr/bin/$*) diff --git a/features.in/e2k/config.mk b/features.in/e2k/config.mk index beb6181c..af1ea687 100644 --- a/features.in/e2k/config.mk +++ b/features.in/e2k/config.mk @@ -8,6 +8,7 @@ use/e2k: use/tty/S0 use/l10n/default/ru_RU @$(call add,STAGE2_PACKAGES,agetty) @$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2) + @$(call add,INSTALL2_PACKAGES,installer-feature-e2k-sensors-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2) @$(call add,INSTALL2_PACKAGES,blacklist-ide) # avoid overwriting hda @$(call add,INSTALL2_PACKAGES,ifplugd) # for net-eth link status diff --git a/features.in/efi/config.mk b/features.in/efi/config.mk index 3cc7674b..67301c14 100644 --- a/features.in/efi/config.mk +++ b/features.in/efi/config.mk @@ -35,7 +35,7 @@ use/efi/signed: use/efi @$(call add,COMMON_PACKAGES,shim-signed) @$(call add,COMMON_PACKAGES,mokutil pesign) @$(call add,RESCUE_PACKAGES,openssl) -ifeq (,$(filter-out p10 c10f1,$(BRANCH))) +ifeq (,$(filter-out p10 c10f%,$(BRANCH))) @$(call add,STAGE1_PACKAGES,shim-signed-installer-kludge grub-efi alt-uefi-certs dosfstools mtools) endif diff --git a/features.in/server/config.mk b/features.in/server/config.mk index 7d4bbae1..1ddf21f4 100644 --- a/features.in/server/config.mk +++ b/features.in/server/config.mk @@ -51,7 +51,6 @@ use/server/groups/services: use/server @$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail) @$(call add,MAIN_GROUPS,server/apache2 server/nginx) @$(call add,MAIN_GROUPS,server/mariadb server/pgsql) - @$(call add,MAIN_GROUPS,server/php8.0) @$(call add,MAIN_GROUPS,server/php8.1) @$(call add,MAIN_GROUPS,server/ftp server/rsync) @$(call add,MAIN_GROUPS,server/kvm) diff --git a/pkg.in/groups/centaurus/mate.directory b/pkg.in/groups/centaurus/mate.directory index 1d23db75..a9973a0d 100644 --- a/pkg.in/groups/centaurus/mate.directory +++ b/pkg.in/groups/centaurus/mate.directory @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=GNOME desktop enviroment +Name=MATE desktop enviroment X-Alterator-PackageList=centaurus/mate X-Alterator-Parent=centaurus/80-desktop X-Alterator-Depends=systemd centaurus/xorg diff --git a/pkg.in/groups/kworkstation/z02-add-additional.directory b/pkg.in/groups/kworkstation/z02-add-additional.directory index 2766553f..e4e7c764 100644 --- a/pkg.in/groups/kworkstation/z02-add-additional.directory +++ b/pkg.in/groups/kworkstation/z02-add-additional.directory @@ -6,5 +6,5 @@ Categories=KDE; Name=Additional (attention) Name[ru_RU]=Дополнительно (внимание) -Comment=Additional options for special use. -Comment[ru_RU]=Дополнительные опции для специального использования. +Comment=Attention! Additional options for special use. +Comment[ru_RU]=Внимание! Дополнительные опции для специального использования. diff --git a/pkg.in/groups/server/php8.0.directory b/pkg.in/groups/server/php8.0.directory deleted file mode 100644 index a3bdcf05..00000000 --- a/pkg.in/groups/server/php8.0.directory +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Directory -Name=PHP 8.0 support -X-Alterator-PackageList=server/php8.0 -X-Alterator-Required=no -Name[ru_RU]=Поддержка PHP 8.0 -Categories=Server;Networking diff --git a/pkg.in/lists/centaurus/base-server b/pkg.in/lists/centaurus/base-server index 1dc54c22..56c0086f 100644 --- a/pkg.in/lists/centaurus/base-server +++ b/pkg.in/lists/centaurus/base-server @@ -70,7 +70,6 @@ openssh-server openssh-blacklist postfix postfix-tls -openntpd irqbalance cgroup diff --git a/pkg.in/lists/centaurus/emulators b/pkg.in/lists/centaurus/emulators index 6d103b14..08ab2c97 100644 --- a/pkg.in/lists/centaurus/emulators +++ b/pkg.in/lists/centaurus/emulators @@ -3,7 +3,8 @@ firefox-esr@!aarch64 firefox-esr-ru@!aarch64 wine@X86 -wine-mono@X86 +#wine-mono@X86 +wine-mono-8.0.0@X86 wine-gecko@X86 i586-wine@x86_64 diff --git a/pkg.in/lists/centaurus/freeipa-client b/pkg.in/lists/centaurus/freeipa-client index 227e5356..21d1e409 100644 --- a/pkg.in/lists/centaurus/freeipa-client +++ b/pkg.in/lists/centaurus/freeipa-client @@ -1,4 +1,3 @@ -openntpd task-auth-freeipa freeipa-client certmonger diff --git a/pkg.in/lists/centaurus/freeipa-server b/pkg.in/lists/centaurus/freeipa-server index 1c52cc9f..fe1078ea 100644 --- a/pkg.in/lists/centaurus/freeipa-server +++ b/pkg.in/lists/centaurus/freeipa-server @@ -1,5 +1,4 @@ freeipa-server-trust-ad freeipa-server-dns -openntpd freeipa-client libsss_sudo diff --git a/pkg.in/lists/kworkstation/add-webterminal b/pkg.in/lists/kworkstation/add-webterminal index 30cb8bd2..4c260e39 100644 --- a/pkg.in/lists/kworkstation/add-webterminal +++ b/pkg.in/lists/kworkstation/add-webterminal @@ -1,4 +1,3 @@ alterator-kiosk chromium-gost webterminal-session -sddm-theme-breeze diff --git a/pkg.in/lists/kworkstation/disk-install b/pkg.in/lists/kworkstation/disk-install index 732f9ef6..a009b4ae 100644 --- a/pkg.in/lists/kworkstation/disk-install +++ b/pkg.in/lists/kworkstation/disk-install @@ -78,3 +78,5 @@ x2goclient x2goserver x2goserver-printing cups-x2go x2gobroker x2gobroker-ssh x2gobroker-daemon x2gobroker-authservice openuds-client openuds-actor +usbip usbip-server +yandex-browser-stable diff --git a/pkg.in/lists/kworkstation/kde5 b/pkg.in/lists/kworkstation/kde5 index c8c8be86..3a9f3760 100644 --- a/pkg.in/lists/kworkstation/kde5 +++ b/pkg.in/lists/kworkstation/kde5 @@ -91,7 +91,6 @@ kde5-ktorrent #eiskaltdcpp-qt #kde5-kio-gdrive -plasma5-welcome plasma5-desktop-maxi plasma5-kinfocenter-maxi kde5@META diff --git a/pkg.in/lists/kworkstation/kde5-base b/pkg.in/lists/kworkstation/kde5-base index 239f2efd..43a92104 100644 --- a/pkg.in/lists/kworkstation/kde5-base +++ b/pkg.in/lists/kworkstation/kde5-base @@ -90,6 +90,7 @@ pcmciautils pinfo pm-utils polkit-rule-admin-root +power-profiles-daemon pulseaudio-bluez quota rpminstall @@ -120,6 +121,7 @@ xinput xfsprogs xorg-conf-synaptics xorg-conf-libinput-touchpad +xsetup libva-driver-intel@X86 libva-intel-media-driver@x86_64 diff --git a/pkg.in/lists/mobile/phosh b/pkg.in/lists/mobile/phosh index f17da4b4..2115ebfa 100644 --- a/pkg.in/lists/mobile/phosh +++ b/pkg.in/lists/mobile/phosh @@ -5,6 +5,8 @@ xdg-desktop-portal-gnome xorg-xwayland qt5-wayland qt6-wayland +qt6-svg +qt6-imageformats bluez # base applications diff --git a/pkg.in/lists/server/php8.0 b/pkg.in/lists/server/php8.0 deleted file mode 100644 index f48669bf..00000000 --- a/pkg.in/lists/server/php8.0 +++ /dev/null @@ -1,25 +0,0 @@ -apache2-mod_php8.0 -php8.0 -php8.0-curl -php8.0-dba -php8.0-dom -php8.0-exif -php8.0-fileinfo -php8.0-fpm-fcgi -php8.0-gd2 -php8.0-imap -php8.0-ldap -php8.0-mbstring -php8.0-mcrypt -php8.0-memcached -php8.0-mysqlnd -php8.0-mysqlnd-mysqli -php8.0-pdo -php8.0-pdo_mysql -php8.0-pdo_odbc -php8.0-pdo_pgsql -php8.0-pdo_sqlite -php8.0-pgsql -php8.0-xmlrpc -php8.0-xsl -php8.0-zip diff --git a/pkg.in/lists/xfce-sysv b/pkg.in/lists/xfce-sysv index e4fc193a..c9336315 100644 --- a/pkg.in/lists/xfce-sysv +++ b/pkg.in/lists/xfce-sysv @@ -29,3 +29,6 @@ firmware-alsa-sof edid-decode mediainfo mpv +xinput +trafshow +7-zip