summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerris McCormick <fmccor@gentoo.org>2008-03-18 19:13:57 +0000
committerFerris McCormick <fmccor@gentoo.org>2008-03-18 19:13:57 +0000
commit72fac235392e8397a72eef85c1a787db5404e3f7 (patch)
treeea3642a555934056c7e5fa657bc6bfc78e4f1ee4 /x11-misc
parentCommit the changes proposed in bug #213796. (diff)
downloadgentoo-2-72fac235392e8397a72eef85c1a787db5404e3f7.tar.gz
gentoo-2-72fac235392e8397a72eef85c1a787db5404e3f7.tar.bz2
gentoo-2-72fac235392e8397a72eef85c1a787db5404e3f7.zip
Don't do anything at all if we don't have any /proc/fb to look at.
(Portage version: 2.2_pre4)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/afbinit/ChangeLog6
-rw-r--r--x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch3
2 files changed, 7 insertions, 2 deletions
diff --git a/x11-misc/afbinit/ChangeLog b/x11-misc/afbinit/ChangeLog
index 982980fb5dbd..a664d64d43cb 100644
--- a/x11-misc/afbinit/ChangeLog
+++ b/x11-misc/afbinit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/afbinit
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.23 2008/03/18 18:16:23 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.24 2008/03/18 19:13:57 fmccor Exp $
+
+ 18 Mar 2008; Ferris McCormick <fmccor@gentoo.org>
+ files/rc.afb-1.0.1-r7.patch:
+ Don't do anything at all if we don't have any /proc/fb to look at.
*afbinit-1.0.1-r7 (18 Mar 2008)
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
index 0105a2aeef4a..37f5f40d1a6a 100644
--- a/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
+++ b/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
@@ -12,7 +12,7 @@
# The microcode loader binary and the microcode
# itself must exist.
if [ ! -x /usr/sbin/afbinit -o ! -f /usr/lib/afb.ucode ]
-@@ -22,13 +17,37 @@
+@@ -22,13 +17,38 @@
exit 0
fi
@@ -49,6 +49,7 @@
- /usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
- echo "done."
-done
++ [[ -e /proc/fb ]] || exit 0
+ afb_devs=`/bin/more -s /proc/fb | /bin/egrep -i "Elite 3D" | /bin/sed 's/\ .*//'`
+ # Load microcode onto each card.
+ for AFB in ${afb_devs}