>From 3f3c75de4c0e78b3aa6e283eab474084760ba81f Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sat, 6 Jan 2018 16:08:28 +0700 Subject: [PATCH 2/2] Added features +alsa or +pulse in regular.mk for desktop distrbution --- conf.d/regular.mk | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index d0e095d..ba9f0cd 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -101,7 +101,7 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \ @$(call add,RESCUE_LISTS,$(call tags,rescue misc)) @$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch) -distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \ +distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm +alsa \ use/x11/lightdm/gtk use/init/sysv/polkit use/deflogin/sysv/nm \ use/browser/chromium use/fonts/ttf/redhat @$(call add,LIVE_LISTS,$(call tags,desktop nm)) @@ -111,50 +111,50 @@ distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \ @$(call set,KFLAVOURS,un-def) # wdm can't do autologin so add standalone one for livecd -distro/regular-wmaker: distro/.regular-sysv \ +distro/regular-wmaker: distro/.regular-sysv +alsa \ mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n @$(call add,LIVE_PACKAGES,wdm wmxkbru) -distro/regular-gnustep: distro/.regular-sysv \ +distro/regular-gnustep: distro/.regular-sysv +alsa \ mixin/regular-wmaker mixin/regular-gnustep; @: -distro/regular-gnustep-systemd: distro/.regular-wm +systemd \ +distro/regular-gnustep-systemd: distro/.regular-wm +systemd +alsa \ mixin/regular-wmaker mixin/regular-gnustep; @: -distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \ +distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce +alsa \ use/x11/xfce/full use/domain-client @$(call set,KFLAVOURS,un-def) -distro/regular-xfce-sysv: distro/.regular-sysv-gtk \ +distro/regular-xfce-sysv: distro/.regular-sysv-gtk +alsa \ 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 +alsa @$(call add,THE_PACKAGES,lxde) -distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde +distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde +alsa @$(call add,THE_PACKAGES,lxde-sysvinit) distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad @$(call add,LIVE_PACKAGES,livecd-regular-xmonad) -distro/regular-mate: distro/.regular-gtk +nm \ +distro/regular-mate: distro/.regular-gtk +nm +alsa \ use/x11/mate use/fonts/ttf/google use/domain-client @$(call add,LIVE_LISTS,$(call tags,mobile mate)) @$(call add,LIVE_LISTS,$(call tags,desktop sane)) @$(call add,LIVE_LISTS,$(call tags,base smartcard)) -distro/regular-enlightenment: distro/.regular-gtk \ +distro/regular-enlightenment: distro/.regular-gtk +alsa \ use/x11/enlightenment use/fonts/infinality; @: distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \ use/x11/enlightenment @$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271 -distro/regular-cinnamon: distro/.regular-gtk \ +distro/regular-cinnamon: distro/.regular-gtk +pulse \ use/x11/cinnamon use/fonts/infinality use/fonts/ttf/google \ use/net/nm/mmgui use/im; @: # not .regular-gtk due to gdm vs lightdm -distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ +distro/regular-gnome3: distro/.regular-desktop +plymouth +nm +pulse \ use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat @$(call set,KFLAVOURS,un-def) @$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done) @@ -164,7 +164,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \ use/x11/gtk/nm use/net/nm/mmgui -distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \ +distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde +alsa \ use/net-eth/dhcp use/efi/refind; @: distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \ @@ -175,9 +175,9 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \ @$(call set,THE_IMAGEWRITER,rosa-imagewriter) @$(call add,DEFAULT_SERVICES_ENABLE,prefdm) -distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @: +distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +alsa; @: -distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \ +distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt +alsa \ use/net-eth/dhcp use/efi/refind; @: distro/regular-kde5: distro/.regular-desktop \ @@ -201,12 +201,12 @@ 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-tde: distro/.regular-install-x11-full mixin/regular-tde +distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde +alsa @$(call add,THE_LISTS,$(call tags,base desktop)) @$(call add,THE_LISTS,$(call tags,regular tde)) @$(call add,THE_PACKAGES,kpowersave) -distro/regular-sysv-xfce: distro/.regular-install-x11-full \ +distro/regular-sysv-xfce: distro/.regular-install-x11-full +alsa \ mixin/regular-xfce mixin/regular-xfce-sysv; @: distro/.regular-server-base: distro/.regular-install \ -- 2.10.4