diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /pcmcia-cs | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'pcmcia-cs')
-rw-r--r-- | pcmcia-cs/files/arm/pcmcia | 17 | ||||
-rw-r--r-- | pcmcia-cs/files/network.conf | 0 | ||||
-rw-r--r-- | pcmcia-cs/files/pcmcia | 1 | ||||
-rw-r--r-- | pcmcia-cs/files/wnv.conf | 0 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch | 20 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.8/ide.opts | 25 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.8/network.patch | 92 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch | 0 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts | 47 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs_3.2.8.bb | 0 |
10 files changed, 0 insertions, 202 deletions
diff --git a/pcmcia-cs/files/arm/pcmcia b/pcmcia-cs/files/arm/pcmcia deleted file mode 100644 index 3dc330db21..0000000000 --- a/pcmcia-cs/files/arm/pcmcia +++ /dev/null @@ -1,17 +0,0 @@ -case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in - *XScale-PXA2*) - PCIC=pxa_cs - ;; - *StrongARM-1100* | *StrongARM-1110*) - PCIC=sa1100_cs - ;; - *) - echo "Unable to determine PCIC value for this CPU" - exit 1 - ;; -esac - -if grep -q iPAQ /proc/cpuinfo; then - PCIC_EXTRA=h3600_generic_sleeve -fi - diff --git a/pcmcia-cs/files/network.conf b/pcmcia-cs/files/network.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/pcmcia-cs/files/network.conf +++ /dev/null diff --git a/pcmcia-cs/files/pcmcia b/pcmcia-cs/files/pcmcia deleted file mode 100644 index c42fea0691..0000000000 --- a/pcmcia-cs/files/pcmcia +++ /dev/null @@ -1 +0,0 @@ -# no defaults for /etc/sysconfig/pcmcia diff --git a/pcmcia-cs/files/wnv.conf b/pcmcia-cs/files/wnv.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/pcmcia-cs/files/wnv.conf +++ /dev/null diff --git a/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch b/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch deleted file mode 100644 index 7237f3b813..0000000000 --- a/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pcmcia-cs-3.2.3/etc/shared~ide 2003-03-11 10:26:14.000000000 -0600 -+++ pcmcia-cs-3.2.3/etc/shared 2003-03-11 10:32:39.000000000 -0600 -@@ -57,7 +57,7 @@ - fi - if is_true $DO_MOUNT ; then - O=${OPTS:+-o $OPTS} ; FS=${FSTYPE:+-t $FSTYPE} -- log mount -v $O $FS $1 $MOUNTPT || return 1 -+ log mount $O $FS $1 $MOUNTPT || return 1 - fi - return 0 - } -@@ -85,7 +85,7 @@ - test -b $1 || return 1 - do_fuser -k -m $1 > /dev/null - if mount | grep -q "$1 on" ; then -- log umount -v $1 || return 1 -+ log umount $1 || return 1 - fi - if is_true $DO_FSTAB ; then - grep -v $1 /etc/fstab > /etc/fstab.N diff --git a/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts b/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts deleted file mode 100644 index e28cccda1a..0000000000 --- a/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts +++ /dev/null @@ -1,25 +0,0 @@ -# ATA/IDE drive adapter configuration -# -# The address format is "scheme,socket,serial_no[,part]". -# -# For multi-partition devices, first return list of partitions in -# $PARTS. Then, we'll get called for each partition. -# -case "$ADDRESS" in -*,*,*,1) - #INFO="Sample IDE setup" - DO_FSTAB="y"; - #DO_FSCK="y" ; - DO_MOUNT="y" - #FSTYPE="msdos" - #FSTYPE="auto" - #OPTS="" - #MOUNTPT="/mnt/ide" - ;; -*,*,*) - PARTS="1" - # Card eject policy options - NO_CHECK=n - NO_FUSER=y - ;; -esac diff --git a/pcmcia-cs/pcmcia-cs-3.2.8/network.patch b/pcmcia-cs/pcmcia-cs-3.2.8/network.patch deleted file mode 100644 index fb808e209c..0000000000 --- a/pcmcia-cs/pcmcia-cs-3.2.8/network.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- pcmcia-cs/etc/network.old 2004-07-01 00:31:59.000000000 +0100 -+++ pcmcia-cs/etc/network 2004-07-01 00:32:57.000000000 +0100 -@@ -31,16 +31,39 @@ - - RESOLV=/etc/resolv.conf - -+# if this interface has an entry in /etc/network/interfaces, let ifupdown -+# handle it -+if grep -q "iface \+$DEVICE" /etc/network/interfaces; then -+ case $ACTION in -+ start) -+ ifup $DEVICE -+ ;; -+ stop) -+ ifdown $DEVICE -+ ;; -+ restart) -+ ifdown $DEVICE -+ ifup $DEVICE -+ ;; -+ esac -+ -+ exit 0 -+fi -+ -+## see if it is a wireless card. Jamey and AntiProxy -+CHECK_WIRELESS=`grep "$DEVICE" /proc/net/wireless` -+if [ -n "$CHECK_WIRELESS" ] ; then - # Now, run the specific script for Wireless LAN interfaces - # Note : we need the wireless parameters to be set up before IP parameters, - # so that we can perform DHCP over the Wireless link if needed. Jean II --O_INFO=$INFO ; INFO= --if [ -x ./wireless ] ; then -- . ./wireless --else -- . /etc/pcmcia/wireless -+ O_INFO=$INFO ; INFO= -+ if [ -x ./wireless ] ; then -+ . ./wireless -+ else -+ . /etc/pcmcia/wireless -+ fi -+ INFO=$O_INFO - fi --INFO=$O_INFO - - bootp_setup () - { -@@ +225,6 -188,11 @@ - fi - /sbin/dhcpcd -XYZZY 2>&1 | grep -q DHCP || \ - rm -f /var/run/dhcpcd-$DEVICE.pid -+ # modified for udhcpc -+ elif [ -x /sbin/udhcpc ] ; then -+ PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null` -+ if [ -n "$PID" ] ; then kill -TERM $PID ; fi -+ # end of modification - elif [ -x /sbin/dhclient ] ; then - PID=`cat /var/run/dhclient.pid 2>/dev/null` - if [ -n "$PID" ] ; then kill -TERM $PID ; fi -@@ +282,7 -250,30 @@ - [ -n "$IPADDR" ] && /sbin/ifconfig $DEVICE down up - ;; - -+'resume') -+ #logger RESUME EVENT PCMCIA SEEN FROM CARDMGR -+ if [ -z "$IPADDR" ] || is_true $DHCP ; then -+ if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then -+ PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null` -+ if [ -n "$PID" ] ; then -+ kill -USR1 $PID -+ fi -+ fi -+ fi -+ ;; -+ -+'suspend') -+ #logger SUSPEND EVENT SEEN FROM CARDMGR -+# ## uncomment this code below if you get problems where -+# ## you are getting in IP conflict upon resume on DHCP networks -+# if [ -z "$IPADDR" ] || is_true $DHCP ; then -+# if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then -+# PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null` -+# if [ -n "$PID" ] ; then -+# ifconfig $DEVICE 0.0.0.0 -+# fi -+# fi -+# fi --'suspend'|'resume') - ;; - - *) diff --git a/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch +++ /dev/null diff --git a/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts b/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts deleted file mode 100644 index 3e498297fc..0000000000 --- a/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts +++ /dev/null @@ -1,47 +0,0 @@ -# Wireless LAN adapter configuration -# -# Theory of operation : -# -# The script attempts to match a block of settings to the specific wireless -# card inserted, the *first* block matching the card is used. -# The address format is "scheme,socket,instance,hwaddr", with * as a wildcard. -# 'scheme' is the pcmcia scheme (set via 'cardctl scheme XXX'). -# 'hwaddr' is the unique MAC address identifier of the wireless card. -# The MAC address is usually printed on the card, or can be found via ifconfig. -# Some examples here use only half of the MAC address with a wildcard to -# match a whole family of cards... -# -# All the Wireless specific configuration is done through the Wireless -# Extensions, so we will just call 'iwconfig' with the right parameters -# defined below. -# Of course, you need to have iwconfig installled on your system. -# To download iwconfig, or for more info on Wireless Extensions : -# http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html -# -# Note : you don't need to fill all parameters, leave them blank, in most -# cases the driver will initialise itself with sane defaults values or -# automatically figure out the value... And no drivers do support all -# possible settings... -# -# If you make any mistakes, you'll get a cryptic message in the system -# log. You'll need to figure out on your own which parameter was wrong: -# cardmgr[310]: executing: './network start wvlan0' -# cardmgr[310]: + SIOCSIWMODE: Invalid argument -# I've tried to give more troubleshooting help at : -# http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html#debug -# In case of doubts, just check "/etc/pcmcia/wireless" for the gory details... -# -# Note also that this script will work only with the original Pcmcia scripts, -# and not with the default Red Hat scripts. Send a bug report to Red Hat ;-) -# -# Finally, send comments and flames to me, Jean Tourrilhes <jt@hpl.hp.com> -# - -case "$ADDRESS" in -*,*,*,*) - INFO="Default Config" - ESSID=any - MODE=Managed - RATE=auto - ;; -esac diff --git a/pcmcia-cs/pcmcia-cs_3.2.8.bb b/pcmcia-cs/pcmcia-cs_3.2.8.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ /dev/null |