Merge tag 'v1.5.15' into sisyphus

conf.d/alt-server.mk

@@ -6,13 +6,13 @@ distro/alt-server: server_groups_primary = $(addprefix centaurus/,\
 
 ifeq (,$(filter-out x86_64 ppc64le aarch64,$(ARCH)))
 distro/alt-server: server_groups_virtipa = $(addprefix centaurus/,\
-	v12n-server freeipa-server)
+	freeipa-server)
 endif
 endif
 
 ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 e2k%,$(ARCH)))
 distro/alt-server: server_groups_desktop = $(addprefix centaurus/,\
-        80-desktop emulators freenx-server mate office pidgin vlc xorg scanning)
+        80-desktop emulators freenx-server mate office pidgin vlc xorg scanning samba)
 endif
 
 ifeq (,$(filter-out x86_64,$(ARCH)))

conf.d/mixin-alt-server.mk

@@ -77,6 +77,20 @@ endif
 	@$(call add,COMMON_PACKAGES,vim-console)
 	@$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind)
 	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,systemd-networkd.service)
+	@$(call add,SYSTEMD_SERVICES_MASK,suspend.target hibernate.target)
+	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord ahttpd libvirtd qemu-kvm)
+	@$(call add,DEFAULT_SERVICES_ENABLE,virtualbox openntpd bacula-fd daytime-tcp)
+	@$(call add,DEFAULT_SERVICES_DISABLE,vz slapd smb httpd2 squid)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,lightdm.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,cups.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,avahi-daemon.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,NetworkManager.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,ModemManager.service postfix.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,sshd.service ahttpd.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,alteratord.service xinetd.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,nfs-server.service bind.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,cpufreq-simple.service)
+	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,getty@tty1.service)
 	@$(call set,META_VOL_ID,ALT Server 10.2 $(ARCH))
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_VOL_SET,ALT)

conf.d/mixin.mk

@@ -37,6 +37,39 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 	@$(call add,THE_PACKAGES,ethtool net-tools ifplugd)
 	@$(call add,THE_PACKAGES,zsh bash-completion)
 
+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::
+	@$(call set,KFLAVOURS,un-def mp)
+endif
+
+
+ifeq (,$(filter-out armh aarch64,$(ARCH)))
+mixin/vm-archdep:: use/bootloader/uboot use/no-sleep use/arm-rpi4; @:
+endif
+
+ifeq (,$(filter-out mipsel,$(ARCH)))
+mixin/vm-archdep:: use/tty/S0
+	@$(call set,KFLAVOURS,un-malta)
+endif
+
+ifeq (,$(filter-out riscv64,$(ARCH)))
+mixin/vm-archdep:: use/bootloader/uboot
+	@$(call set,KFLAVOURS,un-def)
+endif
+
+mixin/vm-archdep-x11: mixin/vm-archdep use/vmguest/kvm/x11; @:
+
 ### regular.mk
 mixin/regular-x11: use/browser/firefox \
 	use/branding use/ntp/chrony use/services/lvm2-disable
@@ -55,7 +88,9 @@ mixin/regular-desktop: +alsa +nm-native \
 	use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes
 	@$(call set,LOCALES,en_US ru_RU pt_BR)
 	@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools)
+ifeq (p10,$(BRANCH))
 	@$(call add,THE_PACKAGES,polkit-rule-admin-root)
+endif
 	@$(call add,THE_BRANDING,alterator graphics indexhtml)
 ifneq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,THE_BRANDING,notes)
@@ -85,14 +120,14 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
 mixin/regular-gnustep: use/x11/gnustep use/mediacheck
 	@$(call add,THE_BRANDING,graphics)
 
-mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm \
+mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \
 	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
+mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm-gtk4
 	@$(call add,THE_PACKAGES,power-profiles-daemon)
 	@$(call add,THE_PACKAGES,gnome-terminal)
 	@$(call add,THE_PACKAGES,gnome-software)
@@ -125,10 +160,6 @@ mixin/regular-xfce: mixin/xfce-base use/domain-client +pipewire
 	@$(call add,THE_PACKAGES,pavucontrol xscreensaver-frontend)
 	@$(call add,THE_PACKAGES,xfce4-pulseaudio-plugin xfce-polkit)
 
-mixin/regular-xfce-sysv: mixin/xfce-base +net-eth \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_LISTS,xfce-sysv)
-
 mixin/regular-lxde: use/x11/lxde use/im +nm-gtk
 	@$(call add,THE_PACKAGES,qasmixer qpdfview)
 

conf.d/phone.mk

@@ -20,7 +20,7 @@ mixin/phone-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \
 	@$(call add,CONTROL,fusermount:public)
 	@$(call add,CONTROL,libnss-role:disabled)
 
-mixin/phosh: use/services +nm +nm-native
+mixin/phosh: use/services +nm-gtk4 +nm-native
 	@$(call add,THE_LISTS,mobile/phosh)
 	@$(call add,DEFAULT_SERVICES_ENABLE,phosh)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@@ -43,7 +43,7 @@ endif
 ifeq (aarch64,$(ARCH))
 # TODO: devicetree ($root)/boot/dtb/rockchip/rk3399-pinephone-pro.dtb
 mixin/pinephone: use/firmware use/bootloader/uboot use/tty/S2 \
-	 use/phone/ttyescape +pulse
+	 use/phone/ttyescape +pipewire
 	@$(call set,EFI_BOOTLOADER,)
 	@$(call set,UBOOT_TIMEOUT,5)
 	@$(call set,KFLAVOURS,pine)

conf.d/realtime.mk

@@ -8,9 +8,7 @@ mixin/cnc-rt: use/l10n +nm-gtk +systemd +systemd-optimal \
 	@$(call add,THE_PACKAGES,gcc-c++ liblinuxcnc-devel)
 
 ifeq (distro,$(IMAGE_CLASS))
-distro/regular-cnc-rt: distro/.regular-x11 mixin/cnc-rt \
-	use/live-install
-	@$(call set,INSTALLER,alt-workstation)
+distro/regular-cnc-rt: distro/.regular-wm mixin/cnc-rt; @:
 endif
 
 ifeq (vm,$(IMAGE_CLASS))

conf.d/regular-vm.mk

@@ -11,39 +11,6 @@ vm/regular-systemd: vm/systemd-net use/vmguest/kvm use/tty/S0 \
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
 #endif
 
-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::
-	@$(call set,KFLAVOURS,un-def mp)
-endif
-
-
-ifeq (,$(filter-out armh aarch64,$(ARCH)))
-mixin/vm-archdep:: use/bootloader/uboot use/no-sleep use/arm-rpi4; @:
-endif
-
-ifeq (,$(filter-out mipsel,$(ARCH)))
-mixin/vm-archdep:: use/tty/S0
-	@$(call set,KFLAVOURS,un-malta)
-endif
-
-ifeq (,$(filter-out riscv64,$(ARCH)))
-mixin/vm-archdep:: use/bootloader/uboot
-	@$(call set,KFLAVOURS,un-def)
-endif
-
-mixin/vm-archdep-x11: mixin/vm-archdep use/vmguest/kvm/x11; @:
-
 mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
 	use/services/lvm2-disable use/wireless
 ifneq (,$(filter-out i586 x86_64,$(ARCH)))

conf.d/regular.mk

@@ -46,7 +46,7 @@ endif
 
 # WM base target
 distro/.regular-wm: distro/.regular-x11 \
-	mixin/regular-desktop \
+	mixin/regular-desktop use/vmguest/dri \
 	use/live/rw +live-installer
 	@$(call set,GRUB_DEFAULT,live)
 	@$(call set,SYSLINUX_DEFAULT,live)
@@ -93,7 +93,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 	use/syslinux/lateboot.cfg use/cleanup/jeos
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
 
-distro/.regular-jeos-full: distro/.regular-jeos use/install2/vmguest \
+distro/.regular-jeos-full: distro/.regular-jeos \
 	use/volumes/regular use/ntp/chrony use/bootloader/grub \
 	use/grub/localboot_bios.cfg use/kernel/latest +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
@@ -108,6 +108,7 @@ else
 	@$(call add,CLEANUP_PACKAGES,bridge-utils)
 endif
 	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
+	@$(call add,INSTALL2_PACKAGES,xorg-dri-vmwgfx xorg-dri-virtio)
 
 # NB:
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
@@ -115,7 +116,7 @@ distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
 	+sysvinit +power
 	@$(call add,BASE_PACKAGES,apt-conf-ignore-systemd)
 
-distro/regular-jeos-systemd: distro/.regular-jeos-full \
+distro/regular-jeos-systemd: distro/.regular-jeos-full use/install2/vmguest \
 	+systemd +systemd-optimal
 	@$(call add,BASE_PACKAGES,glibc-locales)
 
@@ -123,18 +124,15 @@ distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
 	use/install2/suspend mixin/regular-desktop mixin/regular-x11 \
 	use/branding/complete use/branding/slideshow/once
 
-# assumes somewhat more experienced user
-distro/.regular-install-x11-full: distro/.regular-install-x11 \
-	use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
-	mixin/desktop-installer use/install2/fs use/efi/shell use/rescue/base
-	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
-	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
-
 distro/.regular-install-x11-systemd: distro/.regular-install-x11 \
 	use/x11/lightdm/gtk +systemd +systemd-optimal
 	@$(call add,THE_PACKAGES,bluez)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 
+distro/regular-icewm: distro/.regular-gtk mixin/regular-icewm \
+	use/kernel/latest
+	@$(call add,THE_PACKAGES,icewm-startup-polkit-gnome)
+
 distro/regular-icewm-sysv: distro/.regular-gtk-sysv mixin/regular-icewm \
 	use/kernel/latest; @:
 
@@ -164,18 +162,9 @@ 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
-	@$(call set,KFLAVOURS,std-def)
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-	@$(call set,BOOTLOADER,isolinux)
-endif
-
 distro/regular-gnome-install: distro/.regular-install-x11-systemd mixin/regular-gnome \
 	use/kernel/latest +plymouth; @:
 
-distro/regular-xfce-sysv-install: distro/.regular-install-x11-full \
-	mixin/regular-xfce-sysv use/init/sysv/polkit use/x11/gdm2.20; @:
-
 distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
 
 distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
@@ -186,7 +175,13 @@ distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
 
 # not .regular-gtk due to gdm vs lightdm
 distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
-	use/kernel/latest +plymouth use/browser/epiphany; @:
+	use/kernel/latest +plymouth use/browser/epiphany \
+	use/live-install/vnc/listen; @:
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
+ifeq (sisyphus,$(BRANCH))
+	@$(call set,KFLAVOURS,std-def un-def)
+endif
+endif
 
 distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth; @:
 
@@ -200,7 +195,7 @@ distro/regular-rescue: distro/.regular-base mixin/regular-rescue use/rescue/rw \
 	use/grub/rescue_fm.cfg use/grub/rescue_remote.cfg \
 	use/mediacheck use/stage2/kms use/kernel/latest +wireless
 	@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
-	@$(call add,RESCUE_LISTS,$(call tags,base bench))
+#	@$(call add,RESCUE_LISTS,$(call tags,base bench))
 	@$(call add,RESCUE_LISTS,$(call tags,network security))
 
 distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue

doc/mkimage-profiles.asciidoc

@@ -78,6 +78,8 @@ include::../features.in/cleanup/README[]
 
 include::../features.in/control/README[]
 
+include::../features.in/datetime/README[]
+
 include::../features.in/deflogin/README[]
 
 include::../features.in/dev/README[]

features.in/datetime/README

+=== features.in/datetime ===
+
+Данная фича предназначена для настройки даты, времени, часовых поясов и т.д.
+
+Пока доступна только переменная TIME_UTC для выбора между местным временем и
+UTC. Задайте TIME_UTC=0, чтобы переключиться на местное время.

features.in/datetime/config.mk

+use/datetime:
+	@$(call add_feature)
+	@$(call try,TIME_UTC,1)
+	@$(call xport,TIME_UTC)

features.in/datetime/rootfs/image-scripts.d/05-datetime

+#!/bin/sh -efux
+
+adjtime_file=/etc/adjtime
+sysconfigclock_file=/etc/sysconfig/clock
+
+TIME_UTC="${GLOBAL_TIME_UTC:-}"
+[ "$TIME_UTC" = 0 ] || TIME_UTC=1
+
+if [ -s "$sysconfigclock_file" ]; then
+    if [ "$TIME_UTC" = 1 ]; then
+        sed -i 's/^UTC=.*/UTC=true/' "$sysconfigclock_file"
+    else
+        sed -i 's/^UTC=.*/UTC=false/' "$sysconfigclock_file"
+    fi
+fi
+
+if [ "$TIME_UTC" = 1 ]; then
+    ADJTIME=UTC
+else
+    ADJTIME=LOCAL
+fi
+
+cat > "$adjtime_file" <<EOF
+0.0 0 0
+0
+$ADJTIME
+EOF

features.in/dev/README

@@ -5,7 +5,7 @@
 
 Реализованы поддержка LiveCD, VM, VE и добавление группы в инсталятор.
 
-Обратите внимание: эта фича достаточно серьёзно изменяет поведение
+Обратите внимание: use/dev/repo достаточно серьёзно изменяет поведение
 субпрофиля main, оставляя из всего обычного множества обрабатываемых
 переменных только MAIN_PACKAGES, MAIN_PACKAGES_REGEXP и MAIN_LISTS
 во избежание дублирования не требующихся для сборки минимальных

features.in/dev/config.mk

@@ -8,6 +8,7 @@ use/dev: use/control
 use/dev/repo: use/repo/main
 	@$(call add,THE_PACKAGES,apt-repo)
 	@$(call add,MAIN_LISTS,$(call tags,main builder))
+	@$(call try,DEV_REPO,1)
 
 use/dev/mkimage: use/dev
 	@$(call add,THE_PACKAGES,mkimage shadow-change su)
@@ -44,3 +45,4 @@ endif
 
 use/dev/groups/builder: use/dev/repo
 	@$(call add,MAIN_GROUPS,dev/builder)
+	@$(call set,DEV_REPO,)

features.in/dev/main/lib/50-override.mk

+ifneq ($(DEV_REPO),)
 # only MAIN_* should go in this time
-
 IMAGE_PACKAGES_REGEXP = $(MAIN_PACKAGES_REGEXP)
 IMAGE_PACKAGES = $(MAIN_PACKAGES) $(call map,list,$(MAIN_LISTS))
+endif

features.in/e2k/image-scripts.d/40-e2k-boot-conf

 #!/bin/sh -efu
 
-# NB: don't stick BOOTFS here, it has slightly different semantics
-# 4.9.76-elbrus-def-alt1.11.1 -> def
+# 5.10.194-elbrus-def-alt1.12.2 -> def
 get_label() { echo "${1# *}" | sed -r 's,.*elbrus-([0-9a-z]+)-.*$,\1,'; }
 
 KVERSIONS="$(rpm -qa 'kernel-image*' \
@@ -16,14 +15,11 @@ KVERSIONS="$(rpm -qa 'kernel-image*' \
 
 cd /boot
 
-#rm -f .origver
-
 echo "** KVERSIONS=[$KVERSIONS]" >&2
 if [ "`echo $KVERSIONS | wc -w`" = 1 ]; then # 2+ labels
 	echo -e "default=`get_label $KVERSIONS`\n" >> boot.conf
 fi
 
-# FIXME: relies on particular (current) kernel package naming scheme
 for v in $KVERSIONS; do
 	l="`get_label "$v"`"
 	cat >> boot.conf <<EOF
@@ -31,7 +27,7 @@ label=$l
 	partition=0
 	image=/image-$v
 	initrd=/initrd-$v.img
-	cmdline=console=tty0 consoleblank=0 hardreset LABEL=ROOT
+	cmdline=console=tty0 consoleblank=0 hardreset root=LABEL=ROOT
 
 EOF
 done

features.in/firmware/config.mk

@@ -34,7 +34,6 @@ use/firmware/wireless: use/firmware
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
-	@$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
 
 use/firmware/laptop: use/firmware/cpu; @:
 ifeq (,$(filter-out x86_64,$(ARCH)))

features.in/grub/cfg.in/20install2.cfg

 
 menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-connect.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-listen.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/live-install/stage1/scripts.d/05-live-install-no-hardlinks

+#!/bin/sh -efu
+
+[ -n "${GLOBAL_LIVE_INSTALL:-}" ] || exit 0
+[ -s /.image/squashcfg.mk ] || exit 1
+
+sed -i 's/PACK_SQUASHFS_OPTS=/PACK_SQUASHFS_OPTS=-no-hardlinks /' /.image/squashcfg.mk

features.in/net/config.mk

@@ -19,7 +19,7 @@ use/net/dhcp: use/net
 # base service, no GUI; see x11 feature for those
 use/net/nm: use/net
 	@$(call set,THE_NET_SUBSYS,NetworkManager)
-	@$(call add,THE_LISTS,$(call tags,base nm))  # NB: won't get overridden
+	@$(call add,THE_LISTS,network/NetworkManager)  # NB: won't get overridden
 	@$(call add,LIVE_PACKAGES,livecd-save-nfs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM?
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)

features.in/stage2/stage1/modules.d/50-stage2-sbc-aarch64

@@ -10,3 +10,5 @@ kernel/drivers/usb/dwc3
 kernel/drivers/usb/phy
 kernel/drivers/usb/host
 kernel/drivers/usb/musb
+kernel/drivers/mfd/rk8xx-spi.ko
+kernel/drivers/mfd/rk8xx-i2c.ko

features.in/stage2/stage1/scripts.d/03-test-kernel

@@ -55,4 +55,4 @@ options()
 	fi
 }
 
-echo "PACK_SQUASHFS_OPTS=-no-recovery -no-hardlinks `options`" > /.image/squashcfg.mk
+echo "PACK_SQUASHFS_OPTS=-no-recovery `options`" > /.image/squashcfg.mk

features.in/syslinux/cfg.in/20install2.cfg

@@ -3,5 +3,5 @@ default linux
 label linux
   menu label ^Install @relname@
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@
+  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@ lowmem
  

features.in/vmguest/config.mk

@@ -6,8 +6,10 @@ use/vmguest:
 
 use/vmguest/bare: use/vmguest/vbox use/vmguest/kvm; @:
 use/vmguest/base: use/vmguest/bare use/vmguest/vmware; @:
-use/vmguest/complete: use/vmguest/base \
-	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @:
+use/vmguest/dri: use/vmguest/vbox/dri use/vmguest/vmware/dri \
+	use/vmguest/kvm/dri; @:
+use/vmguest/complete: use/vmguest/vbox/x11 use/vmguest/vmware/x11 \
+	use/vmguest/kvm/x11; @:
 
 ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le riscv64,$(ARCH)))
 # NB: only reasonable for X11-bearing images
@@ -15,13 +17,11 @@ ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le riscv64,$(ARCH)))
 use/vmguest/kvm: use/vmguest; @:
 	@$(call add,THE_PACKAGES,qemu-guest-agent)
 
-use/vmguest/kvm/x11: use/vmguest/kvm
-	@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl)
-ifneq (p9,$(BRANCH))
-ifneq (,$(filter-out armh,$(ARCH)))
+use/vmguest/kvm/dri: use/vmguest
 	@$(call add,THE_PACKAGES,xorg-dri-virtio)
-endif
-endif
+
+use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri
+	@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl)
 else
 use/vmguest/kvm use/vmguest/kvm/x11: ; @:
 endif
@@ -29,18 +29,22 @@ endif
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/vmguest/vbox: use/vmguest; @:
 
-use/vmguest/vbox/x11: use/vmguest/vbox
+use/vmguest/vbox/dri: use/vmguest
 	@$(call add,THE_KMODULES,drm)
+	@$(call add,THE_PACKAGES,xorg-dri-vmwgfx)
+
+use/vmguest/vbox/x11: use/vmguest/vbox use/vmguest/vbox/dri
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
 
 # see also use/install2/vmware
-use/vmguest/vmware:
-	@$(call add,THE_KMODULES,vmware)
-	@$(call add,THE_KMODULES,scsi)	# mptspi.ko
+use/vmguest/vmware: use/vmguest
 	@$(call add,THE_PACKAGES,open-vm-tools)
 
-use/vmguest/vmware/x11: use/vmguest/vmware
-	@$(call add,THE_PACKAGES,xorg-dri-vmwgfx xorg-drv-vmware xorg-drv-vmmouse)
+use/vmguest/vmware/dri: use/vmguest
+	@$(call add,THE_PACKAGES,xorg-dri-vmwgfx)
+
+use/vmguest/vmware/x11: use/vmguest/vmware use/vmguest/vmware/dri
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
 	@$(call add,THE_PACKAGES,open-vm-tools-desktop)
 else
 use/vmguest/vbox use/vmguest/vbox/x11 \

features.in/x11/config.mk

@@ -2,6 +2,7 @@
 +icewm: use/x11/icewm; @:
 +xmonad: use/x11/xmonad; @:
 +nm-gtk: use/x11/gtk/nm; @:
++nm-gtk4: use/x11/gtk4/nm; @:
 +screensaver: use/x11/xscreensaver/gl; @:
 
 ## hardware support
@@ -143,7 +144,14 @@ use/x11/kde/synaptic:
 	@$(call add,THE_PACKAGES,synaptic-kde synaptic-usermode-)
 
 use/x11/gtk/nm: use/net/nm
-	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_LISTS,network/NetworkManager-gtk)
+
+ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
+use/x11/gtk4/nm: use/net/nm
+	@$(call add,THE_LISTS,network/NetworkManager-gtk4)
+else
+use/x11/gtk4/nm: use/x11/gtk/nm; @:
+endif
 
 use/x11/xfce: use/x11
 	@$(call add,THE_PACKAGES,xfce4-minimal xfce4-default)

pkg.in/groups/centaurus/vlc.directory

@@ -4,5 +4,5 @@ Type=Directory
 Name=VLC mediaplayer
 X-Alterator-PackageList=centaurus/vlc
 X-Alterator-Parent=centaurus/80-desktop
-X-Alterator-Required=yes
+X-Alterator-Required=no
 Name[ru_RU]=Медиаплеер VLC

pkg.in/groups/kworkstation/z02-add-additional.directory

@@ -6,5 +6,5 @@ Categories=KDE;
 
 Name=Additional (attention)
 Name[ru_RU]=Дополнительно (внимание)
-Comment=Attention! Additional options for special use.
-Comment[ru_RU]=Внимание! Дополнительные опции для специального использования.
+Comment=Warning! Additional options only for special use.
+Comment[ru_RU]=Осторожно! Дополнительные опции только для специального использования.

pkg.in/lists/centaurus/disk-dvd

@@ -114,6 +114,16 @@ haproxy
 keepalived
 eepm
 
+qemu-kvm
+qemu-img
+libvirt
+libvirt-kvm
+libvirt-daemon-driver-lxc
+lxc
+dnsmasq
+
+mate-screensaver-screenkeyboard
+
 # gostcrypo repo component is needed
 openvpn-gostcrypto
 openvpn-plugins-gostcrypto

pkg.in/lists/centaurus/samba

 samba
-ldap-user-tools
 samba-common-tools
+samba-usershares

pkg.in/lists/kworkstation/kde5

@@ -41,9 +41,6 @@ kde5-file-actions-gost
 #altlinux-freedesktop-menu-nested-menu
 alt-desktop-wallpapers
 
-# #browser chromium-gost#
-#chromium-ublock_origin
-
 qmmp1
 qmmp-skins
 

pkg.in/lists/kworkstation/kde5-base

@@ -139,6 +139,7 @@ kde5-display-manager-lightdm
 kde5-network-manager-etcnet
 openssh openssh-clients openssh-askpass-common openssh-server openssh-common openssh-server-control
 systemd-ssh-agent
+NetworkManager-ssh
 kde5-network-manager-nm
 kde5-video-player-haruna
 kde5-audio-player-qmmp

pkg.in/lists/mobile/apps

@@ -10,6 +10,7 @@ gnome-console
 # web, mail
 chromium@!riscv64
 firefox
+epiphany
 geary
 
 # multimedia
@@ -22,6 +23,7 @@ clapper
 amberol
 lollypop
 shortwave
+easyeffects
 
 # readers
 evince
@@ -42,6 +44,17 @@ fonts-ttf-lxgw-wenkai
 # Dictaphone
 gnome-sound-recorder
 
+# notes & organizers
+iotas
+reminders
+errands
+
+# medical
+gnome-dosage
+
+# translation
+dialect
+
 # misc
 gnome-calculator
 gnome-clocks
@@ -51,6 +64,12 @@ gnome-compass
 gnome-maps
 gnome-weather
 grim
+obfuscate
+tangram
+kana
+solanum
+gnome-games-chess
+gnome-games-sudoku
 wallpapers-mobile
 # libadwaita theme ported to gtk3
 # $ gsettings get org.gnome.desktop.interface gtk-theme

pkg.in/lists/mobile/base

@@ -52,7 +52,7 @@ librsvg
 gnome-icon-theme
 gnome-icon-theme-symbolic
 
-# uicode fonts
+# unicode fonts
 fonts-ttf-gnu-freefont-mono
 fonts-ttf-gnu-freefont-sans
 fonts-ttf-gnu-freefont-serif
@@ -68,3 +68,5 @@ udev-rules-rfkill-uaccess
 xdg-user-dirs
 
 android-tools@!riscv64
+
+screen

pkg.in/lists/mobile/phosh

 # core
 phosh
 xdg-desktop-portal-gtk
-xdg-desktop-portal-gnome
+xdg-desktop-portal-wlr
 xorg-xwayland
 qt5-wayland
 qt6-wayland
@@ -30,4 +30,7 @@ at-spi2-core
 libat-spi2-core-gir
 libgtk+3-gir
 libgtk4-gir
+librsvg-gir
+libportal-gtk3-gir
+libportal-gtk4-gir
 libtelepathy-mission-control

pkg.in/lists/network/NetworkManager-gtk4

+NetworkManager-openvpn-gtk4
+NetworkManager-pptp-gtk4
+NetworkManager-vpnc-gtk4
+NetworkManager-l2tp-gtk4
+NetworkManager-openconnect-gtk4

pkg.in/lists/tagged/base+firmware+wireless

 # kernel/firmware
 firmware-ipw2100
 firmware-ipw2200
-firmware-iwl3945
-firmware-iwl4965
-firmware-iwl5000
 firmware-prism54

pkg.in/lists/tagged/desktop+enlightenment+extra

 ephoto
-econnman

pkg.in/lists/tagged/desktop+regular

@@ -20,8 +20,6 @@ alterator-net-wifi@X86
 alterator-datetime
 alterator-proxy@X86
 alterator-services
-
-alterator-x11@!E2K
 alterator-xkb
 
 alterator-update-kernel

pkg.in/lists/tagged/regular+icewm

@@ -5,8 +5,11 @@ icewm-startup-simple-sound
 xxkb
 icewm-startup-xxkb-tray
 
+mount-tray
+icewm-startup-mount-tray
+
 iftop
-mutt
+#mutt
 elinks
 lftp
 
@@ -17,11 +20,3 @@ leafpad
 
 gqview
 screengrab
-design-icewm-themes
-icewm-theme-darkt
-icewm-theme-silverxp
-
-rp-pppoe-gui
-
-spacefm
-icewm-startup-spacefm

pkg.in/lists/xfce-sysv

-alsa-oss
-apt-conf-ignore-systemd
-cdrkit
-ddrescue
-elinks
-fbset
-gnome-disks
-i2c-tools
-iotop
-leafpad
-man-pages-ru
-man-pages-ru-extra
-mpg123
-NetworkManager-tui
-nload
-ossp
-pandoc
-parcellite
-pm-utils
-pnmixer
-qasmixer
-SysVinit-usermode
-sysstat
-xfce4-screensaver
-vlock
-wget
-whdd
-firmware-alsa-sof
-edid-decode
-mediainfo
-mpv
-xinput
-trafshow
-7-zip

pkg.in/profiles/centaurus-10-server.directory

@@ -2,4 +2,4 @@
 Type=Directory
 Name=Office Server
 Name[ru_RU]=Офисный сервер
-X-Alterator-Groups=centaurus/dhcp-server-a centaurus/dns-server-a centaurus/ftp-server-a centaurus/mail-server-a centaurus/mysql-server-a centaurus/netinst centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/xorg centaurus/samba centaurus/alterator centaurus/mate centaurus/office centaurus/cups centaurus/nm-daemon
+X-Alterator-Groups=centaurus/dhcp-server-a centaurus/dns-server-a centaurus/ftp-server-a centaurus/mail-server-a centaurus/mysql-server-a centaurus/netinst centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/xorg centaurus/alterator centaurus/mate centaurus/office centaurus/cups centaurus/nm-daemon

pkg.in/profiles/centaurus-30-desktop.directory

 [Desktop Entry]
 Type=Directory
-Name=Workstation
-Name[ru_RU]=Рабочая станция
-X-Alterator-Groups=centaurus/mate centaurus/office centaurus/alterator centaurus/bacula-client-a centaurus/bacula-client centaurus/xorg centaurus/docs centaurus/vlc centaurus/cups centaurus/nm-daemon
+Name=Home server
+Name[ru_RU]=Домашний сервер
+X-Alterator-Groups=centaurus/mate centaurus/samba centaurus/diag-tools centaurus/alterator centaurus/bacula-client-a centaurus/bacula-client centaurus/xorg centaurus/docs centaurus/cups centaurus/nm-daemon