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

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

Browse Source 
Also added qasmixer in mixin/regular-xfce-sysv
This commit is contained in:
Anton Midyukov 2019-05-21 14:11:17 +07:00 committed by Michael Shigorin
parent a4373ab7e5
commit ad762a035c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf.d/mixin.mk
View File

@ -86,7 +86,10 @@ mixin/regular-xfce-sysv: use/x11/lightdm/gtk use/browser/palemoon/i18n \
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)
@$(call add,THE_PACKAGES,qasmixer)
@$(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
@$(call add,THE_LISTS,$(call tags,desktop gvfs))

8
conf.d/regular.mk
View File

@ -121,6 +121,9 @@ distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
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-sysv: distro/.regular-sysv-gtk mixin/regular-lxde; @:
@ -180,11 +183,6 @@ distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
@$(call set,META_VOL_ID,ALT Rescue)
@$(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 \
use/server/base use/stage2/kms
@$(call add,THE_LISTS,$(call tags,server && (regular || network)))