1.1.107-alt1

- serial improvements

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.1.93
+Version: 1.1.107
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -11,7 +11,7 @@ Source: %name-%version.tar
 Packager: Michael Shigorin <mike@altlinux.org>
 
 BuildArch: noarch
-BuildRequires: rsync asciidoc-a2x fop fonts-ttf-dejavu
+BuildRequires: rsync
 
 Requires: rsync git-core
 Requires: time schedutils sfdisk
@@ -30,6 +30,7 @@ Requires: mkimage-preinstall
 Summary: %name documentation
 Group: Development/Documentation
 %{?_with_doc:BuildRequires: java /proc}
+%{?_with_doc:BuildRequires: asciidoc-a2x fop fonts-ttf-dejavu}
 
 %description
 mkimage-profiles is a collection of bits and pieces useful for
@@ -90,6 +91,49 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif
 
 %changelog
+* Mon Apr 03 2017 Michael Shigorin <mike@altlinux.org> 1.1.107-alt1
+- serial improvements
+
+* Mon Mar 13 2017 Michael Shigorin <mike@altlinux.org> 1.1.106-alt1
+- starterkits-20170312
+
+* Mon Feb 27 2017 Michael Shigorin <mike@altlinux.org> 1.1.105-alt1
+- disable git hooks (glebfm@)
+
+* Mon Feb 06 2017 Michael Shigorin <mike@altlinux.org> 1.1.104-alt1
+- [[vncinst]] fixed
+
+* Mon Jan 30 2017 Michael Shigorin <mike@altlinux.org> 1.1.103-alt1
+- rescue -= bootsplash
+
+* Mon Jan 09 2017 Michael Shigorin <mike@altlinux.org> 1.1.102-alt1
+- 2017
+
+* Mon Dec 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.101-alt1
+- starterkits-20161212
+
+* Mon Dec 05 2016 Michael Shigorin <mike@altlinux.org> 1.1.100-alt1
+- preparing for starterkits
+
+* Mon Nov 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.99-alt1
+- xfce-sysv
+- preparing...
+
+* Mon Oct 31 2016 Michael Shigorin <mike@altlinux.org> 1.1.98-alt1
+- preparing for workstation 8.1
+
+* Mon Oct 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.97-alt1
+- regular tweaks
+
+* Mon Sep 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.96-alt1
+- starterkits-20160912
+
+* Mon Aug 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.95-alt1
+- s/basealt/alt/g
+
+* Mon Jun 27 2016 Michael Shigorin <mike@altlinux.org> 1.1.94-alt1
+- workstation
+
 * Mon Jun 13 2016 Michael Shigorin <mike@altlinux.org> 1.1.93-alt1
 - starterkits-20160612
 

.gear/tags/3f9bb13441629472a51ae129d6cf2bc47c00bb90

@@ -0,0 +1,6 @@
+object ac06f8d856b70e145c89290aff355dae0a5472c0
+type commit
+tag v1.1.106
+tagger Michael Shigorin <mike@altlinux.org> 1489434435 +0300
+
+v1.1.106

.gear/tags/94f41754b87c908a12be5237ea2e4478e8d8f50f

@@ -1,6 +0,0 @@
-object a6dc910d144a87c1c5303b3d8f6d5ca929c8a7c0
-type commit
-tag v1.1.92
-tagger Michael Shigorin <mike@altlinux.org> 1464632677 +0300
-
-server-openstack

.gear/tags/list

@@ -1 +1 @@
-94f41754b87c908a12be5237ea2e4478e8d8f50f v1.1.92
+3f9bb13441629472a51ae129d6cf2bc47c00bb90 v1.1.106

bin/check-recipe

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# missing "; @:" for recipeless rules makes SHELL payload useless
+# (see also ../lib/report.mk); this results in broken target graphs
+# (so REPORT=1 gets crippled)
+
+  sed 's/^[a-z]\+\/.*:.*$/\n&/' "$@" \
+| grep -vE '^(#|export|if|else|endif|define|endef)' \
+| sed ':loop /^[^#].*[^\\]\\$/N; s/\\\n//; t loop' \
+| grep -vE ':=| = | ?= | += |^\$' \
+| sed ':loop /^[a-z]\+\/.*:.*$/N; s/\n\t\+@*/\; /; t loop' \
+| grep -vE ';|^$' && exit 1 ||:
+
+# see also http://unix.stackexchange.com/questions/228547

bin/mktmpdir

@@ -2,6 +2,8 @@
 # analyze free space, preferring tmpfs over really many gigaz
 # and taking into account configured hasher workdir prefices
 
+# NB: use BUILDDIR to override autodetection (see ../QUICKSTART)
+
 # hope there aren't spaces in RM's $HOME are they?
 DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp .."
 MINSIZE=262144		# face control criterion

bin/mp-commit

@@ -20,7 +20,7 @@ if type -t git >&/dev/null && pushd "$1" >/dev/null; then
 	fi
 	if [ -n "$(git status -s)" ]; then
 		git add . \
-		&& git commit -qam "$2" \
+		&& git commit -anq -m "$2" \
 		|| fatal "git add/commit failed"
 	fi
 	popd >/dev/null

bin/report-targets

@@ -21,10 +21,10 @@ while read first second third rest; do
 	for to in $TO; do
 		out="  \"$FROM\" -> \"$to\""
 		case $to in
-		*distro/*|*vm/*)
+		*distro/*|*vm/*|*ve/*)
 			echo "$out [weight=10];";;
 		*)
-			echo "$out";;
+			echo "$out;";;
 		esac
 	done
 done

conf.d/Makefile

@@ -0,0 +1,2 @@
+check:
+	@../bin/check-recipe *.mk

conf.d/basealt.mk

@@ -0,0 +1,71 @@
+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 sound-editing thunderbird virtualbox \
+	vlc 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/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 set,INSTALLER,altlinux-desktop)
+	@$(call add,INSTALL2_PACKAGES,alterator-notes)
+	@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
+	@$(call add,INSTALL2_PACKAGES,open-iscsi)
+	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,MAIN_PACKAGES,solaar)
+	@$(call add,MAIN_GROUPS,$(workstation_groups))
+	@$(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)
+
+endif

conf.d/live.mk

@@ -1,7 +1,8 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
+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 \
 	use/efi/signed use/efi/refind use/efi/shell; @:
@@ -122,7 +123,7 @@ distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
 distro/live-privacy: distro/.base +power +efi +systemd +vmguest \
 	use/live/base use/live/privacy use/live/ru \
 	use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
-	use/browser/firefox/i18n use/sound \
+	use/browser/firefox/esr use/browser/firefox/i18n use/sound \
 	use/fonts/otf/adobe use/fonts/otf/mozilla \
 	use/fonts/ttf/google use/fonts/ttf/redhat
 	@$(call set,KFLAVOURS,un-def)

conf.d/p8.mk

@@ -1,52 +1,50 @@
 # p8 base kits
 
 mixin/p8: use/browser/firefox/esr
-	@$(call set,BRANDING,basealt-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst basealt-p8-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,BaseALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
+	@$(call set,BRANDING,alt-starterkit)
+	@$(call set,IMAGE_FLAVOUR,$(subst alt-p8-,,$(IMAGE_NAME)))
+	@$(call set,META_VOL_ID,ALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
 
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/basealt-p8-cinnamon: distro/regular-cinnamon mixin/p8; @:
-distro/basealt-p8-icewm: distro/regular-icewm mixin/p8; @:
-distro/basealt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
-distro/basealt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
-distro/basealt-p8-kde4: distro/regular-kde4 mixin/p8; @:
-distro/basealt-p8-kde5: distro/regular-kde5 mixin/p8; @:
-distro/basealt-p8-lxde: distro/regular-lxde mixin/p8; @:
-distro/basealt-p8-lxqt: distro/regular-lxqt mixin/p8; @:
-distro/basealt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
-distro/basealt-p8-mate: distro/regular-mate mixin/p8; @:
-distro/basealt-p8-rescue: distro/regular-rescue mixin/p8; @:
-distro/basealt-p8-tde: distro/regular-tde mixin/p8; @:
-distro/basealt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
-distro/basealt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
-distro/basealt-p8-xfce: distro/regular-xfce mixin/p8; @:
-distro/basealt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
+distro/alt-p8-cinnamon: distro/regular-cinnamon mixin/p8; @:
+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-lxqt: distro/regular-lxqt mixin/p8; @:
+distro/alt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
+distro/alt-p8-mate: distro/regular-mate mixin/p8; @:
+distro/alt-p8-rescue: distro/regular-rescue mixin/p8; @:
+distro/alt-p8-tde: distro/regular-tde mixin/p8; @:
+distro/alt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
+distro/alt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
+distro/alt-p8-xfce: distro/regular-xfce mixin/p8; @:
+distro/alt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
+distro/alt-p8-enlightenment: distro/regular-enlightenment mixin/p8; @:
+distro/alt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
+distro/alt-p8-sysv-xfce: distro/regular-sysv-xfce mixin/p8; @:
 
-distro/basealt-p8-enlightenment: distro/regular-enlightenment mixin/p8
-	@$(call set,META_VOL_ID,BaseALT p8 E/$(ARCH))
+distro/alt-p8-jeos: distro/regular-jeos mixin/p8; @:
+distro/alt-p8-jeos-ovz: distro/regular-jeos-ovz mixin/p8; @:
+distro/alt-p8-server: distro/regular-server mixin/p8; @:
+distro/alt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
+distro/alt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
+distro/alt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
+distro/alt-p8-server-openstack: distro/regular-server-openstack mixin/p8; @:
+distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
 
-distro/basealt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
-
-distro/basealt-p8-jeos: distro/regular-jeos mixin/p8; @:
-distro/basealt-p8-jeos-ovz: distro/regular-jeos-ovz mixin/p8; @:
-distro/basealt-p8-server: distro/regular-server mixin/p8; @:
-distro/basealt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
-distro/basealt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
-distro/basealt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
-distro/basealt-p8-server-openstack: distro/regular-server-openstack mixin/p8; @:
-distro/basealt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
-
-distro/basealt-p8-builder: distro/regular-builder mixin/p8; @:
+distro/alt-p8-builder: distro/regular-builder mixin/p8; @:
 
 endif
 
 ifeq (ve,$(IMAGE_CLASS))
-ve/basealt-p8-ovz-generic: ve/generic mixin/p8; @:
+ve/alt-p8-ovz-generic: ve/generic mixin/p8; @:
 endif
 
 ifeq (vm,$(IMAGE_CLASS))
-vm/basealt-p8-vm-net: vm/net mixin/p8; @:
-vm/basealt-p8-cloud: vm/cloud-systemd mixin/p8; @:
+vm/alt-p8-vm-net: vm/net mixin/p8; @:
+vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
 endif

conf.d/regular.mk

@@ -18,19 +18,20 @@ distro/.regular-x11: distro/.regular-base +vmguest +wireless \
 	@$(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_ENABLE,gpm)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop lvm2-lvmpolld)
 	@$(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)
+	@$(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
+distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:
 
 # DE base target
 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
@@ -39,8 +40,10 @@ distro/.regular-desktop: distro/.regular-wm \
 	@$(call add,LIVE_LISTS,domain-client)
 	@$(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,powertop)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,KFLAVOURS,std-def)
 
 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
@@ -56,20 +59,25 @@ distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
 	@$(call add,THE_BRANDING,alterator)
 
 # common base for the very bare distros
-distro/.regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
-	use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
+distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
+	use/isohybrid use/branding use/bootloader/grub \
 	use/install2/repo use/install2/packages \
-	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
-	use/cleanup/jeos use/net/etcnet use/power/acpi/button
-	@$(call add,STAGE2_BOOTARGS,vga=0)
-	@$(call add,BASE_KMODULES,guest scsi vboxguest)
-	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
+	use/net/etcnet use/power/acpi/button
+	@$(call set,BOOTVGA,)
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
 	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
 	@$(call add,THE_LISTS,openssh)
 
+# ...and for somewhat bare distros
+distro/.regular-jeos: distro/.regular-jeos-base \
+	use/bootloader/lilo use/syslinux/lateboot.cfg \
+	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
+	use/cleanup/jeos
+	@$(call add,BASE_KMODULES,guest scsi vboxguest)
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
+
 # NB:
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
 distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
@@ -91,10 +99,22 @@ distro/.regular-install-x11: distro/.regular-install \
 	@$(call set,INSTALLER,altlinux-desktop)
 	@$(call add,THE_LISTS,$(call tags,regular desktop))
 
-distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
-	use/browser/seamonkey/i18n use/fonts/ttf/redhat
+# 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/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)
+
+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
+	@$(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,icewm-startup-networkmanager)
 	@$(call set,KFLAVOURS,un-def)
 
 mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
@@ -105,7 +125,7 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
 
 # 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/seamonkey/i18n
+	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
@@ -118,15 +138,21 @@ distro/regular-gnustep: distro/.regular-sysv \
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 
-distro/regular-xfce: distro/.regular-gtk \
-	use/x11/xfce use/domain-client/full use/browser/firefox/classic \
-	use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
+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/full
+	@$(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,xfce4-mixer pm-utils elinks mpg123)
 
 distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
-	use/init/sysv/polkit use/x11/xfce \
-	use/fonts/ttf/redhat use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call set,KFLAVOURS,un-def)
-	@$(call add,LIVE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
+	mixin/regular-xfce mixin/regular-xfce-sysv; @:
 
 distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
 	use/x11/gtk/nm use/im +nm
@@ -143,16 +169,15 @@ distro/regular-mate: distro/.regular-gtk +nm \
 distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
 
 distro/regular-enlightenment: distro/.regular-gtk \
-	use/x11/enlightenment use/fonts/infinality
-	@$(call set,META_VOL_ID,ALT Linux regular-E/$(ARCH))
+	use/x11/enlightenment use/fonts/infinality; @:
 
 distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
 	use/x11/enlightenment
-	@$(call set,META_VOL_ID,ALT Linux regular-E-SysV/$(ARCH))
+	@$(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/net/nm/mmgui use/im
-	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
+	use/x11/cinnamon use/fonts/infinality use/fonts/ttf/google \
+	use/net/nm/mmgui use/im; @:
 
 # not .regular-gtk due to gdm vs lightdm
 distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
@@ -166,7 +191,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 mixin/regular-tde: +tde \
 	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
 	@$(call add,THE_PACKAGES,kdeedu)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluez)
+	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
 
 distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
 	use/x11/gtk/nm use/net/nm/mmgui
@@ -184,8 +209,7 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
 
 mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/net/connman use/browser/qupzilla +plymouth
-	@$(call add,THE_PACKAGES,qconnman-ui)
+	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 
 distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
@@ -221,24 +245,24 @@ distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
 	@$(call add,RESCUE_LISTS,$(call tags,base && (smartcard || bench)))
 	@$(call add,RESCUE_LISTS,$(call tags,network security))
 
-distro/regular-sysv-tde: distro/.regular-install-x11 \
-	mixin/desktop-installer mixin/regular-tde use/install2/fs \
-	use/branding/complete use/branding/slideshow/once \
-	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
+distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde
 	@$(call add,THE_LISTS,$(call tags,base desktop))
 	@$(call add,THE_LISTS,$(call tags,regular tde))
 	@$(call add,THE_PACKAGES,kpowersave)
-	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
+
+distro/regular-sysv-xfce: distro/.regular-install-x11-full \
+	mixin/regular-xfce mixin/regular-xfce-sysv; @:
 
 distro/.regular-server-base: distro/.regular-install \
 	use/server/base use/stage2/kms
-	@$(call add,THE_LISTS,$(call tags,regular server))
+	@$(call add,THE_LISTS,$(call tags,server && (regular || network)))
 	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,SYSTEM_PACKAGES,multipath-tools)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
 
 distro/.regular-server: distro/.regular-server-base \
-	use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/x11
+	use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/libs
+	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,aptitude)
 	@$(call add,CLEANUP_PACKAGES,qt4-common)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
@@ -249,7 +273,8 @@ distro/.regular-server-managed: distro/.regular-server
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
 
-distro/regular-server: distro/.regular-server-managed use/server/groups/base
+distro/regular-server: distro/.regular-server-managed \
+	use/server/groups/base use/install2/vnc/full
 	@$(call add,MAIN_GROUPS,server/sambaDC)
 	@$(call add,MAIN_GROUPS,tools/hyperv)
 
@@ -276,9 +301,13 @@ distro/regular-server-pve: distro/.regular-server-base \
 	use/firmware/qlogic +efi +systemd
 	@$(call set,BASE_BOOTLOADER,grub)
 	@$(call set,INSTALLER,altlinux-server)
-	@$(call add,THE_PACKAGES,pve-manager)
+	@$(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_ENABLE,pve-manager)
+	@$(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)
 
 distro/regular-builder: distro/.regular-bare \
 	use/dev/builder/full +sysvinit +efi +power \
@@ -290,9 +319,9 @@ distro/regular-builder: distro/.regular-bare \
 	@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
 	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
 
-distro/regular-server-samba4: distro/regular-server
+distro/regular-server-samba4: distro/.regular-server-managed
 	@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
-	@$(call add,THE_PACKAGES,alterator-fbi alterator-dhcp)
+	@$(call add,THE_PACKAGES,alterator-dhcp)
 	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)
 
 endif

conf.d/ve.mk

@@ -4,11 +4,11 @@ ifeq (ve,$(IMAGE_CLASS))
 ve/bare: ve/.base +sysvinit; @:
 
 # /dev/pty and friends start here
-ve/base: ve/bare
+ve/base: ve/bare use/net-dns/level3
 	@$(call add,BASE_PACKAGES,interactivesystem)
 
 # a particular package list
-ve/ldv: ve/bare
+ve/ldv: ve/bare use/control/server/ldv
 	@$(call add,BASE_PACKAGES,xz bzip2 glibc hostinfo less)
 	@$(call add,BASE_PACKAGES,vim-console netlist rsync time)
 	@$(call add,BASE_PACKAGES,openssh-blacklist openssh-server)
@@ -16,6 +16,14 @@ ve/ldv: ve/bare
 
 ve/docker: ve/.base use/repo; @:
 
+# build environment
+ve/builder: ve/base use/repo
+	@$(call add,BASE_PACKAGES,vim-console git-core bash-completion zsh)
+	@$(call add,BASE_PACKAGES,su hasher mkimage-profiles rpm-build)
+	@$(call add,BASE_PACKAGES,rsync screen parallel pv)
+	@$(call add,BASE_PACKAGES,fdisk e2fsprogs iproute2 net-tools)
+	@$(call add,BASE_LISTS,openssh)
+
 # this should be more or less convenient
 ve/generic: ve/base use/repo
 	@$(call add,BASE_PACKAGES,vim-console etckeeper)
@@ -29,6 +37,9 @@ ve/openvpn: ve/bare
 ve/pgsql94: ve/generic
 	@$(call add,BASE_PACKAGES,postgresql9.4-server)
 
+ve/samba-DC: ve/generic
+	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
+
 ve/systemd-bare: ve/.base use/control/sudo-su use/repo use/net/networkd +systemd
 	@$(call add,BASE_PACKAGES,interactivesystem su)
 	@$(call add,BASE_LISTS,openssh)

doc/assumptions.txt

@@ -16,6 +16,8 @@ ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатыва
 ** ожидает, что каждая подлежащая трассированию цель каждого
     makefile при сборке конфигурации образа содержит непустой
     recipe -- хотя бы "; @:" -- т.к. зависит от запуска $(SHELL)
+** трассировка выполняется при REPORT=1 для формирования графа
+    зависимостей между промежуточными целями сборки конечного образа
 ** характерный признак пропуска -- разрыв графа (report-targets.png)
 
 * pkg.in/lists/Makefile

doc/params.txt

@@ -18,6 +18,11 @@
 ** значение: пусто (по умолчанию авто) либо список через пробел
 ** см. Makefile, doc/profiles.mk.sample
 
+* AUTOCLEAN
+** включает уборку (distclean) после успешной сборки образа
+** значение: пусто (по умолчанию нет) либо любая строка
+** см. lib/build.mk
+
 * BELL
 ** подаёт сигнал после завершения сборки
 ** значение: пусто (по умолчанию нет) либо любая строка

doc/vm.txt

@@ -14,7 +14,9 @@
 При работе с локальной копией mkimage-profiles.git следует иметь
 в виду, что предоставлять недоверенному пользователю право выполнять
 от имени root доступный ему по записи скрипт равнозначно предоставлению
-полных привилегий root.
+полных привилегий root (поэтому фича build-vm сперва проверяет наличие
+системно установленного пакета и по возможности старается запустить
+под sudo скрипт из него, доступный по записи только root).
 
 Для работы с более специфичными форматами, чем raw ("буквальный"
 образ диска), потребуется утилита qemu-img из одноименного пакета;

features.in/Makefile

@@ -25,6 +25,9 @@ define grepper_body
 	done
 endef
 
+check:
+	@../bin/check-recipe */config.mk
+
 %:
 	$(error BUILDDIR not defined)
 

features.in/armh/config.mk

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

features.in/armh/rootfs/image-scripts.d/50-network

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#     DESCRIPTION
-#
-# Setup network settings
-# 1. Truncate /etc/resolv.conf
-# 2. Init /etc/hosts with "127.0.0.1 localhost"
-# 3. Set hostname, domainname
-# 4. Set defaults for NetworkManager.
-
-
-#     REQUIRES
-#
-# Nothing
-
-
-#     INFO
-# At startup time hostname may be changed by live-hostname package.
-
-. shell-config
-
-NAME="init3-network"
-
-verbose()
-{
-    if [ -n "$GLOBAL_VERBOSE" ]; then
-        echo "HOOK: $NAME: $@"
-    fi
-}
-
-verbose "has started"
-
-DOMAINNAME="localdomain"
-HOSTNAME="localhost.localdomain"
-
-verbose "Init /etc/hosts with 127.0.0.1 localhost"
-echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
-
-verbose "Truncate /etc/resolv.conf"
-echo nameserver 8.8.8.8 >/etc/resolv.conf

features.in/browser/config.mk

@@ -1,13 +1,13 @@
 use/browser:
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
-	@$(call try,THE_BROWSER,webclient)	# fallback
+	@$(call try,THE_BROWSER,elinks)	# X11-less fallback
 
 # support both firefox and firefox-esr
 use/browser/firefox: use/browser
 	@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
 
-use/browser/seamonkey \
+use/browser/seamonkey use/browser/palemoon \
 	use/browser/chromium use/browser/epiphany \
 	use/browser/qupzilla use/browser/rekonq \
 	use/browser/elinks use/browser/links2: \
@@ -45,6 +45,9 @@ use/browser/firefox/classic: use/browser/firefox
 use/browser/seamonkey/i18n: use/browser/seamonkey
 	@$(call add,THE_BROWSER,seamonkey-ru)
 
+use/browser/palemoon/i18n: use/browser/palemoon
+	@$(call add,THE_BROWSER,palemoon-ru)
+
 # 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

@@ -17,10 +17,10 @@ DATE_F    := $(shell date +%F)
 
 BOOT_TYPE := isolinux
 
-all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
+all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
 
-prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
+prep: | $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
 
 # can't use mp-showref which belongs to the metaprofile
 dot-disk:

features.in/build-ve/image-scripts.d/08-resolv

@@ -1,9 +0,0 @@
-#!/bin/sh
-# by default hasher copy resolv.conf and /etc/hosts from host system
-# we need to change it to useful defaults
-
-echo 'nameserver 8.8.8.8' > /etc/resolv.conf
-echo 'nameserver 8.8.4.4' > /etc/resolv.conf
-#echo 'nameserver 2001:4860:4860::8888' > /etc/resolv.conf
-#echo 'nameserver 2001:4860:4860::8844' > /etc/resolv.conf
-echo '127.0.0.1 localhost.localdomain localhost' > /etc/hosts

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

@@ -20,9 +20,12 @@ check-sudo:
 	fi
 
 prepare-image: check-sudo
-	@if ! sudo $(TOPDIR)/bin/tar2fs \
+	@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
+		TOPDIR=$(MKIMAGE_PREFIX); \
+	fi; \
+	if ! sudo $(TOPDIR)/bin/tar2fs \
 		"$(VM_TARBALL)" "$(VM_RAWDISK)"  $(VM_SIZE) $(VM_FSTYPE); then \
-		echo "** error: sudo tar2fs failed, see also doc/vm.txt" >&2; \
+		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi
 

features.in/cleanup/live/image-scripts.d/90-cleanup-docs

@@ -1,5 +1,8 @@
 #!/bin/sh
 # remove all docs
 
+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
 rpmquery -ad |grep ^/ |xargs -r rm -f --
 rm -rf /usr/share/{doc,man,info,license,gfxboot}

features.in/deflogin/config.mk

@@ -39,3 +39,7 @@ use/deflogin/xgrp: use/deflogin
 # potentially elevated privileges (NB: _not_ wheel)
 use/deflogin/privileges: use/deflogin
 	@$(call add,GROUPS,fuse netadmin proc users)
+
+# NM with sysvinit
+use/deflogin/sysv/nm: use/deflogin
+	@$(call add,GROUPS,_nmconnect)

features.in/dev/config.mk

@@ -18,6 +18,7 @@ use/dev/builder/base: use/dev/mkimage use/dev
 		$(call tags,(base || live) && (server || builder)))
 	@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
 	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
+	@$(call add,LIVE_PACKAGES,perl-Gear-Remotes)
 
 use/dev/builder/full: use/dev/builder/base use/dev/repo
 	@$(call add,MAIN_LISTS,$(call tags,live builder))

features.in/docs/lib/30-docs.mk

@@ -5,8 +5,10 @@ DOT_BASE += docs-$(DOCS)
 CHROOT_PACKAGES += docs-$(DOCS)
 endif
 
-ifneq (,$(BRANDING))
+ifneq (,$(findstring notes,$(THE_BRANDING) $(INSTALL2_BRANDING)))
 CHROOT_PACKAGES_REGEXP += $(call branding,notes)
 endif
 
+ifneq (,$(findstring indexhtml,$(THE_BRANDING)))
 CHROOT_PACKAGES_REGEXP += $(call branding,indexhtml)
+endif

features.in/docs/scripts.d/50-docs-indexhtml

@@ -14,9 +14,9 @@ indexfile="$indexdir/index.html"
 [ -s "$indexfile" ] || nonfatal "$indexfile not found"
 
 [ -n "$GLOBAL_LOCALE" ] ||
-	echo "** warning: GLOBAL_LOCALE empty, maybe use/l10n" >&2
+	echo "** warning: GLOBAL_LOCALE empty, fallback to en_US (use/l10n?)">&2
 
-LANG="$GLOBAL_LOCALE" indexhtml-update
+LANG="${GLOBAL_LOCALE:-en_US}" indexhtml-update
 
 # http://unix.stackexchange.com/questions/94185/convert-soft-to-hardlinks
 cp -aH "$indexdir" "$dest"

features.in/efi/config.mk

@@ -38,6 +38,6 @@ else
 
 # ignore on an unsupported target arch but make it hybrid at least
 use/efi use/efi/signed use/efi/debug \
-  use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid
+  use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid; @:
 
 endif

features.in/firmware/config.mk

@@ -9,7 +9,7 @@ use/firmware:
 use/firmware/full: use/firmware/server use/firmware/laptop; @:
 
 use/firmware/cpu: use/firmware
-	@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
+	@$(call add,THE_PACKAGES,firmware-intel-ucode iucode_tool)
 
 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)

features.in/init/config.mk

@@ -1,5 +1,5 @@
 +sysvinit: use/init/sysv; @:
-+systemd: use/init/systemd; @:
++systemd: use/init/systemd/full; @:
 
 use/init:
 	@$(call add_feature)
@@ -19,6 +19,9 @@ 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)
+
 # http://www.freedesktop.org/wiki/Software/systemd/Debugging
 use/init/systemd/debug: use/init/systemd use/services
 	@$(call add,THE_PACKAGES,systemd-shutdown-debug-script)

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

@@ -0,0 +1,10 @@
+#!/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

features.in/install2/config.mk

@@ -20,13 +20,14 @@ use/install2/full: \
 	use/install2/packages use/install2/vmguest use/install2/tools \
 	use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader
 	@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
+	@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
 
 # for distributions with their own -stage3 installer part
 use/install2/stage3: use/install2
 	@$(call add,BASE_PACKAGES,installer-$$(INSTALLER)-stage3)
 
 # just an alias, better use its endpoint directly
-use/install2/fonts: use/fonts/install2
+use/install2/fonts: use/fonts/install2; @:
 
 # see also use/vmguest
 use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
@@ -55,11 +56,22 @@ use/install2/vbox:
 use/install2/vmware:
 	@$(call add,STAGE1_KMODULES,vmware)
 	@$(call add,STAGE1_KMODULES,scsi)	# mptspi in led-ws
-	@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware)
+	@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
 
 # NB: sort of conflicts with use/install2/cleanup/vnc
 use/install2/vnc:
-	@$(call add,INSTALL2_PACKAGES,x11vnc)
+	@$(call add,INSTALL2_PACKAGES,x11vnc xterm net-tools)
+
+# this one expects external vncviewer to come
+use/install2/vnc/listen: \
+	use/install2/vnc use/syslinux/install-vnc-listen.cfg; @:
+
+# this one connects to a specified vncviewer --listen
+use/install2/vnc/connect: \
+	use/install2/vnc use/syslinux/install-vnc-connect.cfg; @:
+
+# add both bootloader items to be *that* explicit ;-)
+use/install2/vnc/full: use/install2/vnc/listen use/install2/vnc/connect; @:
 
 # filesystems handling
 use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @:
@@ -87,8 +99,8 @@ use/install2/cleanup/vnc:
 
 # conflicts with luks feature
 use/install2/cleanup/crypto:
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg libgpg-error)
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,libgcrypt* libgnutls*)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,libgnutls*)
 
 # leave only cirrus, fbdev, qxl, vesa in vm-targeted images
 use/install2/cleanup/x11-hwdrivers:

features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat

@@ -19,15 +19,18 @@ rm -rf /usr/share/awk/
 # and no systemd either
 [ -L /sbin/init ] || rm -rf /lib/systemd/system
 
+# save VNC install if present
+MORE=
+[ -x /usr/bin/x11vnc ] || MORE="libGL libEGL libgbm libwayland\\* xterm"
+
 ### could it be handled with any grace?
 rpmquery -a common-licenses \
 	cpp\* gcc\* perl-base file ipv6calc \
 	bind-utils libbind \
 	libmpfr\* libmpc\* \
 	libsoup\* \
-	libwayland\* libgbm \
-	libGL libEGL glxinfo xdriinfo \
-	xdg-utils xterm \
+	$MORE glxinfo xdriinfo \
+	xdg-utils \
 	mkfontscale mkfontdir \
 	make make-initrd \
 | xargs -r rpmi -e --nodeps --

features.in/install2/install2/image-scripts.d/90-install2-cleanup-drivers

@@ -30,7 +30,8 @@ rm -rf /lib/modules/*/kernel/drivers/char/watchdog
 rm -rf /lib/modules/*/kernel/drivers/cpufreq
 rm -rf /lib/modules/*/kernel/drivers/edac
 rm -rf /lib/modules/*/kernel/drivers/gpio
-rm -rf /lib/modules/*/kernel/drivers/hwmon
+# NB: leave hwmon.ko
+rm -rf /lib/modules/*/kernel/drivers/hwmon/[^h]
 rm -rf /lib/modules/*/kernel/drivers/infiniband	###
 rm -rf /lib/modules/*/kernel/drivers/input/{gameport,joy*}
 rm -rf /lib/modules/*/kernel/drivers/isdn

features.in/live/live/image-scripts.d/99-xfce-theme

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -f /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ] || exit 0
+
+# fixup the default which broke after p8
+sed -i 's,name="IconThemeName" type="empty",name="IconThemeName" type="string" value="gnome",' /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ||:
+

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

@@ -7,7 +7,7 @@ METADIR := files/Metadata
 WHATEVER += metadata
 
 # handle these too
-DOT_BASE += $(BASE_PACKAGES_REGEXP)
+DOT_BASE += $(BASE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
 
 # args: type, name
 define dump
@@ -34,11 +34,13 @@ metadata-.base:
 	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
 
 # see also alterator-pkg (backend3/pkg-install);
-# we only tar up what's up to it
+# we only tar up what's up to it (note that e.g.
+# LIVE_LISTS are needed in the generated profile
+# but not for alterator-pkg)
 metadata: metadata-.base
 	@mkdir -p $(METADIR); \
 	tar -C $(PKGDIR) -cvf - \
-		$(call rlist,$(THE_GROUPS) $(MAIN_GROUPS) .base) \
+		$(call rlist,.base $(call groups2lists)) \
 		$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
 		$(call rprofile,$(PKG_PROFILES)) \
 	> $(METADIR)/pkg-groups.tar

features.in/net-dns/README

@@ -0,0 +1,9 @@
+Эта фича позволяет сконфигурировать публично доступный
+рекурсивный DNS-сервер для условий, когда локальный
+неизвестен заранее или попросту отсутствует; следует
+понимать, что это в некотором роде утечка данных,
+т.е. риск безопасности.
+
+Также возможно указать свои NAMESERVERS через пробел
+у себя в фиче или конфигурации дистрибутива, которая
+задействует use/net-dns.

features.in/net-dns/config.mk

@@ -0,0 +1,22 @@
+use/net-dns: use/net
+	@$(call add_feature)
+	@$(call xport,NAMESERVERS)
+
+use/net-dns/google: use/net-dns
+	@$(call add,NAMESERVERS,8.8.8.8 8.8.4.4)
+
+use/net-dns/google/v6: use/net-dns
+	@$(call add,NAMESERVERS,2001:4860:4860::8888)
+	@$(call add,NAMESERVERS,2001:4860:4860::8844)
+
+use/net-dns/level3: use/net-dns
+	@$(call add,NAMESERVERS,4.2.2.1 4.2.2.2 4.2.2.3)
+
+use/net-dns/yandex: use/net-dns
+	@$(call add,NAMESERVERS,77.88.8.8 77.88.8.1)
+
+use/net-dns/yandex/safe: use/net-dns
+	@$(call add,NAMESERVERS,77.88.8.88 77.88.8.2)
+
+use/net-dns/yandex/family: use/net-dns
+	@$(call add,NAMESERVERS,77.88.8.7 77.88.8.3)

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

@@ -0,0 +1,3 @@
+#!/bin/sh
+# set default nameserver, if any
+for i in $GLOBAL_NAMESERVERS; do echo "nameserver $i"; done >> /etc/resolv.conf

features.in/net-eth/config.mk

@@ -1,5 +1,5 @@
 # NB: this is aimed at LiveCD/installer images
-+net-eth: use/net-eth use/stage2/net-eth
++net-eth: use/net-eth use/stage2/net-eth; @:
 
 # see also use/stage2/net-eth; do not depend on it though
 # as stage2-less images need preconfigured networking too

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

@@ -64,6 +64,12 @@ write_systemd_iface() {
 		echo
 		echo "[Network]"
 		echo "DHCP=yes"
+		echo
+		echo "[DHCP]"
+		echo "UseMTU=yes"
+		echo "UseDomains=yes"
+		echo "UseNTP=yes"
+		echo
 		;;
 	static)
 		echo "[Match]"

features.in/net-usershares/rootfs/image-scripts.d/85-samba-usershares.sh

@@ -6,7 +6,7 @@
 
 USERSHARES_DIR="/var/lib/samba/usershares"
 USERSHARES_GROUP="sambashare"
-DEFAULT_GROUPS='cdwriter cdrom audio proc radio camera floppy xgrp scanner uucp' ###
+DEFAULT_GROUPS='cdwriter cdrom audio video proc radio camera floppy xgrp scanner uucp'
 GROUPS_FILE="/usr/share/install3/default-groups"
 
 mkdir -p "$USERSHARES_DIR"

features.in/net/config.mk

@@ -31,4 +31,4 @@ use/net/connman: use/net
 
 use/net/networkd: use/net
 	@$(call add,THE_PACKAGES,systemd-networkd)
-	@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)

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

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # offer some convenient servers for static configuration cases
+# (see also net-dns feature)
 if [ -d /etc/net/ifaces/lo ]; then
 	{
 	echo "# yandex"
@@ -17,3 +18,4 @@ find /var -name resolv.conf -or -name nsswitch.conf -delete
 
 # hasher might have carried host /etc/hosts over, need to overwrite
 echo "127.0.0.1	localhost.localdomain localhost" > /etc/hosts
+sed -ri "/^(search|nameserver)/d" /etc/resolv.conf

features.in/repo/config.mk

@@ -2,4 +2,4 @@ use/repo:
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,gnupg)
 
-use/repo/main: sub/main use/repo
+use/repo/main: sub/main use/repo; @:

features.in/repo/image-scripts.d/90-enable-repo

@@ -2,13 +2,13 @@
 # enable online repos if possible, just quit if anything's wrong
 
 repo_source='/etc/apt/sources.list.d/alt.list'
-host='http://ftp.altlinux.org'
 
 [ -s "$repo_source" ] || exit 0
 
 # regexps from alterator-pkg (via installer-feature-online-repo)
 prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
-updates_re="${prefix_re}http:\/\/\([^[:space:]]\+\)[[:space:]]*"
+host_re="http:\/\/\([^[:space:]]\+\)[[:space:]]\+"
+updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?"
 
 # architectures
 host_arch="$(rpm --eval '%_host_cpu')"

features.in/repo/scripts.d/02-pubring

@@ -1,4 +1,9 @@
 #!/bin/sh
 # generate current plaintext rpm pubring representation
+KEYDIR="/usr/lib/alt-gpgkeys"
 
-gpg --export --armor --homedir=/usr/lib/alt-gpgkeys >$WORKDIR/RPM-GPG-KEY
+if [ -d "$KEYDIR" ]; then
+	gpg --export --armor --homedir="$KEYDIR" >$WORKDIR/RPM-GPG-KEY
+else
+	echo "** warning: skipping RPM-GPG-KEY generation, $KEYDIR missing" >&2
+fi

features.in/rescue/config.mk

@@ -5,7 +5,7 @@ use/rescue/.base: use/stage2 sub/stage2@rescue
 	@$(call add,RESCUE_LISTS,openssh)
 
 use/rescue/base: use/rescue/.base
-	@$(call add,RESCUE_PACKAGES,pciutils)
+	@$(call add,RESCUE_PACKAGES,pciutils nfs-utils os-prober)
 	@$(call add,RESCUE_LISTS,\
 		$(call tags,base && (rescue || network || security || archive)))
 

features.in/server/config.mk

@@ -3,6 +3,7 @@ use/server: use/power/acpi/button
 
 use/server/base: use/server use/firmware/server \
 	use/net-ssh use/syslinux/timeout/600
+	@$(call set,BOOTVGA,)
 	@$(call add,THE_LISTS,server-base)
 	@$(call add,THE_KMODULES,e1000e igb)
 	@$(call add,STAGE1_KMODULES,e1000e igb)
@@ -18,7 +19,7 @@ use/server/mini: use/server/base
 use/server/ovz-base: use/server
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
-	@$(call add,BASE_PACKAGES,lftp wget)
+	@$(call add,BASE_PACKAGES,lftp wget hdparm)
 	@$(call add,BASE_LISTS,$(call tags,base openvz))
 
 use/server/ovz: use/server/ovz-base
@@ -37,6 +38,7 @@ use/server/zabbix: use/server use/services use/control
 
 use/server/groups/tools: use/server
 	@$(call add,MAIN_GROUPS,tools/diag tools/ipmi tools/monitoring)
+	@$(call add,MAIN_GROUPS,tools/tuning)
 
 use/server/groups/services: use/server
 	@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)

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

@@ -33,19 +33,11 @@ for i in $SERVICES; do
 	onoff="$(shell_config_get "$STATUS" "$i")"
 	[ -n "$onoff" ] || continue
 	echo "$i" >> /usr/share/install2/services-"$onoff"
-
-	# create systemd-specific hooks
-	case "$onoff" in
-		on)
-			action=enabled;;
-		off)
-			action=disabled;;
-		*)
-			continue;;
-	esac
-	echo "$i" >> /usr/share/install2/systemd-"$action"
 done
 
+cp -a /usr/share/install2/{services-on,systemd-enabled}
+cp -a /usr/share/install2/{services-off,systemd-disabled}
+
 rm "$STATUS"
 
 :

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

@@ -1 +1,2 @@
 kernel/drivers/virtio
+kernel/drivers/char/virtio_console

features.in/syslinux/README

@@ -14,7 +14,9 @@
 * use/syslinux/%.cfg -- подключение кусочков конфигурации.
 
 Переменные generate.mk:
+* BOOTARGS -- дополнительные аргументы загрузчику;
 * BOOTLOADER -- isolinux (реализовано с оглядкой на syslinux/syslinux4);
+* BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=);
 * SYSLINUX_UI -- модуль интерфейса (если не указан, то внутренний prompt);
 * SYSLINUX_MODULES -- модули .com или .c32 (перечисляются без расширения);
 * SYSLINUX_CFG -- дополнительные кусочки конфигурации (например, localboot).

features.in/syslinux/cfg.in/00ttyS0.cfg

@@ -0,0 +1 @@
+serial 0 115200

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

@@ -1,5 +1,5 @@
 label linux
   menu label ^Install @relname@
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@
+  append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@
 

features.in/syslinux/cfg.in/21install2-failsafe.cfg

@@ -1,5 +1,5 @@
 label noapic
   menu label ^Failsafe install
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz changedisk lowmem noapic nolapic showopts ramdisk_size=@altinst_size@ xdriver=vesa @bootargs@
+  append initrd=alt0/full.cz changedisk ramdisk_size=@altinst_size@ showopts lowmem noapic nolapic xdriver=vesa @bootargs@
 

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

@@ -0,0 +1,5 @@
+label linux
+  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

@@ -0,0 +1,5 @@
+label linux
+  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/30live.cfg

@@ -1,5 +1,5 @@
 label live
   menu label ^LiveCD (no hard disk needed)
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live vga=0x314 @bootargs@
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@
 

features.in/syslinux/cfg.in/32live_rw.cfg

@@ -1,5 +1,5 @@
 label session
   menu label LiveCD with ^sessions support
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live live_rw vga=0x314 @bootargs@
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@
 

features.in/syslinux/cfg.in/80rescue.cfg

@@ -1,5 +1,5 @@
 label rescue
   menu label ^Rescue LiveCD
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@
 

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 showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@ live_rw
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
 

features.in/syslinux/cfg.in/83rescue_fm.cfg

@@ -1,5 +1,5 @@
 label rescue_forensic
   menu label ^Forensic mode (leave disks alone)
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@
 

features.in/syslinux/cfg.in/84rescue_remote.cfg

@@ -1,5 +1,5 @@
 label rescue_remote
   menu label Rescue with remote SSH ^access (DHCP)
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO
 

features.in/syslinux/cfg.in/85mediacheck.cfg

@@ -1,5 +1,5 @@
 label mediachk
   menu label ^Check this media for defects
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck @bootargs@
+  append initrd=alt0/full.cz live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@
 

features.in/syslinux/config.mk

@@ -3,7 +3,8 @@ use/syslinux: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,syslinux)
 	@$(call try,META_SYSTEM_ID,SYSLINUX)
-	@$(call set,RELNAME,ALT Linux ($(IMAGE_NAME)))
+	@$(call try,BOOTVGA,0x314)
+	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
 
 # UI is overwritten
 use/syslinux/ui/%: use/syslinux

features.in/syslinux/generate.mk

@@ -71,7 +71,7 @@ distro: bootargs
 	@if [ -n "$(META_VOL_SET)" ]; then \
 		DISTRO="$(META_VOL_SET)"; \
 	else \
-		DISTRO="ALT Linux"; \
+		DISTRO="ALT"; \
 	fi; \
 	sed -i "s,@distro@,$$DISTRO," $(DSTDIR)/*.cfg
 
@@ -85,6 +85,10 @@ bootargs: clean
 		sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTDIR)/*.cfg; \
 	fi; \
 	sed -i "s,@rescue_bootargs@,," $(DSTDIR)/*.cfg
+	@if [ -n "$(BOOTVGA)" ]; then \
+		sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTDIR)/*.cfg; \
+	fi; \
+	sed -i "s,@bootvga@,,;s,vga= ,," $(DSTDIR)/*.cfg
 
 clean: copy
 	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \

features.in/tty/config.mk

@@ -2,8 +2,10 @@ use/tty:
 	@$(call add_feature)
 	@$(call xport,TTY_DEV)
 	@$(call xport,TTY_RATE)
+	@$(call add,BASE_PACKAGES,installer-feature-serial-stage3)
 
 use/tty/S0: use/tty
 	@$(call add,THE_PACKAGES,agetty)
 	@$(call add,TTY_DEV,ttyS0)
 	@$(call set,TTY_RATE,115200)
+	@$(call add,SYSLINUX_CFG,ttyS0)

features.in/vmguest/config.mk

@@ -1,10 +1,14 @@
+# x86: various VM guest modules/tools
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+
 +vmguest: use/vmguest/complete; @:
 
 use/vmguest:
 	@$(call add_feature)
 
 use/vmguest/base: use/vmguest/vbox use/vmguest/vmware; @:
-use/vmguest/complete: use/vmguest/base use/vmguest/vbox/x11 use/vmguest/kvm; @:
+use/vmguest/complete: use/vmguest/base \
+	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm; @:
 
 use/vmguest/vbox: use/vmguest
 	@$(call add,THE_KMODULES,virtualbox-addition vboxguest)
@@ -24,4 +28,10 @@ use/vmguest/vmware:
 	@$(call add,THE_KMODULES,scsi)	# mptspi.ko
 
 use/vmguest/vmware/x11: use/vmguest/vmware
-	@$(call add,THE_PACKAGES,xorg-drv-vmware)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+
+else
+
++vmguest: ;@:
+
+endif

features.in/wireless/config.mk

@@ -3,7 +3,7 @@
 use/wireless:
 	@$(call add_feature)
 	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
-	@$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)
+	@$(call add,THE_LISTS,tools/wireless)
 
 use/wireless/full: use/wireless use/kernel/wireless; @:
-	@$(call add,RESCUE_PACKAGES,wireless-tools rfkill crda iw)
+	@$(call add,RESCUE_LISTS,tools/wireless)

features.in/x11/config.mk

@@ -1,3 +1,4 @@
++x11: use/x11/xorg; @:
 +icewm: use/x11/icewm; @:
 +xmonad: use/x11/xmonad; @:
 +tde: use/x11/tde use/x11/kdm; @:
@@ -40,6 +41,15 @@ use/x11/radeon: use/x11 use/firmware
 	@$(call set,RADEON_KMODULES,drm-radeon)
 	@$(call set,RADEON_PACKAGES,xorg-drv-ati xorg-drv-radeon)
 
+# here the future
+use/x11/amdgpu: use/x11 use/firmware
+	@$(call set,RADEON_PACKAGES,xorg-drv-amdgpu)
+
+# Vulkan is new and bleeding edge, only intel and amgpu(pro?)
+use/x11/vulkan: use/x11/intel use/x11/amdgpu
+	@$(call add,THE_PACKAGES,vulkan)
+	@$(call add,THE_PACKAGES,vulkan-radeon vulkan-intel)
+
 # sometimes broken with current xorg-server
 use/x11/nvidia: use/x11
 	@$(call set,NVIDIA_KMODULES,nvidia)
@@ -84,10 +94,13 @@ use/x11/icewm: use/x11
 use/x11/tde: use/x11
 	@$(call add,THE_LISTS,$(call tags,tde desktop))
 
-use/x11/kde4-lite: use/x11
+use/x11/kde/synaptic:
+	@$(call add,THE_PACKAGES,synaptic-kde synaptic-usermode-)
+
+use/x11/kde4-lite: use/x11 use/x11/kde/synaptic
 	@$(call add,THE_LISTS,$(call tags,kde4 desktop))
 
-use/x11/kde4: use/x11
+use/x11/kde4: use/x11 use/x11/kde/synaptic
 	@$(call add,THE_PACKAGES,kde4-default)
 	@$(call add,IM_PACKAGES,imsettings-qt)
 
@@ -100,9 +113,12 @@ use/x11/gtk/nm: use/net/nm
 	@$(call add,THE_LISTS,$(call tags,desktop nm))
 
 use/x11/xfce: use/x11
-	@$(call add,THE_LISTS,$(call tags,xfce desktop))
+	@$(call add,THE_PACKAGES,xfce4-regular)
 	@$(call add,IM_PACKAGES,imsettings-xfce)
 
+use/x11/xfce/full: use/x11/xfce
+	@$(call add,THE_PACKAGES,xfce4-full)
+
 use/x11/cinnamon: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
 	@$(call add,IM_PACKAGES,imsettings-cinnamon)
@@ -151,5 +167,5 @@ use/x11/dwm: use/x11
 use/x11/leechcraft: use/x11
 	@$(call add,THE_PACKAGES,leechcraft)
 
-use/x11/kde5: use/x11/xorg
+use/x11/kde5: use/x11/xorg use/x11/kde/synaptic
 	@$(call add,THE_PACKAGES,kde5-maxi kf5-i18n-ru kde5-i18n-ru)

image.in/functions.mk

@@ -1,5 +1,5 @@
 # globals
-PKGDIR := $(GLOBAL_BUILDDIR)/pkg
+PKGDIR ?= $(GLOBAL_BUILDDIR)/pkg
 
 # duplicated from metaprofile makefiles for the sake of "local" builds
 ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
@@ -20,6 +20,15 @@ profile  = $(addprefix $(PKGDIR)/,$(call rprofile,$(1)))
 # map first argument (a function) onto second one (an argument list)
 map = $(foreach a,$(2),$(call $(1),$(a)))
 
+# happens at least twice, and variables are the same by design
+groups2lists = $(shell $(groups2lists_body))
+define groups2lists_body
+{ if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
+	  sed -rn 's,^X-Alterator-PackageList=(.*)$$,\1,p' \
+		$(call map,group,$(THE_GROUPS) $(MAIN_GROUPS)); \
+fi; }
+endef
+
 # kernel package list generation; see also #24669
 NULL :=
 SPACE := $(NULL) # the officially documented way of getting a space

lib/build.mk

@@ -90,6 +90,7 @@ build-image: profile/populate
 		df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
 			{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
 	fi; \
+	if [ -n "$(AUTOCLEAN)" -a $$RETVAL = 0 ]; then $(MAKE) distclean; fi; \
 	if [ -n "$(BELL)" ]; then echo -ne '\a'; fi; \
 	exit $$RETVAL; \
 	} >&2

lib/distro.mk

@@ -16,8 +16,8 @@ distro/.init: profile/bare
 # the kernel packages regexp evaluation has to take place at build stage
 distro/.base: distro/.init use/kernel
 	@$(call set,META_SYSTEM_ID,LINUX)
-	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)/$(ARCH))
-	@$(call set,META_VOL_SET,ALT Linux)
+	@$(call set,META_VOL_ID,ALT $(IMAGE_NAME)/$(ARCH))
+	@$(call set,META_VOL_SET,ALT)
 
 # this one should not be fundamental as it appears (think armh)
 distro/.installer: distro/.base use/bootloader/grub +installer; @:

lib/profile.mk

@@ -94,7 +94,7 @@ profile/bare: profile/init
 	@$(call try,GLOBAL_VERBOSE,)
 	@$(call try,IMAGEDIR,$(wildcard $(IMAGEDIR)))
 	@$(call try,LOGDIR,$(wildcard $(LOGDIR)))
-	@$(call try,BRANDING,altlinux-sisyphus)
+	@$(call try,BRANDING,alt-sisyphus)
 ifeq (,$(REPO:altlinux%=))
 	@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
 endif

pkg.in/groups/Makefile

@@ -2,8 +2,35 @@
 #         (and only those!) over to $(BUILDDIR)
 
 ifndef BUILDDIR
-$(error BUILDDIR not defined)
-endif
+
+check all: check-parents check-echo check-pkglists; @:
+
+check-parents:
+	@find -name "*.directory" \
+	| xargs -r -- sed -rn 's,^X-Alterator-Parent=(.*)$$,\1,p' \
+	| sort -u \
+	| while read group; do \
+		if ! [ -f "$$group.directory" ]; then \
+			echo "** Error: missing parent group referenced in:"; \
+			grep -rl "=$$group$$" $$(find -name "*.directory"); \
+		fi >&2; \
+	done
+
+check-echo:
+	@echo
+
+check-pkglists:
+	@find -name "*.directory" \
+	| xargs -r -- sed -rn 's,^X-Alterator-PackageList=(.*)$$,\1,p' \
+	| sort -u \
+	| while read list; do \
+		if ! [ -f "../lists/$$list" ]; then \
+			echo "** Error: missing pkglist referenced in:"; \
+			grep -rl "=$$list$$" $$(find -name "*.directory"); \
+		fi >&2; \
+	done
+
+else
 
 include $(BUILDDIR)/distcfg.mk
 SUFFIX := pkg/groups
@@ -20,3 +47,5 @@ all: $(GLOBAL_DEBUG)
 debug:
 	@echo "** THE_GROUPS: $(THE_GROUPS)"
 	@echo "** MAIN_GROUPS: $(MAIN_GROUPS)"
+
+endif

pkg.in/groups/tools/tuning.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=System tuning
+X-Alterator-PackageList=tools/tuning
+X-Alterator-Required=no
+Name[ru_RU]=Подстройка системы
+Categories=Server;Diagnostics

pkg.in/groups/workstation/10-office.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Office
+Name[ru_RU]=Офис
+X-Alterator-Required=no
+Comment=Office applications
+Comment[ru_RU]=Офисные приложения

pkg.in/groups/workstation/20-networking.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Internet/Networking
+Name[ru_RU]=Интернет/сети
+X-Alterator-Required=no
+Comment=Networking applications
+Comment[ru_RU]=Сетевые приложения

pkg.in/groups/workstation/30-multimedia.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Multimedia
+Name[ru_RU]=Мультимедиа
+X-Alterator-Required=no
+Comment=Multimedia applications
+Comment[ru_RU]=Мультимедийные приложения

pkg.in/groups/workstation/3rdparty.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=3rd party app support (Chrome, VMware View...)
+Name[ru_RU]=Поддержка сторонних приложений (1С, CryptoPro...)
+X-Alterator-PackageList=workstation/3rdparty
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/20-networking
+Categories=GNOME;MATE;XFCE;KDE;KDE4;

pkg.in/groups/workstation/40-virtualization.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Virtualization
+Name[ru_RU]=Виртуализация
+X-Alterator-Required=no
+Comment=Virtualization/access applications
+Comment[ru_RU]=Приложения для виртуализации и доступа

pkg.in/groups/workstation/50-publishing.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Publishing
+Name[ru_RU]=Издательство
+X-Alterator-Required=no
+Comment=Desktop Publishing applications
+Comment[ru_RU]=Приложения для издательства

pkg.in/groups/workstation/agents.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Infrastructure agents (Bacula, Zabbix...)
+Name[ru_RU]=Агенты инфраструктуры (Zabbix, Bacula...)
+X-Alterator-PackageList=workstation/agents
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/20-networking
+Categories=GNOME;MATE;XFCE;KDE;KDE4;

pkg.in/groups/workstation/blender.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Blender 3D Modeller
+Name[ru_RU]=Трёхмерное моделирование (Blender)
+X-Alterator-PackageList=workstation/blender
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/30-multimedia

pkg.in/groups/workstation/clamav.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=ClamAV Antivirus
+Name[ru_RU]=Антивирус ClamAV
+X-Alterator-PackageList=workstation/clamav
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/10-office
+Categories=GNOME;MATE;XFCE;

pkg.in/groups/workstation/cloud-clients.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Cloud storage clients (Owncloud, Seafile)
+Name[ru_RU]=Клиенты облачного хранилища (Owncloud, Seafile)
+X-Alterator-PackageList=workstation/cloud-clients
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/20-networking
+Categories=GNOME;MATE;XFCE;KDE;KDE4;

pkg.in/groups/workstation/emulators.directory

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Run Windows/DOS software
+Name[ru_RU]=Запуск программ Windows/DOS
+X-Alterator-PackageList=workstation/emulators
+X-Alterator-Conflicts=wine-local
+X-Alterator-Parent=workstation/40-virtualization
+Categories=KDE;KDE4;GNOME;XFCE;
+#Comment=Run applications designed for other operating systems and computer architectures; for example, 32-bit programs in a 64-bit environment
+#Comment[ru_RU]=Запуск приложений, предназначенных для других операционных систем и компьютерных архитектур; например, 32-битных программ в 64-битной среде

pkg.in/groups/workstation/freecad.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=FreeCAD system
+Name[ru_RU]=САПР (FreeCAD)
+X-Alterator-PackageList=workstation/freecad
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/50-publishing

pkg.in/groups/workstation/ganttproject.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Project management (GanttProject)
+Name[ru_RU]=Управление проектами (диаграммы Гантта)
+X-Alterator-PackageList=workstation/ganttproject
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/10-office

pkg.in/groups/workstation/gnome-peer-to-peer.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Peer-to-peer clients
+Name[ru_RU]=Файлообменные сети
+X-Alterator-PackageList=workstation/gnome-peer-to-peer
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/20-networking
+Categories=GNOME;XFCE;

pkg.in/groups/workstation/graphics-editing.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Graphics editing
+Name[ru_RU]=Обработка графики
+X-Alterator-PackageList=workstation/graphics-editing
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/30-multimedia
+Categories=KDE;KDE4;GNOME;XFCE;

pkg.in/groups/workstation/gtk-dictionary.directory

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Dictionary
+Name[ru_RU]=Словари
+X-Alterator-PackageList=workstation/gtk-dictionary
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/10-office
+Categories=GNOME;XFCE;
+

pkg.in/groups/workstation/kvm.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=KVM virtualization server
+Name[ru_RU]=Сервер виртуализации (KVM)
+X-Alterator-PackageList=workstation/kvm
+X-Alterator-Required=no
+X-Alterator-Parent=workstation/40-virtualization

pkg.in/groups/workstation/libreoffice.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=LibreOffice
+Name[ru_RU]=Офисный пакет (LibreOffice)
+X-Alterator-PackageList=workstation/libreoffice
+X-Alterator-Required=yes
+X-Alterator-Parent=workstation/10-office
+Categories=KDE;KDE4;GNOME;XFCE

pkg.in/groups/workstation/mate-usershare.directory

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=User folder sharing
+Name[ru_RU]=Общий доступ к папкам
+X-Alterator-PackageList=workstation/mate-usershare
+X-Alterator-Required=yes
+X-Alterator-Parent=workstation/20-networking
+Categories=GNOME;MATE;
+Comment=Enables users to right-click a folder and mark it for network sharing
+Comment[ru_RU]=Даёт возможность расшарить папку по сети щелчком правой кнопки мыши

pkg.in/groups/workstation/pidgin.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Pidgin IM client
+Name[ru_RU]=Обмен мгновенными сообщениями (Pidgin)
+X-Alterator-PackageList=workstation/pidgin
+X-Alterator-Required=yes
+X-Alterator-Parent=workstation/20-networking
+Categories=GNOME;XFCE;

pkg.in/groups/workstation/qgis.directory

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=QGIS geoinformation system
+Name[ru_RU]=Геоинформационная система QGIS
+X-Alterator-PackageList=workstation/qgis
+X-Alterator-Parent=workstation/50-publishing