Skip to content

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

mixin.mk, regular.mk: unified sysv-xfce and xfce-sysv

Also added qasmixer in mixin/regular-xfce-sysv
parent a4373ab7
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
conf.d/mixin.mk
View file @ ad762a03
...@@ -86,7 +86,10 @@ mixin/regular-xfce-sysv: use/x11/lightdm/gtk use/browser/palemoon/i18n \ ...@@ -86,7 +86,10 @@ mixin/regular-xfce-sysv: use/x11/lightdm/gtk use/browser/palemoon/i18n \
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)
@$(call add,THE_PACKAGES,qasmixer)
@$(call add,THE_PACKAGES,xfce4-screensaver) @$(call add,THE_PACKAGES,xfce4-screensaver)
@$(call add,THE_PACKAGES,caffeine-ng sysstat leafpad)
@$(call add,THE_PACKAGES,nload)
mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
@$(call add,THE_LISTS,$(call tags,desktop gvfs)) @$(call add,THE_LISTS,$(call tags,desktop gvfs))
......
conf.d/regular.mk
View file @ ad762a03
...@@ -121,6 +121,9 @@ distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \ ...@@ -121,6 +121,9 @@ distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \ distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
mixin/regular-xfce mixin/regular-xfce-sysv; @: mixin/regular-xfce mixin/regular-xfce-sysv; @:
distro/regular-sysv-xfce: distro/.regular-install-x11-full \
mixin/regular-xfce 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; @:
...@@ -180,11 +183,6 @@ distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue ...@@ -180,11 +183,6 @@ distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
@$(call set,META_VOL_ID,ALT Rescue) @$(call set,META_VOL_ID,ALT Rescue)
@$(call set,META_APP_ID,$(ARCH)) @$(call set,META_APP_ID,$(ARCH))
distro/regular-sysv-xfce: distro/.regular-install-x11-full \
mixin/regular-xfce mixin/regular-xfce-sysv
@$(call add,THE_PACKAGES,nload)
@$(call add,MAIN_PACKAGES,caffeine-ng sysstat leafpad)
distro/.regular-server-base: distro/.regular-install \ distro/.regular-server-base: distro/.regular-install \
use/server/base use/stage2/kms use/server/base use/stage2/kms
@$(call add,THE_LISTS,$(call tags,server && (regular || network))) @$(call add,THE_LISTS,$(call tags,server && (regular || network)))
......
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