Update of /cvsroot/leaf/src/bering-uclibc/apps/pcmca-cs
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3770
Modified Files:
buildtool.cfg pcmcia.default pcmcia.init
Removed Files:
pcmcia.mk
Log Message:
new config system
--- pcmcia.mk DELETED ---
Index: pcmcia.default
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/pcmca-cs/pcmcia.default,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pcmcia.default 8 Dec 2004 20:10:51 -0000 1.1
--- pcmcia.default 26 Jun 2006 18:17:10 -0000 1.2
***************
*** 1,2 ****
--- 1,6 ----
PCMCIA=yes
+ PCIC=yenta_socket
+ PCIC_OPTS=
+ CORE_OPTS=
CARDMGR_OPTS=-f
+ KM=/lib/modules/pcmcia
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/pcmca-cs/buildtool.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildtool.cfg 31 Jan 2005 22:30:34 -0000 1.9
--- buildtool.cfg 26 Jun 2006 18:17:10 -0000 1.10
***************
*** 57,61 ****
<pcmcia>
Version = 3.2.8
! Revision = 3
Help <<EOF
--- 57,61 ----
<pcmcia>
Version = 3.2.8
! Revision = 4
Help <<EOF
***************
*** 106,109 ****
--- 106,110 ----
Description = pcmcia default parameters
Type = conf
+ Type = local
Type = binary
Permissions = 644
***************
*** 144,161 ****
</File>
<File>
- Filename = var/lib/pcmcia
- Type = directory
- </File>
- <File>
- Filename = var/lib/pcmcia
- Type = list
- </File>
- <File>
- Filename = var/lib/pcmcia/stab
- Type = exclude
- </File>
- <File>
Filename = etc/pcmcia
! Type = list
</File>
</Contents>
--- 145,150 ----
</File>
<File>
Filename = etc/pcmcia
! Type = local
</File>
</Contents>
Index: pcmcia.init
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/pcmca-cs/pcmcia.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pcmcia.init 19 Dec 2004 15:43:43 -0000 1.2
--- pcmcia.init 26 Jun 2006 18:17:10 -0000 1.3
***************
*** 4,9 ****
RCDLINKS="2,S13 3,S13 4,S13 5,S13 0,K87 1,K87 6,K87"
# Save option values passed in through the environment
! for N in PCMCIA CARDMGR_OPTS SCHEME ; do
V=`eval echo '$'$N` ; if [ "$V" ] ; then eval ENV_$N=\"$V\" ; fi
done
--- 4,11 ----
RCDLINKS="2,S13 3,S13 4,S13 5,S13 0,K87 1,K87 6,K87"
+ KM=/lib/modules/pcmcia
+
# Save option values passed in through the environment
! for N in PCMCIA PCIC PCIC_OPTS CORE_OPTS CARDMGR_OPTS SCHEME ; do
V=`eval echo '$'$N` ; if [ "$V" ] ; then eval ENV_$N=\"$V\" ; fi
done
***************
*** 12,16 ****
. /etc/default/pcmcia
! for N in PCMCIA CARDMGR_OPTS SCHEME ; do
V=`eval echo '$'ENV_$N` ; if [ "$V" ] ; then eval $N=\"$V\" ; fi
done
--- 14,18 ----
. /etc/default/pcmcia
! for N in PCMCIA PCIC PCIC_OPTS CORE_OPTS CARDMGR_OPTS SCHEME ; do
V=`eval echo '$'ENV_$N` ; if [ "$V" ] ; then eval $N=\"$V\" ; fi
done
***************
*** 33,36 ****
--- 35,43 ----
for x in "1" ; do
+ if [ "$PCIC" = "" ] ; then
+ echo "PCIC module not defined in startup options!"
+ break
+ fi
+
if [ $# -lt 1 ] ; then usage ; break ; fi
action=$1
***************
*** 40,48 ****
start)
echo "Starting PCMCIA services:"
! SC=/var/lib/pcmcia/scheme
! RUN=/var/lib/pcmcia
if [ -L $SC -o ! -O $SC ] ; then rm -f $SC ; fi
if [ ! -f $SC ] ; then umask 022 ; touch $SC ; fi
if [ "$SCHEME" ] ; then umask 022 ; echo $SCHEME > $SC ; fi
if [ -s /var/run/cardmgr.pid ] && \
kill -0 `cat /var/run/cardmgr.pid` 2>/dev/null ; then
--- 47,62 ----
start)
echo "Starting PCMCIA services:"
! SC=/var/lib/misc/pcmcia-scheme
! RUN=/var/run
if [ -L $SC -o ! -O $SC ] ; then rm -f $SC ; fi
if [ ! -f $SC ] ; then umask 022 ; touch $SC ; fi
if [ "$SCHEME" ] ; then umask 022 ; echo $SCHEME > $SC ; fi
+ grep -q pcmcia /proc/devices
+ if [ $? -ne 0 ] ; then
+ echo " modules"
+ insmod $KM/pcmcia_core.o $CORE_OPTS
+ insmod $KM/$PCIC.o $PCIC_OPTS
+ insmod $KM/ds.o
+ fi
if [ -s /var/run/cardmgr.pid ] && \
kill -0 `cat /var/run/cardmgr.pid` 2>/dev/null ; then
***************
*** 52,58 ****
cat $RUN/stab | cleanup
fi
/sbin/cardmgr $CARDMGR_OPTS
fi
- echo "done."
touch /var/lock/pcmcia 2>/dev/null
EXITCODE=0
--- 66,72 ----
cat $RUN/stab | cleanup
fi
+ echo " cardmgr."
/sbin/cardmgr $CARDMGR_OPTS
fi
touch /var/lock/pcmcia 2>/dev/null
EXITCODE=0
***************
*** 64,67 ****
--- 78,82 ----
PID=`cat /var/run/cardmgr.pid`
kill $PID
+ echo -n " cardmgr"
# Give cardmgr a few seconds to handle the signal
for N in 1 2 3 4 5 1 2 3 4 5 1 2 3 4 5 ; do
***************
*** 70,74 ****
done
fi
! echo "done."
rm -f /var/lock/pcmcia
EXITCODE=0
--- 85,95 ----
done
fi
! if grep -q "^ds " /proc/modules ; then
! echo -n " modules"
! rmmod ds
! rmmod $PCIC
! rmmod pcmcia_core
! fi
! echo "."
rm -f /var/lock/pcmcia
EXITCODE=0
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
