regular.mk: pick up regular lists for installers

A lot of packages that should be in the classic installable images got missed during initial effort; start merging the difference.

regular.mk: pick up regular lists for installers
f7c4f3ee · Michael Shigorin · cadd4827 · f7c4f3ee
Commit f7c4f3ee authored Nov 28, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

regular.mk conf.d/regular.mk +3 -1

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -38,11 +38,13 @@ distro/.regular-sysv-gtk: distro/.regular-sysv use/x11/lightdm/gtk; @:
 distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
 	use/branding use/bootloader/grub use/luks
+	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator)
 distro/.regular-install-x11: distro/.regular-install mixin/regular-desktop
 	@$(call set,INSTALLER,desktop)
+	@$(call add,THE_LISTS,$(call tags,regular desktop))
 distro/regular-icewm: distro/.regular-sysv-gtk +icewm
 	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@@ -111,7 +113,7 @@ distro/regular-sysv-tde: distro/.regular-install-x11 \
 distro/regular-server: distro/.regular-install \
 	use/install2/fs use/server/mini
-	@$(call add,THE_LISTS,$(call tags,(base || server) && regular))
+	@$(call add,THE_LISTS,$(call tags,regular server))
 	@$(call set,INSTALLER,altlinux-server)
 endif