conf/live.mk: minor refactoring

distro/live-builder target used to employ a few duplicated packages that might make it to a list but as the list would have only a single user so far these were moved to a target- specific variable (hm, weird but "private" modifier broke).

conf/live.mk: minor refactoring
3d982dab · Michael Shigorin · a543c9d5 · 3d982dab · 3d982dab
Commit 3d982dab authored Nov 28, 2011 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

Makefile Makefile +2 -2

live.mk conf.d/live.mk +3 -4

No files found.
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@ include conf.d/*.mk
 include features.in/*/config.mk

 DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \
-		lib/distro.mk $(wildcard conf.d/*.mk) | sort)
+		lib/distro.mk $(wildcard conf.d/*.mk) | sort -u)
 VE_TARGETS := $(shell sed -n 's,^\(ve/[^:.]\+\):.*$$,\1,p' \
-		lib/ve.mk $(wildcard conf.d/*.mk) | sort)
+		lib/ve.mk $(wildcard conf.d/*.mk) | sort -u)
 DISTROS := $(call addsuffices,$(DISTRO_EXTS),$(DISTRO_TARGETS)) 
 VES     := $(call addsuffices,$(VE_EXTS),$(VE_TARGETS))
 IMAGES  := $(DISTROS) $(VES)

--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -12,17 +12,16 @@ distro/live-install: distro/.base use/live/install use/syslinux/localboot.cfg
 distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)

+distro/live-builder: pkgs := livecd-tmpfs livecd-online-repo mkimage-profiles
 distro/live-builder: distro/.base use/repo/main \
 	use/live/base use/dev/mkimage use/power/acpi/button
 	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
-	@$(call add,LIVE_PACKAGES,livecd-tmpfs livecd-online-repo)
-	@$(call add,LIVE_PACKAGES,mkimage-profiles)
+	@$(call add,LIVE_PACKAGES,$(pkgs))
 	@$(call add,LIVE_PACKAGES,zsh sudo apt-repo)
 	@$(call add,MAIN_PACKAGES,rpm-build basesystem)
 	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
 	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
-	@$(call add,MAIN_PACKAGES,livecd-tmpfs livecd-online-repo)
-	@$(call add,MAIN_PACKAGES,mkimage-profiles)
+	@$(call add,MAIN_PACKAGES,$(pkgs))

 endif