X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acx.spec;h=c252e64858333df97c868a6403d786b4b6cbb36c;hb=37d29bfceb51f5ca4f2920679a8e1fb114c17a9d;hp=0dad3d4c5327c145d8a8fede2dd407ff363a2014;hpb=1ff32b1ce7842bab0d184410654a843a70667124;p=packages%2Facx.git

diff --git a/acx.spec b/acx.spec
index 0dad3d4..c252e64 100644
--- a/acx.spec
+++ b/acx.spec
@@ -1,21 +1,27 @@
+# TODO:
+# - add firmware download?
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	smp		# don't build SMP module
+#
+%ifarch sparc
+%undefine	with_smp
+%endif
 #
 Summary:	Linux driver for WLAN card base on ACX100
 Summary(pl):	Sterownik dla Linuksa do kart bezprzewodowych na uk³adzie ACX100
-Name:		acx100
-Version:	0.2.0pre8_plus_fixes_18
-%define	_rel	2
+Name:		acx
+Version:	20060215
+%define	_rel	1
 Release:	%{_rel}
 License:	MPL or GPL
 Group:		Base/Kernel
-Source0:	http://rhlx01.fht-esslingen.de/~andi/acx100/%{name}-%{version}.tar.bz2
-#Source0-MD5:   430aa98bc3cc3e7ee0cb0e0c170f4f8c
-URL:		http://acx100.sourcefroge.net/index.html
-%{?with_dist_kernel:BuildRequires:	kernel-headers >= 2.4.0}
-BuildRequires:	%{kgcc_package}
-BuildRequires:	rpmbuild(macros) >= 1.118
+Source0:	http://195.66.192.167/linux/acx_patches/%{name}-%{version}.tar.bz2
+# Source0-md5:	95bcd5df2365dfcfc78169b0331f69a2
+URL:		http://acx100.sourceforge.net/
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.3}
+BuildRequires:	rpmbuild(macros) >= 1.286
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,35 +59,71 @@ Linux SMP driver for WLAN card base on ACX100.
 Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100.
 
 %prep
-%setup -q
+#setup -q -n %{name}-%{version}
+cd $RPM_BUILD_DIR
+install -d %{name}-%{version}
+cd %{name}-%{version}
+tar xfj %{SOURCE0}
+/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+
+%define buildconfigs %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 
 %build
-cat > config.mk <<EOF
-KERNEL_BUILD=%{_kernelsrcdir}
-VERSION_CODE=`grep LINUX_VERSION_CODE %{_kernelsrcdir}/include/linux/version.h | sed -e 's/[^0-9]//g'`
-EOF
-%{__make} \
-	CC="%{kgcc}" \
-	CPPFLAGS="-D__KERNEL__ -DMODULE -DACX_DEBUG=1 -DWLAN_HOSTIF=WLAN_PCI -I%{_kernelsrcdir}/include -I../include" \
-	CFLAGS="%{rpmcflags} -fno-strict-aliasing -fno-common -fomit-frame-pointer -Wall -Wstrict-prototypes -Wno-trigraphs -mpreferred-stack-boundary=4 -pipe -DACX_IO_WIDTH=32"
-
-mv -f src/acx_pci.o acx_pci-up.o
-mv -f src/acx_usb.o acx_usb-up.o
-
-%{__make} clean -C src
-%{__make} \
-	CC="%{kgcc}" \
-	CPPFLAGS="-D__KERNEL__ -D__KERNEL_SMP -DMODULE -DACX_DEBUG=1 -DWLAN_HOSTIF=WLAN_PCI -I%{_kernelsrcdir}/include -I../include" \
-	CFLAGS="%{rpmcflags} -fno-strict-aliasing -fno-common -fomit-frame-pointer -Wall -Wstrict-prototypes -Wno-trigraphs -mpreferred-stack-boundary=4 -pipe -DACX_IO_WIDTH=32"
+# kernel module(s)
+cd %{name}-%{version}
+#cd src
+for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
+        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+                exit 1
+        fi
+        install -d o/include/linux
+        ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+%if %{with dist_kernel}
+        %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+        install -d o/include/config
+        touch o/include/config/MARKER
+        ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
+#
+#       patching/creating makefile(s) (optional)
+#
+        %{__make} -C %{_kernelsrcdir} clean \
+                RCS_FIND_IGNORE="-name '*.ko' -o" \
+                SYSSRC=%{_kernelsrcdir} \
+                SYSOUT=$PWD/o \
+                M=$PWD O=$PWD/o \
+                %{?with_verbose:V=1}
+        %{__make} -C %{_kernelsrcdir} modules \
+                CC="%{__cc}" CPP="%{__cpp}" \
+                SYSSRC=%{_kernelsrcdir} \
+                SYSOUT=$PWD/o \
+                M=$PWD O=$PWD/o \
+                %{?with_verbose:V=1}
+
+        mv MODULE_NAME{,-$cfg}.ko
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+#Add directory to store firmware
+install -d $RPM_BUILD_ROOT%{_datadir}/acx
+
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
-install acx_pci-up.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/acx_pci.o
-install acx_usb-up.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/acx_usb.o
-install src/acx_pci.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/acx_pci.o
-install src/acx_usb.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/acx_usb.o
+for cfg in %{buildconfigs}; do
+	cfgdest=''
+	if [ "$cfg" = "smp" ]; then
+		install modules/$cfg/*.ko \
+			$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}$cfg/misc
+	else
+		install modules/$cfg/*.ko \
+			$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+	fi
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,9 +143,13 @@ rm -rf $RPM_BUILD_ROOT
 %files -n kernel-net-acx100
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO doc/*
-/lib/modules/%{_kernel_ver}/misc/*.o*
+%dir %{_datadir}/acx
+/lib/modules/%{_kernel_ver}/misc/*.ko*
 
+%if %{with smp}
 %files -n kernel-smp-net-acx100
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO doc/*
-/lib/modules/%{_kernel_ver}smp/misc/*.o*
+%dir %{_datadir}/acx
+/lib/modules/%{_kernel_ver}smp/misc/*.ko*
+%endif