Drop STARTERKIT variable, need not

conf.d/engineering.mk

@@ -6,8 +6,7 @@ mixin/alt-engineering-live: engineering_lists = $(addprefix engineering/,\
 
 mixin/alt-engineering: mixin/regular-desktop mixin/regular-mate \
 	use/x11/lightdm/gtk \
-	use/l10n +systemd +systemd-optimal +nm-gtk +plymouth \
-	$(STARTERKIT)
+	use/l10n +systemd +systemd-optimal +nm-gtk +plymouth
 	@$(call add,THE_PACKAGES,theme-mate-windows)
 
 mixin/alt-engineering-install: mixin/alt-engineering

conf.d/mixin.mk

 ### various mixins with their origin
 
-# for stable branch base kits
-ifneq (,$(BRANCH))
-STARTERKIT := mixin/starterkit
-mixin/starterkit: use/browser/firefox/esr
-	@$(call set,BRANDING,alt-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst alt-$(BRANCH)-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,ALT $(BRANCH) $$(IMAGE_FLAVOUR)/$(ARCH))
-else
-STARTERKIT :=
-endif
-
 ### desktop.mk
 mixin/desktop-installer: +vmguest \
 	use/bootloader/os-prober use/x11-autostart use/fonts/install2 use/sound
@@ -57,6 +46,9 @@ mixin/regular-x11: use/luks use/volumes/regular \
 	@$(call add,THE_PACKAGES,btrfs-progs)
 	@$(call add,THE_PACKAGES,gpm)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
+ifneq (,$(BRANCH))
+	@$(call set,FX_FLAVOUR,-esr)
+endif
 
 # common WM live/installer bits
 mixin/regular-desktop: +alsa +power +nm-native \

conf.d/realtime.mk

 mixin/cnc-rt: use/l10n +nm-gtk +systemd +systemd-optimal \
-	mixin/regular-desktop mixin/regular-lxqt use/x11/lightdm/gtk $(STARTERKIT)
+	mixin/regular-desktop mixin/regular-lxqt use/x11/lightdm/gtk
 	@$(call set,KFLAVOURS,rt)
 	@$(call add,THE_LISTS,realtime/tests)
 	@$(call add,THE_LISTS,engineering/cnc)

conf.d/regular-vm.mk

@@ -22,7 +22,7 @@ mixin/vm-archdep:: use/bootloader/uboot use/tty/S0
 endif
 
 mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
-	use/services/lvm2-disable $(STARTERKIT)
+	use/services/lvm2-disable
 ifneq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,multipathd)
 endif

conf.d/regular.mk

@@ -5,8 +5,7 @@ ifeq (distro,$(IMAGE_CLASS))
 distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
 	use/stage2/fs use/stage2/hid use/stage2/md \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
-	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
-	$(STARTERKIT)
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
 	@$(call try,SAVE_PROFILE,yes)
 ifeq (,$(BRANCH))
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@@ -268,5 +267,5 @@ endif
 
 ifeq (ve,$(IMAGE_CLASS))
 ve/docker-sisyphus: ve/docker; @:
-ve/regular-chroot: ve/generic $(STARTERKIT); @:
+ve/regular-chroot: ve/generic; @:
 endif