1.2.9-alt1

- antohami@'s release
desktop+lxqt+extra: added file archiver
2018-02-12 22:58:46 +03:00 · 2018-02-12 22:40:36 +03:00 · 2018-02-12 22:39:48 +03:00 · 2018-02-12 22:31:16 +03:00 · 2018-02-12 22:27:52 +03:00 · 2018-02-12 22:22:40 +03:00
65 changed files with 395 additions and 275 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.2.1
+Version: 1.2.9
 Release: alt1

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

 %changelog
+* Mon Feb 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.9-alt1
+- antohami@'s release
+
+* Mon Feb 05 2018 Michael Shigorin <mike@altlinux.org> 1.2.8-alt1
+- regular fixes
+
+* Mon Jan 22 2018 Michael Shigorin <mike@altlinux.org> 1.2.7-alt1
+- 2018: better sound feature (antohami@)
+
+* Mon Dec 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.6-alt1
+- starterkits-20171212
+
+* Mon Dec 04 2017 Michael Shigorin <mike@altlinux.org> 1.2.5-alt1
+- qcow2c
+
+* Mon Nov 20 2017 Michael Shigorin <mike@altlinux.org> 1.2.4-alt1
+- opennebula-systemd
+
+* Mon Sep 25 2017 Michael Shigorin <mike@altlinux.org> 1.2.3-alt1
+- p8+
+
+* Mon Sep 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.2-alt1
+- regular-engineering
+
 * Mon Aug 21 2017 Michael Shigorin <mike@altlinux.org> 1.2.1-alt1
 - seven years ago...

--- a/.gear/tags/70aa8a363909d5cc70bf00fd7c2f679a452de4f7
+++ b/.gear/tags/70aa8a363909d5cc70bf00fd7c2f679a452de4f7
@@ -1,6 +0,0 @@
-object f1c4c6027238c2886573efc2aadfa443fe427a17
-type commit
-tag v1.2.0
-tagger Michael Shigorin <mike@altlinux.org> 1502132060 +0300
-
-v1.2.0
--- a/.gear/tags/d2ac44034cc20fdb68ff286eabe711a5451d1f78
+++ b/.gear/tags/d2ac44034cc20fdb68ff286eabe711a5451d1f78
@@ -0,0 +1,6 @@
+object 0e8820452a9f7a7cf429ab490ea9c2c0d0cd57b4
+type commit
+tag v1.2.8
+tagger Michael Shigorin <mike@altlinux.org> 1517856680 +0300
+
+regular fixes
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-70aa8a363909d5cc70bf00fd7c2f679a452de4f7 v1.2.0
+d2ac44034cc20fdb68ff286eabe711a5451d1f78 v1.2.8
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,23 +6,11 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg

 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:

-mixin/desktop-installer: +net-eth +vmguest \
-	use/x11-autostart use/fonts/install2 use/sound
-	@$(call add,BASE_LISTS, \
-		$(call tags,(base || desktop) && (l10n || network)))
-	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
-	@$(call add,BASE_PACKAGES,os-prober)
-
 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:

 distro/.desktop-extra:
 	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))

-distro/kde4-lite: distro/.desktop-mini \
-	distro/.desktop-network distro/.desktop-extra +kde4-lite
-	@$(call set,KFLAVOURS,std-def)
-
-distro/tde: distro/.desktop-network +tde; @:
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
--- a/conf.d/e2k.mk
+++ b/conf.d/e2k.mk
@@ -1,20 +1,28 @@
 ifeq (vm,$(IMAGE_CLASS))

-vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
-	@$(call add,THE_PACKAGES,openssh)
+vm/.e2k-bare: vm/.bare use/e2k
+	@$(call add,BASE_PACKAGES,apt)
+
+vm/e2k-live: vm/.e2k-bare use/deflogin/live use/net-ssh use/control/sudo-su
 	@$(call add,THE_LISTS,$(call tags,ve tools))

-vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
+vm/e2k-rescue: vm/e2k-live mixin/e2k-base use/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/sound use/e2k/x11 use/x11/xfce \
-	use/browser/firefox use/browser/firefox/esr use/browser/firefox/i18n \
-	use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,xinit xterm mc)
-	@$(call add,THE_PACKAGES,fonts-bitmap-terminus pnmixer)
+vm/e2k-xfce: vm/e2k-rescue mixin/e2k-desktop use/x11/xfce
+	@$(call add,THE_PACKAGES,pnmixer)
+
+vm/e2k-lxqt: vm/e2k-rescue mixin/e2k-desktop
+	@$(call add,THE_LISTS,$(call tags,(lxqt desktop) && !extra))
+
+vm/e2k-mate: vm/systemd mixin/e2k-base mixin/e2k-desktop \
+	use/deflogin/live use/x11/mate; @:

 vm/e2k-builder: vm/e2k-rescue use/dev/builder/base; @:

+vm/e2k-samba-DC: vm/e2k-rescue
+	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
+
 endif
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -107,8 +107,6 @@ distro/live-0ad: distro/.live-games
 	@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
 	@$(call try,HOMEPAGE,http://play0ad.com/)

-distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
-
 distro/live-gimp: distro/live-icewm use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -0,0 +1,83 @@
+### various mixins with their origin
+
+### desktop.mk
+mixin/desktop-installer: +net-eth +vmguest \
+	use/x11-autostart use/fonts/install2 use/sound
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))
+	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
+	@$(call add,BASE_PACKAGES,os-prober)
+
+### e2k.mk
+mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
+
+mixin/e2k-desktop: use/e2k/x11 use/e2k/sound use/l10n/default/ru_RU \
+	use/browser/firefox/esr use/browser/firefox/i18n \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,xinit xterm mc)
+	@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
+
+### regular.mk
+# common WM live/installer bits
+mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
+	@$(call add,THE_PACKAGES,pam-limits-desktop beesu)
+	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
+	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
+	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
+	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
+	@$(call set,THE_IMAGEWRITER,imagewriter)
+
+mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
+	use/fonts/ttf/redhat use/x11/wmaker
+	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
+	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
+	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
+
+# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
+mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
+	use/browser/firefox/classic
+	@$(call add,THE_BRANDING,graphics)
+
+mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
+
+mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/x11/lightdm/gtk \
+	use/browser/firefox use/browser/firefox/classic \
+	use/browser/firefox/i18n use/browser/firefox/h264 \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
+
+mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im \
+	use/browser/palemoon/i18n +nm
+	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+	@$(call add,THE_PACKAGES,qasmixer qpdfview)
+
+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/qupzilla use/x11/gtk/nm +nm +plymouth
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
+# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
+#     kernel cmdline resulting in method:disk instead of method:cdrom
+#     which will change propagator's behaviour to probe additional
+#     filesystems (ro but no loop) thus potentially writing to
+#     an unrecovered filesystem's journal
+mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
+	use/syslinux/ui/menu use/syslinux/timeout/600 \
+	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
+
+### vm.mk
+mixin/cloud-init:
+	@$(call add,BASE_PACKAGES,cloud-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
+
+mixin/opennebula-context:
+	@$(call add,BASE_PACKAGES,opennebula-context)
+	@$(call add,DEFAULT_SERVICES_ENABLE,one-context-local one-context)
+
+mixin/icewm: use/x11/lightdm/gtk +icewm; @:
--- a/conf.d/p7.mk
+++ b/conf.d/p7.mk
@@ -1,49 +0,0 @@
-# p7 base kits
-
-mixin/p7: use/browser/firefox/esr
-	@$(call set,BRANDING,altlinux-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH))
-
-ifeq (distro,$(IMAGE_CLASS))
-
-### kludge compatibility: introspection stub for main.mk :-/
-distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
-distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
-distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
-distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @:
-distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @:
-distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @:
-distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
-distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @:
-distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
-distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
-distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
-distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
-distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
-distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
-distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
-distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @:
-
-distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
-
-distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
-distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @:
-distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
-distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
-distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
-distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @:
-
-distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @:
-
-endif
-
-ifeq (ve,$(IMAGE_CLASS))
-ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
-ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @:
-endif
-
-ifeq (vm,$(IMAGE_CLASS))
-vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
-vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @:
-endif
--- a/conf.d/p8.mk
+++ b/conf.d/p8.mk
@@ -39,6 +39,7 @@ distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:

 distro/alt-p8-builder: distro/regular-builder mixin/p8; @:

+distro/alt-p8-engineering: distro/regular-engineering mixin/p8; @:
 endif

 ifeq (ve,$(IMAGE_CLASS))
@@ -48,4 +49,5 @@ endif
 ifeq (vm,$(IMAGE_CLASS))
 vm/alt-p8-vm-net: vm/net mixin/p8; @:
 vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
+vm/alt-p8-opennebula: vm/opennebula-systemd mixin/p8; @:
 endif
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -10,26 +10,18 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:

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

-# common WM live/installer bits
-mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
-	@$(call add,THE_PACKAGES,pam-limits-desktop)
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
-	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
-	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
-	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
-	@$(call set,THE_IMAGEWRITER,imagewriter)
-
 # WM base target
 distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:

@@ -39,20 +31,22 @@ distro/.regular-desktop: distro/.regular-wm \
 	use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
 	@$(call add,THE_BRANDING,bootloader)
 	@$(call add,THE_PACKAGES,upower bluez)
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
 	@$(call add,THE_PACKAGES,vconsole-setup-kludge)	#28805
 	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,KFLAVOURS,std-def)

 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
-distro/.regular-sysv: distro/.regular-wm +sysvinit; @:
 distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
 	use/x11/gdm2.20; @:
+distro/.regular-sysv: distro/.regular-wm +sysvinit
+	@$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector)

 distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
 	use/branding use/bootloader/grub use/luks \
 	use/install2/fs use/install2/vnc use/install2/repo
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator)
@@ -96,12 +90,13 @@ distro/regular-jeos-ovz: distro/.regular-jeos \
 distro/.regular-install-x11: distro/.regular-install \
 	use/install2/suspend mixin/regular-desktop +vmguest +wireless
 	@$(call set,INSTALLER,altlinux-desktop)
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
 	@$(call add,THE_LISTS,$(call tags,regular desktop))

 # assumes somewhat more experienced user, mostly for sysv variants
 distro/.regular-install-x11-full: distro/.regular-install-x11 \
 	mixin/desktop-installer mixin/regular-desktop use/install2/fs \
-	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
 	use/branding/complete use/branding/slideshow/once \
 	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@@ -116,47 +111,23 @@ distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \
 	@$(call add,LIVE_PACKAGES,icewm-startup-networkmanager)
 	@$(call set,KFLAVOURS,un-def)

-mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
-	use/fonts/ttf/redhat use/x11/wmaker
-	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
-	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
-	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
-
 # wdm can't do autologin so add standalone one for livecd
 distro/regular-wmaker: distro/.regular-sysv \
 	mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n
 	@$(call add,LIVE_PACKAGES,wdm wmxkbru)

-# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
-mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
-	use/browser/firefox/classic
-	@$(call add,THE_BRANDING,graphics)
-
 distro/regular-gnustep: distro/.regular-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:

-mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
-
 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
 	use/x11/xfce/full use/domain-client
 	@$(call set,KFLAVOURS,un-def)

-mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/x11/lightdm/gtk \
-	use/browser/firefox use/browser/firefox/classic \
-	use/browser/firefox/i18n use/browser/firefox/h264 \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
-
 distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
 	mixin/regular-xfce mixin/regular-xfce-sysv; @:

-mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
-	use/x11/gtk/nm use/im +nm
-	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
-
 distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde
 	@$(call add,THE_PACKAGES,lxde)

@@ -172,18 +143,18 @@ distro/regular-mate: distro/.regular-gtk +nm \
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_LISTS,$(call tags,base smartcard))

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

-distro/regular-enlightenment: distro/.regular-gtk \
-	use/x11/enlightenment use/fonts/infinality; @:
+distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:

 distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
 	use/x11/enlightenment
 	@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271

-distro/regular-cinnamon: distro/.regular-gtk \
-	use/x11/cinnamon use/fonts/infinality use/fonts/ttf/google \
-	use/net/nm/mmgui use/im; @:
+distro/regular-cinnamon: distro/.regular-gtk use/x11/cinnamon \
+	use/fonts/ttf/google use/net/nm/mmgui use/im
+	@$(call add,THE_PACKAGES,thunderbird-ru)	### l10n

 # not .regular-gtk due to gdm vs lightdm
 distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
@@ -191,13 +162,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
 	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
-	@$(call add,LIVE_PACKAGES,gnome-flashback)
-
-# reusable bits
-mixin/regular-tde: +tde \
-	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
-	@$(call add,THE_PACKAGES,kdeedu)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
+	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)

 distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
 	use/x11/gtk/nm use/net/nm/mmgui
@@ -213,20 +178,11 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)

-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
-
 distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:

 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp use/efi/refind; @:

-distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
-
-distro/regular-leechcraft: distro/.regular-desktop \
-	use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
-
 distro/regular-kde5: distro/.regular-desktop \
 	use/x11/kde5 use/x11/sddm use/domain-client \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
@@ -234,15 +190,6 @@ distro/regular-kde5: distro/.regular-desktop \
 	@$(call add,THE_PACKAGES,kde5-telepathy)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

-# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
-#     kernel cmdline resulting in method:disk instead of method:cdrom
-#     which will change propagator's behaviour to probe additional
-#     filesystems (ro but no loop) thus potentially writing to
-#     an unrecovered filesystem's journal
-mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
-	use/syslinux/ui/menu use/syslinux/timeout/600 \
-	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
-
 distro/regular-rescue: distro/.regular-base mixin/regular-rescue  \
 	use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \
 	use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
@@ -336,4 +283,14 @@ distro/regular-server-samba4: distro/.regular-server-managed
 	@$(call add,THE_PACKAGES,alterator-dhcp)
 	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)

+distro/regular-engineering: distro/regular-lxde use/live/ru
+	@$(call add,THE_LISTS,$(call tags,engineering desktop))
+	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
+	@$(call add,THE_PACKAGES,LibreOffice LibreOffice-gnome LibreOffice-langpack-ru)
+	@$(call add,THE_PACKAGES,cups system-config-printer)
+	@$(call add,THE_PACKAGES,gnome-disk-utility)
+	@$(call add,LIVE_KMODULES,staging)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
+	@$(call add,DEFAULT_SERVICES_ENABLE,ModemManager)
+
 endif
--- a/conf.d/t7.mk
+++ b/conf.d/t7.mk
@@ -1,13 +0,0 @@
-# t7 base kits
-
-mixin/t7:
-	@$(call set,BRANDING,altlinux-starterkit) ### needs changing
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @:
-distro/altlinux-t7-gnustep-systemd: distro/regular-gnustep-systemd mixin/t7; @:
-distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @:
-distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @:
-
-endif
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -70,28 +70,6 @@ distro/elinks: distro/.base use/pid1/net

 endif # IMAGE_CLASS: distro

-ifeq (ve,$(IMAGE_CLASS))
-
-ifeq (centos,$(REPO))
-
-ve/.centos-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-
-ve/centos: ve/.centos-base
-	@$(call add,BASE_PACKAGES,openssh-server)
-
-endif # REPO: centos
-
-ifeq (opensuse,$(REPO))
-
-ve/.opensuse-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-	@$(call add,BASE_PACKAGES,aaa_base)
-
-endif # REPO: opensuse
-
-endif # IMAGE_CLASS: ve
-
 ifeq (vm,$(IMAGE_CLASS))

 vm/net-static: vm/bare use/net-eth use/net-ssh
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -18,16 +18,16 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
 	@$(call add,BASE_PACKAGES,su)

 # vm/net or vm/systemd-net
-vm/cloud-systemd: vm/systemd-net use/vmguest/kvm
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
-	@$(call set,KFLAVOURS,un-def)
-	@$(call add,THE_KMODULES,kdbus)

-vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
+
+# vm with OpenNebula contextualization package (with empty network config)
+vm/opennebula-systemd: vm/systemd use/net/networkd use/net-ssh \
+	use/vmguest/kvm mixin/opennebula-context \
+	use/repo use/control/sudo-su use/deflogin
+	@$(call add,BASE_PACKAGES,su)

 # NB: use/x11 employs some installer-feature packages
 vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
@@ -35,8 +35,6 @@ vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
 vm/.desktop-base: vm/.desktop-bare \
 	use/deflogin/altlinuxroot use/x11-autologin; @:

-mixin/icewm: use/x11/lightdm/gtk +icewm; @:
-
 vm/icewm: vm/.desktop-base mixin/icewm; @:

 vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
--- a/features.in/armh/config.mk
+++ b/features.in/armh/config.mk
@@ -1,2 +1,2 @@
-use/armh: use/control/sudo-su use/net/dns/google
+use/armh: use/control/sudo-su use/net-dns/google
 	@$(call add_feature)
--- a/features.in/bootloader/config.mk
+++ b/features.in/bootloader/config.mk
@@ -4,9 +4,14 @@
 #       the last different one wins
 # - remember .base if adding yet another *_PACKAGES

+# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
+
 use/bootloader:
 	@$(call add_feature)
 	@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))

 use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
 	@$(call set,BASE_BOOTLOADER,$*)
+
+use/bootloader/live: use/bootloader
+	@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
--- a/features.in/browser/config.mk
+++ b/features.in/browser/config.mk
@@ -33,7 +33,6 @@ use/browser/firefox/live: use/browser/firefox

 # scarey, and will have to be done otherwise when l10n feature is there
 use/browser/firefox/i18n: use/browser/firefox
-	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -33,15 +33,18 @@ prepare-image: check-sudo
 	fi

 convert-image: prepare-image
-	@case "$(IMAGE_TYPE)" in \
+	@VM_COMPRESS=; \
+	case "$(IMAGE_TYPE)" in \
 	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
 	"vhd") VM_FORMAT="vpc";; \
+	"qcow2c") VM_FORMAT="qcow2"; VM_COMPRESS="-c";; \
 	*) VM_FORMAT="$(IMAGE_TYPE)"; \
 	esac; \
 	if ! type -t qemu-img >&/dev/null; then \
-		echo "** warning: qemu-img not available" >&2; \
+		echo "** error: qemu-img not available" >&2; \
+		exit 1; \
 	else \
-		qemu-img convert -O "$$VM_FORMAT" \
+		qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
 			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
 		rm "$(VM_RAWDISK)"; \
 		if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
--- a/features.in/deflogin/config.mk
+++ b/features.in/deflogin/config.mk
@@ -43,3 +43,4 @@ use/deflogin/privileges: use/deflogin
 # NM with sysvinit
 use/deflogin/sysv/nm: use/deflogin
 	@$(call add,GROUPS,_nmconnect)
+	@$(call add,THE_PACKAGES,nm-sysvinit)
--- a/features.in/e2k/config.mk
+++ b/features.in/e2k/config.mk
@@ -4,7 +4,7 @@ use/e2k:

 use/e2k/x11: use/e2k use/x11
 	@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
-	@$(call add,THE_PACKAGES,xorg-drv-ati)
+	@$(call add,THE_PACKAGES,xorg-drv-ati xinit)

 use/e2k/sound:
 	@$(call add,THE_PACKAGES,setup-alsa-elbrus-401)
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -31,6 +31,7 @@ use/firmware/wireless: use/firmware
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)

 use/firmware/laptop: use/firmware/cpu
 	@$(call add,KMODULES,acpi_call)
--- a/features.in/fonts/config.mk
+++ b/features.in/fonts/config.mk
@@ -19,6 +19,10 @@ use/fonts/zerg: use/fonts
 use/fonts/infinality: use/fonts
 	@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)

+# #34142
+use/fonts/chinese: use/fonts
+	@$(call add,THE_PACKAGES,fonts-bitmap-wqy)
+
 # a few typical font collections
 # NB: dejavu is ugly thus missing
 # NB: not depending on use/fonts intentionally,
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -58,7 +58,8 @@ use/live/repo/online:
 	@$(call add,LIVE_PACKAGES,livecd-online-repo)

 # alterator-based permanent installation
-use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg
+use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \
+	use/bootloader/live use/bootloader/grub
 	@$(call add,LIVE_PACKAGES,livecd-install)
 	@$(call add,LIVE_PACKAGES,livecd-installer-features)

--- a/features.in/pack/config.mk
+++ b/features.in/pack/config.mk
@@ -40,6 +40,6 @@ $(foreach c,$(VE_ARCHIVES), \
 		$(eval $(call PACK_compressors,$(c),$(z)))))

 # virtual machines
-VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
+VM_EXTS := .img .qcow2 .qcow2c .vdi .vmdk .vhd

 $(VM_EXTS:.%=use/pack/%): use/pack; @:
--- a/features.in/rescue/rescue/image-scripts.d/00-test-rescue
+++ b/features.in/rescue/rescue/image-scripts.d/00-test-rescue
@@ -2,9 +2,10 @@

 no_x11() {
 	if rpmquery libX11 >&/dev/null; then
-		echo "** rescue image contains libX11 which is prohibited" >&2
+		echo "** rescue image contains libX11 which is prohibited"
+		rpm -e --test libX11
 		exit 1
-	fi
+	fi >&2
 }

 case "${GLOBAL_TEST_RESCUE:-}" in
--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -41,9 +41,12 @@ use/server/groups/tools: use/server
 	@$(call add,MAIN_GROUPS,tools/tuning)

 use/server/groups/services: use/server
-	@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)
-	@$(call add,MAIN_GROUPS,server/dhcp server/mail server/mysql)
-	@$(call add,MAIN_GROUPS,server/pgsql)
+	@$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail)
+	@$(call add,MAIN_GROUPS,server/apache2 server/nginx)
+	@$(call add,MAIN_GROUPS,server/mariadb server/pgsql)
+	@$(call add,MAIN_GROUPS,server/php5 server/php7)
+	@$(call add,MAIN_GROUPS,server/ftp server/rsync)
+	@$(call add,MAIN_GROUPS,server/kvm)

 use/server/groups/base: use/server/groups/tools use/server/groups/services; @:

--- a/features.in/sound/config.mk
+++ b/features.in/sound/config.mk
@@ -6,11 +6,12 @@ use/sound:
 	@$(call add_feature)
 	@$(call add,THE_KMODULES,alsa sound)
 	@$(call add,THE_LISTS,sound/base)
+	@$(call add,THE_LISTS,$$(THE_SOUND))

 # ALSA only sound (additional utils needed if using pulseaudio)
 use/sound/alsa: use/sound
-	@$(call add,THE_PACKAGES,apulse)
+	@$(call set,THE_SOUND,sound/alsa)

 # PulseAudio (useful for per-app levels, dynamic devices and networked sound)
 use/sound/pulse: use/sound
-	@$(call add,THE_LISTS,sound/pulseaudio)
+	@$(call set,THE_SOUND,sound/pulseaudio)
--- a/features.in/syslinux/cfg.in/82rescue_rw.cfg
+++ b/features.in/syslinux/cfg.in/82rescue_rw.cfg
@@ -1,5 +1,5 @@
 label rescue_session
  menu label Rescue with sess^ions support
  kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
+  append initrd=alt0/full.cz fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw

--- a/features.in/vmguest/config.mk
+++ b/features.in/vmguest/config.mk
@@ -6,9 +6,9 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/vmguest:
 	@$(call add_feature)

-use/vmguest/base: use/vmguest/vbox use/vmguest/vmware; @:
+use/vmguest/base: use/vmguest/vbox use/vmguest/vmware use/vmguest/kvm; @:
 use/vmguest/complete: use/vmguest/base \
-	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm; @:
+	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @:

 use/vmguest/vbox: use/vmguest
 	@$(call add,THE_KMODULES,virtualbox-addition vboxguest)
@@ -20,15 +20,19 @@ use/vmguest/vbox/x11: use/vmguest/vbox
 # NB: only reasonable for X11-bearing images
 # see also use/install2/kvm
 use/vmguest/kvm: use/vmguest
-	@$(call add,THE_PACKAGES,spice-vdagent qemu-guest-agent)
+	@$(call add,THE_PACKAGES,qemu-guest-agent)
+
+use/vmguest/kvm/x11: use/vmguest/kvm
+	@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl)

 # see also use/install2/vmware
 use/vmguest/vmware:
 	@$(call add,THE_KMODULES,vmware)
 	@$(call add,THE_KMODULES,scsi)	# mptspi.ko
+	@$(call add,THE_PACKAGES,open-vm-tools)

 use/vmguest/vmware/x11: use/vmguest/vmware
-	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse open-vm-tools-desktop)

 else

--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -118,10 +118,10 @@ ifneq (,$(filter-out e2k,$(ARCH)))
 	@$(call add,IM_PACKAGES,imsettings-xfce)
 endif

-use/x11/xfce/full: use/x11/xfce
+use/x11/xfce/full: use/x11/xfce +pulse
 	@$(call add,THE_PACKAGES,xfce4-full)

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

@@ -132,7 +132,7 @@ use/x11/gnome3: use/x11/xorg +pulse
 use/x11/e17: use/x11 use/net/connman
 	@$(call add,THE_LISTS,$(call tags,e17 desktop))

-use/x11/enlightenment: use/x11 use/net/connman
+use/x11/enlightenment: use/x11 use/net/connman +pulse
 	@$(call add,THE_LISTS,$(call tags,enlightenment desktop))
 	@$(call add,DEFAULT_SERVICES_DISABLE,acpid)

@@ -159,7 +159,7 @@ use/x11/gnustep: use/x11
 use/x11/xmonad: use/x11
 	@$(call add,THE_LISTS,$(call tags,xmonad desktop))

-use/x11/mate: use/x11
+use/x11/mate: use/x11 +pulse
 	@$(call add,THE_LISTS,$(call tags,mate desktop))
 	@$(call add,IM_PACKAGES,imsettings-mate)

--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -80,6 +80,10 @@ imagedir:

 postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
 	@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | cut -f5 -d' '`"; \
+	if [ ! -n "$$OUTSIZE" ]; then \
+		echo "** error: $(IMAGE_OUTPATH) missing" >&2; \
+		exit 1; \
+	fi; \
 	echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
 	echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \
 	echo "IMAGE_OUTFILE = $(IMAGE_OUTFILE)" && \
--- a/pkg.in/groups/server/apache2.directory
+++ b/pkg.in/groups/server/apache2.directory
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Apache Web Server
+X-Alterator-PackageList=server/apache2
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/nginx
+Name[ru_RU]=Web-сервер Apache 2
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/http.directory
+++ b/pkg.in/groups/server/http.directory
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=LAMP Server (Apache, MySQL, PHP)
-X-Alterator-PackageList=server/http
-X-Alterator-Required=no
-Name[ru_RU]=Сервер LAMP (Apache, MySQL, PHP)
-Categories=Server;Networking
-
--- a/pkg.in/groups/server/mariadb.directory
+++ b/pkg.in/groups/server/mariadb.directory
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=MariaDB Server (MySQL replacement)
+X-Alterator-PackageList=server/mariadb
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/mysql
+Name[ru_RU]=Сервер MariaDB (замена MySQL)
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/mysql.directory
+++ b/pkg.in/groups/server/mysql.directory
@@ -4,6 +4,7 @@ Type=Directory
 Name=MySQL Server
 X-Alterator-PackageList=server/mysql
 X-Alterator-Required=no
+X-Alterator-Conflicts=server/mariadb
 Name[ru_RU]=Сервер MySQL
 Categories=Server;Networking

--- a/pkg.in/groups/server/nginx.directory
+++ b/pkg.in/groups/server/nginx.directory
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=NGINX Web Server
+X-Alterator-PackageList=server/nginx
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/apache2
+Name[ru_RU]=Web-сервер NGINX
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/php5.directory
+++ b/pkg.in/groups/server/php5.directory
@@ -0,0 +1,10 @@
+[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/server/php7.directory
+++ b/pkg.in/groups/server/php7.directory
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=PHP 7 support
+X-Alterator-PackageList=server/php7
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/php5
+Name[ru_RU]=Поддержка PHP 7
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/rsync.directory
+++ b/pkg.in/groups/server/rsync.directory
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Rsync Server
+X-Alterator-PackageList=server/rsync
+X-Alterator-Required=no
+Name[ru_RU]=Сервер rsync
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/sqlite.directory
+++ b/pkg.in/groups/server/sqlite.directory
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=SQLite Support
+Name[ru_RU]=Поддержка SQLite
+X-Alterator-PackageList=server/sqlite
+X-Alterator-Required=no
+Categories=Server;
+
--- a/pkg.in/lists/server/apache2
+++ b/pkg.in/lists/server/apache2
@@ -0,0 +1,2 @@
+apache2
+apache2-httpd-prefork
--- a/pkg.in/lists/server/mariadb
+++ b/pkg.in/lists/server/mariadb
@@ -0,0 +1,6 @@
+mariadb-backup
+mariadb-bench
+mariadb-client
+mariadb-server
+perl-DBD-mysql
+python-module-MySQLdb
--- a/pkg.in/lists/server/nginx
+++ b/pkg.in/lists/server/nginx
@@ -0,0 +1,2 @@
+nginx
+nginx-perl
--- a/pkg.in/lists/server/pgsql
+++ b/pkg.in/lists/server/pgsql
@@ -1,2 +1,2 @@
-postgresql9.5-server
-postgresql9.5-contrib
+postgresql10-server
+postgresql10-contrib
--- a/pkg.in/lists/server/pgsql-1C
+++ b/pkg.in/lists/server/pgsql-1C
@@ -1 +1 @@
-postgresql9.4-1C-server
+postgresql9.6-1C-server
--- a/pkg.in/lists/server/php5
+++ b/pkg.in/lists/server/php5
@@ -1,16 +1,13 @@
-apache2
 apache2-mod_php5
 php5
 php5-cgi
 php5-curl
 php5-dba
 php5-dom
-#php5-eaccelerator
 php5-exif
-#php5-facedetect
 php5-fileinfo
+php5-fpm-fcgi
 php5-gd2
-#php5-imagick2
 php5-imap
 php5-ldap
 php5-mbstring
@@ -23,7 +20,3 @@ php5-suhosin
 php5-xmlrpc
 php5-xsl
 php5-zip
-MySQL-bench
-MySQL-client
-MySQL-server-perl
-
--- a/pkg.in/lists/server/php7
+++ b/pkg.in/lists/server/php7
@@ -0,0 +1,19 @@
+apache2-mod_php7
+php7
+php7-curl
+php7-dba
+php7-dom
+php7-exif
+php7-fileinfo
+php7-fpm-fcgi
+php7-gd2
+php7-imap
+php7-ldap
+php7-mbstring
+php7-mcrypt
+php7-memcached
+php7-mysqlnd
+php7-pgsql
+php7-xmlrpc
+php7-xsl
+php7-zip
--- a/pkg.in/lists/server/rsync
+++ b/pkg.in/lists/server/rsync
@@ -0,0 +1,2 @@
+rsync-server
+xinetd
--- a/pkg.in/lists/server/sqlite
+++ b/pkg.in/lists/server/sqlite
@@ -0,0 +1 @@
+sqlite3
--- a/pkg.in/lists/sound/alsa
+++ b/pkg.in/lists/sound/alsa
@@ -0,0 +1,2 @@
+apulse
+udev-alsa
--- a/pkg.in/lists/tagged/base+regular
+++ b/pkg.in/lists/tagged/base+regular
@@ -6,6 +6,8 @@ ntfs-3g
 dosfstools
 fatresize

+make-initrd-ucode
+
 lvm2
 make-initrd-lvm

@@ -40,4 +42,7 @@ cpufreq-simple
 eject
 bc

+ncdu
+tree
+
 zsh
--- a/pkg.in/lists/tagged/desktop+cinnamon
+++ b/pkg.in/lists/tagged/desktop+cinnamon
@@ -1,3 +1,2 @@
 cinnamon-regular
 installer-feature-xdg-user-dirs
-ConsoleKit
--- a/pkg.in/lists/tagged/desktop+e17
+++ b/pkg.in/lists/tagged/desktop+e17
@@ -2,4 +2,3 @@ e17-default
 evas_generic_loaders
 gnome-icon-theme
 terminology
-ConsoleKit
--- a/pkg.in/lists/tagged/desktop+engineering
+++ b/pkg.in/lists/tagged/desktop+engineering
@@ -1,9 +1,37 @@
-# Electronic
+# EDA
 kicad
 qucs
+qucs-s

-# CAD
+# 2D CAD
 librecad
+qcad
+qcad-partlibrary
+solvespace
+
+# 3D CAD
+freecad
+GLC_Player
+openscad
+openscad-MCAD
+openscad-libraries-mcad
+meshlab
+blender
+blender-i18n
+
+# CAM and gcode generator
+camotics
+pycam
+flatcam
+pcb2gcodeGUI
+
+# CNC
+linuxcnc
+
+# 3D Printer Software
+cura
+printrun
+repraptor

 # APCS
 beremiz
@@ -12,12 +40,13 @@ yaplc-ide
 # SCADA
 openscada-Model.AGLKS
 openscada-Model.Boiler
-
-# CNC
-linuxcnc
-camotics
-repraptor
-pcb2gcode
-inkscape-plugin-gcodetools
-pycam
-flatcam
+openscada-docRU
+libuniset2-utils
+libuniset2-extension-logicproc
+libuniset2-extension-rrd
+libuniset2-extension-smplus
+libuniset2-extension-sqlite
+libomniORB-names
+uniset2-testsuite
+libuniset2-docs
+uniset2-testsuite-doc
--- a/pkg.in/lists/tagged/desktop+enlightenment
+++ b/pkg.in/lists/tagged/desktop+enlightenment
@@ -3,4 +3,3 @@ evas_generic_loaders
 gnome-icon-theme
 rage
 xterm
-ConsoleKit
--- a/pkg.in/lists/tagged/desktop+ibus
+++ b/pkg.in/lists/tagged/desktop+ibus
@@ -9,4 +9,4 @@ imsettings-xim

 ibus-hangul
 ibus-pinyin
-ibus-unikey
+#ibus-unikey
--- a/pkg.in/lists/tagged/desktop+lxde
+++ b/pkg.in/lists/tagged/desktop+lxde
@@ -20,10 +20,7 @@ menu-cache
 altlinux-freedesktop-menu-lxde

 # NB: an lxde-settings is required by lxde-common
-lxde-settings-upstream
+lxde-settings-lxdesktop

 lxde-icon-theme
 tango-icon-theme
-
-# reboot/poweroff in logout menu as of July, 2013
-ConsoleKit
--- a/pkg.in/lists/tagged/desktop+lxde+extra
+++ b/pkg.in/lists/tagged/desktop+lxde+extra
@@ -7,7 +7,7 @@ leafpad
 galculator
 deadbeef-incomplete
 deadbeef-etcskel
-smplayer-mpv
+mpv
 mtpaint
 parcellite

--- a/pkg.in/lists/tagged/desktop+lxqt
+++ b/pkg.in/lists/tagged/desktop+lxqt
@@ -11,6 +11,7 @@ lxqt-qtplugin
 lxqt-runner
 lxqt-session
 pcmanfm-qt
+lxqt-l10n

 # optional components
 lxqt-openssh-askpass
@@ -18,10 +19,11 @@ lxqt-policykit
 udisks2
 gvfs

+# sound mixer
+qasmixer
+
 # system configuration tools
-compton-conf
 lxqt-config
-obconf-qt

 # utilities
 lximage-qt
@@ -33,11 +35,7 @@ eject
 icon-theme-oxygen
 x-cursor-theme-jimmac

-qupzilla
 qterminal
-juffed
-juffed-plugins
-screengrab
 xscreensaver

 psi-plus
@@ -45,8 +43,4 @@ psi-plus-plugin-birthdayreminder
 psi-plus-plugin-conferencelogger
 psi-plus-plugin-screenshot
 psi-plus-plugin-watcher
-
-axkb
-
-# reboot/poweroff in logout menu as of May, 2014
-ConsoleKit
+psi-plus-l10n
--- a/pkg.in/lists/tagged/desktop+lxqt+extra
+++ b/pkg.in/lists/tagged/desktop+lxqt+extra
@@ -1,3 +1,7 @@
+# system configuration tools (qt4)
+compton-conf
+obconf-qt
+
 # carefully chosen
 x-cursor-theme-BlueGlass3D
 x-cursor-theme-CP38
@@ -14,9 +18,15 @@ fatrat
 focuswriter
 qt4-settings
 tubularix
-smplayer
+smplayer-mpv
 QCheckers
 qps
+juffed
+juffed-plugins
+axkb
+
+# file archiver
+file-roller

 # media player; see also #30556 though
 clementine
@@ -34,4 +44,5 @@ qpdfview

 # useless but cute
 cool-retro-term
+
 fonts-ttf-liberation
--- a/pkg.in/lists/tagged/desktop+regular
+++ b/pkg.in/lists/tagged/desktop+regular
@@ -49,3 +49,5 @@ x11-ssh-askpass
 sysfsutils

 mc
+
+apf
--- a/pkg.in/lists/tagged/mobile+mate
+++ b/pkg.in/lists/tagged/mobile+mate
@@ -7,9 +7,6 @@ fonts-otf-mozilla-fira
 xdg-user-dirs
 #gnome-minimal
 #gnome-mobile
-ConsoleKit
-ConsoleKit-x11
-pam-ck-connector
 notification-daemon
 #powermgmt-base
 acpi
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -18,6 +18,7 @@ disktype
 #     would suddenly get busy otherwise
 #evms
 #evms-ncurses
+fio
 gpart
 hddtemp
 idle3-tools
@@ -192,7 +193,6 @@ socat
 sshpt
 #stunnel
 tcpdump
-tcpflow
 tcpreen
 tcpreplay
 tcptrace
@@ -202,7 +202,6 @@ tcpxtract
 telnet
 traceroute
 uucp
-wdfs
 wget
 whatmask
 whois
--- a/pkg.in/lists/tagged/rescue+misc
+++ b/pkg.in/lists/tagged/rescue+misc
@@ -35,6 +35,7 @@ irda-utils
 lm_sensors3
 lshw
 mpt-status
+nvme
 nvramtool
 smartmontools
 smbios-utils
--- a/pkg.in/lists/tagged/server+openvz
+++ b/pkg.in/lists/tagged/server+openvz
@@ -2,4 +2,4 @@
 #vzfree
 #vzvalidate
 openvz-etersoft
-yabeda
+#yabeda
Author	SHA1	Message	Date
Michael Shigorin	fc84a5cb83	1.2.9-alt1 - antohami@'s release	2018-02-12 22:58:46 +03:00
Anton Midyukov	8cf4a8cbe5	desktop+lxqt+extra: added file archiver file-roller seems not the best appropriate but its support is integrated into lxqt; maybe peazip-qt or something else will be better some day. See-also: https://wiki.manjaro.org/List_of_Qt_Applications#Files_Archivers	2018-02-12 22:40:36 +03:00
Anton Midyukov	a2c8501fad	mixin.mk: added beesu ...to mixin/regular-desktop so that all regular desktop images could benefit from it.	2018-02-12 22:39:48 +03:00
Anton Midyukov	c0418eff24	desktop+lxqt, desktop+lxqt+extra: update lists - added missing localization for lxqt and psi+ - added qasmixer - replaced smplayer with smplayer-mpv - removed screengrab (lxqt has its own program for screenshots)	2018-02-12 22:31:16 +03:00
Anton Midyukov	93ad3c748b	desktop+lxde+extra: replace smplayer-mpv with mpv smplayer pulls Qt4 in, mpv might be enough for LXDE.	2018-02-12 22:27:52 +03:00
Anton Midyukov	a1f539a724	regular.mk, pkg.in/lists: drop ConsoleKit This one conflicts with systemd-logind; so let's move it from generic pkglists into specific regular.mk targets (those based on distro/.regular-sysv).	2018-02-12 22:22:40 +03:00
Anton Midyukov	c4f9521e49	mixin.mk: dedup mixin/regular-lxde +alsa is already pulled in by mixin/regular-desktop.	2018-02-12 22:17:25 +03:00
Anton Midyukov	c3fa1a933c	x11: added +pulse for PA-dependent flavours These will either pull half-baked pulseaudio in or even not (and fail to produce sound later on).	2018-02-12 22:16:54 +03:00
Michael Shigorin	06b2e605e9	gear-store-tags	2018-02-05 21:51:41 +03:00
Michael Shigorin	0e8820452a	1.2.8-alt1 - regular fixes	2018-02-05 21:49:48 +03:00
Michael Shigorin	adb5900708	regular.mk, mixin.mk: drop use/fonts/infinality It's been used in cinnamon, enlightenment and lxde{,-based} flavours but is rather deprecated/unsupported by now as maintainer explains the upstream status: https://lists.altlinux.org/pipermail/sisyphus/2018-February/366450.html	2018-02-04 02:48:34 +03:00
Michael Shigorin	0e796f37b3	rescue+extra: dropped wdfs No more in sisyphus: http://git.altlinux.org/tasks/archive/done/_193/198507/	2018-01-30 10:53:19 +03:00
Michael Shigorin	b92f022478	bootloader, live: arrange alterator module ...explicitly; this has been triggered by the change to livecd-install as of 0.9.10-alt2 (doesn't R: alterator-grub anymore to allow non-grub platforms as well). This should be a no-op _together_ with the mentioned change by now as grub is selected explicitly; will take more attention for e.g. e2k as the problem just shifted here from livecd-install. Reported-by: Leonid Krivoshein <klark@altlinux.org>	2018-01-24 14:44:51 +03:00
Michael Shigorin	b57762d1b9	regular.mk: added thunderbird-ru to cinnamon This asks for future improvement within l10n feature though. Reported-by: Leonid Krivoshein <klark@altlinux.org>	2018-01-23 14:18:44 +03:00
Michael Shigorin	0d21c7ae33	gear-store-tags	2018-01-22 20:25:48 +03:00
Michael Shigorin	d12420522a	1.2.7-alt1 - 2018: better sound feature (antohami@)	2018-01-22 20:24:56 +03:00
Anton Midyukov	5c8144dfe7	desktop+regular: added apf An apt-file analog.	2018-01-22 17:04:34 +03:00
Anton Midyukov	93f5dd7d5d	regular.mk: update lxde, engineering flavours - switch browser from firefox to palemoon (firefox needed pulseaudio) - switch LXDE theme from upstream to lxdesktop (cf. ALT Engineering) - added qastool: ALSA mixer GUI - added qpdfview: PDF viewer (there was none) - update regular-engineering pkglist	2018-01-16 15:19:44 +03:00
Anton Midyukov	2a2b3e1b7b	mixin.mk: replace use/sound with +alsa for desktop/regular This will solve the sound problems when using regulars: - The sound when the computer is restarted is set to 0 - Some applications do not know how to work directly with ALSA, apulse allows you to solve this problem partially. Using feature +pulse will override use of +alsa feature.	2018-01-16 15:05:00 +03:00
Anton Midyukov	530d4c1740	sound: added a switch between alsa and pulseaudio Those images who are fine with ALSA might still benefit from addons like udev-alsa to have mixer levels restored on boot; and PulseAudio-bearing images can be based upon the same intermediate targets now without receiving the addons they don't need.	2018-01-10 19:34:57 +03:00
Anton Midyukov	c13ec2d67b	sound: added udev-alsa in feature use/sound/alsa (+alsa) This one should care for default mixer levels upon boot.	2018-01-10 19:31:06 +03:00
Michael Shigorin	9573d6e905	base+regular: added ncdu, tree Suggested-by: Mikhail Novoselov <mikhailnov@dumalogiya.ru> Acked-by: Anton Midyukov <midyukov-anton@ya.ru>	2018-01-05 12:33:34 +03:00
Michael Shigorin	fa0fcaa836	regular.mk: experimental regular-mate-sysv This one has been asked for by someone in starterkits-20171212 thread: http://www.opennet.ru/openforum/vsluhforumID3/113074.html#45	2018-01-05 12:29:01 +03:00
Michael Shigorin	d5976dc3b7	mixin.mk: added apulse to lxde one That is, +alsa which basically means it. Reported-by: Leonid Krivoshein <klark@altlinux.org>	2018-01-05 12:28:53 +03:00
Michael Shigorin	39acd516e9	server+openvz: drop yabeda Not that it was bad but it's just no more around...	2017-12-15 08:49:02 +03:00
Michael Shigorin	9c44541d3c	rescue+misc: added nvme Too bad it wasn't spotted a couple nights ago...	2017-12-13 05:00:20 +03:00
Michael Shigorin	5a6e03b676	gear-store-tags	2017-12-11 23:55:26 +03:00
Michael Shigorin	e4d54acd98	1.2.6-alt1 - starterkits-20161212	2017-12-11 23:53:31 +03:00
Michael Shigorin	71b2e237bd	regular.mk: add xorg-conf-synaptics to installer ...following alt-workstation as well (thank you sem@!).	2017-12-11 23:51:31 +03:00
Michael Shigorin	e97a21ca0d	regular.mk: add fdisk to installers ...following alt-workstation as well.	2017-12-11 23:50:06 +03:00
Michael Shigorin	c337b5c977	regular.mk: use/fonts/chinese ...following alt-workstation.	2017-12-11 23:48:59 +03:00
Michael Shigorin	444790293a	fonts: add use/fonts/chinese ...with the basic bitmap one. Suggested-by: 9gigabit@gmail.com See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=34142	2017-12-11 23:48:52 +03:00
Michael Shigorin	ae7729cef1	regular.mk: add amdgpu support Following alt-workstation; thanks lakostis@.	2017-12-11 23:46:36 +03:00
Michael Shigorin	1cc3a2f164	pkg.in, server: revamped server lists/groups This has been long overdue: pretending that "http server" is an Apache2 with PHP5 was wrong for ages, and providing apache2/nginx, php5/php7 choice along with more databases was waiting for its user proposal. Follow these changes in server feature as well. Suggested-by: Altexander See-also: https://forum.altlinux.org/index.php?topic=40290	2017-12-11 23:38:00 +03:00
Michael Shigorin	0c31b9898b	regular.mk: disable-usb-autosuspend wider This kludge should go to at least desktop installers as well, and WM-based images shouldn't suffer either. Regarding server ones, let's see. Suggested-by: Speccyfighter See-also: https://forum.altlinux.org/index.php?topic=36963.msg289422#msg289422 Suggested-by: Иволгин See-also: https://forum.altlinux.org/index.php?topic=36963.msg292251#msg292251	2017-12-11 22:08:55 +03:00
Michael Shigorin	459a46b868	syslinux: fix rescue_rw config snippet This one enables rw session support for Rescue images; the nitpick is that syslinux' gfxboot will set this up when booting the same ISO from USB Flash media instead of optical one (CD/DVD-ROM/RW), and we don't put gfxboot into a standalone rescue image. See-also: http://altlinux.org/propagator See-also: http://altlinux.org/remount_rw	2017-12-11 20:09:20 +03:00
Michael Shigorin	e45dab0435	regular.mk: add btrfs support to graphical images This is an experiment that should finally land in install2 but SYSTEM_PACKAGES is not enough, mkfs.btrfs doesn't land in the installer somehow. See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=32403	2017-12-06 21:05:41 +03:00
Anton Midyukov	d465848793	Update list desktop+engineering: - remove slic3r (conflict perl-OpenGL with pycam) - added qucs-s - added blender - added libuniset2 - added solvespace	2017-12-06 16:09:07 +03:00
Michael Shigorin	fbde9fc722	gear-store-tags	2017-12-04 22:13:10 +03:00
Michael Shigorin	84183f8818	1.2.5-alt1 - qcow2c	2017-12-04 22:12:05 +03:00
Michael Shigorin	051b8ef2b8	p8.mk: added vm/opennebula-systemd bridge Suggested-by: Alexey Shabalin <shaba@altlinux.org>	2017-12-04 21:00:27 +03:00
Michael Shigorin	e043f87775	build-vm, pack: implement qcow2c support This is a compressed version of good ol' qcow2. Suggested-by: Alexey Shabalin <shaba@altlinux.org>	2017-12-04 20:02:19 +03:00
Michael Shigorin	0f2411ec34	image.in, build-vm: handle qemu-img absence properly This isn't a warning cause, this is a error cause!	2017-12-04 19:41:51 +03:00
Michael Shigorin	a173bbd070	browser: drop -be Maybe this commit will be reverted but this is the current state of both sisyphus and p8. See-also: http://bugzilla.mozilla.org/show_bug.cgi?id=1304743 See-also: http://www.opennet.ru/opennews/art.shtml?num=45909 See-also: http://www.opennet.ru/opennews/art.shtml?num=46987	2017-12-04 18:24:53 +03:00
Michael Shigorin	3ca9ae4ba2	gear-store-tags	2017-11-20 21:50:10 +03:00
Michael Shigorin	cf0fe91f0e	1.2.4-alt1 - opennebula-systemd	2017-11-20 21:49:45 +03:00
Michael Shigorin	ea373cec67	desktop+ibus: dropped ibus-unikey No more in sisyphus: http://git.altlinux.org/tasks/archive/done/_189/193808/	2017-11-14 19:01:36 +03:00
Michael Shigorin	5dd5c0b618	base+regular: added make-initrd-ucode Suggested-by: Anton Farygin <rider@altlinux.org> See-also: https://lists.debian.org/debian-devel/2017/06/msg00308.html	2017-11-03 15:58:54 +03:00
Alexey Shabalin	890390a89a	add vm/opennebula-systemd	2017-10-31 13:24:02 +03:00
Alexey Shabalin	91e0c6e933	cleanup vm/cloud-systemd	2017-10-31 13:23:56 +03:00
Alexey Shabalin	e0dfa733e6	install open-vm-tools-desktop for use/vmguest/vmware/x11	2017-10-31 13:23:49 +03:00
Alexey Shabalin	a9b1f05501	add use/vmguest/kvm/x11	2017-10-31 13:13:09 +03:00
Michael Shigorin	af20f89346	rescue: make libX11 test a bit more helpful It should be more clear what gets libX11 test triggered.	2017-10-23 18:54:37 +03:00
Michael Shigorin	3afb96a824	rescue+extra: drop tcpflow ...as it pulls libX11 in now.	2017-10-23 18:53:26 +03:00
Anton Midyukov	9f10e9d12a	Update pkg.in/lists/tagged/desktop+engineering	2017-09-28 18:40:36 +03:00
Michael Shigorin	4a07391d93	gear-store-tags	2017-09-26 00:11:00 +03:00
Michael Shigorin	efcb82b4f1	1.2.3-alt1 - p8+	2017-09-26 00:00:48 +03:00
Michael Shigorin	fd4f2a675d	e2k.mk, mixin.mk: add more targets mixin/e2k-desktop was asking for separation from its day zero, and the rest just came in naturally (the temporary patch to add lxqt and mate looked awfully with all the duplication in).	2017-09-26 00:00:31 +03:00
Michael Shigorin	41b5a5b633	desktop+lxqt: reshuffle qt4 bits This is to make desktop+lxqt packages installable on e2k as there's no qt4 package within this Sisyphus port and things might just stay this way (it's long unsupported, looks like porting software to qt5 is more worthwile an effort). There's one more removal though: qupzilla. This browser fits lxqt like a glove but* it's pulled in already by mixin/regular-lxqt, and browser feature is available now to make the selection more flexible. It's also going to be renamed on the way to incusion into KDE SC.	2017-09-26 00:00:02 +03:00
Michael Shigorin	f32fd9a3b0	firmware: add firmware-rt* to use/firmware/wireless ...for firmware-rt61pci; thanks to an anonymous bugreporter. See-also: http://www.opennet.ru/openforum/vsluhforumID3/112310.html#177	2017-09-25 23:59:25 +03:00
Michael Shigorin	9d10d78b48	desktop.mk, live.mk, regular.mk, test.mk: cleanup There was a semi-awful lot of long-abandoned targets spotted while factoring out mixins; let's just drop these for good, and if anyone needs some of those drop me a commit.	2017-09-25 23:58:59 +03:00
Michael Shigorin	0a87d47748	p7.mk, t7.mk: drop completely These branches are officially unsupported for the whole two years, probably just the time to clean up. See-also: http://altlinux.org/branches	2017-09-25 23:58:52 +03:00
Michael Shigorin	24defe9461	mixin.mk: gather all mixin/* targets These have appeared in desktop.mk, regular.mk, vm.mk over time, and there are two problems around. The minor one is that mixins have been introduced as handy reusable bits close in context of their use; this practically means that they fall under the same class restrictions as their parent targets, that is a mixin coming from regular.mk will only be available for "distro" IMAGE_CLASS, and so on. The major one is probably the worst design flaw in m-p: building images from ground up, where ground is a valid standalone buildable target as well. Life has shown that we rather want to build up images the other way around, choosing what essentials go in first and then fitting the fine details along with the packaging. The first sign of this difference appeared with ARMv7 Simply: we had a well-built configuration aiming for x86 ISO, still we needed roughly the same app/environment configuration put into armh disk image. Those platforms were different enough that we didn't actually plan shipping lots of distributions but the problem was clear, and it was much alike to the one that sprang m-p to life in the first place (when we had a range of "common" distros and needed to create and maintain a set of "school" ones that mostly had similar or even identical difference to their respective base ones -- and we couldn't do something like conf.d/p8.mk does now). So mixins are going to become the softer way to turn m-p's target configuration chain upside down to considerable extent: build up what you're going to mix into the various deliverables, and make it as portable across image classes, hardware platforms, repository branches as feasible so that total maintenance effort needed goes down or at least doesn't spike too bad. And here's the first strike at that.	2017-09-25 23:58:40 +03:00
Michael Shigorin	b558f88bfa	vm.mk: factor out mixin/cloud-init This one has been clearly duplicated before.	2017-09-25 23:56:42 +03:00
Michael Shigorin	ef0394f810	regular.mk: conditionally add kdeedu* It's been expelled from sisyphus. See-also: http://git.altlinux.org/tasks/archive/done/_183/187993/	2017-09-12 14:29:58 +03:00
Mike Radyuk	fe07f4091f	Fix armh feature	2017-09-12 14:28:28 +03:00
Michael Shigorin	2828090d6b	gear-store-tags	2017-09-11 21:25:50 +03:00
Michael Shigorin	40fd44377b	1.2.2-alt1 - regular-engineering	2017-09-11 20:47:19 +03:00
Anton Midyukov	9c5a47a4ce	New target regular-engineering and alt-p8-engineering	2017-09-11 16:23:29 +03:00
Michael Shigorin	59c1a58793	regular.mk: pnmixer to sysv-based xfce flavours ...instead of xfce4-mixer which is based on gstreamer 0.10 (with its mixer API that perished in 1.0); this has been tested on e2k already. Suggested-by: Mikhail Efremov <sem@altlinux.org> See-also: http://forum.altlinux.org/index.php?topic=36177.msg316175#msg316175	2017-09-11 09:38:06 +03:00
Anton Midyukov	a21ab528da	Update pkg.in/lists/tagged/desktop+engineering	2017-09-08 18:44:01 +03:00
Sergey V Turchin	792e70e237	- add open-vm-tools to use/vmguest/vmware	2017-09-08 18:41:28 +03:00
Michael Shigorin	86ed95a7e1	e2k: need startx too Weird it got overlooked in the first place.	2017-09-08 18:25:02 +03:00
Michael Shigorin	9383fce946	regular.mk: add screenpen to gnome3 flavour ROSA's legacy...	2017-09-08 17:38:36 +03:00
Michael Shigorin	4cec22b957	deflogin: add nm-sysvinit to use/deflogin/sysv/nm Suggested-by: Speccyfighter See-also: http://forum.altlinux.org/index.php?topic=39476.msg315597#msg315597	2017-09-07 15:45:23 +03:00
Michael Shigorin	9371719edc	regular.mk: trim kdeedu set in tde flavour Suggested-by: squire See-also: http://forum.altlinux.org/index.php?topic=38966.msg312602#msg312602	2017-09-07 15:29:31 +03:00
Michael Shigorin	032b3a1bf1	rescue+extra: add fio Suggested-by: Evgenii Terechkov <evg@altlinux.org>	2017-08-29 16:38:22 +03:00
Michael Shigorin	53c2c7fd1d	gear-store-tags	2017-08-21 22:05:01 +03:00