diff options
author | Peter Johanson <latexer@gentoo.org> | 2003-10-09 13:43:28 +0000 |
---|---|---|
committer | Peter Johanson <latexer@gentoo.org> | 2003-10-09 13:43:28 +0000 |
commit | f1936099ea20da914e6af0549ee3abad25280ddb (patch) | |
tree | cd2b03676821e5c72840d124ef657be028a02db5 /sys-apps | |
parent | bug #22462 and #30278 (diff) | |
download | historical-f1936099ea20da914e6af0549ee3abad25280ddb.tar.gz historical-f1936099ea20da914e6af0549ee3abad25280ddb.tar.bz2 historical-f1936099ea20da914e6af0549ee3abad25280ddb.zip |
bug #22462 and #30278
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/pcmcia-cs/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5 | 2 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/pcmcia.conf | 5 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild | 158 |
4 files changed, 166 insertions, 5 deletions
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest index 3fff72f89c22..fc76d6f52b8c 100644 --- a/sys-apps/pcmcia-cs/Manifest +++ b/sys-apps/pcmcia-cs/Manifest @@ -5,11 +5,11 @@ MD5 362a997b2f6e77a55b39056bed46d92b pcmcia-cs-3.2.1.ebuild 4079 MD5 01ac1d06326d1b3a783644fe8533effe pcmcia-cs-3.2.1-r2.ebuild 4545 MD5 aae4ddfbddc6942af41c0027952f779b pcmcia-cs-3.2.3.ebuild 3902 MD5 8fa881eb68d0863794b346cd466d84a1 pcmcia-cs-3.2.1-r4.ebuild 4638 -MD5 5d086cd16cd31850c199589b84514bd6 pcmcia-cs-3.2.5.ebuild 4334 +MD5 9b52f5c2e70916f90a4dab540cf1733c pcmcia-cs-3.2.5.ebuild 4333 MD5 09778e65d2d7dfd817b20bd91185f939 pcmcia-cs-3.2.0.ebuild 4079 MD5 a13380cbcf7e44cb62da8d02f6d5e6b1 pcmcia-cs-3.2.1-r1.ebuild 4359 MD5 946bc338bd45c58f05c757b733549147 pcmcia-cs-3.2.3-r2.ebuild 4626 -MD5 e171da377b5a6f77ff74c0f5b2183bcf ChangeLog 10995 +MD5 1a79d6f49f7783d77219624c8473f97c ChangeLog 11314 MD5 65f0eb65d75bd69dd0d0f4590ffb6ff0 pcmcia-cs-3.2.2.ebuild 4542 MD5 79a4a1c7df41ec21b7b068729bf1ddac pcmcia-cs-3.2.1-r3.ebuild 4485 MD5 27f5efcad7ec088bf5520785f38ffb9e files/digest-pcmcia-cs-3.2.1-r1 132 @@ -29,6 +29,6 @@ MD5 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807 MD5 8621a69779c0a084e6092f495ac08cde files/gentoo-pcmcia-cs-3.1.34.patch 589 MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768 MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228 -MD5 a43f37f4881d16127f80036564a528b2 files/pcmcia.conf 319 +MD5 83977336aa2077a799ca633a6504aabd files/pcmcia.conf 363 MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859 MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133 diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5 new file mode 100644 index 000000000000..2ee56e5aa0f6 --- /dev/null +++ b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5 @@ -0,0 +1,2 @@ +MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494 +MD5 cdf1e5021163432f73bc3ef6cc70daf3 pcmcia-cs-3.2.5-orinoco-monitor.diff.gz 7241 diff --git a/sys-apps/pcmcia-cs/files/pcmcia.conf b/sys-apps/pcmcia-cs/files/pcmcia.conf index 33021535a0f0..aca99fea3917 100644 --- a/sys-apps/pcmcia-cs/files/pcmcia.conf +++ b/sys-apps/pcmcia-cs/files/pcmcia.conf @@ -4,8 +4,9 @@ CARDMGR_OPTS="-f" SCHEME="home" # These are from the pcmcia-cs distribution, but aren't used yet -# Should be either i82365 or tcic -PCIC="i82365 tcic" +# Should be either i82365 or tcic, Depending on your pcmcia hardware. +PCIC="i82365" +#PCIC="tcic" # Put socket driver timing parameters here PCIC_OPTS="" # Put pcmcia_core options here diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild new file mode 100644 index 000000000000..b3878ca80d8c --- /dev/null +++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild,v 1.1 2003/10/09 13:43:25 latexer Exp $ + +inherit eutils + +S=${WORKDIR}/${P} +OV="orinoco-0.13e" + +DESCRIPTION="PCMCIA tools for Linux" +SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz + http://dev.gentoo.org/~latexer/files/${P}-orinoco-monitor.diff.gz" + +HOMEPAGE="http://pcmcia-cs.sourceforge.net" +IUSE="trusted build apm pnp nocardbus" +DEPEND="sys-kernel/linux-headers" +RDEPEND="" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86" + +# check arch for configure +if [ ${ARCH} = "x86" ] ; then + MY_ARCH="i386" +else + MY_ARCH="ppc" +fi + +# Note: To use this ebuild, you should have the usr/src/linux symlink to +# the kernel directory that pcmcia-cs should use for configuration. + +src_unpack() { + unpack ${P}.tar.gz + + check_KV + OKVMINOR="`echo ${KV} | sed -e 's:^2\.\(.\).*:\1:'`" + + cd ${S} + + # 3.2.5 includes the latest orinoco (0.13e), so just patch to add + #monitor mode + epatch ${DISTDIR}/${P}-orinoco-monitor.diff.gz + # If we're on 2.5.x or 2.6.x, modversions.h has *moved* + if [ ${OKVMINOR} -ge 5 ] + then + mv -f Configure ${T} + sed -e "s:include/linux/modversion:include/config/modversion:" \ + ${T}/Configure > Configure + fi + + mv -f Configure ${T} + sed -e 's:usr/man:usr/share/man:g' ${T}/Configure > Configure + chmod ug+x Configure + #man pages will now install into /usr/share/man + + +} + +src_compile() { + local myconf + if [ -n "`use trusted`" ] ; then + myconf="--trust" + else + myconf="--notrust" + fi + + if [ -n "`use apm`" ] ; then + myconf="$myconf --apm" + else + myconf="$myconf --noapm" + fi + + if [ -n "`use pnp`" ] ; then + myconf="$myconf --pnp" + else + myconf="$myconf --nopnp" + fi + + if [ -n "`use nocardbus`" ] ; then + myconf="$myconf --nocardbus" + else + myconf="$myconf --cardbus" + fi + + #use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility) + ./Configure -n \ + --target=${D} \ + --srctree \ + --kernel=/usr/src/linux \ + --arch="${MY_ARCH}" \ + --uflags="$CFLAGS" \ + --kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \ + $myconf || die "failed configuring" + # nopnp and noapm are important, because without them the pcmcia-cs + # tools will require a kernel with ISA PnP and/or APM support, + # which cannot be guaranteed. We need to make sure the tools + # work *all* the time, not just some of the time. + + # The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux + # rather than the currently-running kernel. It's Gentoo Linux policy to configure for + # the kernel in /usr/src/linux + + sed -e "/^HAS_FORMS/d" config.out > config.out.sed + sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed + sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out + sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk + rm -f config.out.sed + rm -f config.mk.sed + + emake all || die "failed compiling" +} + +src_install () { + make PREFIX=${D} install || die "failed installing" + cd ${D} + rm -rf etc/rc*.d + # remove X + # this is simply much easier than patching configure or the makefiles + # not to build them in the first place + rm -rf usr/X11R6 + # todo: if they are nstalled, move them to /usr + + insinto /etc/conf.d + newins ${FILESDIR}/pcmcia.conf pcmcia + + exeinto /etc/pcmcia + doexe ${FILESDIR}/network + + # install our own init script + exeinto /etc/init.d + newexe ${FILESDIR}/pcmcia.rc pcmcia + if [ -z "`use build`" ] + then + cd ${S} + # install docs + dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \ + README-2.4 SUPPORTED.CARDS doc/* + else + rm -rf ${D}/usr/share/man + fi + rm -f ${D}/etc/modules.conf + rm -rf ${D}/var/lib/pcmcia + + # if on ppc set the ppc revised config.opts + if [ ${ARCH} = "ppc" ] ; then + insinto /etc/pcmcia + newins ${FILESDIR}/ppc.config.opts config.opts + fi +} + +pkg_postinst() { + einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel." + einfo "(Otherwise, you might experience CardServices version mismatch errors)" + einfo "" + einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and" + einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support" + einfo "if you have wireless." +} |