Skip to content

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

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

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.
parent 1dd9259b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 11 deletions
conf.d/mixin.mk
View file @ 657c173d
...@@ -90,12 +90,15 @@ mixin/regular-kde5: use/x11/kde5 use/browser/falkon \ ...@@ -90,12 +90,15 @@ mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5) @$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter) @$(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 use/fonts/ttf/redhat use/fonts/ttf/google/extra
@$(call add,THE_PACKAGES,xfce-polkit) @$(call add,THE_PACKAGES,xfce-polkit)
@$(call add,THE_BRANDING,xfce-settings) @$(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 use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123) @$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit) @$(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 ...@@ -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 mixin/regular-lxqt: use/x11/lxqt use/x11/gtk/nm +nm
@$(call set,THE_IMAGEWRITER,rosa-imagewriter) @$(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)) @$(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 mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
@$(call add,THE_LISTS,$(call tags,desktop && (cups || office))) @$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
@$(call add,THE_PACKAGES,apt-indicator) @$(call add,THE_PACKAGES,apt-indicator)
......
conf.d/regular.mk
View file @ 657c173d
...@@ -125,15 +125,13 @@ distro/regular-gnustep: distro/.regular-sysv \ ...@@ -125,15 +125,13 @@ distro/regular-gnustep: distro/.regular-sysv \
distro/regular-gnustep-systemd: distro/.regular-wm +systemd \ distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
mixin/regular-wmaker mixin/regular-gnustep; @: mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \ distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
use/x11/xfce/full use/domain-client
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \ distro/regular-xfce-sysv: distro/.regular-sysv-gtk mixin/regular-xfce-sysv; @:
mixin/regular-xfce mixin/regular-xfce-sysv; @:
distro/regular-sysv-xfce: distro/.regular-install-x11-full \ 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: distro/.regular-gtk mixin/regular-lxde; @:
distro/regular-lxde-sysv: distro/.regular-sysv-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; @: ...@@ -141,10 +139,9 @@ distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde; @:
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@$(call add,LIVE_PACKAGES,livecd-regular-xmonad) @$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
distro/regular-mate: distro/.regular-gtk mixin/regular-mate use/domain-client distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
@$(call add,LIVE_LISTS,$(call tags,base smartcard))
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; @: distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
......
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