mixin.mk, regular.mk: Not add extra lists in mixin/regular-x11

List base+regular+extra contains lvm, mdadm, which are not needed
in rootfs.
This commit is contained in:
Anton Midyukov 2021-03-18 01:04:51 +07:00
parent 8f11c22d0f
commit 06b7093fa7
2 changed files with 2 additions and 1 deletions

View File

@ -41,7 +41,7 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
mixin/regular-x11: use/luks use/volumes/regular \ mixin/regular-x11: use/luks use/volumes/regular \
use/browser/firefox \ use/browser/firefox \
use/branding use/ntp/chrony use/services/lvm2-disable use/branding use/ntp/chrony use/services/lvm2-disable
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular)) @$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra))
@$(call add,THE_PACKAGES,disable-usb-autosuspend) @$(call add,THE_PACKAGES,disable-usb-autosuspend)
@$(call add,THE_PACKAGES,btrfs-progs) @$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,THE_PACKAGES,gpm) @$(call add,THE_PACKAGES,gpm)

View File

@ -21,6 +21,7 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
use/live/suspend use/browser/firefox/live \ use/live/suspend use/browser/firefox/live \
use/syslinux/ui/gfxboot use/grub/ui/gfxboot use/syslinux/ui/gfxboot use/grub/ui/gfxboot
@$(call add,THE_BRANDING,bootloader) @$(call add,THE_BRANDING,bootloader)
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
@$(call add,LIVE_LISTS,$(call tags,base rescue)) @$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_PACKAGES,gpm) @$(call add,LIVE_PACKAGES,gpm)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop) @$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)