From c1a44808789ba0f06aac27e7457d1f284065cd81 Mon Sep 17 00:00:00 2001 From: yogib Date: Sun, 5 Dec 2004 17:45:02 +0000 Subject: [PATCH] - updated to 3.4.1.0 Changed files: atmelwlandriver-makefile.patch -> 1.9 atmelwlandriver-winter-makefile.patch -> 1.2 atmelwlandriver.spec -> 1.29 --- atmelwlandriver-makefile.patch | 198 +++++++++++++++++++------- atmelwlandriver-winter-makefile.patch | 8 +- atmelwlandriver.spec | 56 ++++---- 3 files changed, 178 insertions(+), 84 deletions(-) diff --git a/atmelwlandriver-makefile.patch b/atmelwlandriver-makefile.patch index 4cbdff5..4890ce4 100644 --- a/atmelwlandriver-makefile.patch +++ b/atmelwlandriver-makefile.patch @@ -1,10 +1,10 @@ -diff -dur atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kernelv2.6 ---- atmelwlandriver.orig/Makefile.kernelv2.6 2004-08-25 05:17:05.000000000 +0200 -+++ atmelwlandriver/Makefile.kernelv2.6 2004-08-30 21:22:33.286984975 +0200 +diff -urN atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kernelv2.6 +--- atmelwlandriver.orig/Makefile.kernelv2.6 2004-12-05 14:16:10.000000000 +0100 ++++ atmelwlandriver/Makefile.kernelv2.6 2004-12-05 14:25:12.000000000 +0100 @@ -5,15 +5,13 @@ SCRIPTSDIR=$(TOPDIR)/scripts INC=$(TOPDIR)/src/includes - VERSION=3.4.0.2 + VERSION=3.4.1.0 -MINOR_NUMBER=$(shell uname -r | cut -d . -f 3 | cut -d - -f 1) ID:=$(shell id -u) tmpDIR:=/tmp/atm$(shell date +%S.%s) @@ -18,7 +18,7 @@ diff -dur atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kern PCMCIA_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/pcmcia PCI_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/net USB_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/usb -@@ -99,34 +97,15 @@ +@@ -101,34 +99,15 @@ $(all_targets): %: @echo Building $@ @if [ ! -d $(OBJDIR)/$@ ]; then echo Bootstraping target $@; mkdir $(OBJDIR)/$@; fi @@ -54,46 +54,19 @@ diff -dur atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kern (cd $(OBJDIR)/$@/release; make) ; \ fi -diff -dur atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmcia_Pci/Makefile ---- atmelwlandriver.orig/src/Pcmcia_Pci/Makefile 2004-08-25 05:17:04.000000000 +0200 -+++ atmelwlandriver/src/Pcmcia_Pci/Makefile 2004-08-30 21:21:59.985610940 +0200 -@@ -5,22 +5,7 @@ - include .lastbuild - endif - --ARCH=$(shell uname -m) --VR:=$(shell uname -r) --ID:=$(shell id -u) --ifneq ($(VR),$(UNAME)) --this: --# @echo -ne "\\033[1;31m" -- @echo -ne "Running kernel doesn't match with the source" --# @echo -ne "\\033[0;39m" -- @echo --endif -- --CC:=gcc --CDEBUG:= -DPCMCIA_DEBUG=1 --DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) -fno-optimize-sibling-calls --CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h --CFLAGS := -DLINUX_OS -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) -+CFLAGS += -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) - PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include - srcs := card.c command.c common.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c - pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs)) -diff -dur atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/apps/cmd_line/Makefile ---- atmelwlandriver.orig/src/apps/cmd_line/Makefile 2004-08-25 05:17:04.000000000 +0200 -+++ atmelwlandriver/src/apps/cmd_line/Makefile 2004-08-30 21:21:59.988610523 +0200 -@@ -1,22 +1,8 @@ +diff -urN atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/apps/cmd_line/Makefile +--- atmelwlandriver.orig/src/apps/cmd_line/Makefile 2004-12-05 14:16:10.000000000 +0100 ++++ atmelwlandriver/src/apps/cmd_line/Makefile 2004-12-05 14:56:25.000000000 +0100 +@@ -1,22 +1,9 @@ -KERNEL_VERSION_NUMBER=$(shell uname -r | cut -d . -f 2) - -ifeq '$(KERNEL_VERSION_NUMBER)' '4' -include $(TOPDIR)/.config -endif -- + OBJs=../../../objs -FLAGS1:=-Wall -DATMEL_WLAN -DATMEL -O2 -g -+FLAGS1:=-Wall -DATMEL_WLAN -DATMEL $(OPT) ++FLAGS1 :=-Wall -DATMEL_WLAN -DATMEL $(OPT) FLAGS2:=-lncurses -FLAGS3:=-DLOW_RES -CC:=gcc @@ -109,33 +82,156 @@ diff -dur atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/ap + $(CC) $(FLAGS1) -I$(INC) -I/usr/include/ncurses -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c @install -m 755 lvnet $(OBJs)/ -endif -diff -dur atmelwlandriver.orig/src/apps/fw-upgrade/Makefile atmelwlandriver/src/apps/fw-upgrade/Makefile ---- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile 2004-08-25 05:17:04.000000000 +0200 -+++ atmelwlandriver/src/apps/fw-upgrade/Makefile 2004-08-30 21:21:59.988610523 +0200 -@@ -7,7 +7,7 @@ +diff -urN atmelwlandriver.orig/src/apps/fw-upgrade/Makefile atmelwlandriver/src/apps/fw-upgrade/Makefile +--- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile 2004-12-05 14:16:10.000000000 +0100 ++++ atmelwlandriver/src/apps/fw-upgrade/Makefile 2004-12-05 15:41:43.000000000 +0100 +@@ -3,11 +3,11 @@ + ######################################### + + +-CC:=$(shell wx-config --cxx) ++CC:=$(shell wxgtk2-2.4-config --cxx) CCC:=gcc - CFLAGS:=$(shell wx-config --cxxflags) - CFLAGS1:=$(shell wx-config --libs) +-CFLAGS:=$(shell wx-config --cxxflags) +-CFLAGS1:=$(shell wx-config --libs) -CCFLAGS:= -O2 -Wall -Wstrict-prototypes -+CCFLAGS:=$(OPT) ++CFLAGS:=$(shell wxgtk2-2.4-config --cxxflags) ++CFLAGS1:=$(shell wxgtk2-2.4-config --libs) ++CCFLAGS:= $(OPT) OUTDIR:="/usr/local/bin" -diff -dur atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile ---- atmelwlandriver.orig/src/usb/Makefile 2004-08-25 05:17:05.000000000 +0200 -+++ atmelwlandriver/src/usb/Makefile 2004-08-30 21:21:59.987610662 +0200 -@@ -1,13 +1,8 @@ +@@ -34,7 +34,7 @@ + wxconfig: + @config_exists=no;\ + for path_dir in `echo $(PATH) | tr : ' '`; do\ +- if test -f $$path_dir/wx-config; then\ ++ if test -f $$path_dir/wxgtk2-2.4-config; then\ + config_exists=yes;\ + fi\ + done;\ +diff -urN atmelwlandriver.orig/src/apps/fw-upgrade/Makefile~ atmelwlandriver/src/apps/fw-upgrade/Makefile~ +--- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile~ 1970-01-01 01:00:00.000000000 +0100 ++++ atmelwlandriver/src/apps/fw-upgrade/Makefile~ 2004-12-05 15:03:14.000000000 +0100 +@@ -0,0 +1,75 @@ ++######################################### ++# Makefile of Fucd # ++######################################### ++ ++ ++CC:=$(shell wxgtk2-2.4-config -cxx) ++CCC:=gcc ++CFLAGS:=$(shell wxgtk2-2.4-config --cxxflags) ++CFLAGS1:=$(shell wxgtk2-2.4-config --libs) ++CCFLAGS:= $(OPT) ++OUTDIR:="/usr/local/bin" ++ ++ ++# All object files ++COBJS:= atmelmain.o dfu.o ++OBJS:= FucdApp.o FucdLayer.o dfu.o atmel.o ++ ++usage: ++ @echo -e "make clean\tRemove object files and executables" ++ @echo -e "make fucd\tBuild X upgrade utility" ++ @echo -e "make atmelup\tBuild command line upgrade utility" ++ @echo -e "make all\tBuild both utilities" ++ ++all: fucd atmelup ++ ++fucd: wxconfig $(OBJS: .o=.c) ++ @echo -e "Building fucd wxWidgets application..." ++ $(CC) -o fucd $(OBJS) $(CFLAGS1) -lusb ++ ++atmelup: $(COBJS) ++ @echo -e "Building atmelup command-line tool..." ++ $(CCC) $(CCFLAGS) $(COBJS) -lusb -o $@ ++ ++wxconfig: ++ @config_exists=no;\ ++ for path_dir in `echo $(PATH) | tr : ' '`; do\ ++ if test -f $$path_dir/wxgtk2-2.4-config; then\ ++ config_exists=yes;\ ++ fi\ ++ done;\ ++ if test $$config_exists = 'no'; then\ ++ echo 'It seems that the wxWindows library is not installed.';\ ++ echo 'wx-config, the script providing information about wxWindows';\ ++ echo 'installation, is missing. Please, refer to the README.linux';\ ++ echo 'or visit www.wxwindows.org for further information.';\ ++ echo 'We are sorry about the inconvenience.';\ ++ exit -1;\ ++ fi ++ ++FucdApp.o: FucdApp.cpp FucdApp.h ++ $(CC) $(CFLAGS) -c $< ++ ++FucdLayer.o: FucdLayer.cpp FucdLayer.h ++ $(CC) $(CFLAGS) -c $< ++ ++atmel.o: atmel.c ++ $(CCC) $(CCFLAGS) -c $< ++ ++dfu.o: dfu.c dfu.h ++ $(CCC) $(CCFLAGS) -c $< ++ ++atmelmain.o: atmel.c ++ $(CCC) $(CCFLAGS) -DCONSOLE_APP -c $< -o $@ ++ ++clean: ++ @echo -e "Removing all objects and executables..." ++ @find . -name '*.o' | xargs rm -f *.o ++ @rm -f fucd atmelup ++ ++ ++install: ++ @echo -e "Installing fucd to $(OUTDIR)" ++ @if [ -e fucd ]; then install -m 755 fucd $(OUTDIR) ; fi ++ @echo -e "Installing atmelup to $(OUTDIR)" ++ @if [ -e atmelup ]; then install -m 755 atmelup $(OUTDIR) ; fi +diff -urN atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmcia_Pci/Makefile +--- atmelwlandriver.orig/src/Pcmcia_Pci/Makefile 2004-12-05 14:16:10.000000000 +0100 ++++ atmelwlandriver/src/Pcmcia_Pci/Makefile 2004-12-05 14:27:35.000000000 +0100 +@@ -5,22 +5,7 @@ + include .lastbuild + endif + +-ARCH=$(shell uname -m) +-VR:=$(shell uname -r) +-ID:=$(shell id -u) +-ifneq ($(VR),$(UNAME)) +-this: +-# @echo -ne "\\033[1;31m" +- @echo -ne "Running kernel doesn't match with the source" +-# @echo -ne "\\033[0;39m" +- @echo +-endif +- +-CC:=gcc +-CDEBUG:= -DPCMCIA_DEBUG=1 +-DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) +-CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h +-CFLAGS := -DLINUX_OS -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) ++CFLAGS += -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) + PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include + srcs := card.c command.c common.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c + pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs)) +diff -urN atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile +--- atmelwlandriver.orig/src/usb/Makefile 2004-12-05 14:16:10.000000000 +0100 ++++ atmelwlandriver/src/usb/Makefile 2004-12-05 14:29:51.000000000 +0100 +@@ -1,14 +1,9 @@ include .lastbuild include $(TOPDIR)/.config -ARCH=$(shell uname -m) MODULE := usbvnet.o -CDEBUG := -DUSBDBG --DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) -fno-optimize-sibling-calls +-DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) + #conflicted with gcc's < 2.96: -fno-optimize-sibling-calls USB_DES := $(MODULES_DES)/kernel/drivers/net -CC=gcc -CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h -CFLAGS :=-D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb -+CFLAGS += -I$(KERNEL_SRC)/drivers/usb/core -I$(INC) -I$(INC)/usb ++CFLAGS += -I$(KERNEL_SRC)/drivers/usr/core -I$(INC) -I$(INC)/usb $(CFLAGS_y) # Add extra compilation flags if under version 2.5 or higher diff --git a/atmelwlandriver-winter-makefile.patch b/atmelwlandriver-winter-makefile.patch index 8368035..3210e3d 100644 --- a/atmelwlandriver-winter-makefile.patch +++ b/atmelwlandriver-winter-makefile.patch @@ -7,9 +7,9 @@ -CC:=$(shell wx-config --cxx) -CFLAGS:=$(shell wx-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) -CFLAGS1:=$(shell wx-config --libs) -+CC:=$(shell wxgtk-2.4-config --cxx) -+CFLAGS:=$(OPT) $(shell wxgtk-2.4-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) -+CFLAGS1:=$(shell wxgtk-2.4-config --libs) ++CC:=$(shell wxgtk2-2.4-config --cxx) ++CFLAGS:=$(OPT) $(shell wxgtk2-2.4-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) ++CFLAGS1:=$(shell wxgtk2-2.4-config --libs) VPATH:=$(INC_DIR) $(SRC_DIR) $(RSRC_DIR) @@ -18,7 +18,7 @@ @config_exists=no;\ for path_dir in `echo $(PATH) | tr : ' '`; do\ - if test -f $$path_dir/wx-config; then\ -+ if test -f $$path_dir/wxgtk-2.4-config; then\ ++ if test -f $$path_dir/wxgtk2-2.4-config; then\ config_exists=yes;\ fi\ done;\ diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec index 9997705..ca3e69b 100644 --- a/atmelwlandriver.spec +++ b/atmelwlandriver.spec @@ -10,21 +10,21 @@ Summary: Linux driver for WLAN card based on AT76C5XXx Summary(pl): Sterownik dla Linuksa do kart WLAN opartych na uk³adach AT76C5XXx Name: atmelwlandriver -Version: 3.4.0.2 -%define _rel 0.2 +Version: 3.4.1.0 +%define _rel 0.1 Release: %{_rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel Source0: http://dl.sourceforge.net/atmelwlandriver/%{name}-%{version}.tar.bz2 -# Source0-md5: b5cd84930378981bf86f041c46dfb557 +# Source0-md5: 288882c65cc13fbe48d5c5ed69aba1a8 +# Source0-size: 720567 Source1: %{name}-vnetrc Patch0: %{name}-makefile.patch Patch1: %{name}-etc.patch #Patch2: %{name}-fpmath.patch #Patch3: %{name}-delay.patch -Patch4: %{name}-usb_defctrl.patch +#Patch4: %{name}-usb_defctrl.patch Patch5: %{name}-winter-makefile.patch -Patch6: %{name}-fucd-makefile.patch URL: http://atmelwlandriver.sourceforge.net/ BuildRequires: rpmbuild(macros) >= 1.153 BuildRequires: %{kgcc_package} @@ -37,8 +37,7 @@ BuildRequires: libusb-devel BuildRequires: ncurses-devel BuildRequires: ncurses-ext-devel BuildRequires: wxWindows-devel >= 2.4.0 -BuildRequires: wxGTK-devel >= 2.4.0 -#BuildRequires: xforms-devel +BuildRequires: wxGTK2-devel >= 2.4.0 %endif %{?with_dist_kernel:%requires_releq_kernel_up} Requires: wireless-tools @@ -149,9 +148,8 @@ kart ATMELa. %patch1 -p1 #patch2 -p1 #patch3 -p1 -#%patch4 -p1 +#patch4 -p1 %patch5 -p1 -%patch6 -p1 %build ln -sf Makefile.kernelv2.6 Makefile @@ -238,32 +236,32 @@ install src/apps/fw-upgrade/fucd $RPM_BUILD_ROOT%{_sbindir} rm -rf $RPM_BUILD_ROOT %post -n kernel-net-atmelwlandriver -for i in /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/usbvnet* ; do - cuted_i=$(basename $i|cut -d. -f1) - if [ -f $i ]; then - if ( grep $cuted_i /etc/modprobe.conf >/dev/null ); then - echo "NOP" >/dev/null; - else - echo "#post-install $cuted_i /usr/sbin/fastvnet.sh">> /etc/modprobe.conf; - fi - fi -done +#for i in /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/usbvnet* ; do +# cuted_i=$(basename $i|cut -d. -f1) +# if [ -f $i ]; then +# if ( grep $cuted_i /etc/modprobe.conf >/dev/null ); then +# echo "NOP" >/dev/null; +# else +# echo "#post-install $cuted_i /usr/sbin/fastvnet.sh">> /etc/modprobe.conf; +# fi +# fi +#done %depmod %{_kernel_ver} %postun -n kernel-net-atmelwlandriver %depmod %{_kernel_ver} %post -n kernel-smp-net-atmelwlandriver -for i in /lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/usbvnet* ; do - cuted_i=$(basename $i|cut -d. -f1) - if [ -f $i ]; then - if ( grep $cuted_i /etc/modprobe.conf >/dev/null ); then - echo "NOP" >/dev/null; - else - echo "#post-install $cuted_i /usr/sbin/fastvnet.sh">> /etc/modprobe.conf; - fi - fi -done +#for i in /lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/usbvnet* ; do +# cuted_i=$(basename $i|cut -d. -f1) +# if [ -f $i ]; then +# if ( grep $cuted_i /etc/modprobe.conf >/dev/null ); then +# echo "NOP" >/dev/null; +# else +# echo "#post-install $cuted_i /usr/sbin/fastvnet.sh">> /etc/modprobe.conf; +# fi +# fi +#done %depmod %{_kernel_ver}smp %postun -n kernel-smp-net-atmelwlandriver -- 2.44.0