X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acx.spec;h=ca018721f5557e728456a775f35955c85a63aac4;hb=061a37f3fb75efc1957889af54436efd42b2b074;hp=0a19728d9ffffc68169783b8bfab3fa8c9ba2c98;hpb=eb6f05128fd48971020a68939f83349105d4cabe;p=packages%2Facx.git

diff --git a/acx.spec b/acx.spec
index 0a19728..ca01872 100644
--- a/acx.spec
+++ b/acx.spec
@@ -1,24 +1,25 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	smp		# don't build SMP module
+#
+# TODO:
+# - add firmware download?
 #
 Summary:	Linux driver for WLAN card base on ACX100
 Summary(pl):	Sterownik dla Linuksa do kart bezprzewodowych na uk³adzie ACX100
-Name:		kernel-net-acx100
-Version:	0.2.0pre8_plus_fixes_13
+Name:		acx100
+Version:	0.2.0pre8_plus_fixes_51
 %define	_rel	1
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{_rel}
 License:	MPL or GPL
 Group:		Base/Kernel
-Source0:	http://rhlx01.fht-esslingen.de/~andi/acx100/acx100-%{version}.tar.bz2
-#Source0-MD5:   4daf538ed007ac4181c952703223e556
-URL:		http://acx100.sourcefroge.net/index.html
-%{?with_dist_kernel:BuildRequires:	kernel-headers >= 2.4.0}
+Source0:	http://rhlx01.fht-esslingen.de/~andi/acx100/%{name}-%{version}.tar.bz2
+# Source0-md5:	22b5b5249ae60c152b7f5e1e9d812521
+URL:		http://acx100.sourceforge.net/
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.3}
 BuildRequires:	%{kgcc_package}
 BuildRequires:	rpmbuild(macros) >= 1.118
-%{?with_dist_kernel:%requires_releq_kernel_up}
-Requires(post,postun):	/sbin/depmod
-Obsoletes:	kernel-net-acx100
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,9 +28,24 @@ This is driver for WLAN card based on ACX100 for Linux.
 %description -l pl
 Sterownik dla Linuksa do kart WLAN opartych o uk³ad ACX100.
 
+%package -n kernel-net-acx100
+Summary:	Linux driver for WLAN card base on ACX100
+Summary(pl):	Sterownik dla Linuksa do kart bezprzewodowych na uk³adzie ACX100
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+%{?with_dist_kernel:%requires_releq_kernel_up}
+Requires(post,postun):	/sbin/depmod
+
+%description -n kernel-net-acx100
+This is driver for WLAN card based on ACX100 for Linux.
+
+%description -n kernel-net-acx100 -l pl
+Sterownik dla Linuksa do kart WLAN opartych o uk³ad ACX100.
+
 %package -n kernel-smp-net-acx100
 Summary:	Linux SMP driver for WLAN card base on ACX100
 Summary(pl):	Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100
+Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
@@ -41,43 +57,63 @@ Linux SMP driver for WLAN card base on ACX100.
 Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100.
 
 %prep
-%setup -q -n acx100-%{version}
+%setup -q
+
+%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"
+mv src/Makefile2.6 src/Makefile
+for cfg in %{buildconfigs}; do
+	mkdir -p modules/$cfg
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	rm -f include/asm
+	chmod 000 modules
+	install -d include/{linux,config}
+	%{__make} -C %{_kernelsrcdir} clean \
+		SUBDIRS=$PWD/src \
+		O=$PWD \
+		%{?with_verbose:V=1}
+	install -d include/config
+	chmod 700 modules
+	ln -sf %{_kernelsrcdir}/config-$cfg .config
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-${cfg}.h include/linux/autoconf.h
+	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm #FIXME
+	touch include/config/MARKER
+	%{__make} -C %{_kernelsrcdir} modules \
+		SUBDIRS=$PWD/src \
+		O=$PWD \
+		%{?with_verbose:V=1}
+	mv src/*.ko modules/$cfg/
+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
 
-%post
+%post	-n kernel-net-acx100
 %depmod %{_kernel_ver}
 
-%postun
+%postun	-n kernel-net-acx100
 %depmod %{_kernel_ver}
 
 %post	-n kernel-smp-net-acx100
@@ -86,12 +122,16 @@ rm -rf $RPM_BUILD_ROOT
 %postun	-n kernel-smp-net-acx100
 %depmod %{_kernel_ver}smp
 
-%files
+%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