1.3.6-alt1

- no joke!
regular.mk: switch icewm to default display manager
2019-04-01 21:10:19 +03:00 · 2019-04-01 21:02:28 +03:00 · 2019-04-01 21:02:26 +03:00 · 2019-04-01 21:02:16 +03:00 · 2019-04-01 21:02:14 +03:00 · 2019-04-01 20:27:08 +03:00
83 changed files with 455 additions and 374 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.3.2
+Version: 1.3.6
 Release: alt1

 Summary: ALT based distribution metaprofile
@@ -128,6 +128,30 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif

 %changelog
+* Mon Apr 01 2019 Michael Shigorin <mike@altlinux.org> 1.3.6-alt1
+- no joke!
+
+* Mon Mar 04 2019 Michael Shigorin <mike@altlinux.org> 1.3.5-alt1
+- Spring 2019 patch queue cleanup
+  + antohami@, jqt4@, iv@, obirvalger@, zerg@, me
+  + tar2fs fixes for mipsel, qemu etc
+  + lots of pkglist updates
+
+* Mon Jan 14 2019 Michael Shigorin <mike@altlinux.org> 1.3.4-alt1
+- new 2019 year release ;-)
+- tar2fs related security fix (iv@) iff sudo's been configured
+- use/x11/dm rework (antohami@)
+- archfixes (antohami@, iv@)
+- pre-p8 bits cleanup (me)
+
+* Mon Dec 24 2018 Michael Shigorin <mike@altlinux.org> 1.3.3-alt1
+- aarch64/armh portability fixups (antohami@)
+- grub-based vm images (shaba@)
+- even smaller images (glebfm@)
+- lxc/lxd lists/feature/image (dans@)
+- updated robotics lists/image (dd@)
+- e2k: 801/101/jeos tweaks (me)
+
 * Mon Dec 10 2018 Michael Shigorin <mike@altlinux.org> 1.3.2-alt1
 - sisyphus drops

--- a/.gear/tags/426ad1b1beeeaf289d1cfe0b4a8c0d42849249d5
+++ b/.gear/tags/426ad1b1beeeaf289d1cfe0b4a8c0d42849249d5
@@ -0,0 +1,6 @@
+object aa5bd5de2416c92919191fab35f5e7acdf6d044c
+type commit
+tag v1.3.5
+tagger Michael Shigorin <mike@altlinux.org> 1551722011 +0300
+
+Spring 2019 cleanup
--- a/.gear/tags/ca7455c6104540e2073cca673043ededb3b96a85
+++ b/.gear/tags/ca7455c6104540e2073cca673043ededb3b96a85
@@ -1,6 +0,0 @@
-object 21f8054f955de22bf0bfb2854f0128770d0ad489
-type commit
-tag v1.3.1
-tagger Michael Shigorin <mike@altlinux.org> 1541443415 +0300
-
-fixes&tweaks
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-ca7455c6104540e2073cca673043ededb3b96a85 v1.3.1
+426ad1b1beeeaf289d1cfe0b4a8c0d42849249d5 v1.3.5
--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -52,6 +52,10 @@ e2k)
 	BOOTPART="1"
 	ROOTPART="2"
 	;;
+mips*)
+	ROOTPART="1"
+	BLOCKDEV="/dev/sda"
+	;;
 esac

 # figure out the part taken by /boot in the given tarball
@@ -214,6 +218,16 @@ if [ -n "$BOOTPART" ]; then
 	echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
 fi

+# Query ARCH in chroot and redefine arch-dependent variable
+ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
+
+if [[ $ARCH = *86* ]]
+	then 	# NB: different storage modules might be needed for non-kvm
+		INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
+else
+	INITRD_MODULES=
+fi
+
 echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"

 case "$ARCH" in
@@ -300,8 +314,17 @@ image=/boot/vmlinuz
 	boot=$BLOCKDEV
 	$LILO_COMMON
 	EOF
+elif [ -x "$ROOTFS"/usr/sbin/grub-efi-autoupdate ]; then
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	chroot "$ROOTFS" grub-install
+elif [ -x "$ROOTFS"/usr/sbin/grub-autoupdate ]; then
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
 fi

 if [ -n "$SUDO_USER" ]; then
-	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" "$ROOTFS" "$WORKDIR" ||:
+	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" ||:
 fi
+# maybe qemu interpreter was copied to chroot;
+# this is no longer necessary, remove
+rm -rf "$ROOTFS"/.host ||:
--- a/conf.d/basealt.mk
+++ b/conf.d/basealt.mk
@@ -40,15 +40,18 @@ distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation
 distro/.alt-workstation: distro/.alt-workstation-base use/x11/lightdm/gtk; @:

 distro/alt-workstation-101: distro/.alt-workstation use/e2k/101
-	@$(call set,META_VOL_ID,ALT Workstation/101)
+	@$(call set,META_VOL_ID,ALT Workstation 101)
+	@$(call add,MAIN_GROUPS,workstation/e101-modesetting)
+	@$(call add,MAIN_GROUPS,workstation/e101-mga2)

 distro/alt-workstation-401: distro/.alt-workstation use/e2k/401; @:
-	@$(call set,META_VOL_ID,ALT Workstation/401)
+	@$(call set,META_VOL_ID,ALT Workstation 401)

 # avoid lightdm; NB: mate-settings pulls it in (hence the dummy)
 distro/alt-workstation-801: distro/.alt-workstation-base use/e2k/install2/801
-	@$(call set,META_VOL_ID,ALT Workstation/801)
+	@$(call set,META_VOL_ID,ALT Workstation 801)
 	@$(call add,MAIN_GROUPS,workstation/e801-1seat workstation/e801-2seat)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-dualseat)
 endif

 endif
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -8,11 +8,7 @@ distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:

 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:

-distro/.desktop-extra:
-	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
-
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
-distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:

 endif
--- a/conf.d/e2k.mk
+++ b/conf.d/e2k.mk
@@ -13,8 +13,8 @@ vm/.e2k-rescue: vm/e2k-live \
 	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)

-vm/e2k-rescue: vm/.e2k-rescue +sysvinit
-	@$(call add,KFLAVOURS,elbrus-1cp elbrus-8c elbrus-4c)
+vm/alt-rescue: vm/.e2k-rescue +sysvinit
+	@$(call add,KFLAVOURS,elbrus-def)

 vm/e2k-xfce: vm/.e2k-rescue mixin/e2k-desktop use/x11/xfce
 	@$(call add,THE_PACKAGES,pnmixer)
@@ -69,6 +69,7 @@ distro/.e2k-installer-base: distro/.base mixin/e2k-base \
 	@$(call add,INSTALL2_BRANDING,alterator)
 	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
 	@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients vim-console)
+	@$(call add,THE_PACKAGES,python-module-serial)
 	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
 	@$(call add,THE_BRANDING,alterator)
@@ -80,9 +81,14 @@ distro/.e2k-installer: distro/.e2k-installer-base +systemd; @:
 distro/e2k-801-builder: distro/.e2k-installer-sysv \
 	use/e2k/install2/801 use/dev/groups/builder; @:

-distro/alt-jeos-401: distro/.e2k-installer-sysv use/e2k/install2/401; @:
-distro/alt-jeos-801: distro/.e2k-installer-sysv use/e2k/install2/801; @:
-distro/alt-jeos-101: distro/.e2k-installer-sysv use/e2k/install2/101; @:
+distro/alt-jeos-401: distro/.e2k-installer-sysv use/e2k/install2/401
+	@$(call set,META_VOL_ID,ALT JeOS 401)
+
+distro/alt-jeos-801: distro/.e2k-installer-sysv use/e2k/install2/801
+	@$(call set,META_VOL_ID,ALT JeOS 801)
+
+distro/alt-jeos-101: distro/.e2k-installer-sysv use/e2k/install2/101
+	@$(call set,META_VOL_ID,ALT JeOS 101)

 distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \
 	mixin/e2k-desktop mixin/e2k-mate
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -43,7 +43,6 @@ distro/live-install: distro/.live-base use/live/textinstall; @:
 distro/.livecd-install: distro/.live-base use/live/install; @:

 distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
-distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
 distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:

 distro/live-rescue: distro/live-icewm +efi
@@ -115,8 +114,6 @@ distro/live-gimp: distro/live-icewm use/live/ru
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
 	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)

-distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
-
 # NB: use/browser won't do as it provides a *single* browser ATM
 distro/live-privacy: distro/.base +power +efi +systemd +vmguest \
 	use/live/base use/live/privacy use/live/ru \
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -38,14 +38,28 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 	@$(call add,THE_PACKAGES,zsh bash-completion)

 ### regular.mk
+mixin/regular-x11: use/luks use/volumes/regular \
+	use/browser/firefox/i18n use/browser/firefox/h264 \
+	use/branding use/ntp/chrony use/services/lvm2-disable
+	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
+	@$(call add,THE_PACKAGES,btrfs-progs)
+	@$(call add,THE_PACKAGES,gpm)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
+
 # common WM live/installer bits
 mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
-	@$(call add,THE_PACKAGES,pam-limits-desktop beesu)
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
+	@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit)
 	@$(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)
+	@$(call add,THE_PACKAGES,upower bluez)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
+
+mixin/desktop-extra:
+	@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))

 mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
 	use/fonts/ttf/redhat use/x11/wmaker
@@ -53,13 +67,19 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
 	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
 	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)

+mixin/regular-icewm: use/fonts/ttf/redhat use/deflogin/sysv/nm +icewm +nm
+	@$(call add,THE_LISTS,$(call tags,regular icewm))
+	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_PACKAGES,icewm-startup-networkmanager)
+	@$(call add,THE_PACKAGES,mnt)
+
 # gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
 mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
 	use/browser/firefox/classic
 	@$(call add,THE_BRANDING,graphics)

 mixin/regular-xfce: use/x11/xfce use/x11/gtk/nm +nm \
-	use/fonts/ttf/redhat use/fonts/ttf/google/extra; @:
+	use/fonts/ttf/redhat use/fonts/ttf/google/extra

 mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
 	use/x11/lightdm/gtk \
@@ -67,22 +87,23 @@ mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
 	use/fonts/otf/adobe use/fonts/otf/mozilla
 	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
 	@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit)
-	@$(call add,THE_PACKAGES,xscreensaver)
+	@$(call add,THE_PACKAGES,xfce4-screensaver)

 mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
-	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+	@$(call add,THE_LISTS,$(call tags,desktop gvfs))
 	@$(call add,THE_PACKAGES,qasmixer qpdfview)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

-mixin/regular-tde: +tde \
-	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
-	@$(call add,THE_PACKAGES_REGEXP,kdeedu-kalzium.* kdeedu-ktouch.*)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
-
-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/falkon use/x11/gtk/nm +nm +plymouth
+mixin/regular-lxqt: use/x11/lxqt use/x11/sddm use/x11/gtk/nm +nm
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

+mixin/regular-mate: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm
+	@$(call add,THE_LISTS,$(call tags,mobile mate))
+
+mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
+	@$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
+	@$(call add,THE_PACKAGES,apt-indicator)
+
 # NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
 #     kernel cmdline resulting in method:disk instead of method:cdrom
 #     which will change propagator's behaviour to probe additional
@@ -92,6 +113,11 @@ 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; @:

+mixin/regular-builder: use/dev/builder/base use/net-eth/dhcp
+	@$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh)
+	@$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh)
+	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+
 ### vm.mk
 mixin/cloud-init:
 	@$(call add,BASE_PACKAGES,cloud-init)
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -10,33 +10,26 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi
 	@$(call add,STAGE1_MODLISTS,stage2-mmc)

 # graphical target (not enforcing xorg drivers or blobs)
-distro/.regular-x11: distro/.regular-base +vmguest +wireless \
+distro/.regular-x11: distro/.regular-base \
+	use/x11/wacom use/x11/amdgpu +vmguest +wireless \
 	use/stage2/cifs use/live/rw use/live/x11 use/live/repo \
-	use/live/install use/live/suspend use/browser/firefox/live \
-	use/browser/firefox/i18n use/browser/firefox/h264 \
-	use/branding use/x11/wacom use/x11/amdgpu \
-	use/ntp/client use/services/lvm2-disable \
-	use/luks use/volumes/regular
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
-	@$(call add,LIVE_PACKAGES,btrfs-progs)
-	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
+	use/live/install use/live/suspend use/browser/firefox/live
+	@$(call add,LIVE_PACKAGES,livecd-install-apt-cache)
 	@$(call add,LIVE_LISTS,$(call tags,base rescue))
 	@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
 	@$(call add,EFI_BOOTARGS,live_rw)

 # WM base target
-distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:
+distro/.regular-wm: distro/.regular-x11 mixin/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,THE_BRANDING,bootloader)
-	@$(call add,THE_PACKAGES,upower bluez)
-	@$(call add,THE_PACKAGES,vconsole-setup-kludge)	#28805
-	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
-	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
+	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
 	@$(call set,KFLAVOURS,std-def)

 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
@@ -91,12 +84,9 @@ distro/regular-jeos-ovz: distro/.regular-jeos \
 	use/server/ovz-base use/control/server/ldv use/firmware
 	@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)

-distro/.regular-install-x11: distro/.regular-install \
-	use/install2/suspend mixin/regular-desktop +vmguest +wireless \
-	use/ntp/client
+distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
+	use/install2/suspend mixin/regular-desktop mixin/regular-x11
 	@$(call set,INSTALLER,altlinux-desktop)
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
-	@$(call add,THE_LISTS,$(call tags,regular desktop))

 # assumes somewhat more experienced user, mostly for sysv variants
 distro/.regular-install-x11-full: distro/.regular-install-x11 \
@@ -109,11 +99,8 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)

-distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
-	use/x11/lightdm/slick use/init/sysv/polkit \
-	use/browser/chromium use/fonts/ttf/redhat use/efi/refind
-	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
-	@$(call add,LIVE_PACKAGES,mnt)
+distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
+	use/init/sysv/polkit use/efi/refind use/browser/chromium
 	@$(call set,KFLAVOURS,un-def)

 # wdm can't do autologin so add standalone one for livecd
@@ -142,13 +129,10 @@ distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde
 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
-	@$(call add,LIVE_LISTS,$(call tags,mobile mate))
+distro/regular-mate: distro/.regular-gtk mixin/regular-mate use/domain-client
 	@$(call add,LIVE_LISTS,$(call tags,base smartcard))

-distro/regular-mate-sysv: distro/.regular-sysv-gtk use/x11/mate +nm
-	@$(call add,LIVE_LISTS,$(call tags,mobile mate))
+distro/regular-mate-sysv: distro/.regular-sysv-gtk mixin/regular-mate; @:

 distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:

@@ -169,21 +153,9 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
 	@$(call add,DEFAULT_SERVICES_ENABLE,gdm)

-distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
-	use/x11/gtk/nm use/net/nm/mmgui
-
-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/falkon use/fonts/zerg use/domain-client \
-	use/net/nm/mmgui +pulse +plymouth
-	@$(call add,THE_LISTS,$(call tags,regular kde4))
-	@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
-	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
-
-distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
+distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
+	use/browser/falkon
+	@$(call add,THE_LISTS,$(call tags,lxqt desktop))

 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp use/efi/refind; @:
@@ -195,6 +167,8 @@ distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
 	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

+distro/regular-robo: distro/regular-mate +robotics use/live/ru; @:
+
 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 \
@@ -209,11 +183,6 @@ distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
 	@$(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))
-	@$(call add,THE_PACKAGES,kpowersave)
-
 distro/regular-sysv-xfce: distro/.regular-install-x11-full \
 	mixin/regular-xfce mixin/regular-xfce-sysv
 	@$(call add,THE_PACKAGES,nload)
@@ -278,21 +247,28 @@ distro/regular-server-pve: distro/.regular-server-systemd \
 		pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
 		pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)

-distro/regular-builder: distro/.regular-bare \
+distro/regular-builder: distro/.regular-bare mixin/regular-builder \
 	use/dev/builder/full +sysvinit +efi +power \
 	use/live/base use/live/rw use/live/repo/online use/live/textinstall \
-	use/isohybrid use/syslinux/timeout/30 \
-	use/stage2/net-eth use/net-eth/dhcp
-	@$(call add,LIVE_PACKAGES,cifs-utils elinks lftp openssh wget)
-	@$(call add,LIVE_PACKAGES,bash-completion gpm screen tmux zsh)
-	@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
-	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+	use/isohybrid use/syslinux/timeout/30 use/stage2/net-eth
+	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)

 distro/regular-server-samba4: distro/.regular-server-managed
 	@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
 	@$(call add,THE_PACKAGES,alterator-dhcp)
 	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)

+distro/regular-server-lxd: distro/.regular-bare \
+	use/isohybrid +power \
+	use/live/base use/live/rw use/live/repo/online use/live/textinstall \
+	use/lxc/lxd use/tty/S0 \
+	use/init/systemd/multiuser
+	@$(call set,KFLAVOURS,un-def)
+	@$(call add,DEFAULT_SERVICES_ENABLE,sshd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,lxd-startup lxd-bridge lxcfs cgmanager)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
+	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-net-eth)
+
 distro/regular-engineering: distro/regular-lxde use/live/ru
 	@$(call add,THE_LISTS,$(call tags,engineering desktop))
 	@$(call add,THE_LISTS,$(call tags,desktop sane))
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -2,10 +2,10 @@
 ifeq (vm,$(IMAGE_CLASS))

 # NB: interactivesystem pulls in network-config-subsystem anyways
-vm/bare: vm/.bare +sysvinit
+vm/bare: vm/.base-lilo +sysvinit
 	@$(call add,BASE_PACKAGES,apt)

-vm/systemd: vm/.bare +systemd
+vm/systemd: vm/.base-grub +systemd
 	@$(call add,BASE_PACKAGES,apt)

 # handle ROOTPW (through deflogin)
--- a/features.in/browser/config.mk
+++ b/features.in/browser/config.mk
@@ -7,18 +7,23 @@ use/browser:
 use/browser/firefox: use/browser
 	@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))

-use/browser/seamonkey use/browser/palemoon \
+use/browser/seamonkey use/browser/netsurf \
 	use/browser/chromium use/browser/epiphany \
-	use/browser/qupzilla use/browser/falkon \
+	use/browser/falkon use/browser/otter-browser \
 	use/browser/elinks use/browser/links2: \
 	use/browser/%: use/browser
 	@$(call set,THE_BROWSER,$*)

-use/browser/konqueror: use/browser
-	@$(call set,THE_BROWSER,kdebase-konqueror)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+use/browser/palemoon: use/browser
+	@$(call set,THE_BROWSER,$*)

-use/browser/konqueror4: use/browser
-	@$(call set,THE_BROWSER,kde4base-konqueror)
+use/browser/palemoon/i18n: use/browser/palemoon
+	@$(call add,THE_BROWSER,palemoon-ru)
+else
+use/browser/palemoon: use/browser/firefox; @:
+use/browser/palemoon/i18n: use/browser/palemoon; @:
+endif

 # the complete lack of dependencies is intentional
 use/browser/firefox/esr: use/browser
@@ -44,9 +49,6 @@ 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)
--- a/features.in/build-distro/README
+++ b/features.in/build-distro/README
@@ -9,3 +9,6 @@
 META_SYSTEM_ID, META_PUBLISHER, META_PREPARER, META_APP_ID,
 META_VOL_ID, META_VOL_SET, META_BIBLIO, META_ABSTRACT;
 см. тж. genisoimagerc(5) из пакета genisoimage.
+
+При необходимости задать своё содержимое файла .disk/info,
+который также используется propagator, см. META_DISK_INFO.
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -42,7 +42,11 @@ prep: | $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
 # can't use mp-showref which belongs to the metaprofile
 dot-disk:
 	@mkdir -p files/.disk
-	@echo "$(META_VOL_ID) $(DATE_F)" >files/.disk/info
+	@if [ -n "$(META_DISK_INFO)" ]; then \
+		echo "$(META_DISK_INFO)" >files/.disk/info; \
+	else \
+		echo "$(META_VOL_ID) build $(DATE_F)" >files/.disk/info; \
+	fi
 	@echo "$(ARCH)" >files/.disk/arch
 	@echo "$(DATE)" >files/.disk/date
 	@if type -t git >&/dev/null; then \
--- a/features.in/build-ve/image-scripts.d/03-services
+++ b/features.in/build-ve/image-scripts.d/03-services
@@ -8,6 +8,7 @@

 [ -x /sbin/chkconfig ] || exit 0

-for i in network random syslogd; do chkconfig $i on; done
+chkconfig syslogd on 2>&1
+for i in network random; do chkconfig $i on; done
 for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
 :
--- a/features.in/build-vm/image-scripts.d/03-services
+++ b/features.in/build-vm/image-scripts.d/03-services
@@ -4,6 +4,7 @@

 [ -x /sbin/chkconfig ] || exit 0

-for i in network random syslogd; do chkconfig $i on; done
+chkconfig syslogd on 2>&1
+for i in network random; do chkconfig $i on; done
 for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
 :
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -23,11 +23,15 @@ check-sudo:
 	fi

 prepare-image: check-sudo
-	@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
-		TOPDIR=$(MKIMAGE_PREFIX); \
+	@# need to copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot
+	@#if qemu is used
+	@(cd "$(BUILDDIR)/.work/chroot/"; \
+		tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:; \
+	if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
+		TOPDIR=/usr/share/mkimage-profiles; \
 	fi; \
-	if ! sudo $(TOPDIR)/bin/tar2fs \
-		"$(VM_TARBALL)" "$(VM_RAWDISK)"  $(VM_SIZE) $(VM_FSTYPE); then \
+	if ! sudo $$TOPDIR/bin/tar2fs \
+		"$(VM_TARBALL)" "$(VM_RAWDISK)" $(VM_SIZE) $(VM_FSTYPE); then \
 		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi
@@ -35,7 +39,10 @@ prepare-image: check-sudo
 convert-image: prepare-image
 	@VM_COMPRESS=; \
 	case "$(IMAGE_TYPE)" in \
-	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
+	"img") \
+		mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
+		if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
+		exit 0;; \
 	"vhd") VM_FORMAT="vpc";; \
 	"qcow2c") VM_FORMAT="qcow2"; VM_COMPRESS="-c";; \
 	*) VM_FORMAT="$(IMAGE_TYPE)"; \
--- a/features.in/e2k/config.mk
+++ b/features.in/e2k/config.mk
@@ -23,12 +23,17 @@ use/e2k/x11/101/modesetting: use/e2k/x11/.101
 	@$(call add,THE_PACKAGES,xorg-conf-e101-modesetting)
 	@$(call add,THE_PACKAGES,dummy-xorg-drv-vivante)

-use/e2k/x11/101: use/e2k/x11/.101
+use/e2k/x11/101/mga2: use/e2k/x11/.101
 	@$(call add,THE_PACKAGES,xorg-conf-e101-mga2)
 	@$(call add,THE_PACKAGES,xorg-drv-mga2 vivante_glx)

+use/e2k/x11/101: use/e2k/x11/101/modesetting
+	@$(call add,MAIN_PACKAGES,xorg-conf-e101-mga2)
+	@$(call add,MAIN_PACKAGES,xorg-drv-mga2 vivante_glx)
+
 use/e2k/install2: use/e2k
 	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)

 use/e2k/install2/desktop: use/e2k/install2
--- a/features.in/fonts/config.mk
+++ b/features.in/fonts/config.mk
@@ -51,3 +51,9 @@ use/fonts/ttf/redhat:

 use/fonts/ttf/ubuntu:
 	@$(call add,THE_PACKAGES,fonts-ttf-ubuntu-font-family)
+
+use/fonts/ttf/xo:
+	@$(call add,THE_PACKAGES,fonts-ttf-XO)
+	@$(call add,THE_PACKAGES,fonts-ttf-PT)
+	@$(call add,THE_PACKAGES,fonts-ttf-Cormorant)
+	@$(call add,THE_PACKAGES,fonts-ttf-open-sans)
--- a/features.in/init/config.mk
+++ b/features.in/init/config.mk
@@ -17,7 +17,7 @@ use/init/sysv/polkit: use/init/sysv
 	@$(call add,THE_PACKAGES,polkit-sysvinit)

 use/init/sysv/consolekit: use/init/sysv
-	@$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector)
+	@$(call add,THE_PACKAGES,ConsoleKit2-service ConsoleKit2-x11)

 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init
@@ -37,3 +37,7 @@ use/init/systemd/debug: use/init/systemd use/services
 	@$(call add,STAGE2_BOOTARGS,systemd.log_level=debug)
 	@$(call add,STAGE2_BOOTARGS,systemd.log_target=kmsg)
 	@$(call add,STAGE2_BOOTARGS,log_buf_len=1M enforcing=0)
+
+# set multi-user target by default
+use/init/systemd/multiuser: use/init/systemd
+	@$(call add,STAGE2_BOOTARGS,systemd.unit=multi-user.target)
--- a/features.in/init/rootfs/image-scripts.d/90-systemd
+++ b/features.in/init/rootfs/image-scripts.d/90-systemd
@@ -15,11 +15,7 @@ sub() {
 }

 # tune make-initrd
-sub /etc/initrd.mk 'FEATURES += systemd' 'MODULES_PRELOAD += autofs4'
+sub /etc/initrd.mk 'MODULES_PRELOAD += autofs4'

 # don't allow systemd to set LANG (see also #27408)
 sub /etc/locale.conf 'LANG='
-
-# aufs2 root is rw in reality; but don't bother if there's a record already
-grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
-	sub /etc/fstab '/dev/root / auto defaults 0 0'
--- a/features.in/init/stage2/image-scripts.d/91-systemd
+++ b/features.in/init/stage2/image-scripts.d/91-systemd
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# the part below relates to systemd as init specifically
+rpm -q systemd-sysvinit || exit 0
+
+sub() {
+	local file="$1"
+	shift
+	for i in "$@"; do
+		grep -q "^$i" "$file" || echo "$i" >> "$file"
+	done
+}
+
+# aufs2 root is rw in reality; but don't bother if there's a record already
+grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
+	sub /etc/fstab '/dev/root / auto defaults 0 0'
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -12,6 +12,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 	@$(call try,INSTALLER,altlinux-generic)	# might be replaced later
 	@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-create-ghost-directories)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_PACKAGES,installer-common-stage3)
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules)	# for guile22
--- a/features.in/install2/install2/image-scripts.d/20-vm-profile
+++ b/features.in/install2/install2/image-scripts.d/20-vm-profile
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo -n "*** vm-profile.scm provided by: "
+rpm -qf /var/cache/alterator/vm-profile.scm ||:
--- a/features.in/lxc/README
+++ b/features.in/lxc/README
--- a/features.in/lxc/config.mk
+++ b/features.in/lxc/config.mk
@@ -0,0 +1,12 @@
+use/lxc:
+	@$(call add_feature)
+	@$(call add,CONTROL,fusermount:public)
+	@$(call add,GROUPS,tun)
+
+use/lxc/lxd: use/lxc
+	@$(call add,GROUPS,netadmin lxd)
+	@$(call add,LIVE_LISTS,lxd)
+	@$(call add,LIVE_LISTS,openssh)
+	@$(call add,LIVE_PACKAGES,su)
+	@$(call add,LIVE_PACKAGES,livecd-net-eth)
+	@$(call add,LIVE_PACKAGES,udev-rule-generator-net)
--- a/features.in/lxc/stage2/image-scripts.d/30-lxd
+++ b/features.in/lxc/stage2/image-scripts.d/30-lxd
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+echo LXD configuration
+
+# Setup subordinate ID's for root
+usermod -v 1000000-1065535 -w 1000000-1065535 root
+
+# Configuration of LXD
+cat <<E_O_F >/etc/sysconfig/lxd-bridge
+# The values below are defaults
+USE_LXD_BRIDGE="true"
+LXD_BRIDGE="lxdbr0"
+LXD_CONFILE="/etc/lxd/dnsmasq.conf"
+LXD_DOMAIN="lxd"
+
+# IPv4
+LXD_IPV4_ADDR="192.168.202.1"
+LXD_IPV4_NETMASK="255.255.255.0"
+LXD_IPV4_NETWORK="192.168.202.0/24"
+LXD_IPV4_DHCP_RANGE="192.168.202.100,192.168.202.199"
+LXD_IPV4_DHCP_MAX="100"
+LXD_IPV4_NAT="true"
+
+# IPv6
+#LXD_IPV6_ADDR=""
+#LXD_IPV6_MASK=""
+#LXD_IPV6_NETWORK=""
+#LXD_IPV6_NAT="false"
+LXD_IPV6_PROXY="true"
+E_O_F
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
@@ -1,4 +1,4 @@
-+nm: use/net/nm/nodelay; @:
+nm: use/net/nm; @:

 use/net: use/services
 	@$(call add_feature)
@@ -21,6 +21,8 @@ use/net/nm: use/net
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up

+# NOT recommended unless you know what you're doing
+# (e.g. dnsmasq can win a race against dhcpcd)
 use/net/nm/nodelay: use/net/nm
 	@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)

--- a/features.in/ntp/config.mk
+++ b/features.in/ntp/config.mk
@@ -1,9 +1,18 @@
 use/ntp: use/services use/pkgpriorities
 	@$(call add_feature)
-	@$(call add,THE_PACKAGES,openntpd)
-	@$(call add,PINNED_PACKAGES,openntpd)
-	@$(call add,DEFAULT_SERVICES_ENABLE,ntpd)
+	@$(call add,THE_PACKAGES,$$(THE_NTPD))
+	@$(call add,PINNED_PACKAGES,$$(THE_NTPD))
+	@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_NTPD_SERVICE))
+	@$(call try,THE_PACKAGES,openntpd)
+	@$(call try,PINNED_PACKAGES,openntpd)
+	@$(call try,DEFAULT_SERVICES_ENABLE,ntpd)

 use/ntp/client: use/ntp
+	@$(call set,THE_NTPD,openntpd)
+	@$(call set,THE_NTPD_SERVICE,ntpd)
 	@$(call add,NTP_SERVERS,pool.ntp.org)
 	@$(call xport,NTP_SERVERS)
+
+use/ntp/chrony: use/ntp
+	@$(call set,THE_NTPD,chrony)
+	@$(call set,THE_NTPD_SERVICE,chronyd)
--- a/features.in/plymouth/config.mk
+++ b/features.in/plymouth/config.mk
@@ -25,5 +25,6 @@ use/plymouth/base: use/plymouth/stage2
 	@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
 	@$(call add,BASE_KMODULES_REGEXP,drm.*)
 	@$(call add,THE_BRANDING,bootsplash)
+	@$(call add,THE_PACKAGES,make-initrd-plymouth)

 use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:
--- a/features.in/power/config.mk
+++ b/features.in/power/config.mk
@@ -12,6 +12,10 @@ use/power/acpi: use/power

 use/power/acpi/button: use/power/acpi
 	@$(call add,COMMON_PACKAGES,acpid-events-power)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,COMMON_PACKAGES,acpid-events-e2k)
+	@$(call add,DEFAULT_SERVICES_ENABLE,sysfs)
+endif

 use/power/acpi/powersave: use/power/acpi
 	@$(call add,COMMON_PACKAGES,powersave)
--- a/features.in/repo/image-scripts.d/90-enable-repo
+++ b/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/yandex.list'
+repo_source='/etc/apt/sources.list.d/alt.list'

 [ -s "$repo_source" ] || exit 0

--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -44,7 +44,7 @@ use/server/groups/services: use/server
 	@$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail)
 	@$(call add,MAIN_GROUPS,server/apache2 server/nginx)
 	@$(call add,MAIN_GROUPS,server/mariadb server/pgsql)
-	@$(call add,MAIN_GROUPS,server/php5 server/php7)
+	@$(call add,MAIN_GROUPS,server/php7)
 	@$(call add,MAIN_GROUPS,server/ftp server/rsync)
 	@$(call add,MAIN_GROUPS,server/kvm)
 	@$(call add,DEFAULT_SERVICES_DISABLE,php7-fpm)
--- a/features.in/wireless/config.mk
+++ b/features.in/wireless/config.mk
@@ -2,7 +2,7 @@

 use/wireless:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
+	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 rtl8723de staging)
 	@$(call add,THE_LISTS,tools/wireless)

 use/wireless/full: use/wireless use/kernel/wireless; @:
--- a/features.in/x11/README
+++ b/features.in/x11/README
@@ -8,7 +8,7 @@
  но поддерживают наиболее широкий спектр оборудования
  для типичных десктопных задач;
 - use/x11/3d -- по возможности подключаются проприетарные
-  драйверы NVIDIA/AMD, обычно обладающие более высоким
+  драйверы NVIDIA, обычно обладающие более высоким
  уровнем ускорения графики, но также имеющие и больше
  проблем совместимости со свежими ядрами/xorg-server,
  а заодно обычно рано теряющие поддержку "устаревших"
@@ -20,3 +20,15 @@
 не будет автоматически выбран, т.е. потребуется дополнительное
 конфигурирование (вручную или при помощи alterator-x11) --
 для live-систем это может быть лишено практического смысла.
+
+Обратите внимание: как и в фиче bootloader, переключение
+на какой-либо дисплейный менеджер срабатывает только один раз;
+
+  use/x11/xdm use/x11/lxdm use/x11/xdm
+
+приведёт к выставлению lxdm, а не xdm, поскольку это будет
+последняя "новая" цель с точки зрения make.
+
+При необходимости перекрыть последнее изменение добавьте:
+
+        @$(call set,THE_DISPLAY_MANAGER,нужный)
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -1,9 +1,8 @@
 +x11: use/x11/xorg; @:
 +icewm: use/x11/icewm; @:
 +xmonad: use/x11/xmonad; @:
-+tde: use/x11/tde use/x11/kdm; @:
-+kde4-lite: use/x11/kde4-lite use/x11/kdm4; @:

+## hardware support
 # the very minimal driver set
 use/x11:
 	@$(call add_feature)
@@ -20,15 +19,16 @@ else
 use/x11/xorg: use/x11; @:
 endif

-# both free and excellent
 use/x11/intel: use/x11
 	@$(call add,THE_PACKAGES,xorg-drv-intel)
 	@$(call add,THE_PACKAGES,xorg-dri-intel)	### #25044

+use/x11/armsoc: use/x11 use/firmware
+	@$(call add,THE_PACKAGES,xorg-dri-armsoc)
+
 # for those cases when no 3D means no use at all
 # NB: blobs won't Just Work (TM) along with nouveau/radeon
 #     as free drivers get prioritized during autodetection
-#use/x11/3d: use/x11/intel use/x11/nvidia use/x11/fglrx; @:
 use/x11/3d: use/x11/intel use/x11/nvidia/optimus use/x11/radeon; @:

 # somewhat lacking compared to radeon but still
@@ -41,7 +41,7 @@ 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
+# here's the future
 use/x11/amdgpu: use/x11 use/firmware
 	@$(call set,RADEON_PACKAGES,xorg-drv-amdgpu)

@@ -63,60 +63,34 @@ use/x11/nvidia/optimus: use/x11/nvidia
 	@$(call add,THE_KMODULES,bbswitch)
 	@$(call add,THE_PACKAGES,bumblebee primus)

-# oftenly broken with current xorg-server, use radeon then
-use/x11/fglrx: use/x11
-	@$(call set,RADEON_KMODULES,fglrx)
-	@$(call set,RADEON_PACKAGES,fglrx_glx fglrx-tools)
-
 use/x11/wacom: use/x11
 	@$(call add,THE_PACKAGES,xorg-drv-wacom xorg-drv-wizardpen)

-### xdm: see also #23108
-use/x11/xdm: use/x11-autostart
-	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole-stage3)
+## display managers
+use/x11/dm: use/x11-autostart
+	@$(call try,THE_DISPLAY_MANAGER,xdm)
+	@$(call add,THE_PACKAGES,$$(THE_DISPLAY_MANAGER))

-### : some set()-like thing might be better?
 use/x11/lightdm/gtk use/x11/lightdm/slick \
 	use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \
-	use/x11/lightdm/%: use/x11-autostart
-	@$(call add,THE_PACKAGES,lightdm-$*-greeter)
+	use/x11/lightdm/%: use/x11/dm
+	@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)

-use/x11/kdm: use/x11-autostart
-	@$(call add,THE_PACKAGES,kdebase-kdm<4)
+use/x11/sddm use/x11/lxdm use/x11/gdm2.20 use/x11/gdm: \
+	use/x11/%: use/x11/dm
+	@$(call set,THE_DISPLAY_MANAGER,$*)

-use/x11/kdm4: use/x11-autostart
-	@$(call add,THE_PACKAGES,kde4base-workspace-kdm)
-
-use/x11/gdm2.20: use/x11-autostart
-	@$(call add,THE_PACKAGES,gdm2.20)
-
-use/x11/sddm: use/x11-autostart
-	@$(call add,THE_PACKAGES,sddm)
-
-use/x11/lxdm: use/x11-autostart
-	@$(call add,THE_PACKAGES,lxde-lxdm)
+use/x11/xdm: use/x11/dm
+	@$(call set,THE_DISPLAY_MANAGER,xdm)
+	@$(call add,THE_PACKAGES,installer-feature-no-xconsole-stage3)

+## window managers and desktop environments
 use/x11/icewm: use/x11
 	@$(call add,THE_LISTS,$(call tags,icewm desktop))

-use/x11/tde: use/x11
-	@$(call add,THE_LISTS,$(call tags,tde desktop))
-
 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/kde/synaptic
-	@$(call add,THE_PACKAGES,kde4-default)
-	@$(call add,IM_PACKAGES,imsettings-qt)
-
-# handle both p7/t7 (p-a-nm) and sisyphus (k-p-nm) cases
-use/x11/kde4/nm: use/x11/kde4 use/net/nm
-	@$(call add,THE_PACKAGES_REGEXP,^kde4-plasma-nm.*)
-	@$(call add,THE_PACKAGES_REGEXP,^plasma-applet-networkmanager.*)
-
 use/x11/gtk/nm: use/net/nm
 	@$(call add,THE_LISTS,$(call tags,desktop nm))

@@ -131,13 +105,10 @@ use/x11/cinnamon: use/x11/xorg +pulse
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
 	@$(call add,IM_PACKAGES,imsettings-cinnamon)

-use/x11/gnome3: use/x11/xorg +pulse
+use/x11/gnome3: use/x11/xorg use/x11/gdm +pulse
 	@$(call add,THE_PACKAGES,gnome3-default)
 	@$(call add,IM_PACKAGES,imsettings-gsettings)

-use/x11/e17: use/x11 use/net/connman
-	@$(call add,THE_LISTS,$(call tags,e17 desktop))
-
 use/x11/enlightenment: use/x11 use/net/connman +pulse
 	@$(call add,THE_LISTS,$(call tags,enlightenment desktop))
 	@$(call add,DEFAULT_SERVICES_DISABLE,acpid)
@@ -146,8 +117,8 @@ use/x11/lxde: use/x11
 	@$(call add,THE_LISTS,$(call tags,lxde desktop))
 	@$(call add,IM_PACKAGES,imsettings-lxde)

-use/x11/lxqt: use/x11
-	@$(call add,THE_LISTS,$(call tags,lxqt desktop))
+use/x11/lxqt: use/x11 +pulse
+	@$(call add,THE_LISTS,$(call tags,desktop && lxqt && !extra))
 	@$(call add,IM_PACKAGES,imsettings-qt)

 use/x11/fvwm: use/x11
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -60,6 +60,7 @@ COPY_TREE = ./files
 CLEANUP_OUTDIR ?=

 GLOBAL_TARGET := $(ARCH)
+GLOBAL_HSH_LANGS := $(INSTALL_LANGS)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))

 # take the latter part for complex-specified subprofiles like stage2@live;
@@ -114,5 +115,6 @@ debug::
 	@echo "IMAGEDIR=$(IMAGEDIR)"
 	@echo "ARCH=$(ARCH)"
 	@echo "GLOBAL_TARGET=$(GLOBAL_TARGET)"
+	@echo "GLOBAL_HSH_LANGS=$(GLOBAL_HSH_LANGS)"
 	@echo "GLOBAL_HSH_APT_CONFIG=$(GLOBAL_HSH_APT_CONFIG)"
 	@echo "GLOBAL_HSH_USE_QEMU=$(GLOBAL_HSH_USE_QEMU)"
--- a/lib/build.mk
+++ b/lib/build.mk
@@ -4,7 +4,7 @@ ANSI_FAIL ?= 1;31

 MAX_LINES = 200
 MAX_ERRORS = 5
-GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.)|(not allowed))$$
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Conflicts:|Depends:) .*)|(.* (Stop|failed|not found)\.)|(not allowed))$$

 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -21,13 +21,23 @@ LOWSPACE = 1024
 # it's also nice to know how long and much it takes
 START += time -f "%E %PCPU %Mk"

+
+# e2k* builds always run natively, and without setarch
+ifeq (,$(findstring e2k,$(ARCH)))
+
 # /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
 # armh (armv7l) doesn't have any but should cope with qemu-arm.static;
 # also check whether non-x86 build is running native
-EARCH := $(patsubst e2k%,e2k,$(subst armh,arm,$(ARCH)))
-ifeq (,$(findstring e2k,$(EARCH)))
 ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
-ifeq (,$(findstring $(EARCH),$(shell uname -m)))
+
+EARCH := $(subst armh,arm,$(ARCH))
+
+# for mips*el, `uname -m` never has 'el' suffix, but
+# qemu-user-static binaries always do.
+UARCH := $(subst mipsel,mips,$(EARCH))
+UARCH := $(subst mips64el,mips64,$(UARCH))
+
+ifeq (,$(findstring $(UARCH),$(shell uname -m)))
 export GLOBAL_HSH_USE_QEMU=$(EARCH)
 endif
 else
@@ -35,6 +45,7 @@ START += $(ARCH)
 endif
 endif

+
 # to be passed into distcfg.mk; suggestions are welcome
 IMAGEDIR ?= $(shell \
 	if [ -d "$$HOME/out" -a -w "$$HOME/out" ]; then \
--- a/lib/vm.mk
+++ b/lib/vm.mk
@@ -8,8 +8,20 @@ ifeq (vm,$(IMAGE_CLASS))

 vm/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))	# useless on anything else
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vm/.base-lilo: vm/.bare
 	@$(call add,BASE_PACKAGES,lilo)
 endif

+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vm/.base-grub: vm/.bare
+	@$(call add,BASE_PACKAGES,grub2-pc)
+endif
+
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+vm/.base-grub-efi: vm/.bare
+	@$(call add,BASE_PACKAGES,grub2-efi)
+endif
+
 endif
--- a/pkg.in/groups/server/php5.directory
+++ b/pkg.in/groups/server/php5.directory
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=PHP 5 support
-X-Alterator-PackageList=server/php5
-X-Alterator-Required=no
-X-Alterator-Conflicts=server/php7
-Name[ru_RU]=Поддержка PHP 5
-Categories=Server;Networking
-
--- a/pkg.in/groups/workstation/e101-mga2.directory
+++ b/pkg.in/groups/workstation/e101-mga2.directory
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Elbrus 101-PC (accelerated 3D graphics)
+Name[ru_RU]=Эльбрус 101-РС (ускоренный 3D-драйвер)
+Comment=mga2/vivante driver for 1C+
+Comment[ru_RU]=Настройка видеодрайвера mga2/vivante для 1С+
+X-Alterator-PackageList=workstation/e101-mga2
+X-Alterator-Conflicts=workstation/e101-modesetting
+X-Alterator-Required=no
--- a/pkg.in/groups/workstation/e101-modesetting.directory
+++ b/pkg.in/groups/workstation/e101-modesetting.directory
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Elbrus 101-PC (safe graphics, default)
+Name[ru_RU]=Эльбрус 101-РС (2D-драйвер, надёжно)
+Comment=Modesetting driver for 1C+
+Comment[ru_RU]=Настройка видеодрайвера modesetting для 1С+
+X-Alterator-PackageList=workstation/e101-modesetting
+X-Alterator-Conflicts=workstation/e101-mga2
+X-Alterator-Required=yes
--- a/pkg.in/lists/domain-client
+++ b/pkg.in/lists/domain-client
@@ -2,7 +2,7 @@ pam-config
 pam_mount
 pam_ccreds

-samba4-client
+samba-client
 cifs-utils
 keyutils
 nfs-clients
--- a/pkg.in/lists/lxd
+++ b/pkg.in/lists/lxd
@@ -0,0 +1,9 @@
+# LXC/LXD
+lxc
+#lxc-devel
+cgmanager
+lxcfs
+lxd
+
+# For storage creation
+python3
--- a/pkg.in/lists/remote-access
+++ b/pkg.in/lists/remote-access
@@ -0,0 +1,5 @@
+connector
+freerdp
+remmina
+remmina-plugins
+x2goclient
--- a/pkg.in/lists/robotics/reprap
+++ b/pkg.in/lists/robotics/reprap
@@ -1,4 +1,11 @@
 repetierhost
+repraptor
+slic3r
 skeinforge
+CuraEngine
+meshlab
+GLC_Player
 blender
 free-cad
+openscad
+arduino
--- a/pkg.in/lists/robotics/umki
+++ b/pkg.in/lists/robotics/umki
@@ -1,2 +1,7 @@
 umki
 kumir
+kumir2
+gnuplot
+scratch-full
+kdeedu-kturtle
+gedit
--- a/pkg.in/lists/server/kvm
+++ b/pkg.in/lists/server/kvm
@@ -1,3 +1,2 @@
 qemu-kvm
 libvirt
-virt-top
--- a/pkg.in/lists/server/php5
+++ b/pkg.in/lists/server/php5
@@ -1,22 +0,0 @@
-apache2-mod_php5
-php5
-php5-cgi
-php5-curl
-php5-dba
-php5-dom
-php5-exif
-php5-fileinfo
-php5-fpm-fcgi
-php5-gd2
-php5-imap
-php5-ldap
-php5-mbstring
-php5-mcrypt
-php5-memcache
-php5-mhash
-php5-mysql
-php5-pgsql
-php5-suhosin
-php5-xmlrpc
-php5-xsl
-php5-zip
--- a/pkg.in/lists/sound/pulseaudio
+++ b/pkg.in/lists/sound/pulseaudio
@@ -1,6 +1,3 @@
 pulseaudio-daemon
-
 pulseaudio-utils
-pavucontrol
-
 alsa-plugins-pulse
--- a/pkg.in/lists/tagged/base+comm
+++ b/pkg.in/lists/tagged/base+comm
@@ -1,4 +1,3 @@
-ckermit
 lrzsz
 minicom
 picocom
--- a/pkg.in/lists/tagged/base+kde4mobile
+++ b/pkg.in/lists/tagged/base+kde4mobile
@@ -1,19 +0,0 @@
-kde4mobile-regular
-kde4-settings-kmobile
-maliit-framework-settings
-
-kde4base
-kde4graphics
-kde4multimedia
-kde4network
-
-### this one was hard to find out but requisite
-python3-module-pygobject3
-
-gst-plugins-base
-mplayer
-vlc-mini
-
-libqt4-sql-sqlite
-
-wpa_gui
--- a/pkg.in/lists/tagged/base+rescue
+++ b/pkg.in/lists/tagged/base+rescue
@@ -26,4 +26,4 @@ gpm

 # Provisioning
 udpcast
-partclone
+partclone@X86
--- a/pkg.in/lists/tagged/desktop+cups
+++ b/pkg.in/lists/tagged/desktop+cups
@@ -12,5 +12,7 @@ hplip-hpijs
 hplip-PPDs
 hplip-gui

+printer-driver-splix
+
 system-config-printer
 system-config-printer-udev
--- a/pkg.in/lists/tagged/desktop+e17
+++ b/pkg.in/lists/tagged/desktop+e17
@@ -1,4 +0,0 @@
-e17-default
-evas_generic_loaders
-gnome-icon-theme
-terminology
--- a/pkg.in/lists/tagged/desktop+engineering
+++ b/pkg.in/lists/tagged/desktop+engineering
@@ -8,9 +8,11 @@ librecad
 qcad
 qcad-partlibrary
 solvespace
+qelectrotech

 # 3D CAD
 freecad
+povray
 GLC_Player
 openscad
 openscad-MCAD
--- a/pkg.in/lists/tagged/desktop+enlightenment+e17+extra
+++ b/pkg.in/lists/tagged/desktop+enlightenment+e17+extra
@@ -1,4 +1,4 @@
-gnome-mplayer
+mpv

 ephoto
 econnman
--- a/pkg.in/lists/tagged/desktop+gnustep
+++ b/pkg.in/lists/tagged/desktop+gnustep
@@ -33,14 +33,14 @@ gnustep-CDPlayer
 #gnustep-cenon
 #gnustep-Chess
 #gnustep-Connect
-gnustep-Cynthiune
+#gnustep-Cynthiune
 gnustep-DataBasin
 gnustep-DisplayCalibrator
 gnustep-easydiff
 #gnustep-ec
 gnustep-EdenMath
 gnustep-Expense
-gnustep-FisicaLab
+#gnustep-FisicaLab
 gnustep-FlexiSheet
 gnustep-FreeTar
 gnustep-FTP
@@ -97,7 +97,7 @@ gnustep-Preview
 gnustep-PRICE
 #gnustep-projectcenter
 gnustep-ProjectManager
-gnustep-quartzcore
+#gnustep-quartzcore
 gnustep-RemoteDesk
 #gnustep-renaissance
 gnustep-SequenceConverter
--- a/pkg.in/lists/tagged/desktop+gnustep+etoile
+++ b/pkg.in/lists/tagged/desktop+gnustep+etoile
@@ -1,20 +0,0 @@
-#gnustep-Etoile-AddressManager
-#gnustep-Etoile-adgnumailconverter
-#gnustep-Etoile-adserver
-#gnustep-Etoile-adtool
-#gnustep-Etoile-AZSwitch
-gnustep-Etoile-DictionaryReader
-gnustep-Etoile-FontManager
-#gnustep-Etoile-Inbox
-#gnustep-Etoile-LDAPAddressBook
-#gnustep-Etoile-MenuServer
-#gnustep-Etoile-ModelBuilder
-#gnustep-Etoile-ObjectManager
-#gnustep-Etoile-Sandbox
-#gnustep-Etoile-ScriptServices
-#gnustep-Etoile-StepChat
-#gnustep-Etoile-System
-#gnustep-Etoile-Typewriter
-#gnustep-Etoile-VCFInspector
-#gnustep-Etoile-Vindaloo
-#gnustep-Etoile-Worktable
--- a/pkg.in/lists/tagged/desktop+ibus
+++ b/pkg.in/lists/tagged/desktop+ibus
@@ -1,12 +1,11 @@
 ibus
 ibus-gtk2
 ibus-gtk3
-ibus-qt4

 im-chooser
 imsettings
 imsettings-xim

 ibus-hangul
-ibus-pinyin
+ibus-pinyin@X86
 #ibus-unikey
--- a/pkg.in/lists/tagged/desktop+kde4
+++ b/pkg.in/lists/tagged/desktop+kde4
@@ -1,15 +0,0 @@
-kde4base-workspace-core
-kde4base-dolphin
-kde4-ksnapshot
-kde4-konsole
-kde4-gwenview
-kde4utils-ark
-kde4utils-kcalc
-kde4-kbluetooth
-kde4-kolourpaint
-kde4-okular
-kde4-i18n-ru
-kde4-i18n-uk
-kde4base-plasma-applets
-plasma-applet-showdesktop
-kde4multimedia-kmix
--- a/pkg.in/lists/tagged/desktop+kde4+extra
+++ b/pkg.in/lists/tagged/desktop+kde4+extra
@@ -1,5 +0,0 @@
-kde4-amarok
-kde4-krusader
-kde4-digikam
-kde4-digikam-image-plugins
-smplayer
--- a/pkg.in/lists/tagged/desktop+lxqt
+++ b/pkg.in/lists/tagged/desktop+lxqt
@@ -1,24 +1,15 @@
 # metapackage
-lxqt
+lxqt-regular

-# optional components
-udisks2
-gvfs
+# media-player
+mpv
+qmmp1

-# qt4 configuration tools
-libqt4-qt3support
-
-# utilities
-lximage-qt
+# text-editor
+featherpad

 icon-theme-oxygen
 x-cursor-theme-jimmac

-xscreensaver
+xscreensaver-frontend

-psi-plus
-psi-plus-plugin-birthdayreminder
-psi-plus-plugin-conferencelogger
-psi-plus-plugin-screenshot
-psi-plus-plugin-watcher
-psi-plus-l10n
--- a/pkg.in/lists/tagged/desktop+lxqt+extra
+++ b/pkg.in/lists/tagged/desktop+lxqt+extra
@@ -15,16 +15,13 @@ qt4-settings
 tubularix
 smplayer-mpv
 QCheckers
-qps
-juffed
-juffed-plugins

-# file archiver
-file-roller
+# qt4 configuration tools
+libqt4-qt3support

 # media player; see also #30556 though
-clementine
-clementine-codecs-full
+clementine@X86
+clementine-codecs-full@X86

 # upstream recommended
 #ptbatterysystemtray
@@ -33,13 +30,13 @@ clementine-codecs-full
 qbittorrent
 quiterss

-### doesn't integrate with pcmanfm-qt as of right now
-qpdfview
-
-# clipboard history applet
-qlipper
-
 # useless but cute
-cool-retro-term
+cool-retro-term@X86

-fonts-ttf-liberation
+# xmpp client
+psi-plus
+psi-plus-plugin-birthdayreminder
+psi-plus-plugin-conferencelogger
+psi-plus-plugin-screenshot
+psi-plus-plugin-watcher
+psi-plus-l10n
--- a/pkg.in/lists/tagged/desktop+mate
+++ b/pkg.in/lists/tagged/desktop+mate
@@ -1,6 +1,6 @@
 mate-default
 # this might be a tad too much anyways
-mate-maxi@X86
+mate-maxi

 #altlinux-freedesktop-menu-mate

@@ -9,7 +9,9 @@ mate-maxi@X86
 iso-codes
 tzdata

+# basic multimedia
 pavucontrol
+mpv

 # clipboard manager
 parcellite
--- a/pkg.in/lists/tagged/desktop+office
+++ b/pkg.in/lists/tagged/desktop+office
@@ -1,5 +1,4 @@
-libreoffice5
+LibreOffice
 LibreOffice-langpack-ru
-LibreOffice-common
 libcmis
 libwps
--- a/pkg.in/lists/tagged/desktop+regular
+++ b/pkg.in/lists/tagged/desktop+regular
@@ -41,6 +41,7 @@ sdparm
 fonts-bitmap-terminus

 ldd-requires@X86
+arm-rootfs-installer

 gparted@X86
 gpart
--- a/pkg.in/lists/tagged/desktop+tde
+++ b/pkg.in/lists/tagged/desktop+tde
@@ -1,13 +0,0 @@
-tde-regular
-kde-i18n-ru
-kde-i18n-uk
-
-# rom_as@ says it's still needed
-hal
-arts
-
-# Speccyfighter says it's needed too
-hmount
-
-# how could this get skipped?
-filelight
--- a/pkg.in/lists/tagged/desktop+wmaker+extra
+++ b/pkg.in/lists/tagged/desktop+wmaker+extra
@@ -7,7 +7,6 @@ wmbday
 wmcliphist
 wmclockmon
 wmctrl
-wmcube-gdk
 wmdiskmon
 wmeyes
 wmfishtime
@@ -24,7 +23,6 @@ wmmemload
 wmmenu
 wmmisc
 wmmon
-wmmsg
 wmnet
 wmnetload
 wmpager
@@ -36,7 +34,6 @@ wmsysmon
 wmsystray
 wmtimer
 wmtop
-wmtunlo
 wmupmon
 #wmvolman	--> needs udisks2 *running*
 #wmusic		--> libxmms
--- a/pkg.in/lists/tagged/dev+gnustep
+++ b/pkg.in/lists/tagged/dev+gnustep
@@ -7,7 +7,7 @@ gnustep-projectcenter
 gnustep-renaissance
 gnustep-simplewebkit
 gnustep-sqlclient
-gnustep-steptalk
+#gnustep-steptalk
 gnustep-systempreferences
 gnustep-ucsdata
 gnustep-Wrapper
--- a/pkg.in/lists/tagged/mobile+mate
+++ b/pkg.in/lists/tagged/mobile+mate
@@ -12,4 +12,4 @@ notification-daemon
 acpi
 acpid
 #acpid-events-power
-eeepc-acpi-scripts
+eeepc-acpi-scripts@X86
--- a/pkg.in/lists/tagged/regular+icewm
+++ b/pkg.in/lists/tagged/regular+icewm
@@ -10,8 +10,9 @@ mutt
 elinks
 lftp

-tray_mixer_plus
-icewm-startup-tray_mixer_plus
+qasmixer
+pnmixer
+icewm-startup-pnmixer
 leafpad

 gqview
--- a/pkg.in/lists/tagged/regular+kde4
+++ b/pkg.in/lists/tagged/regular+kde4
@@ -1,13 +0,0 @@
-kde4-regular
-kde4-kamerka
-
-phonon-gstreamer
-
-gtk2-theme-oxygen-gtk
-gtk3-theme-oxygen-gtk
-kde-gtk-config
-
-altlinux-freedesktop-menu-kde4
-altlinux-freedesktop-menu-shallow-menu
-
-quick-usb-formatter
--- a/pkg.in/lists/tagged/rescue+backup
+++ b/pkg.in/lists/tagged/rescue+backup
@@ -1 +1 @@
-bacula7-client
+bacula9-client
--- a/pkg.in/lists/tagged/rescue+crypto
+++ b/pkg.in/lists/tagged/rescue+crypto
@@ -3,5 +3,4 @@ bcrypt
 cryptmount
 cryptsetup
 cryptsetup-reencrypt
-stegdetect
 steghide
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -4,7 +4,6 @@ x86info

 # Disk utils
 aff-tools
-aimage
 altquire
 bonnie++
 cfdisk
@@ -41,7 +40,6 @@ smartmontools
 stress
 testdisk
 mtools
-partimage
 gdisk
 cgdisk
 fixparts
@@ -120,7 +118,7 @@ liblnk-tools
 libpff-tools
 libregf-tools
 libuna-tools
-libvshadow-tools
+#libvshadow-tools
 libwrc-tools
 ntfs-3g
 ocfs2-tools
@@ -198,7 +196,6 @@ tcpdump
 tcpreen
 tcpreplay
 tcptrace
-tcptraceroute
 tcputils
 tcpxtract
 telnet
@@ -243,3 +240,6 @@ usbmuxd

 # l10n
 glibc-locales
+
+# Misc
+rescue-launcher
--- a/pkg.in/lists/tagged/rescue+misc
+++ b/pkg.in/lists/tagged/rescue+misc
@@ -61,6 +61,7 @@ wimtools
 # Filesystem maintenance
 duff
 fdupes
+jdupes
 hardlinkpy
 hardlink

--- a/pkg.in/lists/tagged/rescue+x11
+++ b/pkg.in/lists/tagged/rescue+x11
@@ -1,18 +1,17 @@
 # mostly X11 counterparts/GUIs to some rescue+extra packages
 autopsy
 binwalk
-dissy
-dsniff-X11
+dissy@X86
+dsniff-X11@X86
 dvdisaster
 extract
 gksu
 gparted
 gsmartcontrol
 jhead
-hardinfo
+hardinfo@X86
 ht
 libpst-tools
-ntop
-qt4-fsarchiver
-recoll-full
+qt-fsarchiver@X86
+recoll-full@X86
 recoverjpeg
--- a/pkg.in/lists/tagged/server+zabbix
+++ b/pkg.in/lists/tagged/server+zabbix
@@ -1,5 +1,5 @@
 zabbix-server-mysql
-zabbix-phpfrontend-apache2-mod_php5
+zabbix-phpfrontend-apache2-mod_php7
 zabbix-agent

 zabbix-preinstall
@@ -7,10 +7,10 @@ zabbix-preinstall
 MySQL-server
 MySQL-client

-php5-gd2
-php5-mbstring
-php5-mysqli
-php5-sockets
+php7-gd2
+php7-mbstring
+php7-mysqli
+php7-sockets

 postfix
 mailx
--- a/pkg.in/lists/tools/diag
+++ b/pkg.in/lists/tools/diag
@@ -5,7 +5,6 @@ lft
 mtr
 nmap
 scanssh
-tcptraceroute
 telnet
 traceroute
 whois
--- a/pkg.in/lists/workstation/e101-mga2
+++ b/pkg.in/lists/workstation/e101-mga2
@@ -0,0 +1,3 @@
+xorg-conf-e101-mga2
+xorg-drv-mga2
+vivante_glx
--- a/pkg.in/lists/workstation/e101-modesetting
+++ b/pkg.in/lists/workstation/e101-modesetting
@@ -0,0 +1,2 @@
+xorg-conf-e101-modesetting
+dummy-xorg-drv-vivante