migration to live-installer-pkg (without cleaning)

conf.d/ximper.mk

@@ -75,7 +75,7 @@ mixin/ximper-x11: use/luks \
 	@$(call add,THE_PACKAGES,btrfs-progs)
 	@$(call add,THE_PACKAGES,gpm)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-kdesktop)
+	@$(call add,LIVE_PACKAGES,volumes-profile-kdesktop)
 	@$(call set,INSTALL2_FONTS,fonts-otf-abattis-cantarell)
 
 
@@ -130,35 +130,33 @@ distro/.ximper-wm: distro/.ximper-x11 \
 	use/live/rw use/live/ru
 	@$(call set,INSTALLER,alt-workstation)
 
-distro/.ximper-install: distro/.ximper-minimal-env +installer \
-	use/branding use/bootloader/grub use/luks use/stage2/kms \
-	use/install2/fs use/install2/vnc use/install2/repo
-	@$(call add,INSTALL2_PACKAGES,fdisk)
+distro/.ximper-install: distro/.ximper-minimal-env +live-installer-pkg \
+	use/branding use/bootloader/grub use/luks use/stage2/kms 
+	@$(call add,LIVE_PACKAGES,fdisk)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
+	@$(call add,LIVE_PACKAGES,xorg-conf-synaptics)
 endif
 	@$(call add,THE_LISTS,$(call tags,base ximper))
-	@$(call add,INSTALL2_BRANDING,alterator notes)
-	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
+	@$(call add,LIVE_PACKAGES,btrfs-progs)
 	@$(call add,THE_BRANDING,alterator)
 
 
 distro/.ximper-install-x11: distro/.ximper-install +vmguest +wireless \
-	use/install2/suspend mixin/ximper-desktop mixin/ximper-x11 \
+	mixin/ximper-desktop mixin/ximper-x11 \
 	use/branding/complete use/branding/slideshow/once mixin/desktop-installer \
-	use/install2/fs use/efi/shell use/l10n/default/ru_RU
+	use/efi/shell use/l10n/default/ru_RU
 	@$(call set,INSTALLER,alt-workstation)
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 
 
-distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \
-	use/x11/lightdm/gtk +systemd +systemd-optimal
+distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 +systemd +systemd-optimal
 	@$(call add,THE_PACKAGES,bluez)
 	@$(call add,THE_PACKAGES,btrfs-progs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 
 distro/ximper-base: distro/.ximper-install-x11-systemd \
-	distro/.ximper-wm \
+	use/live/rw use/live/ru use/live/x11 use/live/repo \
+	use/live/suspend \
 	mixin/ximper-desktop-common-software \
 	use/kernel/latest \
 	+plymouth;
@@ -181,9 +179,8 @@ distro/ximper-base: distro/.ximper-install-x11-systemd \
 mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia
 	@$(call add,EFI_BOOTARGS,xdriver=vesa initcall_blacklist=simpledrm_platform_driver_init)
 	@$(call add,BASE_BOOTARGS,nvidia-drm.modeset=1)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-remove-xorgconf)
-	@$(call add,INSTALL2_PACKAGES,apt-scripts-nvidia)
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-dri-nouveau xorg-drv-nouveau)
+	@$(call add,LIVE_PACKAGES,installer-feature-remove-xorgconf)
+	@$(call add,LIVE_PACKAGES,apt-scripts-nvidia)
 	@$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*')
 	@$(call add,BASE_PACKAGES,apt-scripts-nvidia)
 	@$(call add,BASE_PACKAGES,nvidia-modprobe nvidia-settings libglut libGLU nvidia-vaapi-driver vulkan-tools \