Skip to content

M
mkimage-profiles
Commit 935d2508 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

desktop.mk, fonts, install2: explicit installer fonts

mixin/desktop-installer became *quite* inobvious even for me over time, and it's not easy to grep up; let's introduce explicit targets where one is expected to expect those.
parent 522eff57
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
conf.d/desktop.mk
View file @ 935d2508
...@@ -6,8 +6,8 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg ...@@ -6,8 +6,8 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @: distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
mixin/desktop-installer: use/x11-autostart use/sound +net-eth +vmguest mixin/desktop-installer: +net-eth +vmguest \
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo) use/x11-autostart use/fonts/install2 use/sound
@$(call add,BASE_LISTS, \ @$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network))) $(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g) @$(call add,INSTALL2_PACKAGES,ntfs-3g)
......
features.in/fonts/config.mk
View file @ 935d2508
...@@ -4,6 +4,10 @@ use/fonts: ...@@ -4,6 +4,10 @@ use/fonts:
@$(call xport,FONT_FEATURES_ENABLE) @$(call xport,FONT_FEATURES_ENABLE)
@$(call xport,FONT_FEATURES_DISABLE) @$(call xport,FONT_FEATURES_DISABLE)
# standalone target to specify non-bitmap installer fonts
use/fonts/install2:
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
# just stating that kernels and font habits are pretty individual # just stating that kernels and font habits are pretty individual
use/fonts/zerg: use/fonts use/fonts/zerg: use/fonts
@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \ @$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
......
features.in/install2/config.mk
View file @ 935d2508
...@@ -19,6 +19,9 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \ ...@@ -19,6 +19,9 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/install2/full: use/install2/packages use/install2/vmguest \ use/install2/full: use/install2/packages use/install2/vmguest \
use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader; @: use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader; @:
# just an alias, better use its endpoint directly
use/install2/fonts: use/fonts/install2
# see also use/vmguest # see also use/vmguest
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @: use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
......
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