- fixed build (tested with kernel-module-build-2.6.5-1)

[packages/acx.git] / acx.spec

diff --git a/acx.spec b/acx.spec
index 9fa64718d7e03a6c69efaf8943eda5d94f94f85d..11ea4f84c99a4c0d570a1a2ad433ac9050ff339d 100644 (file)
--- a/acx.spec
+++ b/acx.spec
@@ -2,21 +2,21 @@
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
 #
+%define                no_install_post_compress_modules        1
 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.0pre6_plus_fixes_7
+Version:       0.2.0pre8
 %define        _rel    1
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       MPL or GPL
 Group:         Base/Kernel
 Source0:       http://rhlx01.fht-esslingen.de/~andi/acx100/acx100-%{version}.tar.bz2
-# Source0-md5: d03a9252ad411bd77eeb508a34bca8bd
+# Source0-md5: 489314f0dd48da036de1e94475bc1304
 URL:           http://acx100.sourcefroge.net/index.html
-%{?with_dist_kernel:BuildRequires:     kernel-headers >= 2.4.0}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.0}
 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)
@@ -31,7 +31,6 @@ Sterownik dla Linuksa do kart WLAN opartych o uk
 Summary:       Linux SMP driver for WLAN card base on ACX100
 Summary(pl):   Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100
 Group:         Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun): /sbin/depmod
 
 %description -n kernel-smp-net-acx100
@@ -44,31 +43,39 @@ Sterownik dla Linuksa SMP do kart bezprzewodowych na uk
 %setup -q -n acx100-%{version}
 
 %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"
-mv -f src/acx100_pci.o acx100_pci-up.o
-mv -f src/acx100_usb.o acx100_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"
+cd src
+mv Makefile2.6 Makefile
+ln -sf %{_kernelsrcdir}/config-up .config
+rm -rf include
+install -d include/{linux,config}
+cp ../include/* .
+ln -s %{_kernelsrcdir}/include/linux/autoconf-up.h include/linux/autoconf.h
+ln -s %{_kernelsrcdir}/include/asm-%{_arch} include/asm
+touch include/config/MARKER
+%{__make} -C %{_kernelsrcdir} modules \
+       SUBDIRS=$PWD \
+       O=$PWD \
+       V=1
+
+mv acx_pci.ko acx_pci.ko-done
+
+#% %{__make} -C %{_kernelsrcdir} SUBDIRS=$PWD O=$PWD V=1 mrproper
+
+#ln -sf %{_kernelsrcdir}/config-smp .config
+#rm -rf include
+#install -d include/{linux,config}
+#cp ../include/* include/
+#ln -s %{_kernelsrcdir}/include/linux/autoconf-smp.h include/linux/autoconf.h
+#ln -s %{_kernelsrcdir}/include/asm-%{_arch} include/asm
+#touch include/config/MARKER
+#%%{__make} -C %{_kernelsrcdir} SUBDIRS=$PWD O=$PWD V=1 modules
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
-install acx100_pci-up.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/acx100_pci.o
-install acx100_usb-up.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/acx100_usb.o
-install src/acx100_pci.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/acx100_pci.o
-install src/acx100_usb.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/acx100_usb.o
+install src/acx_pci.ko-done $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/acx_pci.ko
+#install src/acx100_pci.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/acx100_pci.ko
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,17 +87,17 @@ rm -rf $RPM_BUILD_ROOT
 %depmod %{_kernel_ver}
 
 %post  -n kernel-smp-net-acx100
-%depmod %{_kernel_ver}
+%depmod %{_kernel_ver}smp
 
 %postun        -n kernel-smp-net-acx100
-%depmod %{_kernel_ver}
+%depmod %{_kernel_ver}smp
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO doc/*
-/lib/modules/%{_kernel_ver}/misc/*.o*
+/lib/modules/%{_kernel_ver}/misc/*
 
-%files -n kernel-smp-net-acx100
-%defattr(644,root,root,755)
-%doc ChangeLog README TODO doc/*
-/lib/modules/%{_kernel_ver}smp/misc/*.o*
+#%files -n kernel-smp-net-acx100
+#%defattr(644,root,root,755)
+#%doc ChangeLog README TODO doc/*
+#/lib/modules/%{_kernel_ver}smp/misc/*.ko