Skip to content

M
mkimage-profiles
Commit d1d5e3e4 authored by Anton Midyukov's avatar Anton Midyukov Committed by Michael Shigorin
Browse files
Options

mixin.mk, regular.mk: factored out mixin-icewm

This mixin will be used for non-ISO image builds.
parent 1c80e7a0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
conf.d/mixin.mk
View file @ d1d5e3e4
...@@ -62,6 +62,10 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \ ...@@ -62,6 +62,10 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3) @$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb) @$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
mixin/regular-icewm: use/fonts/ttf/redhat +icewm
@$(call add,THE_LISTS,$(call tags,regular icewm))
@$(call add,THE_PACKAGES,mnt)
# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim # gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \ mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
use/browser/firefox/classic use/browser/firefox/classic
......
conf.d/regular.mk
View file @ d1d5e3e4
...@@ -105,11 +105,9 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \ ...@@ -105,11 +105,9 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch) @$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord) @$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
distro/regular-icewm: distro/.regular-sysv-gtk +icewm \ distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
use/x11/lightdm/slick use/init/sysv/polkit \ use/x11/lightdm/slick use/init/sysv/polkit use/efi/refind \
use/browser/chromium use/fonts/ttf/redhat use/efi/refind use/browser/chromium
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call add,LIVE_PACKAGES,mnt)
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
# wdm can't do autologin so add standalone one for livecd # wdm can't do autologin so add standalone one for livecd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment