Update of /cvsroot/leaf/src/bering-uclibc/apps/madwifi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28020
Modified Files:
buildtool.cfg buildtool.mk madwifi-cvs-current.tar.bz2
Added Files:
err.c madwifi_tools.patch
Log Message:
updates and debug package by Paul Traina
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/madwifi/buildtool.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.mk 25 Mar 2005 21:34:01 -0000 1.1
--- buildtool.mk 6 Aug 2005 17:32:04 -0000 1.2
***************
*** 11,14 ****
--- 11,16 ----
$(MADWIFI_DIR)/.source:
bzcat $(MADWIFI_SOURCE) | tar -xvf -
+ cp $(ERR_C) $(MADWIFI_DIR)/tools
+ cat $(MADWIFI_TOOLS_PATCH) | (cd $(MADWIFI_DIR) ; patch -p1)
touch $(MADWIFI_DIR)/.source
--- NEW FILE: madwifi_tools.patch ---
--- madwifi/Makefile 2005-07-12 17:35:11.000000000 -0700
+++ madwifi.x/Makefile 2005-08-03 14:12:14.276709184 -0700
@@ -44,7 +44,7 @@
include Makefile.inc
# NB: the order is important here
-DIRS= ${ATH_HAL} ${ATH_RATE} ${WLAN} ${ATH}
+DIRS= ${ATH_HAL} ${ATH_RATE} ${WLAN} ${ATH} ${TOOLS}
all: configcheck
mkdir -p ${SYMBOLSDIR}
--- madwifi/Makefile.inc 2005-07-13 17:35:49.000000000 -0700
+++ madwifi.x/Makefile.inc 2005-08-03 14:13:16.986332618 -0700
@@ -152,6 +152,10 @@
AWK= awk
#
+# Path to the debugging tools
+#
+TOOLS= ${DEPTH}/tools
+#
# Path to the HAL source code.
#
ifeq ($(HAL),)
--- madwifi/tools/Makefile 2005-02-16 08:09:10.000000000 -0800
+++ madwifi.x/tools/Makefile 2005-08-03 14:12:14.277709035 -0700
@@ -26,7 +26,7 @@
#
DEPTH= ..
-BINDIR= /usr/local/bin
+BINDIR= /usr/sbin
include ${DEPTH}/Makefile.inc
@@ -37,25 +37,27 @@
INCS+= -I. -I${HAL} -I${HAL}/linux -I${ATH_HAL} -I${WLAN} -I${DEPTH}
CFLAGS= ${INCS} -g
-LDFLAGS=
+LDFLAGS= err.o
all: ${ALL}
-athstats: athstats.c
+err.o: err.c
+
+athstats: athstats.c err.o
${CC} -o athstats ${CFLAGS} -I../ath ${LDFLAGS} athstats.c
-80211stats: 80211stats.c
+80211stats: 80211stats.c err.o
${CC} -o 80211stats ${CFLAGS} ${LDFLAGS} 80211stats.c
-athkey: athkey.c
+athkey: athkey.c err.o
${CC} -o athkey ${CFLAGS} ${LDFLAGS} athkey.c
-athctrl: athctrl.c
+athctrl: athctrl.c err.o
${CC} -o athctrl ${CFLAGS} ${LDFLAGS} athctrl.c
-athdebug: athdebug.c
+athdebug: athdebug.c err.o
${CC} -o athdebug ${CFLAGS} ${LDFLAGS} athdebug.c
-80211debug: 80211debug.c
+80211debug: 80211debug.c err.o
${CC} -o 80211debug ${CFLAGS} ${LDFLAGS} 80211debug.c
install: ${ALL_INSTALL}
for i in ${ALL_INSTALL}; do \
- cp $$i ${DESTDIR}${BINDIR}; \
+ install -c -s $$i ${DESTDIR}${BINDIR}; \
done
clean:
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/madwifi/buildtool.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.cfg 25 Mar 2005 21:34:01 -0000 1.1
--- buildtool.cfg 6 Aug 2005 17:32:04 -0000 1.2
***************
*** 11,12 ****
--- 11,78 ----
EnvName = MADWIFI_SOURCE
</File>
+
+ # The err.c part of the patch is uClibc-0.9.20 specific
+ <File madwifi_tools.patch>
+ Server = cvs-sourceforge
+ Directory = madwifi
+ revision = HEAD
+ EnvName = MADWIFI_TOOLS_PATCH
+ </File>
+
+ <File err.c>
+ Server = cvs-sourceforge
+ Directory = madwifi
+ revision = HEAD
+ EnvName = ERR_C
+ </File>
+
+ <Package>
+ <madwifi>
+ Version cvs20050803
+ Revision = 1
+
+ Help <<EOF
+ Debugging/hacking tools for MADWIFI drivers
+ Homepage: http://madwifi.sourceforge.net
+
+ LEAF package by __PACKAGER__, __BUILDDATE__
+
+ This package is not necessary to use the MADWIFI
+ drivers, but can be handy if you're doing debugging.
+ Don't bother to load it unless you need these tools.
+ EOF
+
+ <Permissions>
+ Files = 755
+ Directories = 755
+ </Permissions>
+
+ <Owner>
+ Files = root:root
+ Directories = root:root
+ </Owner>
+
+ <Contents>
+ <File>
+ Filename = usr/sbin/athstats
+ Source = usr/sbin/athstats
+ Type = binary
+ </File>
+ <File>
+ Filename = usr/sbin/80211stats
+ Source = usr/sbin/80211stats
+ Type = binary
+ </File>
+ <File>
+ Filename = usr/sbin/athdebug
+ Source = usr/sbin/athdebug
+ Type = binary
+ </File>
+ <File>
+ Filename = usr/sbin/80211debug
+ Source = usr/sbin/80211debug
+ Type = binary
+ </File>
+ </Contents>
+ </madwifi>
+ </Package>
Index: madwifi-cvs-current.tar.bz2
===================================================================
RCS file:
/cvsroot/leaf/src/bering-uclibc/apps/madwifi/madwifi-cvs-current.tar.bz2,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsUbLvXU and /tmp/cvsRyCJ97 differ
--- NEW FILE: err.c ---
/* Copyright (C) 2004 Manuel Novoa III <[EMAIL PROTECTED]>
*
* GNU Library General Public License (LGPL) version 2 or later.
*
* Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details.
**** WARNING: this ripoff from uclibc is no longer thread safe!
*/
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <errno.h>
#include <err.h>
extern const char *__progname;
static void vwarn_work(const char *format, va_list args, int showerr)
{
/* 0123 45678 9 a b*/
static const char fmt[] = "%s: \0: %s\n\0\n";
const char *f;
char buf[64];
/* Do this first, in case something below changes errno. */
f = fmt + 11; /* At 11. */
if (showerr) {
f -= 4; /* At 7. */
strerror_r(errno, buf, sizeof(buf));
}
fprintf(stderr, fmt, __progname);
if (format) {
vfprintf(stderr, format, args);
f -= 2; /* At 5 (showerr) or 9.
*/
}
fprintf(stderr, f, buf);
}
extern void warn(const char *format, ...)
{
va_list args;
va_start(args, format);
vwarn(format, args);
va_end(args);
}
extern void vwarn(const char *format, va_list args)
{
vwarn_work(format, args, 1);
}
extern void warnx(const char *format, ...)
{
va_list args;
va_start(args, format);
vwarnx(format, args);
va_end(args);
}
extern void vwarnx(const char *format, va_list args)
{
vwarn_work(format, args, 0);
}
extern void err(int status, const char *format, ...)
{
va_list args;
va_start(args, format);
verr(status, format, args);
/* This should get optimized away. We'll leave it now for safety. */
va_end(args);
}
extern void verr(int status, const char *format, va_list args)
{
vwarn(format, args);
exit(status);
}
extern void errx(int status, const char *format, ...)
{
va_list args;
va_start(args, format);
verrx(status, format, args);
/* This should get optimized away. We'll leave it now for safety. */
va_end(args);
}
extern void verrx(int status, const char *format, va_list args)
{
vwarnx(format, args);
exit(status);
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
