1.3.0-alt1

- pre-p9 sisyphus: fixes, drops and just two kludges

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.2.2
+Version: 1.3.0
 Release: alt1
 
 Summary: ALT based distribution metaprofile
@@ -128,6 +128,67 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif
 
 %changelog
+* Mon Oct 15 2018 Michael Shigorin <mike@altlinux.org> 1.3.0-alt1
+- pre-p9 sisyphus: fixes, drops and just two kludges
+
+* Mon Aug 13 2018 Michael Shigorin <mike@altlinux.org> 1.2.21-alt1
+- volumes feature; fixups
+
+* Mon Aug 06 2018 Michael Shigorin <mike@altlinux.org> 1.2.20-alt1
+- isoboot/isodata; apt-conf feature; dual-seat e801
+
+* Mon Jul 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.19-alt1
+- alt-workstation: x86 (sem@), e2k (me)
+
+* Mon Jul 16 2018 Michael Shigorin <mike@altlinux.org> 1.2.18-alt1
+- ldm feature (lakostis@)
+
+* Mon Jun 25 2018 Michael Shigorin <mike@altlinux.org> 1.2.17-alt1
+- e2k & profiles
+
+* Mon Jun 11 2018 Michael Shigorin <mike@altlinux.org> 1.2.16-alt1
+- starterkits-20180612
+
+* Mon May 28 2018 Michael Shigorin <mike@altlinux.org> 1.2.15-alt1
+- fixup release
+
+* Mon May 21 2018 Michael Shigorin <mike@altlinux.org> 1.2.14-alt1
+- pkgpriorities feature (manowar@)
+- extended e2k support
+
+* Mon Apr 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.13-alt1
+- antohami@'s improvements
+
+* Mon Mar 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.12-alt1
+- @IA32, @X86
+
+* Mon Mar 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.11-alt1
+- starterkits-20180312
+
+* Mon Feb 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.10-alt1
+- antohami@'s fixups
+
+* Mon Feb 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.9-alt1
+- antohami@'s release
+
+* Mon Feb 05 2018 Michael Shigorin <mike@altlinux.org> 1.2.8-alt1
+- regular fixes
+
+* Mon Jan 22 2018 Michael Shigorin <mike@altlinux.org> 1.2.7-alt1
+- 2018: better sound feature (antohami@)
+
+* Mon Dec 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.6-alt1
+- starterkits-20171212
+
+* Mon Dec 04 2017 Michael Shigorin <mike@altlinux.org> 1.2.5-alt1
+- qcow2c
+
+* Mon Nov 20 2017 Michael Shigorin <mike@altlinux.org> 1.2.4-alt1
+- opennebula-systemd
+
+* Mon Sep 25 2017 Michael Shigorin <mike@altlinux.org> 1.2.3-alt1
+- p8+
+
 * Mon Sep 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.2-alt1
 - regular-engineering
 

.gear/tags/c0de6d3ac2e9abfec056da74f11f53c4bebe9d91

@@ -1,6 +0,0 @@
-object 58844d304a02408eff356c3d509d9c9b0db1551c
-type commit
-tag v1.2.1
-tagger Michael Shigorin <mike@altlinux.org> 1503342262 +0300
-
-seven years of m-p

.gear/tags/c59a92ded00cc09186d7cdf258fe5d86d019ba94

@@ -0,0 +1,6 @@
+object e3043208f677dc7a9213ee9d194ecb177f632aef
+type commit
+tag v1.2.21
+tagger Michael Shigorin <mike@altlinux.org> 1534180062 +0300
+
+volumes

.gear/tags/list

@@ -1 +1 @@
-c0de6d3ac2e9abfec056da74f11f53c4bebe9d91 v1.2.1
+c59a92ded00cc09186d7cdf258fe5d86d019ba94 v1.2.21

bin/tar2fs

@@ -226,19 +226,37 @@ esac
 
 # NB: don't stick BOOTFS here, it has slightly different semantics
 pushd $ROOTFS/boot
+
+KVERSIONS=
 if [ -s .origver ]; then
-	read KVER < .origver
+	while read kver; do
+		chroot "$ROOTFS" make-initrd -k "$kver"
+		KVERSIONS="$KVERSIONS $kver"
+	done < .origver
 fi
-[ -n "$KVER" ] || fatal "unable to deduce kernel version"
-chroot "$ROOTFS" make-initrd -k "$KVER"
+[ -n "$KVERSIONS" ] || fatal "unable to deduce kernel version"
 rm -f .origver
 
 # ...target device too
 sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
 
-if [ -f boot.conf ]; then
-	sed -i -e "s,@ROOTUUID@,$ROOTUUID,g" -e "s,@KVER@,$KVER,g" boot.conf
-fi
+# FIXME: relies on particular (current) kernel package naming scheme
+for v in $KVERSIONS; do
+	l="$(echo "$v" | sed -r 's,.*elbrus-([0-9a-z]+)-.*$,\1,')"
+	cat >> boot.conf <<EOF
+
+label=$l
+	partition=0
+	image=/image-$v
+	initrd=/initrd-$v.img
+	cmdline=console=ttyS0,115200 console=tty0 consoleblank=0 hardreset root=UUID=$ROOTUUID
+EOF
+done
+
+echo "** start of boot.conf"
+cat boot.conf
+echo "** end of boot.conf"
+
 popd
 
 if [ -x "$ROOTFS"/sbin/lilo ]; then

conf.d/basealt.mk

@@ -1,72 +1,53 @@
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/alt-workstation: workstation_groups = $(addprefix workstation/,\
-	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
-	3rdparty agents blender clamav cloud-clients emulators freecad \
-	ganttproject gnome-peer-to-peer graphics-editing gtk-dictionary \
-	kvm libreoffice mate-usershare pidgin raccess \
-	scanning scribus smartcard sound-editing thunderbird virtualbox \
-	vlc voip-clients)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
+	3rdparty blender clamav cloud-clients freecad gnome-peer-to-peer \
+	gtk-dictionary kvm smartcard virtualbox voip-clients)
 
-distro/alt-workstation: distro/.base use/luks  \
-	+installer +power +systemd +pulse +vmguest +wireless +efi \
-	use/kernel/net use/docs/license \
-	use/memtest use/bootloader/grub \
-	use/install2/fs use/install2/vnc use/install2/repo \
-	use/install2/suspend use/x11/xorg use/sound use/xdg-user-dirs \
-	mixin/desktop-installer \
-	use/efi/refind use/efi/memtest86 use/efi/shell use/rescue/base \
-	use/branding/complete \
-	use/fonts/install2 use/install2/fs \
-	use/fonts/otf/adobe use/fonts/otf/mozilla \
-	use/fonts/ttf/google/extra use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
-	use/l10n/default/ru_RU \
-	use/control use/services \
-	use/live/install use/live/suspend use/live/x11 use/live/repo \
-	use/live/rw \
-	use/x11/lightdm/gtk use/docs/manual use/x11/gtk/nm +nm \
-	use/fonts/ttf/google use/domain-client/full \
-	use/browser/firefox use/browser/firefox/esr
-	@$(call set,BRANDING,alt-workstation)
-	@$(call add,THE_BRANDING,mate-settings)
-	@$(call add,STAGE1_MODLISTS,stage2-mmc)
-	@$(call set,INSTALLER,altlinux-desktop)
-	@$(call add,INSTALL2_PACKAGES,alterator-notes)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
+distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \
+	mixin/desktop-installer mixin/alt-workstation \
+        use/memtest use/rescue/base use/bootloader/grub use/luks \
+        use/efi/refind use/efi/memtest86 use/efi/shell \
+	use/install2/repo use/install2/suspend use/live/suspend \
+        use/live/install use/live/x11 use/live/repo use/live/rw \
+	use/branding/complete use/docs/license \
+        use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk
 	@$(call add,INSTALL2_PACKAGES,open-iscsi)
-	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
 	@$(call add,MAIN_PACKAGES,solaar)
-	@$(call add,MAIN_GROUPS,$(workstation_groups))
+	@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
 	@$(call add,MAIN_LISTS,workstation/extras)
 	@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
-	@$(call add,BASE_LISTS,workstation/base.pkgs)
-	@$(call add,BASE_LISTS,$(call tags,desktop cups))
-	@$(call add,LIVE_LISTS,workstation/live.pkgs)
-	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
-	@$(call add,LIVE_LISTS,$(call tags,desktop office))
-	@$(call add,THE_LISTS,workstation/mate)
-	@$(call add,THE_LISTS,workstation/the.pkgs)
-	@$(call add,THE_LISTS,$(call tags,regular desktop))
-	@$(call add,THE_LISTS,$(call tags,base regular))
-	@$(call add,THE_LISTS,$(call tags,base l10n))
-	@$(call add,THE_LISTS,$(call tags,base desktop))
 	@$(call add,THE_LISTS,$(call tags,archive extra))
 	@$(call add,THE_LISTS,$(call tags,mobile mate))
-	@$(call add,THE_KMODULES,staging)
 	@$(call add,BASE_KMODULES,kvm virtualbox)
 	@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
-	@$(call add,CLEANUP_PACKAGES,xterm)
-	@$(call add,EFI_BOOTARGS,lang=ru_RU)
 	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
-	@$(call add,CONTROL,xdg-user-dirs:enabled)
-	@$(call add,SERVICES_ENABLE,sshd)
-	@$(call add,SERVICES_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
-	@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
-	@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
-	@$(call set,META_PUBLISHER,BaseALT Ltd)
-	@$(call set,META_VOL_SET,ALT)
-	@$(call set,META_VOL_ID,ALT Workstation)
-	@$(call set,META_APP_ID,8.1/$(ARCH))
-	@$(call set,DOCS,alt-workstation)
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+endif
+
+ifeq (,$(filter-out e2k%,$(ARCH)))
+distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation
+	@$(call add,THE_PACKAGES,setup-mate-terminal)
+	@$(call add,THE_PACKAGES,setup-mate-nocomposite)
+	@$(call add,THE_PACKAGES,setup-pulseaudio-plain-module-detect)
+	@$(call add,THE_PACKAGES,firmware-linux)
+	@$(call add,THE_BRANDING,graphics)
+	@$(call set,META_APP_ID,ALT Workstation/$(ARCH))
+
+distro/.alt-workstation: distro/.alt-workstation-base use/x11/lightdm/gtk; @:
+
+distro/alt-workstation-101: distro/.alt-workstation use/e2k/101
+	@$(call set,META_VOL_ID,ALT Workstation/101)
+
+distro/alt-workstation-401: distro/.alt-workstation use/e2k/401; @:
+	@$(call set,META_VOL_ID,ALT Workstation/401)
+
+# avoid lightdm; NB: mate-settings pulls it in (hence the dummy)
+distro/alt-workstation-801: distro/.alt-workstation-base use/e2k/install2/801
+	@$(call set,META_VOL_ID,ALT Workstation/801)
+	@$(call add,MAIN_GROUPS,workstation/e801-1seat workstation/e801-2seat)
+endif
 
 endif

conf.d/desktop.mk

@@ -6,23 +6,11 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 
 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
 
-mixin/desktop-installer: +net-eth +vmguest \
-	use/x11-autostart use/fonts/install2 use/sound
-	@$(call add,BASE_LISTS, \
-		$(call tags,(base || desktop) && (l10n || network)))
-	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
-	@$(call add,BASE_PACKAGES,os-prober)
-
 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
 
 distro/.desktop-extra:
 	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
 
-distro/kde4-lite: distro/.desktop-mini \
-	distro/.desktop-network distro/.desktop-extra +kde4-lite
-	@$(call set,KFLAVOURS,std-def)
-
-distro/tde: distro/.desktop-network +tde; @:
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:

conf.d/e2k.mk

@@ -1,20 +1,99 @@
 ifeq (vm,$(IMAGE_CLASS))
 
-vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
-	@$(call add,THE_PACKAGES,openssh)
+vm/.e2k-bare: vm/.bare use/e2k
+	@$(call add,BASE_PACKAGES,apt)
+
+vm/e2k-live: vm/.e2k-bare use/deflogin/live use/net-ssh use/control/sudo-su
 	@$(call add,THE_LISTS,$(call tags,ve tools))
 
-vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
+vm/.e2k-rescue: vm/e2k-live \
+	mixin/e2k-base use/net/etcnet use/services/lvm2-disable
 	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
+	@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients)
 	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
 
-vm/e2k-xfce: vm/e2k-rescue use/e2k/sound use/e2k/x11 use/x11/xfce \
-	use/browser/firefox use/browser/firefox/esr use/browser/firefox/i18n \
-	use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,xinit xterm mc)
-	@$(call add,THE_PACKAGES,fonts-bitmap-terminus pnmixer)
+vm/e2k-rescue: vm/.e2k-rescue +sysvinit
+	@$(call add,KFLAVOURS,elbrus-1cp elbrus-8c elbrus-4c)
 
-vm/e2k-builder: vm/e2k-rescue use/dev/builder/base; @:
+vm/e2k-xfce: vm/.e2k-rescue mixin/e2k-desktop use/x11/xfce
+	@$(call add,THE_PACKAGES,pnmixer)
+
+vm/e2k-mate: vm/.e2k-rescue use/deflogin/live use/x11/mate use/x11/lightdm/gtk \
+	mixin/e2k-base mixin/e2k-desktop mixin/e2k-livecd-install
+	@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
+	@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
+
+vm/e2k-lxqt: vm/.e2k-rescue mixin/e2k-desktop
+	@$(call add,THE_LISTS,$(call tags,desktop && lxqt && !extra))
+
+vm/e2k-builder: vm/.e2k-rescue use/dev/builder/base
+	@$(call add,KFLAVOURS,elbrus-8c elbrus-4c)
+
+vm/e2k-samba-DC: vm/.e2k-rescue
+	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
+
+endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/.e2k-bare: ve/.base use/e2k +sysvinit
+	@$(call add,BASE_PACKAGES,apt)
+
+ve/e2k-installer: ve/.e2k-bare use/repo/main
+	@$(call add,MAIN_PACKAGES,hello)
+
+ve/e2k-git: ve/.e2k-bare use/e2k use/net-ssh use/net-dns/yandex
+	@$(call add,BASE_PACKAGES,git-server nginx)
+	@$(call add,DEFAULT_SERVICES_ENABLE,xinetd git nginx)
+endif
+
+ifeq (distro,$(IMAGE_CLASS))
+distro/.e2k-rescue: distro/.base mixin/e2k-base use/rescue/.base +net-eth
+	@$(call set,META_VOL_ID,ALT Rescue for Elbrus)
+
+distro/e2k-101-rescue: distro/.e2k-rescue
+	@$(call add,KFLAVOURS,elbrus-1cp)
+
+# NB: this one is NOT suited for a particular processor yet!
+# (that's to be done downstream)
+distro/.e2k-installer-base: distro/.base mixin/e2k-base \
+	use/install2 use/install2/packages use/e2k/install2 \
+	use/volumes/regular use/net-ssh +net-eth
+	@$(call set,INSTALLER,altlinux-generic)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_VOL_ID,ALT for Elbrus)
+	@$(call set,META_APP_ID,ALT/$(ARCH))
+	@$(call add,INSTALL2_PACKAGES,agetty)
+	@$(call add,INSTALL2_PACKAGES,ifplugd) ### for net-eth link status
+	@$(call add,INSTALL2_BRANDING,alterator)
+	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
+	@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients vim-console)
+	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
+	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
+	@$(call add,THE_BRANDING,alterator)
+	@$(call set,BRANDING,alt-workstation)	### conflicts w/alt-sisyphus
+
+distro/.e2k-installer-sysv: distro/.e2k-installer-base +sysvinit; @:
+distro/.e2k-installer: distro/.e2k-installer-base +systemd; @:
+
+distro/e2k-801-builder: distro/.e2k-installer-sysv \
+	use/e2k/install2/801 use/dev/groups/builder; @:
+
+distro/alt-jeos-401: distro/.e2k-installer-sysv use/e2k/install2/401; @:
+distro/alt-jeos-801: distro/.e2k-installer-sysv use/e2k/install2/801; @:
+distro/alt-jeos-101: distro/.e2k-installer-sysv use/e2k/install2/101; @:
+
+distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \
+	mixin/e2k-desktop mixin/e2k-mate
+	@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
+	@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
+
+distro/e2k-4xx-installer: distro/.e2k-installer-sysv use/e2k/install2/4xx
+	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
+
+distro/.e2k-installer-mate: distro/.e2k-installer \
+	mixin/e2k-desktop mixin/e2k-mate; @:
 
 endif

conf.d/live.mk

@@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS))
 distro/dos: distro/.init use/dos use/syslinux/ui/menu
 	@$(call set,RELNAME,ALT FreeDOS)
 
-distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
+distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \
 	use/efi/signed use/efi/refind use/efi/shell; @:
 
 distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@@ -107,8 +107,6 @@ distro/live-0ad: distro/.live-games
 	@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
 	@$(call try,HOMEPAGE,http://play0ad.com/)
 
-distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
-
 distro/live-gimp: distro/live-icewm use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)

conf.d/mixin-basealt.mk

@@ -0,0 +1,52 @@
+# shared across all supported arches, can be complemented per arch
+
+mixin/alt-workstation: workstation_groups = $(addprefix workstation/,\
+	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
+	agents emulators ganttproject graphics-editing libreoffice \
+	mate-usershare pidgin raccess scanning scribus sound-editing \
+	thunderbird vlc freeipa-client)
+
+mixin/alt-workstation: +installer +systemd +pulse +nm \
+	use/kernel/net use/l10n/default/ru_RU \
+	use/x11/xorg use/x11-autostart use/x11/gtk/nm \
+	use/install2/fs use/install2/fat use/install2/vnc \
+	use/apt-conf/branch use/volumes/regular \
+	use/fonts/install2 \
+	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/fonts/ttf/google use/fonts/ttf/google/extra \
+	use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
+	use/branding use/control use/services \
+	use/sound use/xdg-user-dirs use/docs/manual \
+	use/browser/firefox use/browser/firefox/esr
+	@$(call set,BRANDING,alt-workstation)
+	@$(call add,THE_BRANDING,mate-settings)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+	@$(call set,INSTALLER,altlinux-desktop)
+	@$(call add,INSTALL2_PACKAGES,alterator-notes)
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,MAIN_GROUPS,$(workstation_groups))
+	@$(call add,BASE_LISTS,workstation/base.pkgs)
+	@$(call add,BASE_LISTS,$(call tags,desktop cups))
+	@$(call add,LIVE_LISTS,workstation/live.pkgs)
+	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
+	@$(call add,LIVE_LISTS,$(call tags,desktop office))
+	@$(call add,THE_LISTS,workstation/mate)
+	@$(call add,THE_LISTS,workstation/the.pkgs)
+	@$(call add,THE_LISTS,$(call tags,regular desktop))
+	@$(call add,THE_LISTS,$(call tags,base regular))
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,THE_LISTS,$(call tags,base desktop))
+	@$(call add,THE_KMODULES,staging)
+	@$(call add,CLEANUP_PACKAGES,xterm)
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
+	@$(call add,CONTROL,xdg-user-dirs:enabled)
+	@$(call add,SERVICES_ENABLE,sshd)
+	@$(call add,SERVICES_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
+	@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_VOL_ID,ALT Workstation)
+	@$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH))
+	@$(call set,DOCS,alt-workstation)

conf.d/mixin.mk

@@ -0,0 +1,105 @@
+### various mixins with their origin
+
+### desktop.mk
+mixin/desktop-installer: +net-eth +vmguest \
+	use/bootloader/os-prober use/x11-autostart use/fonts/install2 use/sound
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))
+	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
+
+### e2k.mk
+mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
+
+mixin/e2k-desktop: use/e2k/x11 use/l10n/default/ru_RU \
+	use/browser/firefox/esr use/browser/firefox/i18n \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,xinit xterm mc)
+	@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
+
+mixin/e2k-livecd-install: use/e2k/x11
+	@$(call add,THE_PACKAGES,livecd-install alterator-notes)
+	@$(call add,THE_PACKAGES,fdisk hdparm rsync openssh vim-console)
+	@$(call add,THE_PACKAGES,apt-repo)
+
+mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
+	use/deflogin/live use/deflogin/xgrp \
+	use/x11/mate use/x11/lightdm/slick \
+	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/fonts/ttf/google use/fonts/ttf/redhat
+	@$(call set,INSTALLER,altlinux-desktop)
+	@$(call add,THE_BRANDING,mate-settings)
+	@$(call add,THE_BRANDING,alterator)
+	@$(call add,THE_BRANDING,graphics)
+	@$(call add,THE_PACKAGES,setup-mate-terminal)
+	@$(call add,THE_PACKAGES,setup-mate-nocomposite)
+	@$(call add,THE_PACKAGES,alterator-standalone)
+	@$(call add,THE_PACKAGES,terminfo-extra)
+	@$(call add,THE_PACKAGES,ethtool net-tools ifplugd)
+	@$(call add,THE_PACKAGES,zsh bash-completion)
+
+### regular.mk
+# common WM live/installer bits
+mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
+	@$(call add,THE_PACKAGES,pam-limits-desktop beesu)
+	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
+	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
+	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
+	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
+	@$(call set,THE_IMAGEWRITER,imagewriter)
+
+mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
+	use/fonts/ttf/redhat use/x11/wmaker
+	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
+	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
+	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
+
+# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
+mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
+	use/browser/firefox/classic
+	@$(call add,THE_BRANDING,graphics)
+
+mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
+
+mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/x11/lightdm/gtk \
+	use/browser/palemoon/suggested \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
+	@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit)
+	@$(call add,THE_PACKAGES,xscreensaver)
+
+mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im \
+	use/browser/palemoon/i18n +nm
+	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+	@$(call add,THE_PACKAGES,qasmixer qpdfview)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
+mixin/regular-tde: +tde \
+	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
+	@$(call add,THE_PACKAGES_REGEXP,kdeedu-kalzium.* kdeedu-ktouch.*)
+	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
+
+mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
+	use/browser/falkon use/x11/gtk/nm +nm +plymouth
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
+# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
+#     kernel cmdline resulting in method:disk instead of method:cdrom
+#     which will change propagator's behaviour to probe additional
+#     filesystems (ro but no loop) thus potentially writing to
+#     an unrecovered filesystem's journal
+mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
+	use/syslinux/ui/menu use/syslinux/timeout/600 \
+	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
+
+### vm.mk
+mixin/cloud-init:
+	@$(call add,BASE_PACKAGES,cloud-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
+
+mixin/opennebula-context:
+	@$(call add,BASE_PACKAGES,opennebula-context)
+	@$(call add,DEFAULT_SERVICES_ENABLE,one-context-local one-context)
+
+mixin/icewm: use/x11/lightdm/gtk +icewm; @:

conf.d/p7.mk

@@ -1,49 +0,0 @@
-# p7 base kits
-
-mixin/p7: use/browser/firefox/esr
-	@$(call set,BRANDING,altlinux-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH))
-
-ifeq (distro,$(IMAGE_CLASS))
-
-### kludge compatibility: introspection stub for main.mk :-/
-distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
-distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
-distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
-distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @:
-distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @:
-distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @:
-distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
-distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @:
-distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
-distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
-distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
-distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
-distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
-distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
-distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
-distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @:
-
-distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
-
-distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
-distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @:
-distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
-distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
-distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
-distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @:
-
-distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @:
-
-endif
-
-ifeq (ve,$(IMAGE_CLASS))
-ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
-ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @:
-endif
-
-ifeq (vm,$(IMAGE_CLASS))
-vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
-vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @:
-endif

conf.d/p8.mk

@@ -5,15 +5,19 @@ mixin/p8: use/browser/firefox/esr
 	@$(call set,IMAGE_FLAVOUR,$(subst alt-p8-,,$(IMAGE_NAME)))
 	@$(call set,META_VOL_ID,ALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
 
+# missing in sisyphus but not in p8
+mixin/p8/unikey:
+	@$(call add,THE_PACKAGES,ibus-unikey)
+
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/alt-p8-cinnamon: distro/regular-cinnamon mixin/p8; @:
+distro/alt-p8-cinnamon: distro/regular-cinnamon mixin/p8 mixin/p8/unikey; @:
 distro/alt-p8-icewm: distro/regular-icewm mixin/p8; @:
 distro/alt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
 distro/alt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
 distro/alt-p8-kde4: distro/regular-kde4 mixin/p8; @:
 distro/alt-p8-kde5: distro/regular-kde5 mixin/p8; @:
-distro/alt-p8-lxde: distro/regular-lxde mixin/p8; @:
+distro/alt-p8-lxde: distro/regular-lxde mixin/p8 mixin/p8/unikey; @:
 distro/alt-p8-lxde-sysv: distro/regular-lxde-sysv mixin/p8; @:
 distro/alt-p8-lxqt: distro/regular-lxqt mixin/p8; @:
 distro/alt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
@@ -44,9 +48,13 @@ endif
 
 ifeq (ve,$(IMAGE_CLASS))
 ve/alt-p8-ovz-generic: ve/generic mixin/p8; @:
+
+ve/docker-p8: ve/docker; @:
+	@$(call set,BRANDING,alt-starterkit)
 endif
 
 ifeq (vm,$(IMAGE_CLASS))
 vm/alt-p8-vm-net: vm/net mixin/p8; @:
 vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
+vm/alt-p8-opennebula: vm/opennebula-systemd mixin/p8; @:
 endif

conf.d/regular.mk

@@ -10,26 +10,20 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:
 
 # graphical target (not enforcing xorg drivers or blobs)
 distro/.regular-x11: distro/.regular-base +vmguest +wireless \
-	use/live/x11 use/live/install use/live/suspend \
-	use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
-	use/branding use/browser/firefox/live use/browser/firefox/i18n \
-	use/browser/firefox/h264 use/services/lvm2-disable
-	@$(call add,LIVE_PACKAGES,volumes-profile-regular)
+	use/stage2/cifs use/live/rw use/live/x11 use/live/repo \
+	use/live/install use/live/suspend use/browser/firefox/live \
+	use/browser/firefox/i18n use/browser/firefox/h264 \
+	use/branding use/x11/wacom use/x11/amdgpu \
+	use/ntp/client use/services/lvm2-disable \
+	use/luks use/volumes/regular
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
+	@$(call add,LIVE_PACKAGES,btrfs-progs)
 	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
 	@$(call add,LIVE_LISTS,$(call tags,base rescue))
 	@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
 	@$(call add,EFI_BOOTARGS,live_rw)
 
-# common WM live/installer bits
-mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
-	@$(call add,THE_PACKAGES,pam-limits-desktop)
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
-	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
-	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
-	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
-	@$(call set,THE_IMAGEWRITER,imagewriter)
-
 # WM base target
 distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:
 
@@ -39,20 +33,22 @@ distro/.regular-desktop: distro/.regular-wm \
 	use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
 	@$(call add,THE_BRANDING,bootloader)
 	@$(call add,THE_PACKAGES,upower bluez)
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
 	@$(call add,THE_PACKAGES,vconsole-setup-kludge)	#28805
 	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,KFLAVOURS,std-def)
 
-distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
-distro/.regular-sysv: distro/.regular-wm +sysvinit; @:
+distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
+distro/.regular-sysv: distro/.regular-wm +sysvinit \
+	use/init/sysv/consolekit; @:
 distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
 	use/x11/gdm2.20; @:
 
 distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
 	use/branding use/bootloader/grub use/luks \
 	use/install2/fs use/install2/vnc use/install2/repo
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator)
@@ -80,11 +76,12 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 # NB:
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
 distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
-	use/install2/vmguest use/vmguest/base
+	use/volumes/jeos use/install2/vmguest use/vmguest/base
+	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,MAIN_PACKAGES,firmware-linux)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
-	@$(call add,CLEANUP_PACKAGES,'glib2*' libffi 'libltdl*')
+	@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
 	@$(call add,CLEANUP_PACKAGES,bridge-utils)
+	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
 	@$(call add,STAGE2_BOOTARGS,quiet)
 	@$(call set,KFLAVOURS,un-def)
 
@@ -94,69 +91,48 @@ distro/regular-jeos-ovz: distro/.regular-jeos \
 	@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
 
 distro/.regular-install-x11: distro/.regular-install \
-	use/install2/suspend mixin/regular-desktop +vmguest +wireless
+	use/install2/suspend mixin/regular-desktop +vmguest +wireless \
+	use/ntp/client
 	@$(call set,INSTALLER,altlinux-desktop)
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
 	@$(call add,THE_LISTS,$(call tags,regular desktop))
 
 # assumes somewhat more experienced user, mostly for sysv variants
 distro/.regular-install-x11-full: distro/.regular-install-x11 \
 	mixin/desktop-installer mixin/regular-desktop use/install2/fs \
-	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
 	use/branding/complete use/branding/slideshow/once \
 	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
+	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
 
 distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \
-	use/x11/lightdm/gtk use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/browser/chromium use/fonts/ttf/redhat
+	use/x11/lightdm/slick use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/browser/chromium use/fonts/ttf/redhat use/efi/refind
 	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
 	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
-	@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
+	@$(call add,LIVE_PACKAGES,mnt xpra)
 	@$(call add,LIVE_PACKAGES,icewm-startup-networkmanager)
 	@$(call set,KFLAVOURS,un-def)
 
-mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
-	use/fonts/ttf/redhat use/x11/wmaker
-	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
-	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
-	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
-
 # wdm can't do autologin so add standalone one for livecd
 distro/regular-wmaker: distro/.regular-sysv \
 	mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n
 	@$(call add,LIVE_PACKAGES,wdm wmxkbru)
 
-# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
-mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
-	use/browser/firefox/classic
-	@$(call add,THE_BRANDING,graphics)
-
 distro/regular-gnustep: distro/.regular-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 
-mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
-
 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
 	use/x11/xfce/full use/domain-client
 	@$(call set,KFLAVOURS,un-def)
 
-mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/x11/lightdm/gtk \
-	use/browser/firefox use/browser/firefox/classic \
-	use/browser/firefox/i18n use/browser/firefox/h264 \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
-
 distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
 	mixin/regular-xfce mixin/regular-xfce-sysv; @:
 
-mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
-	use/x11/gtk/nm use/im +nm
-	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
-
 distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde
 	@$(call add,THE_PACKAGES,lxde)
 
@@ -169,21 +145,20 @@ distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 distro/regular-mate: distro/.regular-gtk +nm \
 	use/x11/mate use/fonts/ttf/google use/domain-client
 	@$(call add,LIVE_LISTS,$(call tags,mobile mate))
-	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_LISTS,$(call tags,base smartcard))
 
-distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
+distro/regular-mate-sysv: distro/.regular-sysv-gtk use/x11/mate +nm
+	@$(call add,LIVE_LISTS,$(call tags,mobile mate))
 
-distro/regular-enlightenment: distro/.regular-gtk \
-	use/x11/enlightenment use/fonts/infinality; @:
+distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
 
 distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
 	use/x11/enlightenment
 	@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271
 
-distro/regular-cinnamon: distro/.regular-gtk \
-	use/x11/cinnamon use/fonts/infinality use/fonts/ttf/google \
-	use/net/nm/mmgui use/im; @:
+distro/regular-cinnamon: distro/.regular-gtk use/x11/cinnamon \
+	use/fonts/ttf/google use/net/nm/mmgui use/im
+	@$(call add,THE_PACKAGES,thunderbird-ru)	### l10n
 
 # not .regular-gtk due to gdm vs lightdm
 distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
@@ -192,12 +167,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
 	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
-
-# reusable bits
-mixin/regular-tde: +tde \
-	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
-	@$(call add,THE_PACKAGES,kdeedu-kalzium kdeedu-ktouch)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,gdm)
 
 distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
 	use/x11/gtk/nm use/net/nm/mmgui
@@ -206,43 +176,25 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
 	use/net-eth/dhcp use/efi/refind; @:
 
 distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
-	use/browser/konqueror4 use/fonts/zerg use/domain-client \
+	use/browser/falkon use/fonts/zerg use/domain-client \
 	use/net/nm/mmgui +pulse +plymouth
 	@$(call add,THE_LISTS,$(call tags,regular kde4))
 	@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
 
-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
-
 distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
 
 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp use/efi/refind; @:
 
-distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
-
-distro/regular-leechcraft: distro/.regular-desktop \
-	use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
-
-distro/regular-kde5: distro/.regular-desktop \
+distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
 	use/x11/kde5 use/x11/sddm use/domain-client \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
 	+nm +pulse +plymouth
-	@$(call add,THE_PACKAGES,kde5-telepathy)
+	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 
-# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
-#     kernel cmdline resulting in method:disk instead of method:cdrom
-#     which will change propagator's behaviour to probe additional
-#     filesystems (ro but no loop) thus potentially writing to
-#     an unrecovered filesystem's journal
-mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
-	use/syslinux/ui/menu use/syslinux/timeout/600 \
-	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
-
 distro/regular-rescue: distro/.regular-base mixin/regular-rescue  \
 	use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \
 	use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
@@ -263,7 +215,9 @@ distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde
 	@$(call add,THE_PACKAGES,kpowersave)
 
 distro/regular-sysv-xfce: distro/.regular-install-x11-full \
-	mixin/regular-xfce mixin/regular-xfce-sysv; @:
+	mixin/regular-xfce mixin/regular-xfce-sysv
+	@$(call add,THE_PACKAGES,nload)
+	@$(call add,MAIN_PACKAGES,caffeine-ng sysstat leafpad)
 
 distro/.regular-server-base: distro/.regular-install \
 	use/server/base use/stage2/kms
@@ -272,8 +226,11 @@ distro/.regular-server-base: distro/.regular-install \
 	@$(call add,SYSTEM_PACKAGES,multipath-tools)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
 
+distro/.regular-server-systemd: distro/.regular-server-base +systemd; @:
+
 distro/.regular-server: distro/.regular-server-base \
-	use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/libs
+	use/server/mini use/firmware/qlogic use/rescue/base \
+	use/ntp/client use/cleanup/libs
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,aptitude)
 	@$(call add,CLEANUP_PACKAGES,qt4-common)
@@ -286,7 +243,7 @@ distro/.regular-server-managed: distro/.regular-server
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
 
 distro/regular-server: distro/.regular-server-managed \
-	use/server/groups/base use/install2/vnc/full
+	use/server/groups/base use/dev/groups/builder use/install2/vnc/full
 	@$(call add,MAIN_GROUPS,server/sambaDC)
 	@$(call add,MAIN_GROUPS,tools/hyperv)
 
@@ -305,18 +262,18 @@ distro/.regular-server-openstack: distro/.regular-server-base \
 	@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
 
 distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:
+	@$(call add,THE_PACKAGES,dhcpcd)
 
 distro/regular-server-openstack-sysv: distro/.regular-server-openstack +sysvinit
 	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
 
-distro/regular-server-pve: distro/.regular-server-base \
-	use/firmware/qlogic +efi +systemd
+distro/regular-server-pve: distro/.regular-server-systemd \
+	use/kernel/server use/firmware/qlogic +efi
 	@$(call set,BASE_BOOTLOADER,grub)
 	@$(call set,INSTALLER,altlinux-server)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
 	@$(call add,THE_PACKAGES,pve-manager nfs-clients su)
 	@$(call add,THE_PACKAGES,bridge-utils dhcpcd faketime tzdata postfix)
-	@$(call add,THE_KMODULES,ipset kvm)
 	@$(call add,DEFAULT_SERVICES_DISABLE,pve-manager pve-cluster \
 		pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
 		pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
@@ -337,16 +294,18 @@ distro/regular-server-samba4: distro/.regular-server-managed
 	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)
 
 distro/regular-engineering: distro/regular-lxde use/live/ru
-	@$(call add,THE_PACKAGES,lxde-settings-lxdesktop)
 	@$(call add,THE_LISTS,$(call tags,engineering desktop))
-	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
-	@$(call add,THE_PACKAGES,LibreOffice LibreOffice-gnome LibreOffice-langpack-ru)
-	@$(call add,THE_PACKAGES,firefox-pepperflash)
-	@$(call add,THE_PACKAGES,cups system-config-printer)
+	@$(call add,THE_LISTS,$(call tags,desktop sane))
+	@$(call add,THE_LISTS,$(call tags,cups desktop))
+	@$(call add,THE_PACKAGES,libreofficekit LibreOffice-gnome LibreOffice-langpack-ru)
+	@$(call add,THE_PACKAGES,LibreOffice-mimetypes java)
 	@$(call add,THE_PACKAGES,gnome-disk-utility)
-	@$(call add,THE_PACKAGES,evince)
-	@$(call add,LIVE_KMODULES,staging)
+	@$(call add,THE_KMODULES,staging)
 	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
 	@$(call add,DEFAULT_SERVICES_ENABLE,ModemManager)
 
 endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/docker-sisyphus: ve/docker; @:
+endif

conf.d/t7.mk

@@ -1,13 +0,0 @@
-# t7 base kits
-
-mixin/t7:
-	@$(call set,BRANDING,altlinux-starterkit) ### needs changing
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @:
-distro/altlinux-t7-gnustep-systemd: distro/regular-gnustep-systemd mixin/t7; @:
-distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @:
-distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @:
-
-endif

conf.d/test.mk

@@ -3,7 +3,7 @@ ifneq (,$(DEBUG))
 
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @:
+distro/syslinux-auto: distro/.boot use/hdt use/syslinux/timeout/1; @:
 distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
 
 distro/live-systemd: distro/.base use/live/base +systemd; @:
@@ -70,28 +70,6 @@ distro/elinks: distro/.base use/pid1/net
 
 endif # IMAGE_CLASS: distro
 
-ifeq (ve,$(IMAGE_CLASS))
-
-ifeq (centos,$(REPO))
-
-ve/.centos-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-
-ve/centos: ve/.centos-base
-	@$(call add,BASE_PACKAGES,openssh-server)
-
-endif # REPO: centos
-
-ifeq (opensuse,$(REPO))
-
-ve/.opensuse-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-	@$(call add,BASE_PACKAGES,aaa_base)
-
-endif # REPO: opensuse
-
-endif # IMAGE_CLASS: ve
-
 ifeq (vm,$(IMAGE_CLASS))
 
 vm/net-static: vm/bare use/net-eth use/net-ssh

conf.d/ve.mk

@@ -22,7 +22,7 @@ ve/builder: ve/base use/dev/builder/base use/repo
 
 # this should be more or less convenient
 ve/generic: ve/base use/repo
-	@$(call add,BASE_PACKAGES,vim-console etckeeper)
+	@$(call add,BASE_PACKAGES,vim-console etckeeper apt-rsync)
 	@$(call add,BASE_LISTS,openssh \
 		$(call tags,base && (server || network || security || pkg)))
 

conf.d/vm.mk

@@ -18,16 +18,16 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
 	@$(call add,BASE_PACKAGES,su)
 
 # vm/net or vm/systemd-net
-vm/cloud-systemd: vm/systemd-net use/vmguest/kvm
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
-	@$(call set,KFLAVOURS,un-def)
-	@$(call add,THE_KMODULES,kdbus)
 
-vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
+
+# vm with OpenNebula contextualization package (with empty network config)
+vm/opennebula-systemd: vm/systemd use/net/networkd use/net-ssh \
+	use/vmguest/kvm mixin/opennebula-context \
+	use/repo use/control/sudo-su use/deflogin
+	@$(call add,BASE_PACKAGES,su)
 
 # NB: use/x11 employs some installer-feature packages
 vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
@@ -35,8 +35,6 @@ vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
 vm/.desktop-base: vm/.desktop-bare \
 	use/deflogin/altlinuxroot use/x11-autologin; @:
 
-mixin/icewm: use/x11/lightdm/gtk +icewm; @:
-
 vm/icewm: vm/.desktop-base mixin/icewm; @:
 
 vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart

doc/archdep.txt

@@ -22,7 +22,7 @@
 
 В скриптовых хуках ({image-,}scripts.d/*) проверяйте $GLOBAL_ARCH.
 
-=== списки пакетов ===
+=== списки пакетов, профили групп ===
 
 Бывает так, что в списке пакетов есть смысл упоминать какой-либо из них
 только для определённой архитектуры (например, wine или steam); в таких
@@ -40,7 +40,24 @@
   haspd@i586
   i586-haspd@x86_64
 
+или упрощённо (с версии 1.2.12):
+
+  haspd@IA32
+
 Для преобразования можно воспользоваться следующей командой:
 
   sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \
          -e 's/@X86_64_ONLY@([^\t ]+)/\1@x86_64/g'
+
+При необходимости добавить пакет только на x86-архитектурах (неважно,
+i586 или x86_64) можно воспользоваться макросом X86 (с версии 1.2.12):
+
+  xorg-drv-intel@X86
+
+Аналогичная функциональность реализована для профилей установки.
+
+=== загрузчики ===
+
+Как правило, сперва понадобится доработка mkimage -- см. скрипты
+tools/mki-pack-*boot -- и лишь затем профиля; см. тж. lib/boot.mk
+и фичу pack.

doc/assumptions.txt

@@ -21,9 +21,9 @@ NB: пути приводятся от верхнего уровня; проек
 ** характерный признак пропуска -- разрыв графа (report-targets.png)
 
 * pkg.in/lists/Makefile
-** ожидает, что названия пакаджлистов указываются в переменных
+** ожидает, что названия списков пакетов указываются в переменных
     вида *_LISTS, и копирует в генерируемый профиль только их
-** если задать имя файла пакаджлиста непосредственно в Makefile
+** если задать имя файла списка пакетов непосредственно в Makefile
     субпрофиля, он не будет скопирован
 ** характерное сообщение об ошибке:
 
@@ -37,6 +37,7 @@ NB: пути приводятся от верхнего уровня; проек
     в KFLAVOURS)
 ** если добавить какой-либо kernel-image в STAGE1_PACKAGES*,
     результат может быть неожиданным
+** обратите внимание: bin/tar2fs умеет несколько ядер
 ** вероятная ошибка: незагрузка полученного squashfs
 
 * features.in/install2/install2/stage2cfg.mk

doc/debug.txt

@@ -16,6 +16,7 @@
    этого коммита;
 ** содержит список конфигурационных переменных и их конечных значений,
    созданный на основании distcfg.mk (см. тж. build/vars.mk)
+
 * REPORT=1 включает генерацию дополнительного вывода:
 ** build/reports/targets.png -- граф зависимостей между целями
 ** build/reports/scripts.log -- порядок запуска скриптовых хуков

doc/params.txt

@@ -60,6 +60,11 @@
 ** значение: пусто (по умолчанию), 1 или 2
 ** см. lib/log.mk, lib/clean.mk
 
+* DISTRO_VERSION
+** задаёт версию дистрибутива, если применимо
+** значение: пусто (по умолчанию) либо любая строка
+** см. image.in/Makefile
+
 * HOMEPAGE, HOMENAME, HOMEWAIT
 ** указывают адрес, название и таймаут перехода для домашней страницы
 ** значение: корректный URL, строка, целое неотрицательное число

doc/pkglists.txt

@@ -1,8 +1,7 @@
 == Списки пакетов ==
 
 Состав пакетной базы субпрофилей определяется значениями
-следующих переменных профиля (см. тж. conf.d/README;
-некоторые "*" ниже заэкранированы ради парсера asciidoc):
+следующих переменных профиля (см. тж. conf.d/README):
 
 * main: пакетная база для установки
 ** sub.in/main/Makefile, features.in/*/main/lib/

doc/qemu.txt

@@ -2,10 +2,12 @@
 
 Для сборки на "неродной" архитектуре с применением трансляции
 посредством QEMU установите пакет livecd-qemu-arch и выполните
-команду register-qemu-arm от имени root (также предоставляется
+команду register-qemu-armh от имени root (также предоставляется
 register-qemu-ppc, но как минимум при сборке под ppc32 на x86_64
 известны проблемы эмуляции).
 
 Пример запуска:
 
-  make ARCH=arm APTCONF=/etc/apt/apt.conf.sisyphus.arm ve/bare.tar
+  make ARCH=armh APTCONF=/etc/apt/apt.conf.sisyphus.arm ve/bare.tar
+
+Обратите также внимание на http://bugzilla.altlinux.org/34638

doc/style.txt

@@ -33,7 +33,7 @@
 
 * предпочтительно применение $() вместо `` (особенно при вложенности);
 
-* постарайтесь не вылазить за 80 колонок;
+* постарайтесь не вылезать за 80 колонок;
 
 * избегайте merge-коммитов в коде, который предлагаете для включения
   в основную ветку: поддерживается линейная история для удобства

features.in/apt-conf/README

@@ -0,0 +1 @@
+Данная фича определяет то, какая конфигурация apt попадёт в образ.

features.in/apt-conf/config.mk

@@ -0,0 +1,8 @@
+use/apt-conf:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,apt-conf-$$(THE_APT_CONF))
+	@$(call add,IMAGE_INIT_LIST,apt-conf-$$(THE_APT_CONF))
+	@$(call try,THE_APT_CONF,sisyphus)
+
+use/apt-conf/branch: use/apt-conf
+	@$(call set,THE_APT_CONF,branch)

features.in/armh/config.mk

@@ -1,2 +1,2 @@
-use/armh: use/control/sudo-su use/net/dns/google
+use/armh: use/control/sudo-su use/net-dns/google
 	@$(call add_feature)

features.in/bootloader/config.mk

@@ -4,9 +4,21 @@
 #       the last different one wins
 # - remember .base if adding yet another *_PACKAGES
 
-use/bootloader:
+# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
+
+use/bootloader: use/pkgpriorities
 	@$(call add_feature)
 	@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+	@$(call add,PINNED_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+	@$(call add,PINNED_PACKAGES,installer-bootloader-$$(BASE_BOOTLOADER)-stage2)
 
 use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
 	@$(call set,BASE_BOOTLOADER,$*)
+
+use/bootloader/live: use/bootloader
+	@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+
+use/bootloader/os-prober: use/bootloader
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+	@$(call add,BASE_PACKAGES,os-prober)
+endif

features.in/branding/config.mk

@@ -2,10 +2,15 @@
 use/branding:
 	@$(call add_feature)
 
+# license notes, if any
+use/branding/notes: use/branding
+	@$(call add,THE_BRANDING,notes)
+
 # NB: not every distro might have all the branding of its own
-use/branding/full: use/branding use/syslinux/ui/gfxboot
+# FIXME: syslinux is x86-specific
+use/branding/full: use/branding/notes use/syslinux/ui/gfxboot
 	@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
-	@$(call add,THE_BRANDING,indexhtml notes slideshow)
+	@$(call add,THE_BRANDING,indexhtml slideshow)
 
 use/branding/complete: use/branding/full use/plymouth/full
 	@$(call add,INSTALL2_BRANDING,notes slideshow)

features.in/browser/config.mk

@@ -9,7 +9,7 @@ use/browser/firefox: use/browser
 
 use/browser/seamonkey use/browser/palemoon \
 	use/browser/chromium use/browser/epiphany \
-	use/browser/qupzilla use/browser/rekonq \
+	use/browser/qupzilla use/browser/falkon \
 	use/browser/elinks use/browser/links2: \
 	use/browser/%: use/browser
 	@$(call set,THE_BROWSER,$*)
@@ -33,7 +33,6 @@ use/browser/firefox/live: use/browser/firefox
 
 # scarey, and will have to be done otherwise when l10n feature is there
 use/browser/firefox/i18n: use/browser/firefox
-	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
@@ -48,6 +47,9 @@ use/browser/seamonkey/i18n: use/browser/seamonkey
 use/browser/palemoon/i18n: use/browser/palemoon
 	@$(call add,THE_BROWSER,palemoon-ru)
 
+use/browser/palemoon/suggested: use/browser/palemoon/i18n
+	@$(call add,THE_BROWSER,palemoon-suggested)
+
 # inherently insecure, NPAPI only
 use/browser/plugin/flash: use/browser
 	@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)

features.in/build-distro/lib/90-build-distro.mk

@@ -1,9 +1,5 @@
 # step 4: build the distribution image
 
-# take the latter part for complex-specified subprofiles like stage2@live;
-# care to exclude non-directories holding no makefiles like rootfs
-SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
-
 # proxy over the ISO metadata collected; see also genisoimagerc(5)
 BOOT_SYSI := $(META_SYSTEM_ID)
 BOOT_PUBL := $(META_PUBLISHER)
@@ -13,9 +9,30 @@ BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
 BOOT_VOLS := $(META_VOL_SET)
 BOOT_BIBL := $(META_BIBLIO)
 BOOT_ABST := $(META_ABSTRACT)
+BOOT_COPY := $(META_LICENSE_FILE)
+
+ISODATA_SYSI = $(BOOT_SYSI)
+ISODATA_PUBL = $(BOOT_PUBL)
+ISODATA_PREP = $(BOOT_PREP)
+ISODATA_APPI = $(BOOT_APPI)
+ISODATA_VOLI = $(BOOT_VOLI)
+ISODATA_VOLS = $(BOOT_VOLS)
+ISODATA_BIBL = $(BOOT_BIBL)
+ISODATA_ABST = $(BOOT_ABST)
+ISODATA_COPY = $(BOOT_COPY)
+
 DATE_F    := $(shell date +%F)
 
+ifeq (isodata,$(IMAGE_PACKTYPE))
+BOOT_TYPE :=
+else
+ifeq (,$(filter-out e2k%,$(ARCH)))
+BOOT_TYPE := e2kboot
+endif
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 BOOT_TYPE := isolinux
+endif
+endif
 
 all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

features.in/build-ve/lib/90-build-ve.mk

@@ -20,5 +20,6 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
                         $(BASE_PACKAGES_REGEXP)
 
-all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
+all: $(GLOBAL_DEBUG) \
+	build-image copy-subdirs copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

features.in/build-vm/image-scripts.d/04-inittab

@@ -1,4 +1,6 @@
 #!/bin/sh -e
 # we don't need no extra gettys in VMs
 [ -s /etc/inittab ] || exit 0
+# ...except when it's a real disk image, not a VM for sure
+[ `arch` = e2k ] && exit 0
 sed -i 's,^[3-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab

features.in/build-vm/image-scripts.d/07-kernel

@@ -5,7 +5,6 @@
 kver="$(rpm -qa 'kernel-image*' \
             --qf '%{installtime} %{version}-%{name}-%{release}\n' \
         | sort -n \
-        | tail -n 1 \
         | cut -f 2 -d ' ' \
         | sed 's/kernel-image-//')"
 

features.in/build-vm/lib/90-build-vm.mk

@@ -8,7 +8,7 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 		 $(call list,$(BASE_LISTS) $(THE_LISTS))
 
 IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
-			$(BASE_PACKAGES_REGEXP)
+                        $(BASE_PACKAGES_REGEXP)
 
 # intermediate chroot archive
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
@@ -33,15 +33,18 @@ prepare-image: check-sudo
 	fi
 
 convert-image: prepare-image
-	@case "$(IMAGE_TYPE)" in \
+	@VM_COMPRESS=; \
+	case "$(IMAGE_TYPE)" in \
 	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
 	"vhd") VM_FORMAT="vpc";; \
+	"qcow2c") VM_FORMAT="qcow2"; VM_COMPRESS="-c";; \
 	*) VM_FORMAT="$(IMAGE_TYPE)"; \
 	esac; \
 	if ! type -t qemu-img >&/dev/null; then \
-		echo "** warning: qemu-img not available" >&2; \
+		echo "** error: qemu-img not available" >&2; \
+		exit 1; \
 	else \
-		qemu-img convert -O "$$VM_FORMAT" \
+		qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
 			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
 		rm "$(VM_RAWDISK)"; \
 		if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
@@ -52,5 +55,6 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
 # override
 pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
 
-all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
+all: $(GLOBAL_DEBUG) \
+	build-image copy-subdirs copy-tree run-image-scripts pack-image \
 	convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)

features.in/cleanup/config.mk

@@ -1,5 +1,6 @@
 use/cleanup:
 	@$(call add_feature)
+	@$(call xport,GLOBAL_LIVE_NO_CLEANUPDB)
 	@$(call xport,CLEANUP_PACKAGES)
 	@$(call xport,CLEANUP_BASE_PACKAGES)
 

features.in/cleanup/live/image-scripts.d/99-cleanupdb

@@ -1,7 +1,10 @@
 #!/bin/sh
 
-# don't cripple the image to be copied over
-[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+# don't cripple the image to be copied over or explicitly requested
+# not to do this
+[ -n "$GLOBAL_LIVE_NO_CLEANUPDB" ] || \
+	[ -x /usr/sbin/live-install ] || \
+	[ -x /usr/sbin/livecd-install ] && exit 0
 
 # dump what's here by this point
 echo "** live packages before rpmdb purge:"

features.in/dev/README

@@ -1,7 +1,7 @@
 Эта фича служит для создания образов, предназначающихся для разработки.
 В первую очередь обеспечивается развёртывание hasher и mkimage.
 
-Реализована поддержка LiveCD, VM, VE.
+Реализованы поддержка LiveCD, VM, VE и добавление группы в инсталятор.
 
 Обратите внимание: эта фича достаточно серьёзно изменяет поведение
 субпрофиля main, оставляя из всего обычного множества обрабатываемых

features.in/dev/config.mk

@@ -3,11 +3,10 @@ use/dev: use/control
 	@$(call add,THE_PACKAGES,git-core hasher gear)
 	@$(call add,CONTROL,pam_mktemp:enabled)
 
-use/dev/repo: use/dev use/repo/main
+# use/dev intentionally missing
+use/dev/repo: use/repo/main
 	@$(call add,THE_PACKAGES,apt-repo)
-	@$(call add,MAIN_PACKAGES,rpm-build basesystem)
-	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
-	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
+	@$(call add,MAIN_LISTS,$(call tags,main builder))
 
 use/dev/mkimage: use/dev
 	@$(call add,THE_PACKAGES,mkimage shadow-change su)
@@ -19,9 +18,12 @@ use/dev/builder/live: use/dev/builder/base
 	@$(call add,LIVE_LISTS,$(call tags,live builder))
 	@$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc)
 
-use/dev/builder/full: use/dev/builder/live use/dev/repo
+use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo
 	@$(call set,KFLAVOURS,$(BIGRAM))
 	@$(call add,THE_LISTS,$(call tags,server extra))
 	@$(call add,MAIN_LISTS,$(call tags,live builder))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
 	@$(call add,LIVE_PACKAGES,sudo perl-Gear-Remotes)
+
+use/dev/groups/builder: use/dev/repo
+	@$(call add,MAIN_GROUPS,dev/builder)

features.in/docs/config.mk

@@ -15,7 +15,7 @@ use/docs/manual: use/docs
 	@$(call xport,DOCS)
 	@$(call add,THE_PACKAGES,docs-$$(DOCS))
 
-use/docs/license: use/docs use/branding
-	@$(call add,THE_BRANDING,notes)
+use/docs/license: use/docs use/branding/notes
+	@$(call set,META_LICENSE_FILE,license.all.html)
 
 use/docs/full: use/docs/indexhtml use/docs/manual use/docs/license; @:

features.in/domain-client/config.mk

@@ -5,3 +5,4 @@ use/domain-client: use/net/dhcp
 use/domain-client/full: use/domain-client
 	@$(call add,THE_PACKAGES,krb5-ticket-watcher)
 	@$(call add,DEFAULT_SERVICES_ENABLE,avahi-daemon)
+	@$(call add,BASE_LISTS,domain-client-i) # i-f-* shouldn't hit live

features.in/e2k/config.mk

@@ -1,10 +1,55 @@
 use/e2k:
 	@$(call add_feature)
-	@$(call set,KFLAVOURS,mcst-def)
+	@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
+
+# at least one of these is requisite
+use/e2k/1cp use/e2k/4c use/e2k/8c: use/e2k/%: use/e2k
+	@$(call set,KFLAVOURS,elbrus-$*)
 
 use/e2k/x11: use/e2k use/x11
-	@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
-	@$(call add,THE_PACKAGES,xorg-drv-ati xinit)
+	@$(call add,THE_PACKAGES,xorg-server xinit)
 
-use/e2k/sound:
+use/e2k/x11/401: use/e2k/x11 use/e2k/4c
+	@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
+	@$(call add,THE_PACKAGES,xorg-drv-ati)
+
+use/e2k/x11/801: use/e2k/x11 use/e2k/8c
+	@$(call add,THE_PACKAGES,xorg-conf-e801-radeon)
+	@$(call add,THE_PACKAGES,xorg-drv-ati)
+
+use/e2k/x11/.101: use/e2k/x11 use/e2k/1cp; @:
+
+use/e2k/x11/101/modesetting: use/e2k/x11/.101
+	@$(call add,THE_PACKAGES,xorg-conf-e101-modesetting)
+	@$(call add,THE_PACKAGES,dummy-xorg-drv-vivante)
+
+use/e2k/x11/101: use/e2k/x11/.101
+	@$(call add,THE_PACKAGES,xorg-conf-e101-mga2)
+	@$(call add,THE_PACKAGES,xorg-drv-mga2 vivante_glx)
+
+use/e2k/install2: use/e2k
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
+
+use/e2k/install2/desktop: use/e2k/install2
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
+
+use/e2k/install2/4xx: use/e2k/install2 use/e2k/4c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e4xx-fbdev)
+
+use/e2k/install2/401: use/e2k/install2/desktop use/e2k/4c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e401-modesetting)
+
+use/e2k/install2/801: use/e2k/install2/desktop use/e2k/8c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e801-modesetting)
+
+use/e2k/install2/101: use/e2k/install2/desktop use/e2k/1cp
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e101-modesetting)
+	@$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante)
+
+use/e2k/sound/401:
 	@$(call add,THE_PACKAGES,setup-alsa-elbrus-401)
+
+use/e2k/401: use/e2k/install2/401 use/e2k/x11/401 use/e2k/sound/401; @:
+use/e2k/801: use/e2k/install2/801 use/e2k/x11/801; @:
+use/e2k/101: use/e2k/install2/101 use/e2k/x11/101; @:

features.in/e2k/install2/image-scripts.d/50-e2k-no-notes

@@ -0,0 +1,4 @@
+#!/bin/sh
+# e2k images are distributed through MCST now with a separate agreement
+
+sed -i '/license/d' /usr/share/install2/installer-steps ||:

features.in/e2k/rootfs/files/boot/boot.conf

@@ -1,7 +0,0 @@
-default=auto
-
-label=auto
-       partition=0
-       image=/image-@KVER@
-       initrd=/initrd-@KVER@.img
-       cmdline=console=tty0 consoleblank=0 hardreset root=UUID=@ROOTUUID@

features.in/e2k/rootfs/image-scripts.d/50-e2k-serial

@@ -1,9 +1,14 @@
 #!/bin/sh
 
 CFG="/boot/boot.conf"
+[ -s "$CFG" ] || {
+	echo "50-e2k-serial: $CFG missing, exiting" >&2
+	exit 0
+}
 
-[ -f "$CFG" ] || exit 1
 [ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
 
 # tty0 first
 sed -i "s/console=tty0 /console=$GLOBAL_TTY_DEV,$GLOBAL_TTY_RATE &/" "$CFG"
+
+### NB: there's no boot.conf yet!  could only be the sample one

features.in/e2k/rootfs/image-scripts.d/51-e2k-koi8-r

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "#LANG=ru_RU.KOI8-R" >> /etc/sysconfig/i18n
+echo "#SYSFONTACM=koi8-r" >> /etc/sysconfig/consolefont
+echo "#KBCHARSET=koi8-r" >> /etc/sysconfig/keyboard
+echo "#KEYTABLE=ru_cplk-KOI8-R" >> /etc/sysconfig/keyboard

features.in/e2k/rootfs/image-scripts.d/51-e2k-utf-8

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "LANG=ru_RU.UTF-8" >> /etc/sysconfig/i18n
+echo "SYSFONT=UniCyr_8x16" >> /etc/sysconfig/consolefont
+echo "KEYTABLE=ruwin_cplk-UTF-8" >> /etc/sysconfig/keyboard
+
+[ ! -f /etc/locale.conf ] ||
+	echo "LANG=ru_RU.UTF-8" >> /etc/locale.conf

features.in/efi/config.mk

@@ -23,7 +23,7 @@ use/efi/refind: use/efi
 use/efi/signed: use/efi
 	@$(call set,EFI_CERT,altlinux)
 	@$(call add,COMMON_PACKAGES,shim-signed)
-	@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
+	@$(call add,RESCUE_PACKAGES,openssl pesign)
 
 use/efi/shell: use/efi
 	@$(call try,EFI_SHELL,efi-shell)

features.in/firmware/config.mk

@@ -31,6 +31,7 @@ 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
-	@$(call add,KMODULES,acpi_call)
+	@$(call add,THE_KMODULES,acpi_call)

features.in/fonts/config.mk

@@ -19,6 +19,10 @@ use/fonts/zerg: use/fonts
 use/fonts/infinality: use/fonts
 	@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)
 
+# #34142
+use/fonts/chinese: use/fonts
+	@$(call add,THE_PACKAGES,fonts-bitmap-wqy)
+
 # a few typical font collections
 # NB: dejavu is ugly thus missing
 # NB: not depending on use/fonts intentionally,

features.in/init/config.mk

@@ -1,26 +1,34 @@
 +sysvinit: use/init/sysv; @:
 +systemd: use/init/systemd/full; @:
 
-use/init:
+# NB: the list name MUST be identical to init package name
+use/init: use/pkgpriorities
 	@$(call add_feature)
 	@$(call add,THE_LISTS,$$(INIT_TYPE))
+	@$(call add,PINNED_PACKAGES,$$(INIT_TYPE))
 
 # THE_LISTS is too late when BASE_PACKAGES have pulled in
 # the wrong syslogd-daemon provider already
 use/init/sysv: use/init
 	@$(call set,INIT_TYPE,sysvinit)
-	@$(call add,BASE_PACKAGES,syslogd)
+	@$(call add,BASE_PACKAGES,rsyslog-classic)
 
 use/init/sysv/polkit: use/init/sysv
 	@$(call add,THE_PACKAGES,polkit-sysvinit)
 
+use/init/sysv/consolekit: use/init/sysv
+	@$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector)
+
 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init
 	@$(call set,INIT_TYPE,systemd)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-journald-tty)
 
 use/init/systemd/full: use/init/systemd
-	@$(call add,THE_PACKAGES,bash-completion-systemd)
+	@$(call add,THE_PACKAGES,bash-completion-systemd chkconfig)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,THE_PACKAGES,vconsole-setup-kludge)
+endif
 
 # http://www.freedesktop.org/wiki/Software/systemd/Debugging
 use/init/systemd/debug: use/init/systemd use/services

features.in/init/rescue/image-scripts.d/50-sysvinit

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# the part below relates to sysvinit specifically
+rpm -q sysvinit || exit 0
+
+# this was a bunch of dirty complaints
+sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||:
+
+# https://bugzilla.altlinux.org/35350
+# this FAILS: no symlinks...
+#rm -rf /var/run /var/lock
+# ...so just revert what's been broken in failsystem package
+mkdir -p /var/run /var/lock/{serial,subsys,uucp}
+chmod 0770 /var/lock/subsys
+chmod 0770 /var/lock/{serial,uucp}
+chgrp uucp /var/lock/{serial,uucp}

features.in/init/rootfs/image-scripts.d/50-sysvinit

@@ -0,0 +1,22 @@
+#!/bin/sh
+# 40: should run before 50-users in deflogin
+
+# the part below relates to sysvinit specifically
+rpm -q sysvinit || exit 0
+
+# NM-specific group
+case "$GLOBAL_GROUPS" in
+	*_nmconnect*) groupadd -r _nmconnect ||:;;
+esac
+
+# this was a bunch of dirty complaints
+sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||:
+
+# https://bugzilla.altlinux.org/35350
+# this FAILS: no symlinks...
+#rm -rf /var/run /var/lock
+# ...so just revert what's been broken in failsystem package
+mkdir -p /var/run /var/lock/{serial,subsys,uucp}
+chmod 0770 /var/lock/subsys
+chmod 0770 /var/lock/{serial,uucp}
+chgrp uucp /var/lock/{serial,uucp}

features.in/install2/config.mk

@@ -1,6 +1,10 @@
 # alterator-based installer, second (livecd) stage
 
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 +installer: use/install2/full; @:
+else
++installer: use/install2/packages; @:
+endif
 
 use/install2: use/stage2 sub/stage2@install2 use/metadata \
 	use/cleanup/installer
@@ -86,6 +90,9 @@ use/install2/jfs:
 use/install2/reiserfs:
 	@$(call add,SYSTEM_PACKAGES,reiserfsprogs)
 
+use/install2/fat:
+	@$(call add,SYSTEM_PACKAGES,dosfstools fatresize)
+
 # prepare bootloader for software suspend (see also live)
 use/install2/suspend:
 	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
@@ -108,7 +115,7 @@ use/install2/cleanup/x11-hwdrivers:
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-ati xorg-drv-intel)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-glamor)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-mach64 xorg-drv-mga)
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau xorg-drv-nv)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-openchrome)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-r128 xorg-drv-radeon)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-s3virge xorg-drv-savage)

features.in/kernel/config.mk

@@ -18,7 +18,10 @@ use/kernel/wireless: use/firmware/wireless
 	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
 
 use/kernel/laptop: use/firmware/laptop
-	@$(call add,KMODULES,omnibook tp_smapi)
+	@$(call add,THE_KMODULES,omnibook tp_smapi)
 
 use/kernel/desktop:
-	@$(call add,KMODULES,lirc v4l)
+	@$(call add,THE_KMODULES,lirc v4l)
+
+use/kernel/server:
+	@$(call add,THE_KMODULES,ipset kvm)

features.in/kernel/stage1/scripts.d/80-make-initrd

@@ -28,8 +28,15 @@ fi
 make-initrd $MAKE_INITRD_OPTS ||
 	fatal "make-initrd failed"
 
+case `arch` in
+e2k)
+	kname=image;;
+*)
+	kname=vmlinuz;;
+esac
+
 [ -h /boot/vmlinuz ] ||
-	ln -s vmlinuz-$kver /boot/vmlinuz
+	ln -s $kname-$kver /boot/$kname
 
 [ -h /boot/initrd.img ] ||
 	ln -s initrd-$kver.img /boot/initrd.img

features.in/l10n/config.mk

@@ -7,7 +7,6 @@
 # TODO: KEYMAP for default keymap?
 use/l10n:
 	@$(call add_feature)
-	@$(call add,STAGE2_BOOTARGS,lang=$$(LOCALE))
 	@$(call add,THE_PACKAGES,glibc-locales)
 	@$(call add,LOCALES,en_US)
 	@$(call add,XKB_KEYMAPS,us)

features.in/ldm/README

@@ -0,0 +1,9 @@
+Simple hook to run Linux Driver Management tools to configure hybrid graphics
+(aka Optimus/PRIME) for different DM's.
+
+Currently supported:
++ LightDM
++ GDM
++ SDDM
+
+See https://github.com/solus-project/linux-driver-management

features.in/ldm/config.mk

@@ -0,0 +1,23 @@
++ldm: use/ldm/session; @:
+
+# common
+use/ldm: sub/rootfs use/services
+	@$(call add_feature)
+	@$(call add,COMMON_PACKAGES,ldm-tools)
+
+# configure X11 session
+use/ldm/session: use/ldm
+	@$(call add,COMMON_PACKAGES,ldm-session-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,ldm)
+
+# configure lightdm session
+use/ldm/session/lightdm: use/ldm/session
+	@$(call add,COMMON_PACKAGES,ldm-session-init-lightdm)
+
+# configure sddm session
+use/ldm/session/sddm: use/ldm/session
+	@$(call add,COMMON_PACKAGES,ldm-session-init-sddm)
+
+# configure gdm session
+use/ldm/session/gdm: use/ldm/session
+	@$(call add,COMMON_PACKAGES,ldm-session-init-gdm)

features.in/ldm/rootfs/image-scripts.d/50-ldm

@@ -0,0 +1,17 @@
+#!/bin/sh -efu
+# initiate LDM hook on boot
+
+cat << EOF > /etc/systemd/system/ldm.service
+[Unit]
+Description=Runs LDM configuration hooks
+
+[Service]
+ExecStart=/usr/bin/linux-driver-management configure gpu
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=default.target
+EOF
+
+systemctl enable ldm.service

features.in/live/config.mk

@@ -3,7 +3,7 @@
 # service defaults
 _ON = alteratord cpufreq-simple \
       livecd-evms livecd-fstab livecd-hostname \
-      livecd-setauth livecd-setlocale livecd-net-eth livecd-install-wmaker \
+      livecd-setauth livecd-setlocale livecd-timezone livecd-net-eth livecd-install-wmaker \
       random rpcbind plymouth avahi-daemon \
 
 _OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
@@ -58,7 +58,8 @@ use/live/repo/online:
 	@$(call add,LIVE_PACKAGES,livecd-online-repo)
 
 # alterator-based permanent installation
-use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg
+use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \
+	use/bootloader/live use/bootloader/grub
 	@$(call add,LIVE_PACKAGES,livecd-install)
 	@$(call add,LIVE_PACKAGES,livecd-installer-features)
 

features.in/live/live/image-scripts.d/65-os-release

@@ -0,0 +1,7 @@
+#!/bin/sh
+# Install /etc/*-release files on live if needed
+if [ -d /usr/share/branding-data-current ] && \
+	! [ -e /etc/altlinux-release ] && \
+	! [ -e /etc/os-release ]; then
+    cp -a /usr/share/branding-data-current/release/*-release /etc/
+fi

features.in/live/live/stage2cfg.mk

@@ -1,14 +1,13 @@
 # stage2 mod: livecd
 
-STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)
+STAGE2_KMODULES = $(LIVE_KMODULES) $(THE_KMODULES)
 
-IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
-			$(LIVE_PACKAGES_REGEXP)
+IMAGE_PACKAGES_REGEXP = $(LIVE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
 
-IMAGE_PACKAGES = $(call map,list, \
-			$(THE_LISTS) $(THE_GROUPS) \
-			$(LIVE_LISTS) $(LIVE_GROUPS)) \
-		 $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
+IMAGE_PACKAGES = $(COMMON_PACKAGES) $(LIVE_PACKAGES) $(THE_PACKAGES) \
+		 $(call map,list, \
+			$(LIVE_LISTS) $(LIVE_GROUPS) \
+			$(THE_LISTS) $(THE_GROUPS)) \
 		 interactivesystem
 
 MKI_PACK_RESULTS = squash:live

features.in/metadata/lib/50-metadata.mk

@@ -42,5 +42,5 @@ metadata: metadata-.base
 	tar -C $(PKGDIR) -cvf - \
 		$(call rlist,.base $(call groups2lists)) \
 		$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
-		$(call rprofile,$(PKG_PROFILES)) \
+		$(call rprofile,$(THE_PROFILES)) \
 	> $(METADIR)/pkg-groups.tar

features.in/net-dns/rootfs/image-scripts.d/60-net-dns

@@ -1,3 +1,17 @@
 #!/bin/sh
 # set default nameserver, if any
-for i in $GLOBAL_NAMESERVERS; do echo "nameserver $i"; done >> /etc/resolv.conf
+
+if [ $GLOBAL_NAMESERVERS = "example" ]; then
+	echo "# yandex"
+	echo "#nameserver 77.88.8.1"
+	echo "# google"
+	echo "#nameserver 8.8.8.8"
+	echo "# level3"
+	echo "#nameserver 4.2.2.1"
+	echo "#nameserver 4.2.2.2"
+	echo "#nameserver 4.2.2.3"
+else
+	for i in $GLOBAL_NAMESERVERS; do
+		echo "nameserver $i"
+	 done
+fi >> /etc/resolv.conf

features.in/net/config.mk

@@ -2,20 +2,22 @@
 
 use/net: use/services
 	@$(call add_feature)
-	@$(call add,THE_PACKAGES,network-config-subsystem)
+	@$(call add,THE_PACKAGES,$$(THE_NET_SUBSYS))
+	@$(call set,THE_NET_SUBSYS,network-config-subsystem)
 
 use/net/etcnet: use/net
-	@$(call add,THE_PACKAGES,etcnet)
+	@$(call set,THE_NET_SUBSYS,etcnet)
 	@$(call add,DEFAULT_SERVICES_ENABLE,network)
 
 use/net/dhcp: use/net
 	@$(call add,THE_PACKAGES,dhcpcd)
 
-# base service, no GUI
+# base service, no GUI; see x11 feature for those
 use/net/nm: use/net
-	@$(call add,THE_LISTS,$(call tags,base nm))
+	@$(call set,THE_NET_SUBSYS,NetworkManager)
+	@$(call add,THE_LISTS,$(call tags,base nm))  # 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,network) # need for NM?
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
 
@@ -23,12 +25,12 @@ use/net/nm/nodelay: use/net/nm
 	@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)
 
 use/net/nm/mmgui: use/net/nm
-	@$(call add,THE_PACKAGES,modem-manager-gui)
+	@$(call set,THE_NET_SUBSYS,modem-manager-gui)
 
 use/net/connman: use/net
-	@$(call add,THE_PACKAGES,connman)
+	@$(call set,THE_NET_SUBSYS,connman)
 	@$(call add,DEFAULT_SERVICES_ENABLE,connmand connman)
 
 use/net/networkd: use/net
-	@$(call add,THE_PACKAGES,systemd-networkd)
+	@$(call set,THE_NET_SUBSYS,systemd-networkd)
 	@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)

features.in/net/rootfs/image-scripts.d/50-net-resolv

@@ -1,19 +1,8 @@
 #!/bin/sh
+# see also net-dns feature for actual nameserver control
 
-# offer some convenient servers for static configuration cases
-# (see also net-dns feature)
-if [ -d /etc/net/ifaces/lo ]; then
-	{
-	echo "# yandex"
-	echo "#nameserver 77.88.8.1"
-	echo "# google"
-	echo "#nameserver 8.8.8.8"
-	echo "# level3"
-	echo "#nameserver 4.2.2.1"
-	echo "#nameserver 4.2.2.2"
-	echo "#nameserver 4.2.2.3"
-	} >> /etc/net/ifaces/lo/resolv.conf
-fi
+# purge hasher-provided files potentially disclosing
+# build host's network configuration bits
 find /var -name resolv.conf -or -name nsswitch.conf -delete
 
 # hasher might have carried host /etc/hosts over, need to overwrite

features.in/ntp/config.mk

@@ -1,6 +1,7 @@
-use/ntp: use/services
+use/ntp: use/services use/pkgpriorities
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,openntpd)
+	@$(call add,PINNED_PACKAGES,openntpd)
 	@$(call add,DEFAULT_SERVICES_ENABLE,ntpd)
 
 use/ntp/client: use/ntp

features.in/pack/config.mk

@@ -6,14 +6,9 @@ DISTRO_EXTS := .iso
 use/pack:
 	@$(call add_feature)
 
-# conventional ISO9660 image hybridization
-# for direct bootable usbflash imaging
-use/pack/iso: use/pack boot/isolinux $(ISOHYBRID:%=use/isohybrid)
-ifeq (distro,$(IMAGE_CLASS))
-	@$(call set,IMAGE_PACKTYPE,boot)
-else
-	@$(call set,IMAGE_PACKTYPE,isodata)
-endif
+# fallback type is isodata, might get set elsewhere to produce bootable iso
+use/pack/iso: use/pack
+	@$(call try,IMAGE_PACKTYPE,isodata)
 
 # virtual environments
 VE_ARCHIVES := tar cpio ubifs
@@ -40,6 +35,6 @@ $(foreach c,$(VE_ARCHIVES), \
 		$(eval $(call PACK_compressors,$(c),$(z)))))
 
 # virtual machines
-VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
+VM_EXTS := .img .qcow2 .qcow2c .vdi .vmdk .vhd
 
 $(VM_EXTS:.%=use/pack/%): use/pack; @:

features.in/pkgpriorities/README

@@ -0,0 +1,28 @@
+Эта фича обеспечивает добавление записей в файл
+`$(PKGBOX)/aptbox/etc/apt/pkgpriorities`
+после инициализации чрута, но перед установкой пакетов.
+
+Содержимое файла `pkgpriorities` формируется на основе списка
+`PINNED_PACKAGES`.  Значение приоритета по умолчанию определяется
+переменной `PIN_PRIORITY`, в которую при инициализации фичи
+записывается `"Important"`.  Список приоритетов:
+
+ Essential, Important, Required, Standard, Optional, Extra
+
+Переопределить значение приоритета можно отдельно для каждого пакета
+в списке, указав желаемый приоритет через двоеточие после имени пакета;
+например:
+
+ $(call add,PINNED_PACKAGES,my-package:Essential)
+
+Используя `PINNED_PACKAGES`, можно заранее определить выбор того
+или иного пакета для удовлетворения виртуальной зависимости.
+Если виртуальный пакет присутствует в основном списке пакетов для
+установки, а пакет, его предоставляющий -- в этом списке, то
+вероятность его установки повышается согласно приоритету. Однако
+если виртуальный пакет не выбран для установки или приоритетный
+пакет отсутствует в репозитории, то сборка образа продолжится без
+изменений. Следовательно, с помощью списка `PINNED_PACKAGES` можно
+влиять на состав дистрибутива, но его содержание, в отличие от
+обыкновенных списков пакетов, имеет _рекомендательный_, а не
+обязательный, характер.

features.in/pkgpriorities/config.mk

@@ -0,0 +1,3 @@
+use/pkgpriorities:
+	@$(call add_feature)
+	@$(call set,PIN_PRIORITY,Important)

features.in/pkgpriorities/main/lib/50-pkgpriorities.mk

@@ -0,0 +1,26 @@
+_IMAGE_APTBOX_ = $(WORKDIR)/aptbox
+
+# Add prerequisite to the copy-packages target of
+# $(MKIMAGE_PREFIX)/targets.mk.
+copy-packages: $(_IMAGE_APTBOX_)/etc/apt/pkgpriorities
+
+_PINNED_PACKAGES_ = $(foreach pp,$(PINNED_PACKAGES),$(if $(findstring :,$(pp)),$(pp),$(pp):$(PIN_PRIORITY)))
+_PIN_PRIORITIES_ = $(sort $(foreach pp,$(_PINNED_PACKAGES_),$(lastword $(subst :, ,$(pp)))))
+_PKGPRIORITIES_ = $(subst \n ,\n,$(foreach pri,$(_PIN_PRIORITIES_),$(pri):$(patsubst %:$(pri),\n   %,$(filter %:$(pri),$(_PINNED_PACKAGES_)))\n))
+
+$(_IMAGE_APTBOX_)/etc/apt/pkgpriorities: prepare-workdir
+	@echo -e '$(_PKGPRIORITIES_)' | sed -e 's,[[:space:]]\+$$,,' >$@
+	@if [ -s $@ ]; then \
+		if grep -q '^\(APT::\)\?Dir::Etc::pkgpriorities[[:space:]]' \
+			$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+		then \
+			sed -i -e 's,\(Dir::Etc::pkgpriorities\)[[:space:]].*$$,\1 "$@";,g' \
+				$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+		else \
+			echo 'Dir::Etc::pkgpriorities "$@";' \
+				>>$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+		fi; \
+		echo "--- Package priorities ---" >&2; \
+		cat $@ >&2; \
+		echo "---" >&2; \
+	fi

features.in/pkgpriorities/stage2/lib/50-pkgpriorities.mk

@@ -0,0 +1,26 @@
+_IMAGE_APTBOX_ = $(WORKDIR)/chroot/$(WORKDIRNAME)/aptbox
+
+# Add prerequisite to the build-image target of
+# $(MKIMAGE_PREFIX)/targets.mk.
+build-image: $(_IMAGE_APTBOX_)/etc/apt/pkgpriorities
+
+_PINNED_PACKAGES_ = $(foreach pp,$(PINNED_PACKAGES),$(if $(findstring :,$(pp)),$(pp),$(pp):$(PIN_PRIORITY)))
+_PIN_PRIORITIES_ = $(sort $(foreach pp,$(_PINNED_PACKAGES_),$(lastword $(subst :, ,$(pp)))))
+_PKGPRIORITIES_ = $(subst \n ,\n,$(foreach pri,$(_PIN_PRIORITIES_),$(pri):$(patsubst %:$(pri),\n   %,$(filter %:$(pri),$(_PINNED_PACKAGES_)))\n))
+
+$(_IMAGE_APTBOX_)/etc/apt/pkgpriorities: prepare-image-workdir
+	@echo -e '$(_PKGPRIORITIES_)' | sed -e 's,[[:space:]]\+$$,,' >$@
+	@if [ -s $@ ]; then \
+		if grep -q '^\(APT::\)\?Dir::Etc::pkgpriorities[[:space:]]' \
+			$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+		then \
+			sed -i -e 's,\(Dir::Etc::pkgpriorities\)[[:space:]].*$$,\1 "$@";,g' \
+				$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+		else \
+			echo 'Dir::Etc::pkgpriorities "$@";' \
+				>>$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+		fi; \
+		echo "--- Package priorities ---" >&2; \
+		cat $@ >&2; \
+		echo "---" >&2; \
+	fi

features.in/repo/README

@@ -1,8 +1,8 @@
 Эта фича предназначена для конфигурирования репозиториев
 в образе, включая генерацию хэшей и подключение к LiveCD.
 
-На данный момент единственным таким репозиторием является
-RPMS.main (создаваемый sub/main), но возможно добавление
+По умолчанию таким репозиторием является RPMS.main
+(создаваемый sub/main), но возможно добавление
 addons, updates или иных по мере необходимости.
 
 Результат -- каталог ALTLinux/base/ для копирования в образ.

features.in/repo/config.mk

@@ -3,3 +3,6 @@ use/repo:
 	@$(call add,STAGE1_PACKAGES,gnupg)
 
 use/repo/main: sub/main use/repo; @:
+
+use/repo/addon: use/repo/main
+	@$(call set,MAIN_SUFFIX,addon)

features.in/rescue/rescue/image-scripts.d/00-test-rescue

@@ -2,9 +2,10 @@
 
 no_x11() {
 	if rpmquery libX11 >&/dev/null; then
-		echo "** rescue image contains libX11 which is prohibited" >&2
+		echo "** rescue image contains libX11 which is prohibited"
+		rpm -e --test libX11
 		exit 1
-	fi
+	fi >&2
 }
 
 case "${GLOBAL_TEST_RESCUE:-}" in

features.in/rescue/rescue/image-scripts.d/60-apt

@@ -1,4 +1,4 @@
 #!/bin/sh
 # enable online repository even more unconditionally
 
-sed -i "s,^#\(rpm \[alt\] http.*\),\1," "/etc/apt/sources.list.d/yandex.list"
+sed -i "s,^#\(rpm \[alt\] http.*\),\1," "/etc/apt/sources.list.d/yandex.list" ||	echo "** warning: unable to enable online repos" >&2

features.in/rescue/rescue/stage2cfg.mk

@@ -1,8 +1,8 @@
 # stage2 mod: rescue "live" image
 
-IMAGE_PACKAGES = $(call list,$(RESCUE_LISTS)) \
-		 $(COMMON_PACKAGES) \
+IMAGE_PACKAGES = $(COMMON_PACKAGES) \
 		 $(RESCUE_PACKAGES) \
+		 $(call list,$(RESCUE_LISTS)) \
 		 interactivesystem startup-rescue
 
 MKI_PACK_RESULTS = squash:rescue

features.in/server/config.mk

@@ -41,9 +41,13 @@ use/server/groups/tools: use/server
 	@$(call add,MAIN_GROUPS,tools/tuning)
 
 use/server/groups/services: use/server
-	@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)
-	@$(call add,MAIN_GROUPS,server/dhcp server/mail server/mysql)
-	@$(call add,MAIN_GROUPS,server/pgsql)
+	@$(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/php5 server/php7)
+	@$(call add,MAIN_GROUPS,server/ftp server/rsync)
+	@$(call add,MAIN_GROUPS,server/kvm)
+	@$(call add,DEFAULT_SERVICES_DISABLE,php7-fpm)
 
 use/server/groups/base: use/server/groups/tools use/server/groups/services; @:
 

features.in/services/README

@@ -9,7 +9,5 @@
 Выключение сервиса в каждой из этих пар имеет приоритет перед
 включением.
 
-Внимание: фича опирается на субпрофиль rootfs, он должен быть
-задействован в каком-либо качестве, чтобы ожидаемое произошло.
-На данный момент действие rootfs не распространяется на системы,
-устанавливаемые при помощи install2.
+Предприняты особые меры в виде скрипта для install2,
+чтобы передать указание настроить службы инсталятору.

features.in/services/install2/image-scripts.d/10-services

@@ -7,16 +7,27 @@
 # NB: install2 is not a rootfs, handling differs either
 
 STATUS=`mktemp`
+CONFDIR=/usr/share/install2
+CHECK_FILES=
 
 . shell-config
 
 switch() {
+	[ -n "$CHECK_FILES" ] && \
+		egrep -qs "^[[:blank:]]*$1(.service|.socket)?[[:blank:]]*$" \
+			$CHECK_FILES && return ||:
+
 	case "$2" in
 	on|off)
 		shell_config_set "$STATUS" "$1" "$2";;
 	esac
 }
 
+for f in services-on services-off systemd-enabled systemd-disabled; do
+	[ -s "$CONFDIR/$f" ] || continue
+	CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
+done
+
 # defaults (most likely features.in ones)
 for i in $GLOBAL_DEFAULT_SERVICES_ENABLE;  do switch $i on;  done
 for i in $GLOBAL_DEFAULT_SERVICES_DISABLE; do switch $i off; done
@@ -32,11 +43,11 @@ SERVICES="$(echo $SERVICES | sort -u)"
 for i in $SERVICES; do
 	onoff="$(shell_config_get "$STATUS" "$i")"
 	[ -n "$onoff" ] || continue
-	echo "$i" >> /usr/share/install2/services-"$onoff"
+	echo "$i" >> "$CONFDIR"/services-"$onoff"
 done
 
-cp -a /usr/share/install2/{services-on,systemd-enabled}
-cp -a /usr/share/install2/{services-off,systemd-disabled}
+cp -a "$CONFDIR"/{services-on,systemd-enabled}
+cp -a "$CONFDIR"/{services-off,systemd-disabled}
 
 rm "$STATUS"
 

features.in/sound/config.mk

@@ -6,11 +6,12 @@ use/sound:
 	@$(call add_feature)
 	@$(call add,THE_KMODULES,alsa sound)
 	@$(call add,THE_LISTS,sound/base)
+	@$(call add,THE_LISTS,$$(THE_SOUND))
 
 # ALSA only sound (additional utils needed if using pulseaudio)
 use/sound/alsa: use/sound
-	@$(call add,THE_PACKAGES,apulse)
+	@$(call set,THE_SOUND,sound/alsa)
 
 # PulseAudio (useful for per-app levels, dynamic devices and networked sound)
 use/sound/pulse: use/sound
-	@$(call add,THE_LISTS,sound/pulseaudio)
+	@$(call set,THE_SOUND,sound/pulseaudio)

features.in/stage2/config.mk

@@ -1,8 +1,10 @@
 # "1" is not a typo
 use/stage2: sub/stage1
 	@$(call add_feature)
-	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)
+	@$(call add,STAGE1_PACKAGES,make-initrd iproute2)
+	@$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator)
 	@$(call add,STAGE1_MODLISTS,$$(FEATURES))
+	@$(call xport,STAGE1_PACKAGES)
 	@$(call xport,STAGE1_KCONFIG)
 
 # building blocks for propagator's module cove

features.in/stage2/stage1/modules.d/50-stage2-net

@@ -5,6 +5,7 @@ kernel/drivers/net/\([^w]\|w[^i]\).\+\.ko
 8139too.ko
 8390.ko
 acenic.ko
+af_packet.ko
 amd8111e.ko
 atl1.ko
 atl1e.ko

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

@@ -24,8 +24,10 @@ configured()
 ls $CONFIGS >&/dev/null || fatal "no stage1 kernel config found in /boot"
 
 # test for installer-required filesystems support
-for opt in SQUASHFS AUFS_FS OVERLAY_FS $GLOBAL_STAGE1_KCONFIG; do
-	[ "$opt" = AUFS_FS ] && [ $(configured "OVERLAY_FS=[my]") -a $(configured "AUFS_FS=n") ] && continue
+configured "OVERLAY_FS=[my]" || configured "AUFS_FS=[my]" ||
+	echo fatal "stage1 kernel must support overlayfs or aufs"
+
+for opt in SQUASHFS $GLOBAL_STAGE1_KCONFIG; do
 	configured "$opt=[my]" || fatal "stage1 kernel must have $opt support"
 done
 

features.in/stage2/stage1/scripts.d/20-initrd-cifs

@@ -0,0 +1,9 @@
+#!/bin/sh
+# add mount.cifs to for get image from samba server
+# if it's available
+
+if [ -f /sbin/mount.cifs ]; then
+	echo "PUT_FILES += /sbin/mount.cifs" >> /etc/initrd.mk
+else
+	echo "20-initrd-cifs: skipping mount.cifs (missing)"
+fi

features.in/syslinux/cfg.in/25install-vnc-connect.cfg

@@ -1,4 +1,4 @@
-label linux
+label vncconnect
   menu label ^VNC install (<Tab>, IP of vncviewer --listen)
   kernel alt0/vmlinuz
   append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless vncconnect=IP

features.in/syslinux/cfg.in/25install-vnc-listen.cfg

@@ -1,4 +1,4 @@
-label linux
+label vncpasswd
   menu label VNC install (<Tab>, set pass^word and connect here)
   kernel alt0/vmlinuz
   append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless vncpasswd=VNCPWD

features.in/syslinux/cfg.in/82rescue_rw.cfg

@@ -1,5 +1,5 @@
 label rescue_session
   menu label Rescue with sess^ions support
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
 

features.in/syslinux/config.mk

@@ -1,10 +1,12 @@
 # default is plain text prompt
-use/syslinux: sub/stage1
+# NB: might be usbflash-ready hybrid iso
+use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,syslinux)
 	@$(call try,META_SYSTEM_ID,SYSLINUX)
-	@$(call try,BOOTVGA,0x314)
+	@$(call try,BOOTVGA,normal)
 	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
+	@$(call set,IMAGE_PACKTYPE,boot)
 
 # UI is overwritten
 use/syslinux/ui/%: use/syslinux

features.in/syslinux/generate.mk

@@ -28,7 +28,8 @@ ifndef SYSLINUX_DIRECT
 SYSLINUX_CFG := $(SYSLINUX_CFG) $(SUBPROFILE_DIRS) defaults
 endif
 
-DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in
+DSTDIR  := $(BUILDDIR)/stage1/files/syslinux/.in
+DSTCFGS := $(DSTDIR)/*.cfg
 
 # we can do SYSLINUX_{CFG,MODULES,FILES}
 # CFG have only cfg snippet
@@ -56,7 +57,7 @@ all: debug timeout
 	@sed -i \
 		-e 's,@mkimage-profiles@,$(IMAGE_NAME),' \
 		-e 's,@relname@,$(RELNAME),' \
-		$(DSTDIR)/*.cfg
+		$(DSTCFGS)
 
 # integerity check
 timeout: distro
@@ -65,7 +66,7 @@ timeout: distro
 	else \
 		TIMEOUT="$(DEFAULT_TIMEOUT)"; \
 	fi; \
-	sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg
+	sed -i "s,@timeout@,$$TIMEOUT," $(DSTCFGS)
 
 distro: bootargs
 	@if [ -n "$(META_VOL_SET)" ]; then \
@@ -73,26 +74,26 @@ distro: bootargs
 	else \
 		DISTRO="ALT"; \
 	fi; \
-	sed -i "s,@distro@,$$DISTRO," $(DSTDIR)/*.cfg
+	sed -i "s,@distro@,$$DISTRO," $(DSTCFGS)
 
 # pass over additional parameters, if any
 bootargs: clean
 	@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
-		sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTDIR)/*.cfg; \
+		sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTCFGS); \
 	fi; \
-	sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg
+	sed -i "s,@bootargs@,," $(DSTCFGS)
 	@if [ -n "$(RESCUE_BOOTARGS)" ]; then \
-		sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTDIR)/*.cfg; \
+		sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTCFGS); \
 	fi; \
-	sed -i "s,@rescue_bootargs@,," $(DSTDIR)/*.cfg
+	sed -i "s,@rescue_bootargs@,," $(DSTCFGS)
 	@if [ -n "$(BOOTVGA)" ]; then \
-		sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTDIR)/*.cfg; \
+		sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTCFGS); \
 	fi; \
-	sed -i "s,@bootvga@,,;s,vga= ,," $(DSTDIR)/*.cfg
+	sed -i "s,@bootvga@,,;s,vga= ,," $(DSTCFGS)
 
 clean: copy
 	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
-		sed -i "s/\^//;/menu label /d" $(DSTDIR)/*.cfg; \
+		sed -i "s/\^//;/menu label /d" $(DSTCFGS); \
 	fi
 
 copy: prep

features.in/syslinux/lib/90-syslinux.mk

@@ -0,0 +1 @@
+BOOT_TYPE := isolinux

features.in/vmguest/config.mk

@@ -1,14 +1,25 @@
-# x86: various VM guest modules/tools
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-
-+vmguest: use/vmguest/complete; @:
+# various VM guest modules/tools
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 
 use/vmguest:
 	@$(call add_feature)
 
-use/vmguest/base: use/vmguest/vbox use/vmguest/vmware; @:
+# NB: only reasonable for X11-bearing images
+# see also use/install2/kvm
+use/vmguest/kvm: use/vmguest
+	@$(call add,THE_PACKAGES,qemu-guest-agent)
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
++vmguest: use/vmguest/kvm; @:
+endif
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+
++vmguest: use/vmguest/complete; @:
+
+use/vmguest/base: use/vmguest/vbox use/vmguest/vmware use/vmguest/kvm; @:
 use/vmguest/complete: use/vmguest/base \
-	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm; @:
+	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @:
 
 use/vmguest/vbox: use/vmguest
 	@$(call add,THE_KMODULES,virtualbox-addition vboxguest)
@@ -17,10 +28,8 @@ use/vmguest/vbox/x11: use/vmguest/vbox
 	@$(call add,THE_KMODULES,drm)
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
 
-# NB: only reasonable for X11-bearing images
-# see also use/install2/kvm
-use/vmguest/kvm: use/vmguest
-	@$(call add,THE_PACKAGES,spice-vdagent qemu-guest-agent)
+use/vmguest/kvm/x11: use/vmguest/kvm
+	@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl)
 
 # see also use/install2/vmware
 use/vmguest/vmware:
@@ -29,10 +38,12 @@ use/vmguest/vmware:
 	@$(call add,THE_PACKAGES,open-vm-tools)
 
 use/vmguest/vmware/x11: use/vmguest/vmware
-	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse open-vm-tools-desktop)
 
 else
 
+# kvm-unsupported guest arch
 +vmguest: ;@:
 
 endif
+endif

features.in/volumes/README

@@ -0,0 +1,2 @@
+Эта фича обеспечивает выставление нужного профиля разбивки дисков
+при установке с помощью installer или livecd-install.

features.in/volumes/config.mk

@@ -0,0 +1,7 @@
+use/volumes:
+	@$(call add_feature)
+	@$(call add,INSTALL2_PACKAGES,$$(STAGE2_VOLUMES_PROFILE))
+	@$(call add,LIVE_PACKAGES,$$(STAGE2_VOLUMES_PROFILE))
+
+use/volumes/%: use/volumes
+	@$(call set,STAGE2_VOLUMES_PROFILE,volumes-profile-$*)

features.in/x11/config.mk

@@ -50,6 +50,10 @@ use/x11/vulkan: use/x11/intel use/x11/amdgpu
 	@$(call add,THE_PACKAGES,vulkan)
 	@$(call add,THE_PACKAGES,vulkan-radeon vulkan-intel)
 
+# see https://github.com/NVIDIA/libglvnd for all gory details
+use/x11/glvnd: use/x11
+	@$(call add,THE_PACKAGES,libglvnd-glx,libglvnd-egl)
+
 # sometimes broken with current xorg-server
 use/x11/nvidia: use/x11
 	@$(call set,NVIDIA_KMODULES,nvidia)
@@ -72,8 +76,9 @@ use/x11/xdm: use/x11-autostart
 	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole-stage3)
 
 ### : some set()-like thing might be better?
-use/x11/lightdm/gtk use/x11/lightdm/qt use/x11/lightdm/lxqt \
-	use/x11/lightdm/kde: use/x11/lightdm/%: use/x11-autostart
+use/x11/lightdm/gtk use/x11/lightdm/slick \
+	use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \
+	use/x11/lightdm/%: use/x11-autostart
 	@$(call add,THE_PACKAGES,lightdm-$*-greeter)
 
 use/x11/kdm: use/x11-autostart
@@ -114,14 +119,12 @@ use/x11/gtk/nm: use/net/nm
 
 use/x11/xfce: use/x11
 	@$(call add,THE_PACKAGES,xfce4-regular)
-ifneq (,$(filter-out e2k,$(ARCH)))
 	@$(call add,IM_PACKAGES,imsettings-xfce)
-endif
 
-use/x11/xfce/full: use/x11/xfce
+use/x11/xfce/full: use/x11/xfce +pulse
 	@$(call add,THE_PACKAGES,xfce4-full)
 
-use/x11/cinnamon: use/x11/xorg
+use/x11/cinnamon: use/x11/xorg +pulse
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
 	@$(call add,IM_PACKAGES,imsettings-cinnamon)
 
@@ -132,7 +135,7 @@ use/x11/gnome3: use/x11/xorg +pulse
 use/x11/e17: use/x11 use/net/connman
 	@$(call add,THE_LISTS,$(call tags,e17 desktop))
 
-use/x11/enlightenment: use/x11 use/net/connman
+use/x11/enlightenment: use/x11 use/net/connman +pulse
 	@$(call add,THE_LISTS,$(call tags,enlightenment desktop))
 	@$(call add,DEFAULT_SERVICES_DISABLE,acpid)
 
@@ -159,7 +162,7 @@ use/x11/gnustep: use/x11
 use/x11/xmonad: use/x11
 	@$(call add,THE_LISTS,$(call tags,xmonad desktop))
 
-use/x11/mate: use/x11
+use/x11/mate: use/x11 +pulse
 	@$(call add,THE_LISTS,$(call tags,mate desktop))
 	@$(call add,IM_PACKAGES,imsettings-mate)
 

image.in/Makefile

@@ -35,9 +35,15 @@ IMAGEDIR := $(wildcard $(IMAGEDIR))
 # additional means to reduce havoc in IMAGEDIR
 IMAGE_SORTDIR := $(wildcard $(SORTDIR))
 
-# reconstruct instead of passing yet another variable
+# use distro version in image name if defined
+ifdef DISTRO_VERSION
+IMAGE_VERSION := -$(DISTRO_VERSION)
+IMAGE_VER_LINK := $(IMAGE_NAME)$(IMAGE_VERSION)-latest-$(ARCH).$(IMAGE_TYPE)
+endif
+
+IMAGE_OUTFILE  := \
+	$(IMAGE_NAME)$(IMAGE_VERSION)-$(STATUS)$(DATE)-$(ARCH).$(IMAGE_TYPE)
 IMAGE_OUTDIR   := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)
-IMAGE_OUTFILE  := $(IMAGE_NAME)-$(STATUS)$(DATE)-$(ARCH).$(IMAGE_TYPE)
 IMAGE_OUTPATH  := $(IMAGE_OUTDIR)/$(IMAGE_OUTFILE)
 IMAGE_RELPATH  := $(IMAGE_SORTDIR:%=%/)$(IMAGE_OUTFILE)
 IMAGE_RELDIR   := $(IMAGE_OUTDIR:$(GLOBAL_BUILDDIR)/%=%)
@@ -56,6 +62,10 @@ CLEANUP_OUTDIR ?=
 GLOBAL_TARGET := $(ARCH)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))
 
+# take the latter part for complex-specified subprofiles like stage2@live;
+# care to exclude non-directories holding no makefiles like rootfs
+SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
+
 # the lib/build-*.mk comes from features.in/build-*/lib
 include $(sort $(wildcard lib/*.mk))
 include $(MKIMAGE_PREFIX)/targets.mk
@@ -80,12 +90,19 @@ imagedir:
 
 postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
 	@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | cut -f5 -d' '`"; \
+	if [ ! -n "$$OUTSIZE" ]; then \
+		echo "** error: $(IMAGE_OUTPATH) missing" >&2; \
+		exit 1; \
+	fi; \
 	echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
 	echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \
 	echo "IMAGE_OUTFILE = $(IMAGE_OUTFILE)" && \
 	ln -sf "$(IMAGE_RELPATH)" "$(IMAGE_LINKPATH)" && \
 	ln -sf "$(IMAGE_RELDIR)" "$(OUT_LINK)" && \
 	ln -sf "$(IMAGE_LINK)" "$(IMAGEDIR)/$(CURRENT_LINK).$(IMAGE_TYPE)"; \
+	if [ -n "$(IMAGE_VER_LINK)" ]; then \
+		ln -sf "$(IMAGE_RELPATH)" "$(IMAGEDIR)/$(IMAGE_VER_LINK)"; \
+	fi; \
 	if [ -n "$(GLOBAL_DEBUG)" ]; then \
 		mkdir -p "$(LOGDIR)"; \
 		cp -a build.log "$(LOGDIR)/$(IMAGE_OUTFILE).log"; \

lib/boot.mk

@@ -3,7 +3,17 @@ $(error this makefile is designed to be included in toplevel one)
 endif
 
 ifeq (distro,$(IMAGE_CLASS))
-# install media bootloader
-boot/isolinux: use/syslinux
+
+# install x86 media bootloader
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+boot/iso: use/syslinux
 	@$(call set,BOOTLOADER,isolinux)
 endif
+
+# firmware is the bootloader
+ifeq (,$(filter-out e2k%,$(ARCH)))
+boot/iso:
+	@$(call set,BOOTLOADER,e2k-boot)
+endif
+
+endif

lib/build.mk

@@ -24,7 +24,8 @@ START += time -f "%E %PCPU %Mk"
 # /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
 # armh (armv7l) doesn't have any but should cope with qemu-arm.static;
 # also check whether non-x86 build is running native
-EARCH := $(subst armh,arm,$(ARCH))
+EARCH := $(patsubst e2k%,e2k,$(subst armh,arm,$(ARCH)))
+ifeq (,$(findstring e2k,$(EARCH)))
 ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
 ifeq (,$(findstring $(EARCH),$(shell uname -m)))
 export GLOBAL_HSH_USE_QEMU=$(EARCH)
@@ -32,6 +33,7 @@ endif
 else
 START += $(ARCH)
 endif
+endif
 
 # to be passed into distcfg.mk; suggestions are welcome
 IMAGEDIR ?= $(shell \