diff --git a/pentoo/pentoo/Manifest b/pentoo/pentoo/Manifest index 0257deb3f..159d2959d 100644 --- a/pentoo/pentoo/Manifest +++ b/pentoo/pentoo/Manifest @@ -1,3 +1,5 @@ +AUX 00-linux_link.start 220 RMD160 b0ad204479455da3c92d09d3be4134e445f629a6 SHA1 59acf956d4126a553fccd0af658307520314fa9d SHA256 30d2fcd15cb8e6cb48ff192cde52542885ed39fecf39d2d2bca8b4ddd88bd2b6 +AUX 00-power_saving.start 1125 RMD160 00695ab0d2bf2830900e931568fcc6e723515275 SHA1 23cd3c20e0328161914a2180587df6c8b922e86a SHA256 709ffb9884e586991952cd6642ee11b546f45a1c7300290f963d4040c6f27645 AUX b43-commercial-2012.0 305 RMD160 03ed4dcfd834752f9b0cf7e236f198abb2c0ac19 SHA1 f6b7bbe95e6cbd437b4bcce81f244cf68b9959ff SHA256 b9a147fc4a41f4d45e5bd8dd790154293bb3a59fd8e9e560c9db5c5b54857ddc AUX b43-commercial-2012.1 305 RMD160 03ed4dcfd834752f9b0cf7e236f198abb2c0ac19 SHA1 f6b7bbe95e6cbd437b4bcce81f244cf68b9959ff SHA256 b9a147fc4a41f4d45e5bd8dd790154293bb3a59fd8e9e560c9db5c5b54857ddc AUX dokeybindings-2012.0 265 RMD160 4e6c969ac3414972fcab9ac70386be7f933e63ff SHA1 6fa70fafe3e3c4955c4ff39fc574b0ca6bd9471f SHA256 ea323401cfaf10a37f04771541390b1c037a255c5583a5030ea6acbce5b5a409 @@ -13,4 +15,4 @@ AUX pentoo-release-2012.0-rc1 34 RMD160 420510bde0142884e09a62290ba4e4687c043c02 AUX pentoo-release-2012.1-rc2 34 RMD160 68cf0901aef7d92ddf14dae52c60760a2f716278 SHA1 f9c11d3344a74f2b6ab9f621c710f74a99ef751e SHA256 31e6bd2df90dca4c5483de8ce197bbf39a6581792e07dd4a6b8b884dd780949c AUX pentoo.xpm.gz 59047 RMD160 c0f486fafba5397ae7f894c609643709a5701545 SHA1 6f585ad36306c3794134dc5f7ab7db75e589c8cd SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 EBUILD pentoo-2012.0.ebuild 8901 RMD160 b6a116cb572560f83fe71ca62b9e3059d42c1b81 SHA1 95d1f8bcd12b7f965e81c315202678bf95cbdfd0 SHA256 8b7e7c4ccbcf9e76a2406464cd33184d2e6d551ff12ef706ab0a19d7d307b542 -EBUILD pentoo-2012.1.ebuild 8976 RMD160 68e8e5f3b4f00800d92f4f40852e37de4b01cece SHA1 c26790b1d27483fa66dcb61a6f5256fabaaa6c48 SHA256 b58e22660f195502be7926abc43c20472ef4d4cbab4a709466c2bb682a11d40e +EBUILD pentoo-2012.1.ebuild 9119 RMD160 672a08953d079950506568cd81d8812f7003d4a5 SHA1 948f9fd67cd5fb9c3106967cb05c10a82edcd405 SHA256 1eec294ac1af1a2dcb4d8a25cbf4198442446158d9b20b57a2fe302bd000dfd6 diff --git a/pentoo/pentoo/files/00-linux_link.start b/pentoo/pentoo/files/00-linux_link.start new file mode 100755 index 000000000..9597fa9b6 --- /dev/null +++ b/pentoo/pentoo/files/00-linux_link.start @@ -0,0 +1,8 @@ +#!/bin/sh + +##adjust /usr/src/linux link if we are pretty sure we won't screw up the system +if [ -d /usr/src/linux-`uname -r` ] +then + unlink /usr/src/linux + ln -s /usr/src/linux-`uname -r` /usr/src/linux +fi diff --git a/pentoo/pentoo/files/00-power_saving.start b/pentoo/pentoo/files/00-power_saving.start new file mode 100755 index 000000000..9ff56a6f2 --- /dev/null +++ b/pentoo/pentoo/files/00-power_saving.start @@ -0,0 +1,31 @@ +#!/bin/sh + +##start with things we power save no matter what +#PM runtime (PCI Devices) +for i in `find /sys/devices/pci* -name "control"`; do echo "auto" > $i; done + +#USB Suspend +for i in /sys/bus/usb/devices/*/power/autosuspend; do echo 1 > $i; done +for i in /sys/bus/usb/devices/*/power/control; do echo auto > $i; done +for i in /sys/bus/usb/devices/*/power/level; do echo auto > $i; done + +#disable NMI watchdog (unless we are running a redundant kernel we don't need this) +echo 0 > /proc/sys/kernel/nmi_watchdog + + +##then the battery specific power savings +if $(grep -iq off-line /proc/acpi/ac_adapter/AC/state); then + #battery + for CPU in $(ls /sys/devices/system/cpu/|grep -E "cpu[0-9]+"|cut -d"u" -f2); do + echo conservative > /sys/devices/system/cpu/${CPU}/cpufreq/scaling_governor + done + echo min_power > /sys/class/scsi_host/host0/link_power_management_policy +else + #AC + for CPU in $(ls /sys/devices/system/cpu/|grep -E "cpu[0-9]+"|cut -d"u" -f2); do + echo ondemand > /sys/devices/system/cpu/${CPU}/cpufreq/scaling_governor + done + echo max_performance > /sys/class/scsi_host/host0/link_power_management_policy +fi + + diff --git a/pentoo/pentoo/pentoo-2012.1.ebuild b/pentoo/pentoo/pentoo-2012.1.ebuild index 018782842..25705ae83 100644 --- a/pentoo/pentoo/pentoo-2012.1.ebuild +++ b/pentoo/pentoo/pentoo-2012.1.ebuild @@ -312,8 +312,14 @@ src_install() { #/etc insinto /etc newins "${FILESDIR}/pentoo-release-${PV}-rc2" pentoo-release || die "pentoo-release versioning failed" + + #/etc/portage/postsync.d exeinto /etc/portage/postsync.d doexe "${FILESDIR}"/layman-sync || die "/etc/portage/postsync.d failure" + + #/etc/local.d/ + exeinto /etc/local.d + doexe "${FILESDIR}"/00-linux_link.start "${FILESDIR}"/00-power_saving.start } pkg_postinst() { diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest index 95ec5c791..aebb78f26 100644 --- a/sys-power/acpid/Manifest +++ b/sys-power/acpid/Manifest @@ -4,14 +4,10 @@ AUX acpid-1.0.6-default.sh 1214 RMD160 1d656cee490664931062cb6a8f6ee968b48f28d1 AUX acpid-2.0.11-init.d 705 RMD160 4be48a2621d676b5a3e0d224f453f2ca76e1239a SHA1 26c0bf6cf54eb7f1722a7d3bda4d2e1231b0323b SHA256 f1f818f7e085ecd8b46992a89ff0471558bb8ddbebbaa677089dcabb993c286d AUX acpid-2.0.3-init.d 668 RMD160 66d460850e02e8e817c3dbabef120a0d0e53758f SHA1 f4fc04c345215eb4c1ec971d284cb18a9405a0e8 SHA256 70d0ffc4cc11046e4445619784e187c009a97273b9826e7f62a0b7c92aa330d0 AUX acpid-2.0.3.patch 881 RMD160 81a32d23d72e3104d67c37863f14aa88fe8b5b39 SHA1 ea9c629cbfed5f2e3e34c4d242fcff2b69fda51d SHA256 d313d9645e705221ef9f4610a0b127ee38240125d5e2f39554537bde38a7a813 -AUX acpid-pentoo-1.0.6-default.sh 1401 RMD160 2f6af4a0ad19dabebafee52ee793ce8c0a7a471b SHA1 50e3d9ccc85e24829e29a32deb6caf458534f6bd SHA256 d9e9f6d3b309f995d986d611149e1a5d252cbde33d62732bf6e5ac713fe9d3ab +AUX acpid-pentoo-1.0.6-default.sh 1773 RMD160 8dcda2f0beeadbba8379eb5d3f300d1d6c55ca01 SHA1 36714eea7ff42205f4417d791e752baa94510c6b SHA256 b0724130bab5d97d8a895cdd97cafab97c5d3d28a7b3415a49443bb1e3b6a983 AUX acpid.service 135 RMD160 dee559a0c4e8ae4372002851e518f1477ff1d1eb SHA1 47f40dee8d2e341b9c96f70a61439b6a1837dd52 SHA256 c01b8cc2532c4a130c020f042ab9e9be9a9ff075ad7c2e9c9f971a57b40b5cc6 DIST acpid-2.0.12.tar.gz 76333 RMD160 f81377fee79a8150c262255a9f00eafe528eb1f7 SHA1 21a0fccb8ec13badb8a9a7d2907020309159c4ca SHA256 dc8c600f6a7f0ceb423099874e66c6e091ae73eb2227dc5f771dacac50a1b6eb DIST acpid-2.0.14.tar.gz 77395 RMD160 9ddd5018b92619b1d7434cbd219dc7a60bc56d82 SHA1 029d8c5045f417af1b2dd91462a263cfb1b3554a SHA256 88158b889280017072362b37a4b378826285756489857b93fc5888acf5b4db0b -DIST acpid-2.0.6.tar.gz 74689 RMD160 d22a43998c795a8a2058cd53a06f6d336fc6220e SHA1 d2f5fdb80c6cee8b49250435d66828a4610b0846 SHA256 89db450ab9c740f24fb8324f75efebf38096afa0f4c5cabc4072441659059a33 -DIST acpid-2.0.9.tar.gz 75552 RMD160 45352e7e2a318c68e4464b29537b9f3b00a87155 SHA1 b64ed84c53997a33650205f1582bf60a68688d53 SHA256 f02a4931083ef52e6785c989d9d44720387c1d65a42bdcd364e3b06cd588ba65 EBUILD acpid-2.0.12.ebuild 1420 RMD160 db405ef6f68550edbc86cd468063315b15a6ab31 SHA1 405ad155c297040ee8fdc6a8a8da075c8ca483e1 SHA256 6d8d6a08ddadd4f3211bd61be1fefe58a1a0fd5a85f905a516e8a2c103ec1075 EBUILD acpid-2.0.14.ebuild 1395 RMD160 ac9c25a521198b19b34a7f7409a80790687946b7 SHA1 0f030cb07c66c0d8adc6051ce83c7eb363518f75 SHA256 f86ade0fbfc972027177733c27ecd0c497ed2c6cc4973e6c1ab7b0f9c2afc565 -EBUILD acpid-2.0.6.ebuild 1396 RMD160 7ebb98d9da4219ee8547e18039f6a71049701e33 SHA1 c223e0208fb1f513e694f6c2d544427411ee32a8 SHA256 54175c529bdaf7243258b7b05969bd8d0c2f748e5418b8e4eefe5e78cb4ef7ea -EBUILD acpid-2.0.9.ebuild 1320 RMD160 7dbda34cd6a8da17ca17c797eceaf5243cab2528 SHA1 cf0f5f0d13fa458ba57ddc9e8d8b3c329d501a8d SHA256 684a9e36d9f34dd9fad3edf3b787446c78439046a3f6414ac4a0df6265a44392 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89 diff --git a/sys-power/acpid/acpid-2.0.6.ebuild b/sys-power/acpid/acpid-2.0.6.ebuild deleted file mode 100644 index b93d3e54c..000000000 --- a/sys-power/acpid/acpid-2.0.6.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.6.ebuild,v 1.4 2010/10/05 19:34:14 maekke Exp $ - -EAPI=2 -inherit eutils toolchain-funcs - -DESCRIPTION="Daemon for Advanced Configuration and Power Interface" -HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html" -SRC_URI="http://tedfelix.com/linux/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 -ppc x86" -IUSE="pentoo" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.3.patch -} - -src_compile() { - tc-export CC CPP - emake || die - emake -C kacpimon || die -} - -src_install() { - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install || die - - dobin kacpimon/kacpimon || die - newdoc kacpimon/README README.kacpimon - - exeinto /etc/acpi - if use pentoo; then - newexe "${FILESDIR}"/${PN}-pentoo-1.0.6-default.sh default.sh || die - else - newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh || die - fi - - insinto /etc/acpi/events - newins "${FILESDIR}"/${PN}-1.0.4-default default || die - - newinitd "${FILESDIR}"/${PN}-2.0.3-init.d acpid || die - newconfd "${FILESDIR}"/${PN}-1.0.6-conf.d acpid || die - - prepalldocs -} - -pkg_postinst() { - elog - elog "You may wish to read the Gentoo Linux Power Management Guide," - elog "which can be found online at:" - elog "http://www.gentoo.org/doc/en/power-management-guide.xml" - elog -} diff --git a/sys-power/acpid/acpid-2.0.9.ebuild b/sys-power/acpid/acpid-2.0.9.ebuild deleted file mode 100644 index 16a580e65..000000000 --- a/sys-power/acpid/acpid-2.0.9.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.9.ebuild,v 1.3 2011/05/23 13:19:40 hwoarang Exp $ - -EAPI=4 -inherit eutils toolchain-funcs - -DESCRIPTION="Daemon for Advanced Configuration and Power Interface" -HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html" -SRC_URI="http://tedfelix.com/linux/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 -ppc ~x86" -IUSE="pentoo" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.3.patch -} - -src_compile() { - tc-export CC CPP - emake - emake -C kacpimon -} - -src_install() { - emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install - - dobin kacpimon/kacpimon - newdoc kacpimon/README README.kacpimon - - exeinto /etc/acpi - if use pentoo; then - newexe "${FILESDIR}"/${PN}-pentoo-1.0.6-default.sh default.sh - else - newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh - fi - - insinto /etc/acpi/events - newins "${FILESDIR}"/${PN}-1.0.4-default default - - newinitd "${FILESDIR}"/${PN}-2.0.3-init.d acpid - newconfd "${FILESDIR}"/${PN}-1.0.6-conf.d acpid -} - -pkg_postinst() { - elog - elog "You may wish to read the Gentoo Linux Power Management Guide," - elog "which can be found online at:" - elog "http://www.gentoo.org/doc/en/power-management-guide.xml" - elog -} diff --git a/sys-power/acpid/files/acpid-pentoo-1.0.6-default.sh b/sys-power/acpid/files/acpid-pentoo-1.0.6-default.sh index a1c4f3a2d..a041da6c3 100755 --- a/sys-power/acpid/files/acpid-pentoo-1.0.6-default.sh +++ b/sys-power/acpid/files/acpid-pentoo-1.0.6-default.sh @@ -40,7 +40,10 @@ case "$group" in # multicore systems, make sure you set powersave mode # for each core! *0) - for CPU in `ls /sys/devices/system/cpu/|grep -E "cpu[0-9]+"|cut -d"u" -f2`; do cpufreq-set -r -c $CPU -g ondemand; done + for CPU in $(ls /sys/devices/system/cpu/|grep -E "cpu[0-9]+"|cut -d"u" -f2); do + echo conservative > /sys/devices/system/cpu/${CPU}/cpufreq/scaling_governor + done + echo min_power > /sys/class/scsi_host/host0/link_power_management_policy ;; # Add code here to handle when the system is plugged in @@ -48,7 +51,10 @@ case "$group" in # multicore systems, make sure you set performance mode # for each core! *1) - for CPU in `ls /sys/devices/system/cpu/|grep -E "cpu[0-9]+"|cut -d"u" -f2`; do cpufreq-set -r -c $CPU -g performance; done + for CPU in $(ls /sys/devices/system/cpu/|grep -E "cpu[0-9]+"|cut -d"u" -f2); do + echo ondemand > /sys/devices/system/cpu/${CPU}/cpufreq/scaling_governor + done + echo max_performance > /sys/class/scsi_host/host0/link_power_management_policy ;; *) log_unhandled $* ;;