features.in/power: renamed++ from powerbutton

This feature was handling powersave already, so the name should be changed already. Thanks sem@ for cpufreq-simple, there's now a compelling reason for that rename. Tweaked a few distro recipes accordingly.

features.in/power: renamed++ from powerbutton
b85d82c2 · Michael Shigorin · e2eef6eb · b85d82c2 · b85d82c2 · b85d82c2
Commit b85d82c2 authored Nov 09, 2011 by Michael Shigorin
7 changed files
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,7 +6,7 @@ distro/desktop-base: distro/installer sub/main \

 distro/icewm: distro/desktop-base \
 	use/lowmem use/x11/xdm use/x11/runlevel5 \
-	use/bootloader/lilo use/powerbutton/acpi \
+	use/bootloader/lilo use/power/acpi/button \
 	use/cleanup/alterator
 	@$(call add,BASE_LISTS,$(call tags,icewm desktop))


--- a/conf.d/live.mk
+++ b/conf.d/live.mk
 # live images
 ifeq (distro,$(IMAGE_CLASS))

-distro/live: distro/.base use/live/base
+distro/live: distro/.base use/live/base use/power/acpi/cpufreq
 distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
 distro/dos: distro/.init use/dos use/syslinux/ui-menu

 distro/live-builder: distro/.base sub/main \
-	use/live/base use/dev/mkimage
+	use/live/base use/dev/mkimage use/power/acpi/button
 	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
 	@$(call add,LIVE_PACKAGES,livecd-tmpfs livecd-online-repo)
 	@$(call add,LIVE_PACKAGES,mkimage-profiles)

--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -13,7 +13,7 @@ distro/server-mini: distro/server-base use/cleanup/x11-alterator
 	@$(call add,BASE_LISTS,$(call tags,extra network))

 distro/server-ovz: distro/server-base \
-	use/hdt use/rescue use/firmware/server use/powerbutton/acpi \
+	use/hdt use/rescue use/firmware/server use/power/acpi/button \
 	use/cleanup/x11-alterator
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)

--- a/features.in/power/README
+++ b/features.in/power/README
+Эта фича конфигурирует поддержку управления питанием
+-- выключение и регулировку частоты CPU для ACPI,
+засыпание для APM (не проверялось).
+
+TODO: учесть изложенное в https://bugzilla.altlinux.org/25018
+(для gnome & co)
--- a/features.in/power/config.mk
+++ b/features.in/power/config.mk
+# common
+# TODO: invent multi-target scripts and integrate that 08-powerbutton
+use/power:
+	@$(call add,COMMON_PACKAGES,installer-feature-powerbutton-stage3)
+
+# modern power management
+use/power/acpi: use/power
+	@$(call add,COMMON_PACKAGES,acpid)
+
+use/power/acpi/button: use/power/acpi
+	@$(call add,COMMON_PACKAGES,acpid-events-power)
+
+use/power/acpi/cpufreq: use/power/acpi
+	@$(call add,COMMON_PACKAGES,cpufreq-simple)
+
+use/power/acpi/powersave: use/power/acpi
+	@$(call add,COMMON_PACKAGES,powersave)
+
+# legacy power management
+use/power/apm: use/power
+	@$(call add,COMMON_PACKAGES,apmd)
--- a/features.in/powerbutton/README
+++ b/features.in/powerbutton/README
-Эта фича конфигурирует поддержку управления кнопкой питания
-- выключение для ACPI, засыпание для APM (не проверялось).
-
-TODO: учесть изложенное в https://bugzilla.altlinux.org/25018
--- a/features.in/powerbutton/config.mk
+++ b/features.in/powerbutton/config.mk
-# common
-use/powerbutton:
-	@$(call add,COMMON_PACKAGES,installer-feature-powerbutton-stage3)
-
-# modern power management
-use/powerbutton/acpi: use/powerbutton
-	@$(call add,COMMON_PACKAGES,acpid acpid-events-power)
-
-use/powerbutton/powersave: use/powerbutton/acpi
-	@$(call add,COMMON_PACKAGES,powersave)
-
-# legacy power management
-use/powerbutton/apm: use/powerbutton
-	@$(call add,COMMON_PACKAGES,apmd)