From 889be05910804b8a20cd2665fefba245111ba142 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Thu, 4 Jul 2013 22:34:00 +0400 Subject: [PATCH] armh.mk: employ sound feature This bunch of commits was done so these can be mixed and matched (or even reverted) later if needed; it was tempting to just revamp things wholesale again but coarse grained approach is worse to maintain. --- conf.d/armh.mk | 5 +++-- pkg.in/lists/slinux/arm | 4 ---- pkg.in/lists/tagged/base+tablet | 8 -------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/conf.d/armh.mk b/conf.d/armh.mk index dd7c7239..0ba87aeb 100644 --- a/conf.d/armh.mk +++ b/conf.d/armh.mk @@ -5,7 +5,7 @@ ifeq (ve,$(IMAGE_CLASS)) ve/.tegra3-base: ve/.base use/armh use/kernel @$(call add,BASE_PACKAGES,nvidia-tegra) -ve/.tegra3-tablet: ve/.tegra3-base use/armh-tegra3 +ve/.tegra3-tablet: ve/.tegra3-base use/armh-tegra3 +pulse @$(call add,BASE_LISTS,$(call tags,base tablet)) ve/.nexus7-tablet: ve/.tegra3-tablet use/armh-nexus7 \ @@ -36,7 +36,8 @@ vm/.arm-base: profile/bare use/kernel use/net-eth/dhcp use/vm-ssh; @: @$(call set,BRANDING,altlinux-kdesktop) vm/.cubox-bare: vm/.arm-base use/armh use/armh-cubox use/services/ssh +systemd \ - use/cleanup/installer use/repo use/branding use/xdg-user-dirs/deep + use/cleanup/installer use/repo use/branding use/xdg-user-dirs/deep \ + +pulse @$(call set,KFLAVOURS,cubox) @$(call set,BRANDING,altlinux-kdesktop) @$(call add,THE_BRANDING,alterator graphics indexhtml menu notes) diff --git a/pkg.in/lists/slinux/arm b/pkg.in/lists/slinux/arm index 1b5be9e7..3870a9cf 100644 --- a/pkg.in/lists/slinux/arm +++ b/pkg.in/lists/slinux/arm @@ -59,10 +59,6 @@ update-kernel printer-drivers-base udev-extras libnss-mdns -pulseaudio-daemon -pulseaudio-utils -pavucontrol -alsa-plugins-pulse fdisk cpufreq-simple attr diff --git a/pkg.in/lists/tagged/base+tablet b/pkg.in/lists/tagged/base+tablet index 6c58c4ed..f9d20b8d 100644 --- a/pkg.in/lists/tagged/base+tablet +++ b/pkg.in/lists/tagged/base+tablet @@ -8,14 +8,6 @@ setxkbmap fonts-ttf-dejavu fonts-ttf-droid -alsa-utils -amixer -aplay - -pulseaudio-daemon -pulseaudio-utils -pavucontrol - rfkill wpa_supplicant