dev, ve.mk: factor out builder+extra

It's strange but ve/builder and distro/live-builder
along with distro/regular-builder are all mostly
"independent", that is duplicating functionality
without any reasonable gain; spotted finally.

conf.d/ve.mk

@@ -17,11 +17,7 @@ ve/ldv: ve/bare use/control/server/ldv
 ve/docker: ve/.base use/repo; @:
 
 # build environment
-ve/builder: ve/base use/repo
-	@$(call add,BASE_PACKAGES,vim-console git-core bash-completion zsh)
-	@$(call add,BASE_PACKAGES,su hasher mkimage-profiles rpm-build)
-	@$(call add,BASE_PACKAGES,rsync screen parallel pv)
-	@$(call add,BASE_PACKAGES,fdisk e2fsprogs iproute2 net-tools)
+ve/builder: ve/base use/dev/builder/base use/repo
 	@$(call add,BASE_LISTS,openssh)
 
 # this should be more or less convenient

features.in/dev/README

@@ -1,8 +1,7 @@
 Эта фича служит для создания образов, предназначающихся для разработки.
 В первую очередь обеспечивается развёртывание hasher и mkimage.
 
-Реализована поддержка LiveCD, возможно приспособление для образов
-сборочных VM/VE.
+Реализована поддержка LiveCD, VM, VE.
 
 Обратите внимание: эта фича достаточно серьёзно изменяет поведение
 субпрофиля main, оставляя из всего обычного множества обрабатываемых

features.in/dev/config.mk

@@ -3,24 +3,25 @@ use/dev: use/control
 	@$(call add,THE_PACKAGES,git-core hasher gear)
 	@$(call add,CONTROL,pam_mktemp:enabled)
 
-use/dev/mkimage: use/dev
-	@$(call add,THE_PACKAGES,mkimage shadow-change su)
-
 use/dev/repo: use/dev use/repo/main
 	@$(call add,THE_PACKAGES,apt-repo)
 	@$(call add,MAIN_PACKAGES,rpm-build basesystem)
 	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
 	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
 
-use/dev/builder/base: use/dev/mkimage use/dev
-	@$(call set,KFLAVOURS,$(BIGRAM))
-	@$(call add,LIVE_LISTS,\
-		$(call tags,(base || live) && (server || builder)))
-	@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
-	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
-	@$(call add,LIVE_PACKAGES,perl-Gear-Remotes)
+use/dev/mkimage: use/dev
+	@$(call add,THE_PACKAGES,mkimage shadow-change su)
 
-use/dev/builder/full: use/dev/builder/base use/dev/repo
+use/dev/builder/base: use/dev/mkimage
+	@$(call add,THE_LISTS,$(call tags,builder && (base || extra)))
+
+use/dev/builder/live: use/dev/builder/base
+	@$(call add,LIVE_LISTS,$(call tags,live builder))
+	@$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc)
+
+use/dev/builder/full: use/dev/builder/live use/dev/repo
+	@$(call set,KFLAVOURS,$(BIGRAM))
+	@$(call add,THE_LISTS,$(call tags,server extra))
 	@$(call add,MAIN_LISTS,$(call tags,live builder))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
-	@$(call add,LIVE_PACKAGES,sudo)
+	@$(call add,LIVE_PACKAGES,sudo perl-Gear-Remotes)

pkg.in/lists/tagged/builder+extra

@@ -0,0 +1,17 @@
+bash-completion
+e2fsprogs
+fdisk
+gear
+hasher
+iproute2
+mkimage-profiles
+net-tools
+parallel
+pv
+rpm-build
+screen
+strace
+sudo
+su
+vim-console
+zsh