From 93cd57c8d261b4489585d14d11be5681cafd6c1d Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 13 Nov 2013 20:38:57 +0400 Subject: [PATCH] regular.mk: split out a mixin Parts common to both livecd and installer images factored out to avoid duplication. --- conf.d/regular.mk | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 0921a7f6..108d1c4e 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -15,12 +15,14 @@ distro/.regular-x11: distro/.regular-bare use/x11/wacom +vmguest \ @$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache) @$(call add,DEFAULT_SERVICES_ENABLE,gpm) +# common WM live/installer bits +mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs + @$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2) + @$(call add,THE_PACKAGES,alterator-notes) + @$(call add,THE_BRANDING,alterator graphics indexhtml notes) + # WM base target -distro/.regular-base: distro/.regular-x11 use/x11/xorg - @$(call add,LIVE_PACKAGES,installer-feature-desktop-other-fs-stage2) - @$(call add,LIVE_PACKAGES,alterator-notes) - @$(call add,THE_BRANDING,indexhtml notes alterator) - @$(call add,THE_BRANDING,graphics) +distro/.regular-base: distro/.regular-x11 mixin/regular-desktop # DE base target # TODO: use/plymouth/live when luks+plymouth is done, see also #28255 @@ -39,6 +41,8 @@ distro/.regular-install: distro/.regular-bare \ use/branding use/bootloader/grub +installer +sysvinit +power @$(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) distro/regular-icewm: distro/.regular-sysv-gtk +icewm