Some updates to the CHANGES file. Also added support for not overwriting

wlan-ng.opts when the version codes are the same.  MAN! what a pain in
the butt!
This commit is contained in:
mark 2001-03-07 19:56:26 +00:00
parent 496e244ec5
commit e110ea8b48
6 changed files with 130 additions and 7 deletions

View File

@ -41,6 +41,12 @@
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
0.1.8
- Added pkundrat's 'chinfo' patch
- Added pkundrat's 'small fixes' patch
- Added some contributed patches supporting a fix to our 'reassoc
under load' problem
- Added wlannoenable pcmcia scheme support to prevent card initialization.
0.1.7
- Fixed the "converting eth in unknown mode" bug
- Added APM/ACPI suspend/resume handling

View File

@ -160,8 +160,90 @@ ask_str () {
write_str $2
}
mkversionh () {
versionh=src/include/wlan/version.h
cat > $versionh <<END
/* src/include/wlan/version.h
*
*
* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved.
* --------------------------------------------------------------------
*
* linux-wlan
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU Public License version 2 (the "GPL"), in which
* case the provisions of the GPL are applicable instead of the
* above. If you wish to allow the use of your version of this file
* only under the terms of the GPL and not to allow others to use
* your version of this file under the MPL, indicate your decision
* by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL. If you do not delete
* the provisions above, a recipient may use your version of this
* file under either the MPL or the GPL.
*
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
* made directly to:
*
* AbsoluteValue Systems Inc.
* info@linux-wlan.com
* http://www.linux-wlan.com
*
* --------------------------------------------------------------------
*
* Portions of the development of this software were funded by
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
*/
END
printf '#define WLAN_RELASE\t\"%d.%d.%d%s\"\n' \
${WLAN_VERSION} \
${WLAN_PATCHLEVEL} \
${WLAN_SUBLEVEL} \
${WLAN_EXTRAVERSION} >> $versionh
printf '#define WLAN_RELEASE_CODE 0x%02x%02x%02x\n' \
${WLAN_VERSION} \
${WLAN_PATCHLEVEL} \
${WLAN_SUBLEVEL} >> $versionh
}
#=======================================================================
# Dump the version variables
dump_str "WLAN_VERSION=$WLAN_VERSION"
dump_str "WLAN_PATCHLEVEL=$WLAN_PATCHLEVEL"
dump_str "WLAN_SUBLEVEL=$WLAN_SUBLEVEL"
dump_str "WLAN_EXTRAVERSION=$WLAN_EXTRAVERSION"
# If the src/include/wlan/version.h file needs a touchup, fix or create it
if [ -r src/include/wlan/version.h ]; then
WLAN_RELEASE="${WLAN_VERSION}.${WLAN_PATCHLEVEL}.${WLAN_SUBLEVEL}${WLAN_EXTRAVERSION}"
OLD_RELEASE=`sed --quiet -e '/#define.*WLAN_RELEASE[^_].*\"\(.*\)\"/s//\1/p' < src/include/wlan/version.h`
echo ${WLAN_RELEASE}
echo ${OLD_RELEASE}
if [ "${WLAN_RELEASE}" != "${OLD_RELEASE}" ]; then
# Overwrite the file
mkversionh
fi
else
# File doesn't exist, create it
mkversionh
fi
$ECHO ""
$ECHO "-------------- Linux WLAN Configuration Script -------------"
$ECHO ""

View File

@ -65,6 +65,7 @@ clean:
rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
rm -f config.mk config.new
rm -f src/include/wlan/version.h
install:
set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done

View File

@ -1,3 +1,7 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=1
WLAN_SUBLEVEL=8
WLAN_EXTRAVERSION=
LINUX_SRC=/usr/src/linux
WLAN_TARGET_ARCH=
PCMCIA_SRC=

View File

@ -51,23 +51,48 @@ clean:
echo "Nothing to do"
install:
set -x; \
if [ -f $(TARGET_PCMCIA_DIR)/wlan-ng ]; then \
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng $(TARGET_PCMCIA_DIR)/wlan-ng.O ; \
fi ; \
cp wlan-ng $(TARGET_PCMCIA_DIR) ; \
chmod +x $(TARGET_PCMCIA_DIR)/wlan-ng ; \
mkwlanopts () { \
sed -e '/WLAN_VERSION=.*/s//WLAN_VERSION=$(WLAN_VERSION)/' \
-e '/WLAN_PATCHLEVEL=.*/s//WLAN_PATCHLEVEL=$(WLAN_PATCHLEVEL)/' \
-e '/WLAN_SUBLEVEL=.*/s//WLAN_SUBLEVEL=$(WLAN_SUBLEVEL)/' \
-e '/WLAN_EXTRAVERSION=.*/s//WLAN_EXTRAVERSION=$(WLAN_EXTRAVERSION)/' \
< ./wlan-ng.opts > $(TARGET_PCMCIA_DIR)/wlan-ng.opts; \
} ; \
if [ -f $(TARGET_PCMCIA_DIR)/wlan-ng.opts ]; then \
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng.opts $(TARGET_PCMCIA_DIR)/wlan-ng.opts.O ; \
if grep -s WLAN_VERSION $(TARGET_PCMCIA_DIR)/wlan-ng.opts; then \
mkver=$(WLAN_VERSION).$(WLAN_PATCHLEVEL).$(WLAN_SUBLEVEL)$(WLAN_EXTRAVERSION); \
eval `grep "WLAN_VERSION=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
eval `grep "WLAN_PATCHLEVEL=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
eval `grep "WLAN_SUBLEVEL=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
eval `grep "WLAN_EXTRAVERSION=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
oldver=$$WLAN_VERSION.$$WLAN_PATCHLEVEL.$$WLAN_SUBLEVEL$$WLAN_EXTRAVERSION; \
echo mkver= $$mkver; \
echo oldver= $$oldver; \
if [ $$mkver != $$oldver ]; then \
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng.opts $(TARGET_PCMCIA_DIR)/wlan-ng.opts.O ; \
mkwlanopts ; \
fi; \
else \
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng.opts $(TARGET_PCMCIA_DIR)/wlan-ng.opts.O ; \
mkwlanopts ; \
fi; \
else \
mkwlanopts ; \
fi ; \
cp wlan-ng.opts $(TARGET_PCMCIA_DIR) ; \
chmod +x $(TARGET_PCMCIA_DIR)/wlan-ng ; \
chmod +x $(TARGET_PCMCIA_DIR)/wlan-ng.opts ; \
if [ -f $(TARGET_PCMCIA_DIR)/wlan-ng.conf ]; then \
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng.conf $(TARGET_PCMCIA_DIR)/wlan-ng.conf.O ; \
fi ; \
cp wlan-ng.conf $(TARGET_PCMCIA_DIR) ; \
if ! grep -sq 'source.*\.\/\*\.conf$$' $(TARGET_PCMCIA_DIR)/config ; then \
if ! grep -sq 'source \.\/wlan-ng.conf' $(TARGET_PCMCIA_DIR)/config ; then \
mv -f $(TARGET_PCMCIA_DIR)/config $(TARGET_PCMCIA_DIR)/config.O ; \
( echo "source ./wlan-ng.conf"; cat $(TARGET_PCMCIA_DIR)/config.O) > $(TARGET_PCMCIA_DIR)/config ; \
fi ; \
if ! grep -sq 'source \.\/wlan-ng.conf' $(TARGET_PCMCIA_DIR)/config ; then \
mv -f $(TARGET_PCMCIA_DIR)/config $(TARGET_PCMCIA_DIR)/config.O ; \
( echo "source ./wlan-ng.conf"; cat $(TARGET_PCMCIA_DIR)/config.O) > $(TARGET_PCMCIA_DIR)/config ; \
fi ; \
fi

View File

@ -49,6 +49,11 @@
#
# --------------------------------------------------------------------
WLAN_VERSION=
WLAN_PATCHLEVEL=
WLAN_SUBLEVEL=
WLAN_EXTRAVERSION=
case "$ADDRESS" in
wlannoenable,*,*,*)
#=======ENABLE========================================