Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-09 04:51:27 +02:00
Code Issues Projects Releases Wiki Activity

pentoo-livecd: a few minor fixes found during bdh runs

Browse source
This commit is contained in:
Rick Farina (Zero_Chaos) 2019-02-06 10:34:34 -05:00
parent ced13891c6
commit 51d1ee2382
No known key found for this signature in database
GPG key ID: A5DD1427DD11F94A
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.3-r1 → pentoo/pentoo-livecd/files/binary-driver-handler.initd-2019.0
View file

@ -33,7 +33,10 @@ start() {
if [ ! -f /lib/modules/$(uname -r)/video/nvidia.ko ]; then
einfo "Building evil binary nvidia driver..."
eval ${run_merge} --nodeps nvidia-drivers
if ! eval ${run_merge} nvidia-drivers; then
eerror "Failed to build nvidia driver, very sad..."
return
fi
fi
modprobe nvidia || NVIDIA_FAILURE=yes
@ -166,7 +169,10 @@ start() {
if [ ! -f /lib/modules/$(uname -r)/video/fglrx.ko ]; then
einfo "Building evil binary AMD driver..."
eval ${run_merge} --nodeps ati-drivers
if ! eval ${run_merge} ati-drivers; then
eerror "Failed to build AMD driver, very sad..."
return
fi
fi
modprobe fglrx || FGLRX_FAILURE=yes
if [ "${FGLRX_FAILURE}" = "yes" ]; then
@ -280,7 +286,7 @@ start() {
eerror "Missing distfile for ${mod}-firmware"
fi
done
if eval ${run_merge} --nodeps ${BROADCOM_READY}; then
if eval ${run_merge} ${BROADCOM_READY}; then
return 0
else
return 1
@ -298,7 +304,7 @@ start() {
if [ -w /mnt/cdrom/modules ] && [ -x /usr/sbin/makemo ]; then
run_merge="echo y | makemo"
else
run_merge="emerge"
run_merge="emerge --nodeps"
fi
ebegin "Setting up broadcom firmware if needed..."
@ -316,7 +322,7 @@ start() {
if handle_broadcom; then
eend 0
else
eend "Something went wrong"
eend "Something went wrong installing broadcom drivers."
fi
fi

4
pentoo/pentoo-livecd/files/makemo-2018.0-r1 → pentoo/pentoo-livecd/files/makemo-2019.0
View file

@ -15,6 +15,10 @@ fi
einfo "Pentoo Overlay Module creator version 1.0 running..."
PKGDIR="$(portageq envvar PKGDIR)"
if [ ! -d "${PKGDIR}" ]; then
einfo "PKGDIR ${PKGDIR} missing, creating it"
mkdir "${PKGDIR}" || eerror "Failed to create ${PKGDIR}"
fi
if [ ! -w "${PKGDIR}" ]; then
eerror "ERROR: ${PKGDIR} is not writable or does not exist!"
exit 1

4
pentoo/pentoo-livecd/pentoo-livecd-2018.3-r2.ebuild → pentoo/pentoo-livecd/pentoo-livecd-2019.0.ebuild
View file

@ -36,10 +36,10 @@ pkg_setup() {
src_install() {
#/usr/sbin
newsbin "${FILESDIR}"/flushchanges-2018.0 flushchanges
newsbin "${FILESDIR}"/makemo-2018.0-r1 makemo
newsbin "${FILESDIR}"/makemo-2019.0 makemo
newsbin "${FILESDIR}"/livecd-setpass-r1 livecd-setpass
newinitd "${FILESDIR}"/binary-driver-handler.initd-2018.3-r1 binary-driver-handler
newinitd "${FILESDIR}"/binary-driver-handler.initd-2019.0 binary-driver-handler
exeinto /root/Desktop
doexe "${FILESDIR}"/networkmanager.desktop