diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-25 15:23:08 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-25 15:23:08 +0000 |
commit | 6de1eeaa11c2cc82aede83aaf00c13692e5f40f6 (patch) | |
tree | 35dfe10950c283bb662415157492d5aca28a41e2 /meta | |
parent | 8cd7a0e4f49e3ccce07de59a5d8d14080d0dc366 (diff) | |
download | poky-6de1eeaa11c2cc82aede83aaf00c13692e5f40f6.tar.gz |
pcmcia-cs: drop as we use pcmciautils for all PCMCIA machines
Pcmcia-cs is needed for kernels older then 2.6.13-rc1 and all Poky targets
use newer versions.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2976 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/pcmcia-cs/files/arm/pcmcia | 40 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/files/gcc4_fixes.patch | 26 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/files/network.conf | 13 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/files/pcmcia | 1 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/files/wnv.conf | 14 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch | 19 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch | 20 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts | 25 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch | 92 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/no-hostap-cards.patch | 124 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch | 11 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch | 30 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ratoc-cfu1u.patch | 23 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts | 28 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts | 47 | ||||
-rw-r--r-- | meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb | 105 |
16 files changed, 0 insertions, 618 deletions
diff --git a/meta/packages/pcmcia-cs/files/arm/pcmcia b/meta/packages/pcmcia-cs/files/arm/pcmcia deleted file mode 100644 index d5346fb13a..0000000000 --- a/meta/packages/pcmcia-cs/files/arm/pcmcia +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | module_id() { | ||
2 | awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo | ||
3 | } | ||
4 | |||
5 | |||
6 | case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in | ||
7 | *XScale-PXA2*) | ||
8 | |||
9 | case "`uname -r`" in | ||
10 | 2.4*) | ||
11 | PCIC=pxa_cs | ||
12 | ;; | ||
13 | 2.6*) | ||
14 | PCIC=pxa2xx_core | ||
15 | ;; | ||
16 | esac | ||
17 | ;; | ||
18 | *StrongARM-1100* | *StrongARM-1110*) | ||
19 | PCIC=sa1100_cs | ||
20 | ;; | ||
21 | *) | ||
22 | echo "Unable to determine PCIC value for this CPU" | ||
23 | exit 1 | ||
24 | ;; | ||
25 | esac | ||
26 | |||
27 | case "`uname -r`" in | ||
28 | 2.4*) | ||
29 | DS=ds | ||
30 | ;; | ||
31 | 2.6*) | ||
32 | DS=pcmcia | ||
33 | ;; | ||
34 | esac | ||
35 | |||
36 | case `module_id` in | ||
37 | "HP iPAQ H3"* | "HP iPAQ H5"*) | ||
38 | PCIC_EXTRA=h3600_generic_sleeve | ||
39 | ;; | ||
40 | esac | ||
diff --git a/meta/packages/pcmcia-cs/files/gcc4_fixes.patch b/meta/packages/pcmcia-cs/files/gcc4_fixes.patch deleted file mode 100644 index c68ba7a0f9..0000000000 --- a/meta/packages/pcmcia-cs/files/gcc4_fixes.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Index: pcmcia-cs-3.2.8/debug-tools/lspnp.c | ||
2 | =================================================================== | ||
3 | --- pcmcia-cs-3.2.8.orig/debug-tools/lspnp.c 2002-02-13 05:45:01.000000000 +0000 | ||
4 | +++ pcmcia-cs-3.2.8/debug-tools/lspnp.c 2005-11-11 23:43:33.000000000 +0000 | ||
5 | @@ -496,7 +496,7 @@ | ||
6 | dump_io_fixed(r); break; | ||
7 | } | ||
8 | } | ||
9 | - (u_char *)p += sz + 1; | ||
10 | + p = (union pnp_resource *) ((u_char *)p + sz + 1); | ||
11 | } | ||
12 | return (u_char *)p; | ||
13 | } | ||
14 | Index: pcmcia-cs-3.2.8/debug-tools/setpnp.c | ||
15 | =================================================================== | ||
16 | --- pcmcia-cs-3.2.8.orig/debug-tools/setpnp.c 2001-10-10 02:58:12.000000000 +0000 | ||
17 | +++ pcmcia-cs-3.2.8/debug-tools/setpnp.c 2005-11-11 23:44:32.000000000 +0000 | ||
18 | @@ -163,7 +163,7 @@ | ||
19 | break; | ||
20 | } | ||
21 | } | ||
22 | - (u_char *)p += sz + 1; | ||
23 | + p = (union pnp_resource *) ((u_char *)p + sz + 1); | ||
24 | } | ||
25 | return (u_char *)p; | ||
26 | } | ||
diff --git a/meta/packages/pcmcia-cs/files/network.conf b/meta/packages/pcmcia-cs/files/network.conf deleted file mode 100644 index 51a38dd55b..0000000000 --- a/meta/packages/pcmcia-cs/files/network.conf +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | card "TRENDnet TE-CF100" | ||
2 | manfid 0x0149, 0xc1ab | ||
3 | version "Fast Ethernet", "CF Size PC Card", "1.0" | ||
4 | bind "pcnet_cs" | ||
5 | |||
6 | card "Hawking 10/100 CF Fast Ethernet" | ||
7 | manfid 0x0149, 0xc1ab | ||
8 | bind "pcnet_cs" | ||
9 | |||
10 | card "Billionton CFLA-100N 10/100 FastEthernet" | ||
11 | version "CF", "100Base-Ethernet", "V", "1.0" | ||
12 | manfid 0x021b, 0x0202 | ||
13 | bind "pcnet_cs" | ||
diff --git a/meta/packages/pcmcia-cs/files/pcmcia b/meta/packages/pcmcia-cs/files/pcmcia deleted file mode 100644 index c42fea0691..0000000000 --- a/meta/packages/pcmcia-cs/files/pcmcia +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | # no defaults for /etc/sysconfig/pcmcia | ||
diff --git a/meta/packages/pcmcia-cs/files/wnv.conf b/meta/packages/pcmcia-cs/files/wnv.conf deleted file mode 100644 index f293b67178..0000000000 --- a/meta/packages/pcmcia-cs/files/wnv.conf +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | device "wnv_cs" | ||
2 | module "wnv_cs" | ||
3 | |||
4 | # | ||
5 | # Winnov PCMCIA Camera | ||
6 | # | ||
7 | card "Winnov VideumMPC Camera" | ||
8 | version "Winnov", "VideumMPC", "Rev 1.0", "" | ||
9 | bind "wnv_cs" | ||
10 | |||
11 | ## handhelds.org bugzilla bug 188 | ||
12 | card "Winnov VideumCam Traveler" | ||
13 | manfid 0x01a5, 0x0000 | ||
14 | bind "wnv_cs" | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch deleted file mode 100644 index 5f11147eb8..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | --- pcmcia-cs-3.2.8/etc/shared.orig 2004-12-15 02:21:11.000000000 +0100 | ||
2 | +++ pcmcia-cs-3.2.8/etc/shared 2004-12-27 17:09:51.000000000 +0100 | ||
3 | @@ -55,8 +55,15 @@ | ||
4 | fi | ||
5 | if is_true $DO_MOUNT ; then | ||
6 | O=${OPTS:+-o $OPTS} ; FS=${FSTYPE:+-t $FSTYPE} | ||
7 | - log mount $O $FS $1 $MOUNTPT || return 1 | ||
8 | + if test -x /etc/pcmcia/ide_automount | ||
9 | + then | ||
10 | + /etc/pcmcia/ide_automount | ||
11 | + else | ||
12 | + log mount $O $FS $1 $MOUNTPT || return 1 | ||
13 | + fi | ||
14 | fi | ||
15 | + | ||
16 | + logger "SHARED [$MOUNTPT] [$1]" | ||
17 | return 0 | ||
18 | } | ||
19 | |||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch deleted file mode 100644 index 7237f3b813..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | --- pcmcia-cs-3.2.3/etc/shared~ide 2003-03-11 10:26:14.000000000 -0600 | ||
2 | +++ pcmcia-cs-3.2.3/etc/shared 2003-03-11 10:32:39.000000000 -0600 | ||
3 | @@ -57,7 +57,7 @@ | ||
4 | fi | ||
5 | if is_true $DO_MOUNT ; then | ||
6 | O=${OPTS:+-o $OPTS} ; FS=${FSTYPE:+-t $FSTYPE} | ||
7 | - log mount -v $O $FS $1 $MOUNTPT || return 1 | ||
8 | + log mount $O $FS $1 $MOUNTPT || return 1 | ||
9 | fi | ||
10 | return 0 | ||
11 | } | ||
12 | @@ -85,7 +85,7 @@ | ||
13 | test -b $1 || return 1 | ||
14 | do_fuser -k -m $1 > /dev/null | ||
15 | if mount | grep -q "$1 on" ; then | ||
16 | - log umount -v $1 || return 1 | ||
17 | + log umount $1 || return 1 | ||
18 | fi | ||
19 | if is_true $DO_FSTAB ; then | ||
20 | grep -v $1 /etc/fstab > /etc/fstab.N | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts deleted file mode 100644 index d13dab0015..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | # ATA/IDE drive adapter configuration | ||
2 | # | ||
3 | # The address format is "scheme,socket,serial_no[,part]". | ||
4 | # | ||
5 | # For multi-partition devices, first return list of partitions in | ||
6 | # $PARTS. Then, we'll get called for each partition. | ||
7 | # | ||
8 | case "$ADDRESS" in | ||
9 | *,*,*,1) | ||
10 | #INFO="Sample IDE setup" | ||
11 | DO_FSTAB="n"; | ||
12 | #DO_FSCK="y" ; | ||
13 | DO_MOUNT="y" | ||
14 | #FSTYPE="msdos" | ||
15 | #FSTYPE="auto" | ||
16 | #OPTS="" | ||
17 | #MOUNTPT="/mnt/ide" | ||
18 | ;; | ||
19 | *,*,*) | ||
20 | PARTS="1" | ||
21 | # Card eject policy options | ||
22 | NO_CHECK=n | ||
23 | NO_FUSER=y | ||
24 | ;; | ||
25 | esac | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch deleted file mode 100644 index fb808e209c..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | --- pcmcia-cs/etc/network.old 2004-07-01 00:31:59.000000000 +0100 | ||
2 | +++ pcmcia-cs/etc/network 2004-07-01 00:32:57.000000000 +0100 | ||
3 | @@ -31,16 +31,39 @@ | ||
4 | |||
5 | RESOLV=/etc/resolv.conf | ||
6 | |||
7 | +# if this interface has an entry in /etc/network/interfaces, let ifupdown | ||
8 | +# handle it | ||
9 | +if grep -q "iface \+$DEVICE" /etc/network/interfaces; then | ||
10 | + case $ACTION in | ||
11 | + start) | ||
12 | + ifup $DEVICE | ||
13 | + ;; | ||
14 | + stop) | ||
15 | + ifdown $DEVICE | ||
16 | + ;; | ||
17 | + restart) | ||
18 | + ifdown $DEVICE | ||
19 | + ifup $DEVICE | ||
20 | + ;; | ||
21 | + esac | ||
22 | + | ||
23 | + exit 0 | ||
24 | +fi | ||
25 | + | ||
26 | +## see if it is a wireless card. Jamey and AntiProxy | ||
27 | +CHECK_WIRELESS=`grep "$DEVICE" /proc/net/wireless` | ||
28 | +if [ -n "$CHECK_WIRELESS" ] ; then | ||
29 | # Now, run the specific script for Wireless LAN interfaces | ||
30 | # Note : we need the wireless parameters to be set up before IP parameters, | ||
31 | # so that we can perform DHCP over the Wireless link if needed. Jean II | ||
32 | -O_INFO=$INFO ; INFO= | ||
33 | -if [ -x ./wireless ] ; then | ||
34 | - . ./wireless | ||
35 | -else | ||
36 | - . /etc/pcmcia/wireless | ||
37 | + O_INFO=$INFO ; INFO= | ||
38 | + if [ -x ./wireless ] ; then | ||
39 | + . ./wireless | ||
40 | + else | ||
41 | + . /etc/pcmcia/wireless | ||
42 | + fi | ||
43 | + INFO=$O_INFO | ||
44 | fi | ||
45 | -INFO=$O_INFO | ||
46 | |||
47 | bootp_setup () | ||
48 | { | ||
49 | @@ +225,6 -188,11 @@ | ||
50 | fi | ||
51 | /sbin/dhcpcd -XYZZY 2>&1 | grep -q DHCP || \ | ||
52 | rm -f /var/run/dhcpcd-$DEVICE.pid | ||
53 | + # modified for udhcpc | ||
54 | + elif [ -x /sbin/udhcpc ] ; then | ||
55 | + PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null` | ||
56 | + if [ -n "$PID" ] ; then kill -TERM $PID ; fi | ||
57 | + # end of modification | ||
58 | elif [ -x /sbin/dhclient ] ; then | ||
59 | PID=`cat /var/run/dhclient.pid 2>/dev/null` | ||
60 | if [ -n "$PID" ] ; then kill -TERM $PID ; fi | ||
61 | @@ +282,7 -250,30 @@ | ||
62 | [ -n "$IPADDR" ] && /sbin/ifconfig $DEVICE down up | ||
63 | ;; | ||
64 | |||
65 | +'resume') | ||
66 | + #logger RESUME EVENT PCMCIA SEEN FROM CARDMGR | ||
67 | + if [ -z "$IPADDR" ] || is_true $DHCP ; then | ||
68 | + if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then | ||
69 | + PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null` | ||
70 | + if [ -n "$PID" ] ; then | ||
71 | + kill -USR1 $PID | ||
72 | + fi | ||
73 | + fi | ||
74 | + fi | ||
75 | + ;; | ||
76 | + | ||
77 | +'suspend') | ||
78 | + #logger SUSPEND EVENT SEEN FROM CARDMGR | ||
79 | +# ## uncomment this code below if you get problems where | ||
80 | +# ## you are getting in IP conflict upon resume on DHCP networks | ||
81 | +# if [ -z "$IPADDR" ] || is_true $DHCP ; then | ||
82 | +# if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then | ||
83 | +# PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null` | ||
84 | +# if [ -n "$PID" ] ; then | ||
85 | +# ifconfig $DEVICE 0.0.0.0 | ||
86 | +# fi | ||
87 | +# fi | ||
88 | +# fi | ||
89 | -'suspend'|'resume') | ||
90 | ;; | ||
91 | |||
92 | *) | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/no-hostap-cards.patch b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/no-hostap-cards.patch deleted file mode 100644 index 1c1dd54356..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/no-hostap-cards.patch +++ /dev/null | |||
@@ -1,124 +0,0 @@ | |||
1 | --- pcmcia-cs/etc/config.orig 2004-07-16 18:38:25.000000000 +0200 | ||
2 | +++ pcmcia-cs/etc/config 2005-10-03 13:02:49.000000000 +0200 | ||
3 | @@ -1151,10 +1151,6 @@ | ||
4 | # | ||
5 | # Wireless network adapters | ||
6 | # | ||
7 | -card "Intersil PRISM2 11 Mbps Wireless Adapter" | ||
8 | - manfid 0x0156, 0x0002 | ||
9 | - bind "orinoco_cs" | ||
10 | - | ||
11 | card "350 Series Wireless LAN Adapter" | ||
12 | manfid 0x015f, 0x000a | ||
13 | bind "airo_cs" | ||
14 | @@ -1180,25 +1176,11 @@ | ||
15 | manfid 0x015f, 0x0007 | ||
16 | bind "airo_cs" | ||
17 | |||
18 | -card "Airvast WN-100" | ||
19 | - #version "WLAN", "PRISM PCMCIA CARD" | ||
20 | - manfid 0x50c2, 0x7300 | ||
21 | - bind "orinoco_cs" | ||
22 | - | ||
23 | -card "AirWay 802.11 Adapter (PCMCIA)" | ||
24 | - #version "AirWay", "802.11 Adapter (PCMCIA)" | ||
25 | - manfid 0x0261, 0x0002 | ||
26 | - bind "orinoco_cs" | ||
27 | - | ||
28 | card "ARtem Onair Version 1.0" | ||
29 | #version "ARtem", "Onair", "Version 1.0" | ||
30 | manfid 0x0268, 0x0001 | ||
31 | bind "orinoco_cs" | ||
32 | |||
33 | -card "ASUS SpaceLink WL-100" | ||
34 | - manfid 0x02aa, 0x0002 | ||
35 | - bind "orinoco_cs" | ||
36 | - | ||
37 | card "AT&T WaveLAN Adapter" | ||
38 | version "AT&T", "WaveLAN/PCMCIA" | ||
39 | bind "wavelan_cs" | ||
40 | @@ -1215,18 +1197,6 @@ | ||
41 | version "Cabletron", "RoamAbout 802.11 DS" | ||
42 | bind "orinoco_cs" | ||
43 | |||
44 | -card "Compaq WL100 11 Mbps Wireless Adapter" | ||
45 | - manfid 0x0138, 0x0002 | ||
46 | - bind "orinoco_cs" | ||
47 | - | ||
48 | -card "Compaq HNW-100 11 Mbps Wireless Adapter" | ||
49 | - manfid 0x028a, 0x0002 | ||
50 | - bind "orinoco_cs" | ||
51 | - | ||
52 | -card "Conceptronic CON11Cpro" | ||
53 | - manfid 0xc250, 0x0002 | ||
54 | - bind "orinoco_cs" | ||
55 | - | ||
56 | card "Corega PCC-11" | ||
57 | version "corega K.K.", "Wireless LAN PCC-11" | ||
58 | bind "orinoco_cs" | ||
59 | @@ -1247,10 +1217,6 @@ | ||
60 | version "D", "Link DRC-650 11Mbps WLAN Card" | ||
61 | bind "orinoco_cs" | ||
62 | |||
63 | -card "D-Link DCF660" | ||
64 | - manfid 0xd601, 0x0005 | ||
65 | - bind "orinoco_cs" | ||
66 | - | ||
67 | card "ELSA AirLancer MC-11" | ||
68 | version "ELSA", "AirLancer MC-11" | ||
69 | bind "orinoco_cs" | ||
70 | @@ -1275,14 +1241,6 @@ | ||
71 | version "Instant Wireless ", " Network PC CARD", "Version 01.02" | ||
72 | bind "orinoco_cs" | ||
73 | |||
74 | -card "Linksys WPC11 11Mbps 802.11b WLAN Card" | ||
75 | - manfid 0x0274, 0x1613 | ||
76 | - bind "orinoco_cs" | ||
77 | - | ||
78 | -card "Linksys WCF12 Wireless CompactFlash Card" | ||
79 | - manfid 0x028a, 0x0673 | ||
80 | - bind "orinoco_cs" | ||
81 | - | ||
82 | card "Lucent Technologies WaveLAN/IEEE Adapter" | ||
83 | version "Lucent Technologies", "WaveLAN/IEEE" | ||
84 | bind "orinoco_cs" | ||
85 | @@ -1343,27 +1301,10 @@ | ||
86 | manfid 0x01a6, 0x0000 | ||
87 | bind "ray_cs" | ||
88 | |||
89 | -card "Safeway 802.11b Wireless Adapter" | ||
90 | - manfid 0xd601, 0x0002 | ||
91 | - bind "orinoco_cs" | ||
92 | - | ||
93 | card "SAMSUNG 11Mbps WLAN Card" | ||
94 | version "SAMSUNG", "11Mbps WLAN Card" | ||
95 | bind "orinoco_cs" | ||
96 | |||
97 | -card "Sandisk Connect SDWCFB-000" | ||
98 | - manfid 0xd601, 0x0005 | ||
99 | - bind "orinoco_cs" | ||
100 | - | ||
101 | -card "Sohoware NCP110" | ||
102 | - manfid 0x000b,0x7300 | ||
103 | - bind "orinoco_cs" | ||
104 | - | ||
105 | -card "SpeedStream SS1021 Wireless Adapter" | ||
106 | - #version "Siemens", "SpeedStream Wireless PCMCIA" | ||
107 | - manfid 0x02ac, 0x0002 | ||
108 | - bind "orinoco_cs" | ||
109 | - | ||
110 | card "Xircom CreditCard Netwave" | ||
111 | version "Xircom", "CreditCard Netwave" | ||
112 | bind "netwave_cs" | ||
113 | @@ -1372,11 +1313,6 @@ | ||
114 | manfid 0x0105, 0x0007 | ||
115 | bind "airo_cs" | ||
116 | |||
117 | -card "ZCOMAX AirRunner/XI-300" | ||
118 | - #version "ZCOMAX", "AirRunner/XI-300" | ||
119 | - manfid 0xd601, 0x0002 | ||
120 | - bind "orinoco_cs" | ||
121 | - | ||
122 | # | ||
123 | # Modems and other serial devices | ||
124 | # | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch deleted file mode 100644 index afebb5a9b9..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- pcmcia-cs-3.2.8/etc/rc.pcmcia.orig 2005-04-22 23:14:56.308784152 +0100 | ||
2 | +++ pcmcia-cs-3.2.8/etc/rc.pcmcia 2005-04-22 23:15:34.637957232 +0100 | ||
3 | @@ -140,7 +140,7 @@ | ||
4 | echo -n "Shutting down PCMCIA services: " | ||
5 | if [ -s /var/run/cardmgr.pid ] ; then | ||
6 | PID=`cat /var/run/cardmgr.pid` | ||
7 | - kill $PID | ||
8 | + kill -9 $PID | ||
9 | # Give cardmgr a few seconds to handle the signal | ||
10 | for N in 1 2 3 4 5 1 2 3 4 5 1 2 3 4 5 ; do | ||
11 | kill -0 $PID 2>/dev/null || break | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch deleted file mode 100644 index 541c4edf71..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | --- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra | ||
2 | +++ pcmcia-cs-3.2.8/etc/rc.pcmcia | ||
3 | @@ -104,11 +104,17 @@ for x in "1" ; do | ||
4 | (/sbin/modprobe yenta_socket >/dev/null 2>&1 && | ||
5 | echo "using yenta_socket instead of $PCIC") || | ||
6 | /sbin/modprobe $PCIC $PCIC_OPTS || break | ||
7 | - /sbin/modprobe ds || break | ||
8 | + /sbin/modprobe $DS || break | ||
9 | + if [ "x$PCIC_EXTRA" != "x" ]; then | ||
10 | + /sbin/modprobe $PCIC_EXTRA | ||
11 | + fi | ||
12 | elif [ -d $PC ] ; then | ||
13 | /sbin/insmod $PC/pcmcia_core.o $CORE_OPTS | ||
14 | /sbin/insmod $PC/$PCIC.o $PCIC_OPTS | ||
15 | /sbin/insmod $PC/ds.o | ||
16 | + if [ "x$PCIC_EXTRA" != "x" ]; then | ||
17 | + /sbin/insmod $PC/$PCIC_EXTRA | ||
18 | + fi | ||
19 | else | ||
20 | echo "module directory $PC not found." | ||
21 | break | ||
22 | @@ -154,7 +160,7 @@ for x in "1" ; do | ||
23 | ;; | ||
24 | |||
25 | status) | ||
26 | - pid=`/sbin/pidof cardmgr` | ||
27 | + pid=`/bin/pidof cardmgr` | ||
28 | if [ "$pid" != "" ] ; then | ||
29 | echo "cardmgr (pid $pid) is running..." | ||
30 | EXITCODE=0 | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ratoc-cfu1u.patch b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ratoc-cfu1u.patch deleted file mode 100644 index 069aa65bdd..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/ratoc-cfu1u.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | --- pcmcia-cs/etc/config 2005-02-06 17:02:39.714620456 +1300 | ||
2 | +++ pcmcia-cs/etc/config 2005-02-06 17:05:06.123362944 +1300 | ||
3 | @@ -131,6 +131,9 @@ | ||
4 | device "ohci1394_cb" | ||
5 | class "ieee1394" module "cb_enabler", "ohci1394_cb" | ||
6 | |||
7 | +device "hc_sl811_cs" | ||
8 | + class "usb" module "usbcore", "hc_sl811", "hc_sl811_cs" | ||
9 | + | ||
10 | # dummy drivers | ||
11 | |||
12 | device "dummy_cs" module "dummy_cs" | ||
13 | @@ -2169,6 +2172,10 @@ | ||
14 | manfid 0x0137, 0x0003 | ||
15 | bind "parport_cs" | ||
16 | |||
17 | +card "RATOC USB HOST CF+ Card" | ||
18 | + manfid 0xc015, 0x0001 | ||
19 | + bind "hc_sl811_cs" | ||
20 | + | ||
21 | card "TELES S0/PC ISDN" | ||
22 | version "TELES", "S0/PC" | ||
23 | bind "teles_cs" | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts deleted file mode 100644 index c67df8e348..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | # ATA/IDE drive adapter configuration | ||
2 | # | ||
3 | # The address format is "scheme,socket,serial_no[,part]". | ||
4 | # | ||
5 | # For multi-partition devices, first return list of partitions in | ||
6 | # $PARTS. Then, we'll get called for each partition. | ||
7 | # | ||
8 | case "$ADDRESS" in | ||
9 | *,1,*,*) | ||
10 | # Socket 1 is the internal HD; don't do anything clever as it's / | ||
11 | ;; | ||
12 | *,*,*,1) | ||
13 | #INFO="Sample IDE setup" | ||
14 | DO_FSTAB="n"; | ||
15 | #DO_FSCK="y" ; | ||
16 | DO_MOUNT="y" | ||
17 | #FSTYPE="msdos" | ||
18 | #FSTYPE="auto" | ||
19 | #OPTS="" | ||
20 | #MOUNTPT="/mnt/ide" | ||
21 | ;; | ||
22 | *,*,*) | ||
23 | PARTS="1" | ||
24 | # Card eject policy options | ||
25 | NO_CHECK=n | ||
26 | NO_FUSER=y | ||
27 | ;; | ||
28 | esac | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts b/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts deleted file mode 100644 index 3e498297fc..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | # Wireless LAN adapter configuration | ||
2 | # | ||
3 | # Theory of operation : | ||
4 | # | ||
5 | # The script attempts to match a block of settings to the specific wireless | ||
6 | # card inserted, the *first* block matching the card is used. | ||
7 | # The address format is "scheme,socket,instance,hwaddr", with * as a wildcard. | ||
8 | # 'scheme' is the pcmcia scheme (set via 'cardctl scheme XXX'). | ||
9 | # 'hwaddr' is the unique MAC address identifier of the wireless card. | ||
10 | # The MAC address is usually printed on the card, or can be found via ifconfig. | ||
11 | # Some examples here use only half of the MAC address with a wildcard to | ||
12 | # match a whole family of cards... | ||
13 | # | ||
14 | # All the Wireless specific configuration is done through the Wireless | ||
15 | # Extensions, so we will just call 'iwconfig' with the right parameters | ||
16 | # defined below. | ||
17 | # Of course, you need to have iwconfig installled on your system. | ||
18 | # To download iwconfig, or for more info on Wireless Extensions : | ||
19 | # http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html | ||
20 | # | ||
21 | # Note : you don't need to fill all parameters, leave them blank, in most | ||
22 | # cases the driver will initialise itself with sane defaults values or | ||
23 | # automatically figure out the value... And no drivers do support all | ||
24 | # possible settings... | ||
25 | # | ||
26 | # If you make any mistakes, you'll get a cryptic message in the system | ||
27 | # log. You'll need to figure out on your own which parameter was wrong: | ||
28 | # cardmgr[310]: executing: './network start wvlan0' | ||
29 | # cardmgr[310]: + SIOCSIWMODE: Invalid argument | ||
30 | # I've tried to give more troubleshooting help at : | ||
31 | # http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html#debug | ||
32 | # In case of doubts, just check "/etc/pcmcia/wireless" for the gory details... | ||
33 | # | ||
34 | # Note also that this script will work only with the original Pcmcia scripts, | ||
35 | # and not with the default Red Hat scripts. Send a bug report to Red Hat ;-) | ||
36 | # | ||
37 | # Finally, send comments and flames to me, Jean Tourrilhes <jt@hpl.hp.com> | ||
38 | # | ||
39 | |||
40 | case "$ADDRESS" in | ||
41 | *,*,*,*) | ||
42 | INFO="Default Config" | ||
43 | ESSID=any | ||
44 | MODE=Managed | ||
45 | RATE=auto | ||
46 | ;; | ||
47 | esac | ||
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb deleted file mode 100644 index 018f33550f..0000000000 --- a/meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ /dev/null | |||
@@ -1,105 +0,0 @@ | |||
1 | DESCRIPTION = "Utilities and system configuration files for the Linux PCMCIA card services" | ||
2 | SECTION = "base" | ||
3 | PRIORITY = "required" | ||
4 | LICENSE = "GPL" | ||
5 | DEPENDS = "virtual/kernel" | ||
6 | RDEPENDS = "hostap-conf orinoco-conf" | ||
7 | PR = "r28" | ||
8 | |||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ | ||
10 | file://busybox.patch;patch=1 \ | ||
11 | file://network.patch;patch=1 \ | ||
12 | file://pcic-extra.patch;patch=1 \ | ||
13 | file://automount.patch;patch=1 \ | ||
14 | file://ratoc-cfu1u.patch;patch=1 \ | ||
15 | file://no-hostap-cards.patch;patch=1 \ | ||
16 | file://gcc4_fixes.patch;patch=1 \ | ||
17 | file://pcmcia \ | ||
18 | file://ide.opts \ | ||
19 | file://wireless.opts \ | ||
20 | file://network.conf \ | ||
21 | file://wnv.conf" | ||
22 | |||
23 | SRC_URI_append_spitz = " file://nocleanup.patch;patch=1" | ||
24 | SRC_URI_append_sh3 = " file://superh-noO3.patch;patch=1" | ||
25 | |||
26 | S = "${WORKDIR}/pcmcia-cs-${PV}" | ||
27 | |||
28 | INITSCRIPT_NAME = "pcmcia" | ||
29 | INITSCRIPT_PARAMS = "defaults" | ||
30 | |||
31 | inherit update-rc.d module-base | ||
32 | |||
33 | export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" | ||
34 | |||
35 | sbindir = "/sbin" | ||
36 | |||
37 | do_configure() { | ||
38 | touch .prereq.ok | ||
39 | touch config.out | ||
40 | cat >config.mk <<EOF | ||
41 | UCC=${CC} | ||
42 | UFLAGS=${CFLAGS} -I${S}/include | ||
43 | HAS_WORDEXP=y | ||
44 | SYSV_INIT=y | ||
45 | RC_DIR=/etc | ||
46 | CONFIG_PNP_BIOS=n | ||
47 | ARCH=${ARCH} | ||
48 | CONFIG_CARDBUS=n | ||
49 | CONFIG_PCMCIA=y | ||
50 | CONFIG_INET=y | ||
51 | CONFIG_SCSI=y | ||
52 | DO_IDE=y | ||
53 | EOF | ||
54 | cat >include/pcmcia/autoconf.h <<EOF | ||
55 | #define HAS_WORDEXP 1 | ||
56 | EOF | ||
57 | } | ||
58 | |||
59 | do_compile() { | ||
60 | oe_runmake all HAS_XPM= FLIBS="" XMANDIR="" | ||
61 | } | ||
62 | |||
63 | INSTALL_ETC = "ftl ide ieee1394 memory network parport scsi serial wireless" | ||
64 | INSTALL_ETC_DATA = "config config.opts ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared" | ||
65 | INSTALL_ETC_DATA_arm = "config ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared" | ||
66 | |||
67 | do_install() { | ||
68 | install -d ${D}${sbindir} | ||
69 | for f in cardmgr/cardctl cardmgr/cardmgr cardmgr/ide_info cardmgr/ifport cardmgr/ifuser cardmgr/pcinitrd flash/ftl_check flash/ftl_format | ||
70 | do | ||
71 | install -m 0755 $f ${D}${sbindir}/ | ||
72 | done | ||
73 | install -d ${D}${sysconfdir}/init.d \ | ||
74 | ${D}${sysconfdir}/pcmcia \ | ||
75 | ${D}${sysconfdir}/pcmcia/cis | ||
76 | |||
77 | install -m 0644 ${WORKDIR}/network.conf ${D}${sysconfdir}/pcmcia/ | ||
78 | install -m 0644 ${WORKDIR}/wnv.conf ${D}${sysconfdir}/pcmcia/ | ||
79 | |||
80 | for i in ${INSTALL_ETC}; do | ||
81 | install -m 0755 etc/${i} ${D}${sysconfdir}/pcmcia/ | ||
82 | done | ||
83 | for i in ${INSTALL_ETC_DATA}; do | ||
84 | install -m 0644 etc/${i} ${D}${sysconfdir}/pcmcia/ | ||
85 | done | ||
86 | |||
87 | # ensure that config.opts always exists, albeit empty | ||
88 | echo >> ${D}${sysconfdir}/pcmcia/config.opts | ||
89 | |||
90 | install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/ | ||
91 | install -m 0644 ${WORKDIR}/wireless.opts ${D}${sysconfdir}/pcmcia/ | ||
92 | for i in etc/cis/*; do | ||
93 | install -m 0644 $i ${D}${sysconfdir}/pcmcia/cis/ | ||
94 | done | ||
95 | install -m 0755 etc/rc.pcmcia ${D}${sysconfdir}/init.d/pcmcia | ||
96 | install -d ${D}${sysconfdir}/sysconfig | ||
97 | install -m 0755 ${WORKDIR}/pcmcia ${D}${sysconfdir}/sysconfig/pcmcia | ||
98 | } | ||
99 | |||
100 | PACKAGES =+ "${PN}-ftl ${PN}-pcinitrd" | ||
101 | |||
102 | FILES_${PN} = "${sbindir} ${sysconfdir}" | ||
103 | FILES_${PN}-ftl = "/sbin/ftl_format /sbin/ftl_check /etc/pcmcia/ftl*" | ||
104 | FILES_${PN}-pcinitrd = "/sbin/pcinitrd" | ||
105 | |||