summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2004-02-04 22:35:33 +0000
committerPeter Johanson <latexer@gentoo.org>2004-02-04 22:35:33 +0000
commit68a0afb42a2501e5631fd97f0a9eccda4f10b0d4 (patch)
tree829ee4fc508efbfbe7a63c9db64f72648e7b3513 /sys-apps/pcmcia-cs
parentClosing documentation bug 35749, essentially USE='-doc' not being abided by c... (diff)
downloadhistorical-68a0afb42a2501e5631fd97f0a9eccda4f10b0d4.tar.gz
historical-68a0afb42a2501e5631fd97f0a9eccda4f10b0d4.tar.bz2
historical-68a0afb42a2501e5631fd97f0a9eccda4f10b0d4.zip
Added alternative PCIC module attempt in init script for more flexibility
Diffstat (limited to 'sys-apps/pcmcia-cs')
-rw-r--r--sys-apps/pcmcia-cs/ChangeLog8
-rw-r--r--sys-apps/pcmcia-cs/Manifest6
-rw-r--r--sys-apps/pcmcia-cs/files/pcmcia.conf12
3 files changed, 22 insertions, 4 deletions
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 7b332c3d6227..772428b47606 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/pcmcia-cs
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.53 2004/02/03 15:54:11 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.54 2004/02/04 22:35:32 latexer Exp $
+
+ 04 Feb 2004; Peter Johanson <latexer@gentoo.org> files/pcmcia.conf,
+ files/pcmcia.rc:
+ Added ability to have two different PCIC modules attempted to the init system.
+ This should be useful for liveCDs as well as for people switching between 2.6
+ and 2.4 kernels potentially.
03 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild,
pcmcia-cs-3.2.5.ebuild:
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 6aeb22f82b27..dc6744e5a409 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,10 +1,16 @@
MD5 b3c2629fd0e60f03cbabcb43345d7876 pcmcia-cs-3.2.4.ebuild 4035
+MD5 887db691c9e97c9feb8ff1abd57b892a pcmcia-cs-3.2.7-r1.ebuild 4538
MD5 42b6034692126c56b1775fdae2c56e45 pcmcia-cs-3.1.34-r8.ebuild 4136
+MD5 ea9b13bc201d8f2fa156249d443cc97f pcmcia-cs-3.2.6.ebuild 4380
+MD5 a5d584dfbd928583715035928f6bebe7 pcmcia-cs-3.2.6-r1.ebuild 4531
MD5 a367610b5e7afb565bb3d5d73c224c19 pcmcia-cs-3.2.5-r1.ebuild 4861
MD5 052a01e3c3fdfd19ecaa57d902c4fd49 pcmcia-cs-3.2.5.ebuild 4430
+MD5 a9a3a90ae223680dc365906b8f538e85 pcmcia-cs-3.2.7.ebuild 4538
MD5 c6b42c5a82dcda5cd12117a20d8f1f82 ChangeLog 12669
MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
MD5 300aadbb4efa9d5933fc0c1fdf004c95 files/digest-pcmcia-cs-3.2.5-r1 233
+MD5 75d50c6e8ed4cfa3d3a9b8532feb922b files/digest-pcmcia-cs-3.2.6-r1 215
+MD5 445043b7ae3483cc97311ca9aaef8f52 files/digest-pcmcia-cs-3.2.7-r1 298
MD5 398d67e8e892182884b962c8ff2fca2e files/pcmcia.rc 1795
MD5 8662e0e954d0cde8b84f76691c910e7a files/digest-pcmcia-cs-3.2.4 652
MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.conf b/sys-apps/pcmcia-cs/files/pcmcia.conf
index aca99fea3917..e9913a6df335 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia.conf
+++ b/sys-apps/pcmcia-cs/files/pcmcia.conf
@@ -3,11 +3,17 @@ CARDMGR_OPTS="-f"
# To set the PCMCIA scheme at startup...
SCHEME="home"
-# These are from the pcmcia-cs distribution, but aren't used yet
-# Should be either i82365 or tcic, Depending on your pcmcia hardware.
+# If using kernel PCMCIA drivers, PCIC should be "yenta_socket". If
+# using the pcmcia-cs drivers, this shhould be either "i82365" or "tcic",
+# depending on your pcmcia hardware.
+# If using kernel drivers not as modules, set PCIC to ""
PCIC="i82365"
-#PCIC="tcic"
# Put socket driver timing parameters here
PCIC_OPTS=""
+
+# Alternative PCIC driver to use if PCIC driver fails
+PCIC_ALT="yenta_socket"
+PCIC_ALT_OPTS=""
+
# Put pcmcia_core options here
CORE_OPTS=""