pentoo/pentoo: cleanup, compat-wireless.start moved from openrc, usb suspend on idle fixed

This commit is contained in:
Anton Bolshakov 2012-08-25 07:12:59 +00:00
parent 43b7f938f3
commit 0ffabfb32e
5 changed files with 29 additions and 337 deletions

View file

@ -1,7 +1,8 @@
AUX 00-compat-wireless.start 773 SHA256 32e5734a0455f9db5aa93d97cd028fee1a934c5c20dc1c456cb334030569ec7e SHA512 3168debd53c845cef1f1a6a4f552a97dca4ea53cfa0292fc9d50bf1491e23d30d7811890a3b6a2af015f369a7cfbf7816c1e613916a56c9a903eac5b6b397d28 WHIRLPOOL 5ded3cd68bcea010cdd7207012927eece66868b99840f57e48152199152f934459dd692c628f24b4bcc649329f1ded26c6ddcd3916b3e7dbea7053d296e9c900
AUX 00-linux_link.start 383 SHA256 1022f30ba59b838dd38d717f95e60e9339e7bd3ca621ca728b432ea6997b3142 SHA512 1882828a3efc28aa4c6c1e84e80b2e5d8018684ccaa48a19fbed8202db88d4867b90ebea61f09f69082b5466ac911568e2b546dc681967d84cb34ea29184f12c WHIRLPOOL c41aac6ceba1af599da512ca4e830c2b724d4e709cb381cdc8af27bb66c81be7c56008c952aaa86c93b6bf2e31c62a00335bec948add15cb7254bcc9164b15ec
AUX 00-speed_shutdown.stop 477 SHA256 e9cd6040c1930d331839edf846c45f2bdd0d05bb05ee2ec6181a0ff757c5aab8 SHA512 ae29ce4c513ee33fbef712342a0bc8b5475702cd844eec3a0381da17b0fc59c317a963bf00a65a566098acbb6583635a48f05e91fcae48d21466c44285181a88 WHIRLPOOL f908bfa92b407dab30d8ef46f7f0183132f0ff895a2278e9a686517e7f4fc2670fcfcaab9bc84f4bdeeaf6b5159fc2c9a69cd870c4f1895dc65db927bfa0f854
AUX 02locale 22 SHA256 78d9a4b47ff35fd22d86214d6caf1af731e0c28abdc7e62e34dac7799f72c4d5 SHA512 ca116813d0d2aca5e6ed6abbb024683f5ce76cce1628038d53e687aacc4f98c2aa3d27fe1802ba3de80222fdec5fa3c76c54fc6c26b693eeed402ff64726715f WHIRLPOOL 799880be84cc34bd3188daa81ab629755e2d724d67daff1665aeca3c66f84ea2573be4bc78b888c26d722a557200da336837fd4e93256167ea4f4b42729c9742
AUX 99-power_saving.start 1710 SHA256 3a6bf923b69be6c1fdc2cc6c136263283cb5c5635d445f7824e9dedad2ce9c79 SHA512 eac996763b0c837aa3a4e690ed640680545ae0891fea44e0f790031139f659417f8adaaba25baf0d4490c779713451ed2cf03ec37751b47815b1acfe17798b9c WHIRLPOOL cac748769a58b46fae97ed0eff91e78f6f92e779af807ee76b16b3d8a12adfca91714b62826a5c5acafeec4c10620c750331b0e3e3d9ae5320d1a877a508aba0
AUX 99-power_saving.start 1543 SHA256 976daa92ae0be0ddfdf2221793a50240a3c80ede39d368ef32c7ac8f72788050 SHA512 3bf0a000ac8dcbea401ec9c34467df532205a8c6828ee6196e1bc56b988b1095ed8cab8d3ad7ae9e3c9884ad9853c5785f9253262ab08f794d0137f8af1faf5e WHIRLPOOL a2a590b3578f9f1b3bd2138e631ccc0056a253018ade512ebbd9664c1409cbb55ae207aff8695e256d1e724cb754b0eab294d78bd014982d1aecbdf05e985f45
AUX b43-commercial-2012.0 305 SHA256 b9a147fc4a41f4d45e5bd8dd790154293bb3a59fd8e9e560c9db5c5b54857ddc SHA512 821f6a904018a17f5a235c51988b7331a4efe7c2209d1e01f2b10f40c986b3acf4d4c9d4b9bcfc12c4feecd58a160bec8eb720cc9e28d9679e5d24900623fd92 WHIRLPOOL bf61b390ecedc9a29ef31c7f6ecdc35c415244aecedad7dddf1a57e971bed736ecb8047008f7c8f659f67b6d62413c22c743626a0f507e3ebeff641277bf4980
AUX b43-commercial-2012.1 305 SHA256 b9a147fc4a41f4d45e5bd8dd790154293bb3a59fd8e9e560c9db5c5b54857ddc SHA512 821f6a904018a17f5a235c51988b7331a4efe7c2209d1e01f2b10f40c986b3acf4d4c9d4b9bcfc12c4feecd58a160bec8eb720cc9e28d9679e5d24900623fd92 WHIRLPOOL bf61b390ecedc9a29ef31c7f6ecdc35c415244aecedad7dddf1a57e971bed736ecb8047008f7c8f659f67b6d62413c22c743626a0f507e3ebeff641277bf4980
AUX dokeybindings-2012.0 265 SHA256 ea323401cfaf10a37f04771541390b1c037a255c5583a5030ea6acbce5b5a409 SHA512 0765034bdb44fea5833be31f41bf1791866221c5f4148e639c172cbfb937a8090ada0c4fa62b5e96dded7501285a8a2f758d59397468d339782652ca18770aac WHIRLPOOL b0b272f7a7ece9930241c89bbe1fe7a3999baf853f547ef4f35770e42f0f49c2e12318ca8ab3fb001ddbbbb87b099e9f6545d897205464d245b5d057c287a431
@ -20,5 +21,4 @@ AUX pentoo-release-2012.1-rc2 34 SHA256 31e6bd2df90dca4c5483de8ce197bbf39a658179
AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 SHA512 a6a2f152861e63c33afdda9997b9be25bd735f0624c946d61d0088210264743f842f103026eeb7cf63ef94b873131b072b61c55fba1922e9830318bcacd7a074 WHIRLPOOL a3b937b810f02f1fa6ebcdc58cada7a71e778f370b3355a08670a7f524d8e370ba29bdaf408d0bdd14753a129734d80a952937f3e009a69e87bed90995a2aaaf
AUX tux-winfly-killah.1600x1200.jpg 360183 SHA256 af7c84386a634e573fbd65884c49c716a4f92369b2f228c68672acc96f4a9879 SHA512 ed81ce83997a7ccc4eeb0fc08d09b98bedd6de8f27b9cfce2cb734ca4f4283c3e44154d7cfa73f94742c627ed67fb3ad520019ad8cbd9286cd8e2ceffc8677e7 WHIRLPOOL a8b2d4b51dc261362c4d9fca225ac9c02defc3903b6e9ecc8a7401a2155135efc2c7d62afba8727de37126ec425936ab08727455a68fd922192ec46a428ebd17
AUX xfce4-desktop.xml 378 SHA256 97b1cb040f9819c0fe904537adf0e51fa3dbb35b8a34050d674a08dfb69c11d0 SHA512 ae84b11c4a5e833ff0b6e36e0619c5dab0e3dcab0e859fdc59dcbfed91e140d165677e2293b0c83bbf8ccaa3fcc5b5262888942a598b3e3de666b0dcdd7b2bc9 WHIRLPOOL b1bf73e6b0e577e411c0043603930fe920bd01326d4f3994661141e77c23983e61084d458ba0dd972330b13c2e0c2cd77ece37c6a3295a732879f0ae88df638b
EBUILD pentoo-2012.0.ebuild 8901 SHA256 8b7e7c4ccbcf9e76a2406464cd33184d2e6d551ff12ef706ab0a19d7d307b542 SHA512 0ac69d0dc621c9a3848e3a934ac5f7d6abee5b66973dff3ced50433bea1cea238b956467304ac9934c3399c2049842086eb0156cc3db15693a70eeac7cac5b60 WHIRLPOOL ac3e0be07bf9c3a260a177aaa7680428a19aae5eec84978d13166d9f7515a09548269a586bc6223c0b329279585e3920f947c7bde7b2f7d6ae53e9048e62b8f5
EBUILD pentoo-2012.1.ebuild 7297 SHA256 1defea839f0ff6ff0f96be2373b52d8e1c57672b64014ba9b58741918354c48a SHA512 bd61f5914d10525da88b623da3e30f2d3e703bb45f03708723d8e8c4cf2833c95e33309ed0ddcf1edb257d4508731f0e89436af2f1caa14580295a274a090f00 WHIRLPOOL bede1567540f569afeb0e9de2a72a936edfe4166765a86018f1e7e967f9d41611b9370a9415775112778e9a7b83af22dfd478f829c6eef2c71b6abee7f8ff069
EBUILD pentoo-2012.1.ebuild 7343 SHA256 41df44f5864327ef802083526c7a113fb8db680efddec6dc28e92b3740886ad5 SHA512 69c849a895abc6d8342347787af0e5cffe2ce70bcf5cd2413938754c64976823e24c7e8c65a4861edda34ce158629b7e358e6bce069f4f9ec39c87c71a0c9c1d WHIRLPOOL 110b52fe1af64117ff8b0506c7237078c8823834128a1e84831f05e89edaf357b03baf461338a34dc159762b8dfcd9e35d4b057e84f638dc7160fde86a8fb295

View file

@ -0,0 +1,21 @@
#!/bin/sh
### THIS SUCKS
### In a newer portage "emerge --list sets" will contain a kernel modules option
### However, we are not using that portage version yet....
### So until that is stable, we hack this to ensure compat-wireless is installed
### ...and leave the rest to the user
##rebuild compat-wireless modules if needed
if [ -e /var/lib/portage/world ]
then
#okay, confirmed we are gentoo...
#now check if compat-wireless is installed
if [ ! -e /lib/modules/`uname -r`/updates/compat/compat.ko ]
then
#the line below should rebuild compat-wireless iff it was already
#installed and isn't installed for the current kernel version
grep --quiet compat-wireless /var/lib/portage/world && ( emerge --nodeps -1 --quiet compat-wireless >/dev/null & )
fi
fi

View file

@ -1,18 +1,14 @@
#!/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
#USB suspend after 60 sec
for i in /sys/bus/usb/devices/*/power/autosuspend_delay_ms; do echo 60000 > $i; done
echo 60 > /sys/module/usbcore/parameters/autosuspend
#disable NMI watchdog (unless we are running a redundant kernel we don't need this)
echo 0 > /proc/sys/kernel/nmi_watchdog
if [ -e /sys/devices/system/cpu/sched_mc_power_savings ]
then
echo 1 > /sys/devices/system/cpu/sched_mc_power_savings
@ -48,5 +44,3 @@ else
done
fi
fi

View file

@ -1,324 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
KEYWORDS="-*"
DESCRIPTION="Pentoo meta ebuild to install all apps"
HOMEPAGE="http://www.pentoo.ch"
SLOT="0"
LICENSE="GPL"
IUSE="livecd hardened dwm +analyzer +bluetooth +cracking +database enlightenment +exploit +footprint +forensics +forging +fuzzers kde +mitm +proxies qemu gnome qt4 +rce +scanner +voip +wireless +xfce"
DEPEND="hardened? ( >=sys-apps/sandbox-2.4
sys-apps/paxctl
app-misc/pax-utils )"
#main atoms
RDEPEND="sys-kernel/pentoo-sources"
# Will get merged by fsscript
# pentoo/pentoo-etc-portage
#System apps
RDEPEND="${RDEPEND}
livecd? ( pentoo/pentoo-installer )
sys-apps/openrc[pentoo]
dev-util/lafilefixer
app-arch/sharutils
app-crypt/gnupg[static]
sys-apps/hdparm
sys-fs/cryptsetup
dev-libs/icu"
#window makers
RDEPEND="${RDEPEND}
dwm? ( x11-wm/dwm )
kde? ( kde-base/kde-meta )
gnome? ( pentoo/pentoo-gnome )
xfce? ( xfce-base/xfce4-meta
app-editors/leafpad
app-cdr/xfburn
xfce-base/thunar
xfce-extra/xfce4-screenshooter
xfce-extra/xfce4-power-manager
xfce-extra/thunar-volman
xfce-extra/tumbler
x11-themes/tango-icon-theme
x11-apps/xrandr
media-gfx/geeqie )"
# enlightenment
RDEPEND="${RDEPEND}
enlightenment? ( =app-misc/exchange-9999
=dev-libs/eet-9999
=dev-libs/eeze-9999
=dev-libs/eina-9999
=dev-libs/embryo-9999
=dev-libs/efreet-9999
=dev-libs/e_dbus-9999
=dev-libs/ecore-9999
=media-libs/edje-9999
=media-libs/emotion-9999
=media-libs/evas-9999
=x11-plugins/e_modules-tclock-9999
=x11-plugins/e_modules-engage-9999
=x11-plugins/extramenu-9999
=x11-wm/enlightenment-9999
x11-apps/xrandr )"
#X windows stuff
RDEPEND="${RDEPEND}
livecd? ( x11-drivers/xf86-input-keyboard
x11-drivers/xf86-input-mouse
x11-drivers/xf86-video-apm
x11-drivers/xf86-video-ark
x11-drivers/xf86-video-ati
x11-drivers/xf86-video-chips
x11-drivers/xf86-video-cirrus
x11-drivers/xf86-video-fbdev
x11-drivers/xf86-video-glint
x11-drivers/xf86-video-i128
x11-drivers/xf86-video-intel
x11-drivers/xf86-video-mach64
x11-drivers/xf86-video-mga
x11-drivers/xf86-video-neomagic
x11-drivers/xf86-video-nv
x11-drivers/xf86-video-nouveau
x11-drivers/xf86-video-rendition
x11-drivers/xf86-video-s3
x11-drivers/xf86-video-s3virge
x11-drivers/xf86-video-savage
x11-drivers/xf86-video-siliconmotion
x11-drivers/xf86-video-sis
x11-drivers/xf86-video-tdfx
x11-drivers/xf86-video-trident
x11-drivers/xf86-video-vesa
x11-drivers/xf86-video-vmware
x11-drivers/xf86-video-voodoo )
x11-libs/gksu
x11-proto/dri2proto
x11-terms/rxvt-unicode
x11-terms/terminal
x11-themes/gtk-chtheme"
#basic systems
RDEPEND="${RDEPEND}
livecd? ( <=app-misc/livecd-tools-2.0.0
virtual/eject
sys-apps/hwsetup
sys-block/disktype
x11-misc/mkxf86config )
qemu? ( app-emulation/virt-manager
app-emulation/qemu-kvm )
x86? ( mail-client/thunderbird-bin
www-client/firefox-bin )
amd64? ( <=www-client/firefox-bin-4.0.0
app-emulation/emul-linux-x86-java )
dev-java/sun-jdk
|| ( sys-boot/grub
sys-boot/grub-static )
app-admin/genmenu
app-admin/localepurge
app-arch/unrar
app-arch/unzip
app-editors/ghex
app-editors/hexedit
app-editors/nano
app-editors/gedit
app-editors/vim
app-misc/screen
app-portage/eix
app-portage/gentoolkit
app-portage/layman
app-portage/smart-live-rebuild
app-text/dos2unix
app-text/evince
app-text/wgetpaste
dev-libs/libxslt
dev-vcs/subversion
gnome-base/gnome-menus
media-fonts/dejavu
media-fonts/font-misc-misc
media-gfx/fbgrab
media-gfx/scrot
media-sound/alsamixergui
media-sound/alsa-utils
media-sound/audacious
media-sound/sox
media-sound/pulseaudio
media-video/vlc
media-video/xine-ui
net-dialup/lrzsz
net-dialup/minicom
net-dialup/ppp
net-dialup/wvdial
net-dns/bind-tools
|| ( net-fs/mount-cifs
net-fs/samba )
net-fs/nfs-utils
net-ftp/ftp
net-ftp/gproftpd
net-ftp/oftpd
net-im/pidgin
net-irc/irssi
net-irc/xchat
net-misc/axel
net-misc/curl
net-misc/dhcp
net-misc/dhcpcd
net-misc/grdesktop
net-misc/iputils
net-misc/netkit-fingerd
net-misc/netkit-rsh
net-misc/netsed
net-misc/ntp
net-misc/openssh
net-misc/openvpn
net-misc/rdesktop
net-misc/stunnel
net-misc/tcpick
net-misc/telnet-bsd
net-misc/tightvnc
net-misc/vconfig
net-misc/vpnc
net-misc/whois
net-misc/wicd
net-misc/wlan2eth
sys-apps/ethtool
sys-apps/fbset
sys-apps/iproute2
sys-apps/microcode-ctl
sys-apps/microcode-data
sys-apps/pciutils
sys-apps/mlocate
sys-apps/sysvinit
sys-block/gparted
sys-boot/syslinux
sys-devel/crossdev
sys-devel/gettext
sys-fs/jfsutils
sys-fs/reiser4progs
sys-fs/reiserfsprogs
sys-fs/squashfs-tools
sys-fs/sshfs-fuse
sys-libs/gpm
sys-power/acpid[pentoo]
sys-power/acpitool
sys-power/cpufrequtils
sys-power/hibernate-script
sys-power/powertop
sys-process/htop
sys-process/iotop
www-client/links
www-plugins/adobe-flash
www-servers/lighttpd
www-plugins/firecat
x11-apps/setxkbmap
x11-apps/xinit"
# FAils:
# net-dialup/linux-atm
# Either links or lynx
# www-client/lynx
# qt4? ( net-firewall/fwbuilder )
# Only in stage2!!!
# sys-apps/v86d
# sys-fs/cdfs
RDEPEND="${RDEPEND}
net-analyzer/tcpreplay"
#things needed for a running system and not for livecd
RDEPEND="${RDEPEND}
!livecd? ( app-portage/portage-utils
app-admin/syslog-ng )"
RDEPEND="${RDEPEND}
app-crypt/openvpn-blacklist
app-misc/dradis
amd64? ( net-analyzer/arpantispoofer )
net-analyzer/netcat6
net-analyzer/netdiscover
net-analyzer/ngrep
net-analyzer/snort
net-analyzer/tcpdump
net-analyzer/traceroute
net-analyzer/wireshark"
# Fails:
# net-analyzer/packet-o-matic
#TODO: explain why these aren't included?
#net-wireless/waveselect
#dev-db/absinthe very old crap
#net-analyzer/hydra medus is better
#bug #333099
# net-analyzer/honeyd
#the tools
RDEPEND="${RDEPEND}
analyzer? ( pentoo/pentoo-analyzer )
bluetooth? ( pentoo/pentoo-bluetooth )
cracking? ( pentoo/pentoo-cracking )
database? ( pentoo/pentoo-database )
exploit? ( pentoo/pentoo-exploit )
footprint? ( pentoo/pentoo-footprint )
forensics? ( pentoo/pentoo-forensics )
forging? ( pentoo/pentoo-forging )
fuzzers? ( pentoo/pentoo-fuzzers )
mitm? ( pentoo/pentoo-mitm )
proxies? ( pentoo/pentoo-proxies )
rce? ( pentoo/pentoo-rce )
scanner? ( pentoo/pentoo-scanner )
voip? ( pentoo/pentoo-voip )
wireless? ( pentoo/pentoo-wireless )"
pkg_setup() {
#pam_pwdb and pam_console are no longer supported
grep -v pam_console "${ROOT}"/etc/pam.d/entrance > "${T}"/entrance
local grepret=$?
[ ${grepret} -ge 2 ] && [ -f "${ROOT}"/etc/pam.d/entrance ] && die "Tried to grep the pam files and got an error."
[ ${grepret} == 0 ] && einfo "pam_console has been purged from /etc/pam.d/entrance. It's a good thing."
[ ${grepret} == 1 ] && einfo "pam_console was not found in /etc/pam.d/entrance. It's a good thing"
mv "${T}"/entrance "${ROOT}"/etc/pam.d/entrance
grep pam_console "${ROOT}/etc/pam.d/*"
local grepret=$?
[ ${grepret} == 0 ] && die "pam_console still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_console."
[ ${grepret} == 1 ] && einfo "pam_console no longer exists in /etc/pam.d. It's a good thing."
grep pam_pwdb "${ROOT}/etc/pam.d/*"
local grepret=$?
[ ${grepret} == 0 ] && die "pam_pwdb still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_pwdb."
[ ${grepret} == 1 ] && einfo "pam_pwdb no longer exists in /etc/pam.d. It's a good thing."
}
src_install() {
##here is where we merge in things from root_overlay which make sense
exeinto /root
newexe "${FILESDIR}"/b43-commercial-${PV} b43-commercial || die "b43-commercial failed"
insinto /root
newins "${FILESDIR}"/motd-${PV} motd || die "motd failed"
#/usr/bin
newbin "${FILESDIR}"/dokeybindings-${PV} dokeybindings || die "dokeybindings failed"
#/usr/sbin
newsbin "${FILESDIR}"/flushchanges-${PV} flushchanges || die "flushchanges failed"
newsbin "${FILESDIR}"/makemo-${PV} makemo || "makemo failed"
#/etc
insinto /etc
newins "${FILESDIR}/pentoo-release-${PV}-rc1" pentoo-release || die "pentoo-release versioning failed"
exeinto /etc/portage/postsync.d
doexe "${FILESDIR}"/layman-sync || die "/etc/portage/postsync.d failure"
}
pkg_postinst() {
elog "This ebuild is a meta ebuild to handle all the pentoo specific things which"
elog "we can't figure out how to handle cleanly. This will allow us our very own"
elog "meta-package which can be used to make sure the installed users can be"
elog "updated when we make fairly major changes. This may not handle everything,"
elog "but it is a start..."
ewarn "Significant changes have been made to your system, you must type 'etc-update'."
ewarn "This command will help you merge the changed configuration files onto your system."
epause "Seriously, stop what you are doing now and run 'etc-update'"
}

View file

@ -249,8 +249,9 @@ src_install() {
#/etc/local.d/
exeinto /etc/local.d
doexe "${FILESDIR}"/00-linux_link.start
doexe "${FILESDIR}"/99-power_saving.start
doexe "${FILESDIR}"/00-speed_shutdown.stop
doexe "${FILESDIR}"/00-compat-wireless.start
doexe "${FILESDIR}"/99-power_saving.start
#we will officially support xfce4 OR enlightenment, defaulting to xfce4
dodir /root