Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4416/scripts
Modified Files:
Tag: rel-1-2-patches
hostap-driver hostap-utils hostapd
Log Message:
- updated hostap-driver to 0.3.9
- updated hostap-utils to 0.3.7
- updated hostapd to 0.3.9
- moved hostapd config files to /etc/hostapd/
Index: hostapd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/hostapd,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- hostapd 11 Jan 2004 14:43:04 -0000 1.2
+++ hostapd 24 Nov 2005 19:25:18 -0000 1.2.2.1
@@ -32,6 +32,7 @@
case $1 in
build )
if [ "$CONFIG_HOSTAPD" = "y" ]; then
+ cp -v $MYDIR/config/hostapd_config .config || exit 1
make || exit 1
strip_debug
fi
@@ -39,19 +40,20 @@
install )
if [ "$CONFIG_HOSTAPD" = "y" ]; then
- mkdir -p $MY_BINDIR || exit1
- mkdir -p $MY_DOCDIR || exit1
+ mkdir -p $MY_BINDIR || exit 1
+ mkdir -p $MY_DOCDIR || exit 1
- cp -dp hostapd $MY_BINDIR ||exit1
+ cp -dp hostapd $MY_BINDIR ||exit 1
+ cp -dp hostapd_cli $MY_BINDIR ||exit 1
cp -dp $MYDIR/scripts/hostapd $ETCDIR/etc/init.d || exit 1
- cp -dp hostapd.conf $ETCDIR/etc || exit1
- cp -dp hostapd.accept $ETCDIR/etc || exit1
- cp -dp hostapd.deny $ETCDIR/etc || exit1
- chmod 600 $ETCDIR/etc/hostapd.conf || exit1
- chmod 600 $ETCDIR/etc/hostapd.accept || exit1
- chmod 600 $ETCDIR/etc/hostapd.deny || exit1
+ mkdir -p $ETCDIR/etc/hostapd || exit 1
+ cp -dpv $(ls hostapd.* | grep -v "hostapd.[cdoh]" ) $ETCDIR/etc/hostapd || exit 1
+ cp -dpv *.conf $ETCDIR/etc/hostapd || exit 1
+ replace_str $ETCDIR/etc/hostapd/hostapd.conf /etc/ /etc/hostapd/
+ rm $ETCDIR/etc/hostapd/*.old || exit 1
+ chmod -R 600 $ETCDIR/etc/hostapd || exit 1
- cp -dp README $MY_DOCDIR/README.daemon || exit1
+ cp -dp README $MY_DOCDIR/README.daemon || exit 1
echo "# Start hostapd?" >> $CONFIGFILE
echo "START_$MYNAME=no" >> $CONFIGFILE
Index: hostap-utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/hostap-utils,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- hostap-utils 11 Jan 2004 14:43:04 -0000 1.2
+++ hostap-utils 24 Nov 2005 19:25:18 -0000 1.2.2.1
@@ -39,19 +39,20 @@
install )
if [ "$CONFIG_HOSTAP_UTILS" = "y" ]; then
- mkdir -p $MY_BINDIR || exit1
- mkdir -p $MY_DOCDIR || exit1
+ mkdir -p $MY_BINDIR || exit 1
+ mkdir -p $MY_DOCDIR || exit 1
- cp -dp hostap_crypt_conf $MY_BINDIR || exit1
- cp -dp hostap_diag $MY_BINDIR || exit1
- cp -dp hostap_io_debug $MY_BINDIR || exit1
- cp -dp hostap_rid $MY_BINDIR || exit1
- cp -dp prism2_param $MY_BINDIR || exit1
- cp -dp prism2_srec $MY_BINDIR || exit1
- cp -dp split_combined_hex $MY_BINDIR || exit1
+ cp -dpv hostap_crypt_conf $MY_BINDIR || exit 1
+ cp -dpv hostap_diag $MY_BINDIR || exit 1
+ cp -dpv hostap_fw_load $MY_BINDIR || exit 1
+ cp -dpv hostap_io_debug $MY_BINDIR || exit 1
+ cp -dpv hostap_rid $MY_BINDIR || exit 1
+ cp -dpv prism2_param $MY_BINDIR || exit 1
+ cp -dpv prism2_srec $MY_BINDIR || exit 1
+ cp -dpv split_combined_hex $MY_BINDIR || exit 1
- cp README $MY_DOCDIR/README.utils || exit1
- cp ChangeLog $MY_DOCDIR/ChangeLog.utils || exit1
+ cp README $MY_DOCDIR/README.utils || exit 1
+ cp ChangeLog $MY_DOCDIR/ChangeLog.utils || exit 1
echo "HELP_$MYNAME=\"$MYNAME are utilities for hostap driver\"" >> $SOFTWAREHELP
Index: hostap-driver
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/hostap-driver,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- hostap-driver 26 Jun 2004 13:49:28 -0000 1.4.2.1
+++ hostap-driver 24 Nov 2005 19:25:18 -0000 1.4.2.2
@@ -36,11 +36,9 @@
# disable depmod's , breaking compile on systems with newer kernel
sed -i 's%/sbin/depmod -ae%#/sbin/depmod -ae%' Makefile
if [ "$CONFIG_PCMCIA_CS" = "y" ] && [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
- make pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \
- -e KERNEL_PATH=$KERNELDIR PCMCIA_PATH=$PCMCIADIR || exit 1
+ make all -e KERNEL_PATH=$KERNELDIR PCMCIA_PATH=$PCMCIADIR || exit 1
else
- make pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \
- -e KERNEL_PATH=$KERNELDIR || exit 1
+ make all -e KERNEL_PATH=$KERNELDIR || exit 1
fi
strip_debug
fi
@@ -48,23 +46,25 @@
install )
if [ "$CONFIG_HOSTAP_DRIVER" = "y" ]; then
- mkdir -p $MY_BINDIR
- mkdir -p $MY_DOCDIR
-
- make install_pci -e MODPATH=$CDDIR/lib/modules/$KERNELVERSION \
- KERNEL_PATH=$KERNELDIR || exit 1
- make install_plx -e MODPATH=$CDDIR/lib/modules/$KERNELVERSION \
- KERNEL_PATH=$KERNELDIR || exit 1
- mkdir -p $ETCDIR/etc/pcmcia || exit 1
- make install_pccard -e MODPATH=$CDDIR/lib/modules/$KERNELVERSION DESTDIR=$ETCDIR \
- KERNEL_PATH=$KERNELDIR || exit 1
+ mkdir -p $TMPDIR/etc/pcmcia || exit 1
+ mkdir -p $TMPDIR/lib/modules/$KERNELVERSION || exit 1
+ if [ "$CONFIG_PCMCIA_CS" = "y" ] && [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+ make install install_conf -e KERNEL_PATH=$KERNELDIR PCMCIA_PATH=$PCMCIADIR DESTDIR=$TMPDIR || exit 1
+ else
+ make install install_conf -e KERNEL_PATH=$KERNELDIR DESTDIR=$TMPDIR || exit 1
+ fi
+
+ cp -dpvR $TMPDIR/lib $CDDIR/ || exit 1
+ cp -dpvR $TMPDIR/etc $ETCDIR/ || exit 1
- cp -dp README $MY_DOCDIR/README.driver || exit1
- cp -dp ChangeLog $MY_DOCDIR/ChangeLog.driver || exit1
- cp -dp COPYING $MY_DOCDIR/COPYING || exit1
+ cp -dp README $MY_DOCDIR/README.driver || exit 1
+ cp -dp ChangeLog $MY_DOCDIR/ChangeLog.driver || exit 1
+ cp -dp COPYING $MY_DOCDIR/COPYING || exit 1
echo "HELP_$MYNAME=\"$MYNAME is an Access Point driver for the Intersil Prism2/2.5 chipset\"" >> $SOFTWAREHELP
+ rm -rf $TMPDIR || exit 1
+
fi
;;
|
