1.2.0-alt1

- e2k

.gear/mkimage-profiles.spec

@@ -1,8 +1,8 @@
 Name: mkimage-profiles
-Version: 1.1.100
+Version: 1.2.0
 Release: alt1
 
-Summary: ALT Linux based distribution metaprofile
+Summary: ALT based distribution metaprofile
 License: GPLv2+
 Group: Development/Other
 
@@ -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
@@ -26,10 +26,7 @@ Requires: mkimage-preinstall
 %def_with doc
 %define docs $HOME/docs
 
-%package doc
-Summary: %name documentation
-Group: Development/Documentation
-%{?_with_doc:BuildRequires: java /proc}
+Summary(ru_RU.UTF-8): метапрофиль дистрибутивов на базе Альт
 
 %description
 mkimage-profiles is a collection of bits and pieces useful for
@@ -40,12 +37,13 @@ to choose from, and some ready-made image recipes as well.
 Make no mistake: constructing distributions isn't just fun, it takes
 a lot of passion and knowledge to produce a non-trivial one.  So m-p
 (the short alias for mkimage-profiles) is complex too.  If you need
--- or want -- to make just a few tweaks to an existing recipe, it might
+-- or want -- to make a few tweaks to an existing recipe, it might
 be easier to comprehend the generated profile (aka builddir) which
 contains only the needed subprofiles, script hooks and package lists
 and is way more compact.
 
-Virtual environment template caches (OpenVZ/LXC) can be made either.
+The main deliverable form for x86 is a (hybrid) ISO; virtual environment
+template caches (OpenVZ/LXC) can be made either as well as VM disk images.
 
 In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
   cd %mpdir
@@ -55,12 +53,52 @@ In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
 But if you're into regular distro hacking and are not afraid of make
 and modest metaprogramming (some code generation and introspection),
 welcome to the metaprofile itself; read the docs and get the git:
+%url (NB: these are mostly in Russian with translation on demand).
+
+%description -l ru_RU.UTF-8
+mkimage-profiles является собранием всего необходимого для
+построения дистрибутивов и содержит списки пакетов, особенности
+и целые субпрофили (вроде "кирпичика" rescue), из которых можно
+выбирать требуемое; также включены и описания готовых образов.
+
+Поймите правильно: создание дистрибутивов является занятием
+не только интересным, но и требующим вдохновения и знаний
+для получения нетривиального результата.  Если хочется или же
+необходимо чуток поправить уже существующий "рецепт", может
+быть проще разобраться в сгенерированном профиле (builddir),
+который содержит только необходимые субпрофили, скрипты
+и списки пакетов, являясь намного более компактным.
+
+Основной формой результата на x86 является (гибридный) ISO-образ;
+также возможно создавать шаблоны контейнеров OpenVZ/LXC и образы
+дисков виртуальных машин.
+
+Короче говоря, настройте hasher (http://altlinux.org/hasher) и:
+  cd %mpdir
+  head README
+  make syslinux.iso
+
+Но если разработка дистрибутивов становится обыденным делом
+и не страшитесь make и чуточки метапрограммирования (немного
+генерирования кода и интроспекции), добро пожаловать в сам
+метапрофиль; гляньте документацию и забирайте git:
 %url
 
+%package doc
+Summary: %name documentation
+Group: Development/Documentation
+%{?_with_doc:BuildRequires: java /proc}
+%{?_with_doc:BuildRequires: asciidoc-a2x fop fonts-ttf-dejavu}
+Summary(ru_RU.UTF-8): документация %name
+
 %description doc
 This package holds developer docs for %name
 as a book in HTML and PDF formats.
 
+%description -l ru_RU.UTF-8 doc
+Этот пакет содержит документацию разработчика
+для %name в форме книжки (HTML, PDF).
+
 %prep
 %setup
 
@@ -90,6 +128,39 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif
 
 %changelog
+* Mon Aug 07 2017 Michael Shigorin <mike@altlinux.org> 1.2.0-alt1
+- e2k
+
+* Mon Jul 31 2017 Michael Shigorin <mike@altlinux.org> 1.1.110-alt1
+- lxde-sysv
+
+* Mon Jun 12 2017 Michael Shigorin <mike@altlinux.org> 1.1.109-alt1
+- starterkits-20170612
+
+* Mon Apr 24 2017 Michael Shigorin <mike@altlinux.org> 1.1.108-alt1
+- yandex.mirror
+
+* 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
 

.gear/tags/310c1bd39f39348903abf218756c0fccb178aac0

@@ -1,6 +0,0 @@
-object 50c18ed20a2f985e2d0d602ba076f522a5e5117a
-type commit
-tag v1.1.100
-tagger Michael Shigorin <mike@altlinux.org> 1480970595 +0300
-
-v1.1.100

.gear/tags/f35b0b48a2974939329f5ad742018ad5dd88b5f3

@@ -0,0 +1,6 @@
+object 9bb71fbbd1f51fd8053d8a42bbfa37a4fb9ad23c
+type commit
+tag v1.1.110
+tagger Michael Shigorin <mike@altlinux.org> 1501531437 +0300
+
+v1.1.110

.gear/tags/list

@@ -1 +1 @@
-310c1bd39f39348903abf218756c0fccb178aac0 v1.1.100
+f35b0b48a2974939329f5ad742018ad5dd88b5f3 v1.1.110

QUICKSTART

@@ -3,7 +3,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
 
 требуется
 ~~~~~~~~~
-- ALT Linux 7.0 или выше (возможна адаптация "вниз")
+- ALT 8.0 или выше (возможна адаптация "вниз", см. ветки)
 - установленный mkimage (свежий, как и hasher)
 - пользователь с правом запуска hasher и подключения /proc к нему
 
@@ -51,3 +51,4 @@ $ make ARCH=i586 APTCONF=~/apt/apt.conf.i586 REPORT=1 ve/generic.tar
 - http://www.altlinux.org/mkimage
 - http://www.altlinux.org/m-p
 - http://www.altlinux.org/m-p-howto ("как поправить под себя")
+- http://www.altlinux.org/starterkits/builder (сборочный LiveCD)

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

bin/tar2fs

@@ -31,7 +31,9 @@ INITRD_MODULES=
 BOOTFSTYPE=
 BOOTPART=
 
-case "`arch`" in	# NB: sudo => no GLOBAL_ will do either; mind qemu-*
+ARCH="$(arch)"		# NB: sudo => no GLOBAL_ will do either; mind qemu-*
+
+case "$ARCH" in
 *86*)
 	# NB: different storage modules might be needed for non-kvm
 	INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
@@ -44,6 +46,12 @@ arm*)
 	BOOTPART="1"
 	ROOTPART="2"
 	;;
+e2k)
+	BOOTFSTYPE="ext2"       # firmware knows it
+	BLOCKDEV="/dev/sda"     # ...hopefully...
+	BOOTPART="1"
+	ROOTPART="2"
+	;;
 esac
 
 # figure out the part taken by /boot in the given tarball
@@ -130,7 +138,10 @@ exit_handler() {
 		umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
 
 		if [ -n "$LOOPDEV" ]; then
-			kpartx -d -s "$LOOPDEV"
+			kpartx -d -s "$LOOPDEV" || {
+				sleep 10
+				kpartx -d -s -v "$LOOPDEV"
+			}
 			losetup --detach "$LOOPDEV"
 		fi
 		rm -r -- "$ROOTFS"
@@ -203,14 +214,33 @@ if [ -n "$BOOTPART" ]; then
 fi
 
 echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
-echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
 
-KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
-chroot "$ROOTFS" make-initrd -k "$KERNEL"
+case "$ARCH" in
+*86*)
+	echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
+	;;
+e2k)
+	echo "FEATURES += usb"  >> "$ROOTFS/etc/initrd.mk"
+	;;
+esac
+
+# NB: don't stick BOOTFS here, it has slightly different semantics
+pushd $ROOTFS/boot
+if [ -s .origver ]; then
+	read KVER < .origver
+fi
+[ -n "$KVER" ] || fatal "unable to deduce kernel version"
+chroot "$ROOTFS" make-initrd -k "$KVER"
+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
+popd
+
 if [ -x "$ROOTFS"/sbin/lilo ]; then
 	# configure and install bootloader
 	REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
@@ -245,5 +275,5 @@ image=/boot/vmlinuz
 fi
 
 if [ -n "$SUDO_USER" ]; then
-	chown "$SUDO_USER" "$IMG" "$ROOTFS" "$WORKDIR"
+	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" "$ROOTFS" "$WORKDIR" ||:
 fi

conf.d/Makefile

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

conf.d/basealt.mk

@@ -5,18 +5,17 @@ distro/alt-workstation: workstation_groups = $(addprefix workstation/,\
 	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 \
+	scanning scribus smartcard sound-editing thunderbird virtualbox \
 	vlc voip-clients)
 
 distro/alt-workstation: distro/.base use/luks  \
-	+installer +sysvinit +power +systemd +pulse +vmguest +wireless +efi \
+	+installer +power +systemd +pulse +vmguest +wireless +efi \
 	use/kernel/net use/docs/license \
-	use/vmguest use/memtest \
-	use/bootloader/grub \
+	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/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 \
@@ -30,6 +29,7 @@ distro/alt-workstation: distro/.base use/luks  \
 	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)

conf.d/e2k.mk

@@ -0,0 +1,16 @@
+ifeq (vm,$(IMAGE_CLASS))
+
+vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
+	@$(call add,THE_PACKAGES,openssh)
+	@$(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
+	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
+	@$(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/x11 use/x11/xfce \
+	use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,xinit xterm firefox mc)
+
+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

@@ -14,6 +14,7 @@ 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-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; @:
 distro/alt-p8-mate: distro/regular-mate mixin/p8; @:

conf.d/regular.mk

@@ -13,16 +13,17 @@ 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/browser/firefox/h264 use/services/lvm2-disable
 	@$(call add,LIVE_PACKAGES,volumes-profile-regular)
 	@$(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 lvm2-lvmpolld)
+	@$(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)
@@ -30,17 +31,16 @@ mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
 	@$(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
 distro/.regular-desktop: distro/.regular-wm \
 	use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
-	@$(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,systemd-udev-console-fb)	#28805
+	@$(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)
@@ -58,20 +58,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 \
@@ -135,7 +140,7 @@ distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 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
+	use/x11/xfce/full use/domain-client
 	@$(call set,KFLAVOURS,un-def)
 
 mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
@@ -148,17 +153,24 @@ mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
 distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
 	mixin/regular-xfce mixin/regular-xfce-sysv; @:
 
-distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
+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)
+
+distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde
+	@$(call add,THE_PACKAGES,lxde-sysvinit)
+
 distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 	@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
 
 distro/regular-mate: distro/.regular-gtk +nm \
-	use/x11/mate use/fonts/ttf/google use/domain-client/full
+	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; @:
 
@@ -189,13 +201,12 @@ mixin/regular-tde: +tde \
 
 distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
 	use/x11/gtk/nm use/net/nm/mmgui
-	@$(call add,THE_LISTS,openscada)
 
 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/full \
+	use/browser/konqueror4 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)
@@ -217,7 +228,7 @@ distro/regular-leechcraft: distro/.regular-desktop \
 	use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
 
 distro/regular-kde5: distro/.regular-desktop \
-	use/x11/kde5 use/x11/sddm \
+	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)
@@ -228,17 +239,24 @@ distro/regular-kde5: distro/.regular-desktop \
 #     which will change propagator's behaviour to probe additional
 #     filesystems (ro but no loop) thus potentially writing to
 #     an unrecovered filesystem's journal
-distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
-	use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
-	use/hdt use/syslinux/ui/menu use/syslinux/timeout/600 \
-	use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
-	use/firmware/qlogic use/mediacheck test/rescue/no-x11 \
-	+wireless +sysvinit
+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 \
+	use/mediacheck +wireless
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
-	@$(call add,RESCUE_LISTS,$(call tags,base && (smartcard || bench)))
+	@$(call add,RESCUE_LISTS,$(call tags,base bench))
 	@$(call add,RESCUE_LISTS,$(call tags,network security))
 
+distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
+	@$(call set,RELNAME,en.altlinux.org/rescue (netboot.xyz edition))
+	@$(call set,META_VOL_ID,ALT Rescue)
+	@$(call set,META_APP_ID,$(ARCH))
+
 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))
@@ -249,13 +267,14 @@ distro/regular-sysv-xfce: distro/.regular-install-x11-full \
 
 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/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)
@@ -266,7 +285,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)
 
@@ -294,7 +314,7 @@ distro/regular-server-pve: distro/.regular-server-base \
 	@$(call set,BASE_BOOTLOADER,grub)
 	@$(call set,INSTALLER,altlinux-server)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
-	@$(call add,THE_PACKAGES,pve-manager)
+	@$(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 \
@@ -311,9 +331,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,7 +4,7 @@ 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
@@ -16,6 +16,14 @@ ve/ldv: ve/bare use/control/server/ldv
 
 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,8 +37,11 @@ ve/openvpn: ve/bare
 ve/pgsql94: ve/generic
 	@$(call add,BASE_PACKAGES,postgresql9.4-server)
 
-ve/systemd-bare: ve/.base use/control/sudo-su use/repo use/net/networkd +systemd
+ve/samba-DC: ve/generic
+	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
+
+ve/systemd-bare: ve/.base use/net/networkd +systemd \
+	use/control/sudo-su use/repo use/net-ssh
 	@$(call add,BASE_PACKAGES,interactivesystem su)
-	@$(call add,BASE_LISTS,openssh)
 
 endif

doc/assumptions.txt

@@ -4,7 +4,7 @@
 других частей mkimage-profiles либо содержание переменных.
 
 NB: пути приводятся от верхнего уровня; проект в целом предполагает
-ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатывается),
+наличие ALT 8.0+ и GNU make 3.82+ (на которых и разрабатывается),
 но может быть портирован вместе с mkimage.  Если что-либо не работает
 или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
 собственно пакетная база), поскольку именно на нём происходит основная

doc/mkimage-profiles.7.in

@@ -16,16 +16,16 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 .\" 
-.TH "MKIMAGE-PROFILES" "7" "February 2016" "mkimage-profiles @VERSION@" "ALT Linux"
+.TH "MKIMAGE-PROFILES" "9" "June 2017" "mkimage-profiles @VERSION@" "ALT"
 .SH "NAME"
-mkimage-profiles \- ALT Linux distribution family metaprofile
+mkimage-profiles \- ALT distribution family metaprofile
 .SH "SYNOPSIS"
 .B make
 .IR "" [ options ]
 .I "" [ <goal> ... ]
 .SH "DESCRIPTION"
 .BR mkimage-profiles
-builds operating environment images based on ALT Linux package repositories.
+builds operating environment images based on ALT package repositories.
 
 Run
 .BR make\ help
@@ -50,7 +50,7 @@ can be used to obtain build dependency graphs.
 Long time ago when Linux distribution images were worked upon by hand
 there was little need for generalization and sharing the common base.
 
-Building several "generic" ALT Linux distros in a team and maintaining
+Building several "generic" ALT{, Linux} distros in a team and maintaining
 their educational flavours at the same time proved the need to be able
 to describe what's common and what's different in a way that doesn't
 resemble more or less complete forks.
@@ -59,7 +59,7 @@ Enter mkimage-profiles: choose what's closest to your dream image
 and add what's missing, or roll on your own using the rich library
 of existing parts and bits.
 .SH "REQUIREMENTS"
-The next-generation image build system for ALT Linux must:
+The next-generation image build system for ALT must:
 .TP
 1.
 provide reasonable means to describe common/differing aspects within
@@ -108,7 +108,7 @@ Report bugs to http://bugzilla.altlinux.org
 .br
 (Sisyphus project, mkimage-profiles component).
 .SH "COPYRIGHT"
-Copyright \(co) 2010-2016  Michael Shigorin <mike@altlinux.org>
+Copyright \(co) 2010-2017  Michael Shigorin <mike@altlinux.org>
 .br
 This is free software; see the source for copying conditions.
 There is NO WARRANTY; not even for MERCHANTABILITY or

doc/params.txt

@@ -10,7 +10,7 @@
 
 * ARCH
 ** задаёт целевую архитектуру образов
-** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc
+** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc, e2k
 ** см. lib/build.mk
 
 * ARCHES

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/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/image-scripts.d/07-kernel

@@ -9,5 +9,12 @@ kver="$(rpm -qa 'kernel-image*' \
         | cut -f 2 -d ' ' \
         | sed 's/kernel-image-//')"
 
-ln -s vmlinuz-$kver /boot/vmlinuz
-ln -s initrd-$kver.img /boot/initrd.img
+[ -n "$kver" ] || { echo "** unable to deduce kernel version" >&2; exit 1; }
+
+cd /boot
+echo "$kver" > .origver	# for tar2fs
+
+# NB: e2k kernel builds "image" instead of "vmlinuz"
+[ -f vmlinuz-$kver ] && ln -s vmlinuz-$kver vmlinuz ||:
+ln -s initrd-$kver.img initrd.img	# missing at this stage
+:

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

@@ -25,7 +25,7 @@ prepare-image: check-sudo
 	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/config.mk

@@ -37,7 +37,7 @@ use/cleanup/jeos: use/cleanup/x11-alterator
 # mostly non-interactive system
 use/cleanup/jeos/full: use/cleanup/jeos
 	@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
-	@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
+	@$(call add,CLEANUP_PACKAGES,gettext)
 	@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
 	@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
 	@$(call add,CLEANUP_PACKAGES,dbus libdbus)

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/dev/live/image-scripts.d/51-hasher

@@ -73,7 +73,7 @@ alias m='cd /usr/share/mkimage-profiles'
 clear
 cat << EOH
 Welcome to live builder environment!
-Here are some ALT Linux package/image build tools prepared for you:
+Here are some ALT package/image build tools prepared for you:
 * ${white}gear${gray}(1) -- see ${cyan}http://en.altlinux.org/gear${gray};
 * ${white}hsh${gray}(1)  -- see ${cyan}http://en.altlinux.org/hasher${gray};
 * ${white}mkimage${gray} -- see ${cyan}http://en.altlinux.org/mkimage${gray};

features.in/e2k/README

@@ -0,0 +1 @@
+Эта фича содержит необходимое для поддержки систем архитектуры "Эльбрус".

features.in/e2k/config.mk

@@ -0,0 +1,7 @@
+use/e2k:
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,mcst-def)
+
+use/e2k/x11: use/e2k use/x11
+	@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
+	@$(call add,THE_PACKAGES,xorg-drv-ati)

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

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

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+CFG="/boot/boot.conf"
+
+[ -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"

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/install2/config.mk

@@ -10,6 +10,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_PACKAGES,installer-common-stage3)
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules)	# for guile22
 	@$(call add,BASE_LISTS,$(call tags,basesystem))
 	@$(call xport,BASE_BOOTLOADER)
 	@$(call xport,INSTALL2_CLEANUP_PACKAGES)
@@ -27,7 +28,7 @@ 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; @:
@@ -60,7 +61,18 @@ use/install2/vmware:
 
 # 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; @:
@@ -88,8 +100,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:
@@ -105,7 +117,7 @@ use/install2/cleanup/x11-hwdrivers:
 # massive purge of anything not critical to installer boot (l10n included!)
 use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \
 	use/install2/cleanup/vnc use/install2/cleanup/crypto
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-gconv-modules glibc-locales)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-locales)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,libX11-locales alterator-l10n)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,kbd-data kbd console-scripts)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,shadow-convert)

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

@@ -1,5 +1,5 @@
 #!/bin/sh
-# NB: grub is currently the default in ALT Linux
+# NB: grub is currently the default in ALT
 
 sed -ri "s/^(grub|lilo)$/$GLOBAL_BASE_BOOTLOADER/" \
 	/usr/share/install2/installer-steps

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

@@ -12,6 +12,7 @@ rm -rf /usr/lib/qt4/plugins/codecs
 rm -rf /usr/lib/qt4/plugins/bearer
 rm -rf /usr/lib/qt4/plugins/inputmethods
 rm -rf /usr/share/qt4/{doc,mkspecs,phrasebooks}
+rm -rf /usr/lib*/qt5/plugins/{bearer,platformthemes}
 
 rm -rf /usr/share/guile/*/{*.txt,scripts}
 rm -rf /usr/share/awk/
@@ -19,15 +20,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-l10n

@@ -26,3 +26,10 @@ find /usr/lib/locale -mindepth 1 -maxdepth 1 -type d \! -name '*.utf8' -print0 |
 
 # dangling symlinks
 find /usr/lib/locale \! -readable -delete
+
+find /usr/share/qt5/translations/ -type f | \
+    grep -v -e '/qtbase_[[:alpha:]][[:alpha:]]*\.qm$' \
+	-e '/alterator_browser_qt_[[:alpha:]][[:alpha:]]*\.qm$' | \
+while read f; do
+    rm -f "$f"
+done

features.in/kernel/config.mk

@@ -7,7 +7,7 @@ endif
 
 use/kernel:
 	@$(call add_feature)
-	@$(call set,KFLAVOURS,std-def)
+	@$(call try,KFLAVOURS,std-def)
 
 # r8168 is a kludge, never install it by default
 use/kernel/net:

features.in/live/config.mk

@@ -7,12 +7,12 @@ _ON = alteratord cpufreq-simple \
       random rpcbind plymouth avahi-daemon \
 
 _OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
-       lvm2-lvmetad lvm2-monitor mdadm netfs o2cb ocfs2 openvpn postfix \
-       rawdevices slapd smartd sshd sysstat update_wms xinetd
+       mdadm netfs o2cb ocfs2 openvpn postfix rawdevices slapd smartd sshd \
+       sysstat update_wms xinetd
 
 # copy stage2 as live
 # NB: starts to preconfigure but doesn't use/cleanup yet
-use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services
+use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services/lvm2-disable
 	@$(call add_feature)
 	@$(call add,CLEANUP_BASE_PACKAGES,'installer*')
 	@$(call add,DEFAULT_SERVICES_ENABLE,$(_ON))

features.in/live/generate.mk

@@ -5,11 +5,11 @@ ifdef BUILDDIR
 include $(BUILDDIR)/distcfg.mk
 
 ifndef HOMEPAGE
-HOMEPAGE = http://wiki.altlinux.org/
+HOMEPAGE = http://altlinux.org/
 endif
 
 ifndef HOMENAME
-HOMENAME = ALT Linux
+HOMENAME = ALT
 endif
 
 ifndef HOMEWAIT

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

@@ -7,4 +7,4 @@ PROTO="${GLOBAL_LIVE_REPO%/*}"	# http, ftp, rsync
 MIRROR="${GLOBAL_LIVE_REPO#*/}"	# alt, heanet, kiev, yandex, ...
 
 sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \
-	"/etc/apt/sources.list.d/${MIRROR:-alt}.list"
+	"/etc/apt/sources.list.d/${MIRROR:-yandex}.list"

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/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/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

@@ -1,7 +1,7 @@
 #!/bin/sh
 # enable online repos if possible, just quit if anything's wrong
 
-repo_source='/etc/apt/sources.list.d/alt.list'
+repo_source='/etc/apt/sources.list.d/yandex.list'
 
 [ -s "$repo_source" ] || exit 0
 

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 nfs-utils)
+	@$(call add,RESCUE_PACKAGES,pciutils nfs-utils os-prober)
 	@$(call add,RESCUE_LISTS,\
 		$(call tags,base && (rescue || network || security || archive)))
 

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/alt.list"
+sed -i "s,^#\(rpm \[alt\] http.*\),\1," "/etc/apt/sources.list.d/yandex.list"

features.in/server/config.mk

@@ -3,28 +3,29 @@ 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)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
 
-use/server/mini: use/server/base
+use/server/mini: use/server/base use/services/lvm2-disable
 	@$(call add,THE_LISTS,\
 		$(call tags,base && (network || security || pkg)))
 	@$(call add,THE_LISTS,$(call tags,extra && (server || network)))
 	@$(call add,MAIN_LISTS,osec)
-	@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad)
+	@$(call add,DEFAULT_SERVICES_DISABLE,messagebus)
 
 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
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
 	@$(call add,MAIN_KMODULES,xtables-addons)	# t6/branch
-	@$(call add,MAIN_KMODULES,drbd83 kvm)
+	@$(call add,MAIN_KMODULES,drbd kvm)
 	@$(call add,MAIN_KMODULES,staging)
 	@$(call add,BASE_LISTS,$(call tags,server openvz))
 
@@ -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/config.mk

@@ -4,3 +4,8 @@ use/services: sub/rootfs
 	@$(call xport,DEFAULT_SERVICES_DISABLE)
 	@$(call xport,SERVICES_ENABLE)
 	@$(call xport,SERVICES_DISABLE)
+
+use/services/lvm2-disable: use/services
+	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
+	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmpolld)
+	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-monitor)

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 automatic=method:cdrom ramdisk_size=@altinst_size@ showopts 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/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 automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem 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 automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts 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 automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue showopts @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 automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue showopts @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 automatic=method:cdrom ramdisk_size=@rescue_size@ showopts 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 automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue showopts @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/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,12 @@ use/tty:
 	@$(call add_feature)
 	@$(call xport,TTY_DEV)
 	@$(call xport,TTY_RATE)
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call add,BASE_PACKAGES,installer-feature-serial-stage3)
+endif
 
 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/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)
@@ -104,7 +114,9 @@ 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
 	@$(call add,THE_PACKAGES,xfce4-full)

image.in/Makefile

@@ -92,7 +92,7 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
 		cp -a distcfg.mk "$(LOGDIR)/$(IMAGE_OUTFILE).cfg"; \
 	fi
 
-debug:
+debug::
 	@echo "TOPDIR=$(TOPDIR)"
 	@echo "IMAGEDIR=$(IMAGEDIR)"
 	@echo "ARCH=$(ARCH)"

main.mk

@@ -91,7 +91,7 @@ $(IMAGES): debug \
 # convenience shortcut
 $(DISTROS:distro/%=%): %: distro/%; @:
 
-debug:
+debug::
 ifeq (2,$(DEBUG))
 	@$(foreach v,\
 		$(filter IMAGE_%,$(sort $(.VARIABLES))),\

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/smartcard.directory

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Smartcard support
+Name[ru_RU]=Поддержка смарт-карт
+X-Alterator-PackageList=workstation/smartcard
+X-Alterator-Required=yes
+X-Alterator-Parent=workstation/10-office
+Categories=KDE;KDE4;GNOME;XFCE

pkg.in/lists/slinux/misc

@@ -74,7 +74,7 @@ yelp
 
 # Compiz things
 compiz
-python-module-fusion-icon-gtk
+#python-module-fusion-icon-gtk
 compiz-gtk
 
 #aen

pkg.in/lists/tagged/archive+extra

@@ -9,6 +9,7 @@ unrar
 unzip
 xar
 xbiso
+zpaq
 
 # parallel (de)compression
 lbzip2

pkg.in/lists/tagged/base+bench

@@ -16,10 +16,10 @@ iozone
 ffsb
 
 # networking
-dbench
+#dbench
 hammerhead
 nepim
-postal
+#postal
 siege
 t50
 wrk

pkg.in/lists/tagged/base+comm

@@ -3,3 +3,4 @@ lrzsz
 minicom
 picocom
 sredird
+python-module-serial

pkg.in/lists/tagged/base+regular

@@ -12,6 +12,8 @@ make-initrd-lvm
 mdadm
 make-initrd-mdadm
 
+shadow-change
+
 openssh
 openssh-blacklist
 net-tools

pkg.in/lists/tagged/base+smartcard

@@ -1,3 +1,4 @@
+openct
 opensc
 pcsc-tools
 
@@ -10,3 +11,7 @@ pcsc-lite-rutokens
 
 pam_pkcs11
 pam_p11
+
+openssl
+openssl-engines
+openssl-engine_pkcs11

pkg.in/lists/tagged/desktop+engineering

@@ -0,0 +1,23 @@
+# Electronic
+kicad
+qucs
+
+# CAD
+librecad
+
+# APCS
+beremiz
+yaplc-ide
+
+# SCADA
+openscada-Model.AGLKS
+openscada-Model.Boiler
+
+# CNC
+linuxcnc
+camotics
+repraptor
+pcb2gcode
+inkscape-plugin-gcodetools
+pycam
+flatcam

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

@@ -1,10 +1,4 @@
-gst-plugins-bad
-gst-plugins-base
-gst-plugins-gl
-gst-plugins-good
-gst-plugins-nice
-gst-plugins-ugly
-gst-ffmpeg
 gnome-mplayer
 
+ephoto
 econnman

pkg.in/lists/tagged/desktop+lxde

@@ -14,6 +14,7 @@ lxde-lxappearance
 lxde-lxappearance-obconf
 lxde-lxshortcut
 lxde-lxinput
+lxde-lxhotkey
 
 menu-cache
 altlinux-freedesktop-menu-lxde

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

@@ -1,17 +1,17 @@
 tango-icon-theme-extras
 
 lxde-lxterminal
-sakura
 fonts-bitmap-terminus
 
 leafpad
 galculator
 deadbeef-incomplete
+deadbeef-etcskel
+smplayer-mpv
 mtpaint
 parcellite
 
-# gqview is long erm... stable, george@ suggested upgrading to geeqie
-geeqie
+gpicview
 
 # file-roller is recommended over xarchiver (gns@) and not that fatty yet
 file-roller

pkg.in/lists/tagged/desktop+lxqt

@@ -15,7 +15,6 @@ pcmanfm-qt
 # optional components
 lxqt-openssh-askpass
 lxqt-policykit
-qt4-dbus
 udisks2
 gvfs
 

pkg.in/lists/tagged/desktop+mate

@@ -6,3 +6,5 @@ altlinux-freedesktop-menu-mate
 # http://lists.altlinux.org/pipermail/sisyphus/2012-August/358079.html
 iso-codes
 tzdata
+
+pavucontrol

pkg.in/lists/tagged/desktop+regular

@@ -29,6 +29,8 @@ alterator-xkb
 glxgears
 xorg-conf-synaptics
 
+cpu-x
+fuse-exfat
 hdparm
 inxi
 lm_sensors3
@@ -45,3 +47,5 @@ gpart
 x11-ssh-askpass
 
 sysfsutils
+
+mc

pkg.in/lists/tagged/desktop+xorg

@@ -1,10 +1,10 @@
 xorg-drv-ati
 xorg-drv-cirrus
-xorg-drv-mga
+#xorg-drv-mga
 xorg-drv-modesetting
 xorg-drv-nv
 xorg-drv-qxl
 #xorg-drv-s3
-xorg-drv-s3virge
-xorg-drv-savage
-xorg-drv-sis
+#xorg-drv-s3virge
+#xorg-drv-savage
+#xorg-drv-sis

pkg.in/lists/tagged/regular+server

@@ -2,5 +2,6 @@ vim-console
 screen
 quota
 fdisk
+mailx
 nano
 mc

pkg.in/lists/tagged/rescue+extra

@@ -23,7 +23,6 @@ hddtemp
 idle3-tools
 iotop
 iozone
-iperf
 hdparm
 lsblk
 lsmount
@@ -31,7 +30,6 @@ lvm2
 mdadm
 ms-sys
 parted
-partclone
 recoverdm
 safecopy
 sdparm
@@ -164,6 +162,9 @@ hping3
 httpry
 httpry-scripts
 iftop
+infiniband-diags
+iperf
+iperf3
 ipmitool
 iproute2
 iptables
@@ -181,11 +182,13 @@ ngrep
 nmap
 p0f
 pdsh
+perftest
 rsh
 rsync
 scanssh
 sflowtool
 #shellinabox
+socat
 sshpt
 #stunnel
 tcpdump
@@ -198,6 +201,7 @@ tcputils
 tcpxtract
 telnet
 traceroute
+uucp
 wdfs
 wget
 whatmask

pkg.in/lists/tagged/rescue+misc

@@ -8,7 +8,7 @@ docx2txt
 unrtf
 
 # Networking
-drbd83-tools
+drbd-utils
 iscsitarget-utils
 ntp-utils
 
@@ -26,6 +26,7 @@ rmt
 
 # Hardware
 cmospwd
+cpuid2
 encled
 flashrom
 hwinfo

pkg.in/lists/tagged/server+network

@@ -16,3 +16,4 @@ vlan-utils
 ntpdate
 tcpdump
 bridge-utils
+wget

pkg.in/lists/tools/monitoring

@@ -1,4 +1,5 @@
 monit
+vnstat
 
 # pull in subpackages which shouldn't toss
 # lots of extra dependencies into an image

pkg.in/lists/tools/tuning

@@ -0,0 +1,2 @@
+tuned
+powertop

pkg.in/lists/workstation/libreoffice

@@ -5,3 +5,6 @@ LibreOffice-gnome
 LibreOffice-common
 libcmis
 libwps
+
+projectlibre
+dia