diff --git a/pentoo/pentoo-livecd/Manifest b/pentoo/pentoo-livecd/Manifest index 9550871ef..47cfda80a 100644 --- a/pentoo/pentoo-livecd/Manifest +++ b/pentoo/pentoo-livecd/Manifest @@ -1,5 +1,7 @@ AUX binary-driver-handler.sh 555 SHA256 62be91841309f6774efe11ea904040155d6f80988e2ee641296da142b0d3aab8 SHA512 9c03c35cf6c05a457dbdcf5f61289dc500e9166c5acb3ba3b34c31c87cac3d7604ad56a1399ff21de99b34b8f64ee7c343ec5572a2732bc0ebf1c636efc6fca5 WHIRLPOOL 7ace73f517c6c5a09276a81e245a245642f8d6c144893be0555a630225d96b24b88ff344b6159940a539f7c3fb5a163145052a3d0b7570c64e1fcc4555635c7c AUX binary-driver-handler.sh-2014.0 1083 SHA256 e92344a67f9d63ebd0b5575e75dfe0136e85af3a91a326506d702a62fa498a53 SHA512 407b4f46f96eb7ad7ca9ab5e7935f1d51f8856e5c1327b05b43a861c1d879645ab0a9e1facbca3625e4f2e3d86ff31077a9423c38f81270f69a9c339b7b01646 WHIRLPOOL c8cf74c841789880f771150c5cf9e369c5ebefca63f20c28b733b7b58e50f8d27b3f1062fbfe022e2e848e567be1d8025ae12236ce0c4a240e2714b64938b182 +AUX binary-driver-handler.sh-2014.1 1138 SHA256 66f11be73f62db3322ca0d81226bccb00e79fff867c84e3ec207e0f318a142d6 SHA512 f912c48b71eb7930f6da917486d46e590d986fbc750ad92e67215efa4a2adb9f5bdafaa8d1b9834856722b10a1b9d3659a00981a1ff690e55cf3e27c026913d9 WHIRLPOOL 4f7108d73d372eb8fd50fa1076b650659385e2eb144f9519d039bc54f23a2be0da48b489897b1aa2eb2f1507bae3e13c4f5d9f8614343357620500edc42a1aa4 EBUILD pentoo-livecd-2012.1.ebuild 494 SHA256 cfff9df31d649663e97242ba0ae5020805f9243c63138e311a4c793d0cb13eae SHA512 d111a711b0d51b7c33304eb69440413b7630cf7224734cf0374f5125adbd375b0ccc479c0c256a11849a0df0c8548c23375055d93c4f35be77cb2c5ac6743e65 WHIRLPOOL c4e456ba496a725600e7b9a1d0cc8d09496f262abf2a21d22e5c40c9286207eed988f924dd5d200fa80e76c38d19d5a5292c01e49c44400fb98b9158e2165843 EBUILD pentoo-livecd-2013.0.ebuild 576 SHA256 6fe1ec079973ca8a07049502558868ce7d8957bffc3e33115dc9ab7457eaa931 SHA512 79eb9fc1da789e764e73628567d1a25f7d142431879810930d3d0180bbe0c50abf28769de4beaecc405d537965dc992cdf24e2afb000ab781e6773a27da9ffa5 WHIRLPOOL 4a98831876525f72443ec705b1d493bddd1b5b2b16eaca202d60053a876b91741143bf9874acbf9dfff472ce649a5ed812125eb0dd2145a141bdb3dadf901b44 EBUILD pentoo-livecd-2014.0.ebuild 760 SHA256 ce93a6e14bdd0b1699b220934bdcbc721732b97c2e276beaa1c4b8aee102eb70 SHA512 ef2914fd350e142746bab6fb557322af41595d124883e102b5f30e77b3f923ee297810e363618a31401e878bc5927fcaa04cbc5f353878c0fc1a31387e7cb870 WHIRLPOOL eaf2cc1e6d52e21146715556c0ed657aa091c952c6ebc362f4c6c79ddc7a7e0b50e3a8e55a3fc405d6459c8fdcaa814ef5327679e2f514ef7725c4aa20e1d044 +EBUILD pentoo-livecd-2014.1.ebuild 760 SHA256 ce93a6e14bdd0b1699b220934bdcbc721732b97c2e276beaa1c4b8aee102eb70 SHA512 ef2914fd350e142746bab6fb557322af41595d124883e102b5f30e77b3f923ee297810e363618a31401e878bc5927fcaa04cbc5f353878c0fc1a31387e7cb870 WHIRLPOOL eaf2cc1e6d52e21146715556c0ed657aa091c952c6ebc362f4c6c79ddc7a7e0b50e3a8e55a3fc405d6459c8fdcaa814ef5327679e2f514ef7725c4aa20e1d044 diff --git a/pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.1 b/pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.1 new file mode 100644 index 000000000..60969ab9e --- /dev/null +++ b/pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.1 @@ -0,0 +1,48 @@ +#!/bin/sh +#seriously, fuck you AMD and Nvidia. Write a sane license that permits redistribution, we just want your shitty hardware to work + +if [ ! "$(grep nobindrivers)" ] +then + exit 0 +else + +set -e +source /lib/rc/sh/functions.sh + +handle_nvidia(){ + einfo "Detected: nvidia gpu, please stand by..." + echo y | makemo --nodeps nvidia-drivers + if $(lspci | grep VGA | grep -iq Intel); then + ewarn "nvidia and intel are both detected, using intel" + else + modprobe nvidia + nvidia-xconfig + #eselect opengl set nvidia + eselect opencl set nvidia + einfo "Successfully switch to NVIDIA binary GPU driver" + fi +} + +handle_amd(){ + einfo "Detected: amd gpu, please stand by..." + echo y | makemo --nodeps ati-drivers + modprobe fglrx + aticonfig --initial + #eselect opengl set ati + eselect opencl set amd + einfo "Successfully switched to AMD binary GPU driver" +} + +if $(lspci | grep VGA | grep -iq NVIDIA); then + if [ ! -f /lib/modules/$(uname -r)/video/nvidia.ko ]; then + handle_nvidia + fi +elif $(lspci | grep VGA | grep -iq Radeon); then + if [ ! -f /lib/modules/$(uname -r)/video/fglrx.ko ]; then + handle_amd + fi +fi + +eselect opengl set xorg-x11 + +fi diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2014.1.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2014.1.ebuild new file mode 100644 index 000000000..fdf6405ea --- /dev/null +++ b/pentoo/pentoo-livecd/pentoo-livecd-2014.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="things needed by pentoo for livecd only" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="livecd" + +S="${WORKDIR}" + +DEPEND="" +RDEPEND="livecd? ( pentoo/pentoo-installer + app-misc/livecd-tools + virtual/eject + sys-apps/hwsetup + sys-block/disktype + x11-misc/mkxf86config + )" + +pkg_setup() { + use !livecd && die "Failed safety check, please run 'emerge --depclean' and/or manually remove pentoo-livecd" +} + +src_install() { + exeinto /etc/local.d + newexe "${FILESDIR}"/binary-driver-handler.sh-${PV} 01-binary-driver-handler.sh +}