diff options
author | Henrik Brix Andersen <brix@gentoo.org> | 2005-04-25 12:00:25 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@gentoo.org> | 2005-04-25 12:00:25 +0000 |
commit | 088d83c4d943fac99bf1031c1477a6eebb13e138 (patch) | |
tree | 151695896d0ec420ef1a674e520bcffded1a9266 /sys-apps/pcmcia-cs-modules | |
parent | Added local cardbus flag for sys-apps/pcmcia-cs-modules (diff) | |
download | gentoo-2-088d83c4d943fac99bf1031c1477a6eebb13e138.tar.gz gentoo-2-088d83c4d943fac99bf1031c1477a6eebb13e138.tar.bz2 gentoo-2-088d83c4d943fac99bf1031c1477a6eebb13e138.zip |
Initial check-in, split from sys-apps/pcmcia-cs.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'sys-apps/pcmcia-cs-modules')
7 files changed, 197 insertions, 0 deletions
diff --git a/sys-apps/pcmcia-cs-modules/ChangeLog b/sys-apps/pcmcia-cs-modules/ChangeLog new file mode 100644 index 000000000000..8b161cb0d39d --- /dev/null +++ b/sys-apps/pcmcia-cs-modules/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for sys-apps/pcmcia-cs-modules +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-modules/ChangeLog,v 1.1 2005/04/25 12:00:25 brix Exp $ + +*pcmcia-cs-modules-3.2.8 (25 Apr 2005) + + 25 Apr 2005; <brix@gentoo.org> +files/pcmcia-cs-3.2.8-modules-only.patch, + +files/pcmcia-cs-3.2.8-orinoco-gcc34.patch, +metadata.xml, + +pcmcia-cs-modules-3.2.8.ebuild: + Initial check-in, split from sys-apps/pcmcia-cs. + diff --git a/sys-apps/pcmcia-cs-modules/Manifest b/sys-apps/pcmcia-cs-modules/Manifest new file mode 100644 index 000000000000..cb73ee53d506 --- /dev/null +++ b/sys-apps/pcmcia-cs-modules/Manifest @@ -0,0 +1,4 @@ +MD5 193f1beffa803b6ead96be599692a4e9 pcmcia-cs-modules-3.2.8.ebuild 2754 +MD5 6e7a371dbbc428966bcfda0029a7b6ef files/pcmcia-cs-3.2.8-modules-only.patch 1165 +MD5 29a2be33a201c160660048fb2f119915 files/digest-pcmcia-cs-modules-3.2.8 131 +MD5 791ff98a3aedc7a9c1c179156ed8fc7c files/pcmcia-cs-3.2.8-orinoco-gcc34.patch 753 diff --git a/sys-apps/pcmcia-cs-modules/files/digest-pcmcia-cs-modules-3.2.8 b/sys-apps/pcmcia-cs-modules/files/digest-pcmcia-cs-modules-3.2.8 new file mode 100644 index 000000000000..a52e76dc7889 --- /dev/null +++ b/sys-apps/pcmcia-cs-modules/files/digest-pcmcia-cs-modules-3.2.8 @@ -0,0 +1,2 @@ +MD5 0d6d65be8896eff081aee996049afaa5 pcmcia-cs-3.2.8.tar.gz 1271846 +MD5 2ddaa8ff53be492b4cd3ef4483f7cf1b monitor-0.13e.patch 22530 diff --git a/sys-apps/pcmcia-cs-modules/files/pcmcia-cs-3.2.8-modules-only.patch b/sys-apps/pcmcia-cs-modules/files/pcmcia-cs-3.2.8-modules-only.patch new file mode 100644 index 000000000000..42248c34fbf2 --- /dev/null +++ b/sys-apps/pcmcia-cs-modules/files/pcmcia-cs-3.2.8-modules-only.patch @@ -0,0 +1,33 @@ +diff -urp pcmcia-cs-3.2.8/Makefile pcmcia-cs-3.2.8-modules-only/Makefile +--- pcmcia-cs-3.2.8/Makefile 2003-05-16 07:59:44.000000000 +0200 ++++ pcmcia-cs-3.2.8-modules-only/Makefile 2005-04-25 11:39:57.000000000 +0200 +@@ -7,7 +7,7 @@ include config.mk + endif + + ALL = modules clients wireless cardmgr flash debug-tools man etc +-DIRS = cardmgr flash debug-tools man etc ++DIRS = man + ifndef CONFIG_PCMCIA + DIRS := modules clients wireless $(DIRS) + endif +diff -urp pcmcia-cs-3.2.8/man/Makefile pcmcia-cs-3.2.8-modules-only/man/Makefile +--- pcmcia-cs-3.2.8/man/Makefile 2003-09-15 07:14:41.000000000 +0200 ++++ pcmcia-cs-3.2.8-modules-only/man/Makefile 2005-04-25 11:40:25.000000000 +0200 +@@ -20,7 +20,7 @@ MAN8 = cardmgr.8 cardctl.8 ftl_format.8 + ifport.8 ifuser.8 ide_info.8 pcinitrd.8 pack_cis.8 dump_cis.8 \ + lspnp.8 setpnp.8 pcic_probe.8 + +-all: $(MAN1_X11) $(MAN4) $(MAN5) $(MAN8) ++all: $(MAN4) + + dep: + +@@ -44,7 +44,7 @@ install-man8: $(MAN8) + @mkdir -p $(MANDIR)/man8 + cp *.8 $(MANDIR)/man8 + +-install: install-man1-x11 install-man4 install-man5 install-man8 ++install: install-man4 + + man2html: $(MAN1) $(MAN4) $(MAN5) $(MAN8) + for f in *.[1458] ; do \ diff --git a/sys-apps/pcmcia-cs-modules/files/pcmcia-cs-3.2.8-orinoco-gcc34.patch b/sys-apps/pcmcia-cs-modules/files/pcmcia-cs-3.2.8-orinoco-gcc34.patch new file mode 100644 index 000000000000..b92c16c26ab8 --- /dev/null +++ b/sys-apps/pcmcia-cs-modules/files/pcmcia-cs-3.2.8-orinoco-gcc34.patch @@ -0,0 +1,14 @@ +diff -urp pcmcia-cs-3.2.8-orinoco/wireless/orinoco.c pcmcia-cs-3.2.8-orinoco-prototype/wireless/orinoco.c +--- pcmcia-cs-3.2.8-orinoco/wireless/orinoco.c 2005-04-17 15:37:56.000000000 +0200 ++++ pcmcia-cs-3.2.8-orinoco-prototype/wireless/orinoco.c 2005-04-17 15:39:32.000000000 +0200 +@@ -569,6 +569,10 @@ static void orinoco_stat_gather(struct n + static struct net_device_stats *orinoco_get_stats(struct net_device *dev); + static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev); + ++void orinoco_int_rxmonitor(struct net_device *dev, u16 rxfid, ++ int len, struct hermes_rx_descriptor *rxdesc, ++ struct ieee802_11_hdr *hdr); ++ + /* Hardware control routines */ + + static int __orinoco_program_rids(struct net_device *dev); diff --git a/sys-apps/pcmcia-cs-modules/metadata.xml b/sys-apps/pcmcia-cs-modules/metadata.xml new file mode 100644 index 000000000000..cfbdff13bd61 --- /dev/null +++ b/sys-apps/pcmcia-cs-modules/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>mobile</herd> +<maintainer> + <email>brix@gentoo.org</email> + <name>Henrik Brix Andersen</name> +</maintainer> +</pkgmetadata> diff --git a/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild b/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild new file mode 100644 index 000000000000..5c1acd0de848 --- /dev/null +++ b/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild,v 1.1 2005/04/25 12:00:25 brix Exp $ + +inherit eutils flag-o-matic toolchain-funcs linux-info + +MY_P=${P/-modules/} +S=${WORKDIR}/${MY_P} + +DESCRIPTION="PCMCIA modules for Linux" +HOMEPAGE="http://pcmcia-cs.sourceforge.net" +SRC_URI="mirror://sourceforge/pcmcia-cs/${MY_P}.tar.gz + http://ozlabs.org/people/dgibson/dldwd/monitor-0.13e.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +IUSE="cardbus" +DEPEND="virtual/linux-sources + app-arch/tar + >=sys-apps/sed-4" +RDEPEND="" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is gt 2 4; then + ewarn + ewarn "The recommended PCMCIA configuration for linux-2.6.x is to" + ewarn "use the in-kernel PCMCIA drivers." + ewarn + ebeep 5 + fi + + if (linux_chkconfig_present PCMCIA || linux_chkconfig_present PCCARD); then + eerror + eerror "This package requires the in-kernel PCMCIA drivers to be disabled." + eerror + die "Kernel PCMCIA support detected" + fi +} + +src_unpack() { + unpack ${MY_P}.tar.gz + + cd ${S}/wireless + epatch ${DISTDIR}/monitor-0.13e.patch + + cd ${S} + epatch ${FILESDIR}/${MY_P}-orinoco-gcc34.patch + epatch ${FILESDIR}/${MY_P}-modules-only.patch +} + +src_compile() { + local config CONFIG_FILE + + if use cardbus; then + einfo "CardBus support enabled" + config="${config} --cardbus" + else + einfo "CardBus support disabled" + config="${config} --nocardbus" + fi + + if linux_chkconfig_present PM; then + einfo "Power management support enabled" + config="${config} --apm" + else + einfo "Power management support disabled" + config="${config} --noapm" + fi + + if linux_chkconfig_present PNP; then + einfo "Plug and Play support enabled" + config="${config} --pnp" + else + einfo "Plug and Play support disabled" + config="${config} --nopnp" + fi + + ${S}/Configure \ + --noprompt \ + --kernel=${KV_DIR} \ + --moddir=/lib/modules/${KV_FULL} \ + --target=${D} \ + --arch=$(tc-arch-kernel) \ + --ucc=$(tc-getCC) \ + --kcc=$(tc-getCC) \ + --ld=$(tc-getLD) \ + --uflags="${CFLAGS}" \ + --kflags="$(getfilevar HOSTCFLAGS ${KV_DIR}/Makefile)" \ + --srctree \ + --nox11 \ + ${config} \ + || die "Configure failed" + + ebegin "Saving pcmcia-cs development environment" + echo ${PV} > ${S}/pcmcia-cs-version + cd ${S} + tar -cjf ${T}/pcmcia-cs-build-env.tbz2 . + eend ${?} + + emake all || die "emake all failed" +} + +src_install () { + emake install || die "emake install failed" + + # remove bogus modules.conf file + rm -f ${D}/etc/modules.conf + + # install the pcmcia-cs development environment tarball + # (used by linux-mod.eclass) + insinto /usr/src/pcmcia-cs + doins ${T}/pcmcia-cs-build-env.tbz2 +} + +pkg_postinst() { + einfo + einfo "It is adviced that you re-merge all external PCMCIA modules" + einfo "after installing a new version of ${PN}." + einfo +} |