Skip to content

M
mkimage-profiles
Commit 240907f5 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

regular.mk: added fontconfig-infinality to lxde

...and refactored its use in cinnamon image too; this isn't a permanent solution though, slated to move into fonts feature. Thanks gns@ for suggestion.
parent 57ddb85d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
conf.d/regular.mk
View file @ 240907f5
# regular build/usage images # regular build/usage images
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
INFINALITY_PACKAGES := libfreetype-infinality fontconfig-infinality
# WM base target # WM base target
distro/.regular-base: distro/.base +live +wireless use/live/ru \ distro/.regular-base: distro/.base +live +wireless use/live/ru \
use/live/install use/live/repo use/live/net-eth use/x11/3d-free \ use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
...@@ -28,7 +30,9 @@ distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm ...@@ -28,7 +30,9 @@ distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @: distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde
@$(call add,LIVE_PACKAGES,$(INFINALITY_PACKAGES))
distro/regular-mate: distro/.regular-gtk distro/regular-mate: distro/.regular-gtk
@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm))) @$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
...@@ -38,7 +42,7 @@ distro/regular-e17: distro/.regular-gtk use/x11/e17 ...@@ -38,7 +42,7 @@ distro/regular-e17: distro/.regular-gtk use/x11/e17
distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271 @$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
@$(call add,LIVE_PACKAGES,fontconfig-infinality) @$(call add,LIVE_PACKAGES,$(INFINALITY_PACKAGES))
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @: distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
......
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