keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mixin.mk, regular.mk: allow mixins to depend on mixins

Browse Source 
Looks like the initial empirical rule "mixin must not depend
on another mixin" is too restrictive for practical purposes
given enough image targets multiplied by enough platforms;
let's declare it obsolete and see what follows.
This commit is contained in:
Anton Midyukov 2019-09-02 22:07:32 +07:00 committed by Michael Shigorin
parent 1dd9259b9a
commit 657c173d50
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf.d/mixin.mk
View File

@ -90,12 +90,15 @@ mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/regular-xfce: use/x11/xfce use/x11/gtk/nm +nm \
mixin/xfce-base: use/x11/xfce use/x11/gtk/nm +nm \
use/fonts/ttf/redhat use/fonts/ttf/google/extra
@$(call add,THE_PACKAGES,xfce-polkit)
@$(call add,THE_BRANDING,xfce-settings)
mixin/regular-xfce-sysv: \
mixin/regular-xfce: mixin/xfce-base use/x11/xfce/full \
use/domain-client; @:
mixin/regular-xfce-sysv: mixin/xfce-base \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit)
@ -114,9 +117,12 @@ mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
mixin/regular-lxqt: use/x11/lxqt use/x11/gtk/nm +nm
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/regular-mate: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm
mixin/mate-base: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm
@$(call add,THE_LISTS,$(call tags,mobile mate))
mixin/regular-mate: mixin/mate-base use/domain-client
@$(call add,THE_LISTS,$(call tags,base smartcard))
mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
@$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
@$(call add,THE_PACKAGES,apt-indicator)

13
conf.d/regular.mk
View File

@ -125,15 +125,13 @@ distro/regular-gnustep: distro/.regular-sysv \
distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
use/x11/xfce/full use/domain-client
distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
@$(call set,KFLAVOURS,un-def)
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
mixin/regular-xfce mixin/regular-xfce-sysv; @:
distro/regular-xfce-sysv: distro/.regular-sysv-gtk mixin/regular-xfce-sysv; @:
distro/regular-sysv-xfce: distro/.regular-install-x11-full \
mixin/regular-xfce mixin/regular-xfce-sysv; @:
mixin/regular-xfce-sysv; @:
distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde; @:
@ -141,10 +139,9 @@ distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde; @:
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
distro/regular-mate: distro/.regular-gtk mixin/regular-mate use/domain-client
@$(call add,LIVE_LISTS,$(call tags,base smartcard))
distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
distro/regular-mate-sysv: distro/.regular-sysv-gtk mixin/regular-mate; @:
distro/regular-mate-sysv: distro/.regular-sysv-gtk mixin/mate-base; @:
distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @: