Author: qboosh                       Date: Mon Feb 21 22:05:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build with proper kernel, not the running one
- pass TOOLPREFIX to override bogus one defined for x86_64-elf
- package userspace tools
- License is basically BSD (with GPL option for opensource part);
  part of code is binary-only and cannot be modified (stupid FCC rules/excuses)

---- Files affected:
SPECS:
   madwifi.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/madwifi.spec
diff -u SPECS/madwifi.spec:1.8 SPECS/madwifi.spec:1.9
--- SPECS/madwifi.spec:1.8      Mon Feb 21 14:46:36 2005
+++ SPECS/madwifi.spec  Mon Feb 21 23:05:01 2005
@@ -4,7 +4,7 @@
 %bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
 %bcond_without smp             # don't build SMP module
-%bcond_with    userspace       # don't build userspace module
+%bcond_without userspace       # don't build userspace module
 %bcond_with    verbose         # verbose build (V=1)
 #
 Summary:       Atheros WiFi card driver
@@ -16,7 +16,7 @@
 %define                _rel    0.%{snap}.1
 Release:       %{_rel}
 Epoch:         0
-License:       GPL
+License:       GPL/BSD (partial source)
 Group:         Base/Kernel
 Source0:       
http://madwifi.otaku42.de/2005/01/madwifi-cvs-snapshot-%{snapdate}.tar.bz2
 # Source0-md5: 2337699afaa8e3c552097db934ba408e
@@ -84,8 +84,9 @@
 
 %build
 %if %{with userspace}
-
-
+%{__make} -C tools \
+       CC="%{__cc}" \
+       CFLAGS="\$(INCS) %{rpmcflags}"
 %endif
 
 %if %{with kernel}
@@ -109,6 +110,8 @@
                %{?with_verbose:V=1}
        %{__make} \
                TARGET="%{_target_base_arch}-elf" \
+               KERNELPATH=%{_kernelsrcdir} \
+               TOOLPREFIX= \
                O=$PWD \
                CC="%{__cc}" CPP="%{__cpp}" \
                %{?with_verbose:V=1}
@@ -126,8 +129,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with userspace}
-
-
+install -d $RPM_BUILD_ROOT%{_bindir}
+%{__make} -C tools install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       BINDIR=%{_bindir}
 %endif
 
 %if %{with kernel}
@@ -171,6 +176,14 @@
 %postun        -n kernel-smp-net-madwifi
 %depmod %{_kernel_ver}smp
 
+%if %{with userspace}
+%files
+%defattr(644,root,root,755)
+%doc COPYRIGHT README
+%attr(755,root,root) %{_bindir}/80211*
+%attr(755,root,root) %{_bindir}/ath*
+%endif
+
 %if %{with kernel}
 %files -n kernel-net-madwifi
 %defattr(644,root,root,755)
@@ -183,18 +196,19 @@
 %endif
 %endif
 
-%if %{with userspace}
-%files
-%defattr(644,root,root,755)
-
-%endif
-
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/02/21 22:05:01  qboosh
+- build with proper kernel, not the running one
+- pass TOOLPREFIX to override bogus one defined for x86_64-elf
+- package userspace tools
+- License is basically BSD (with GPL option for opensource part);
+  part of code is binary-only and cannot be modified (stupid FCC rules/excuses)
+
 Revision 1.8  2005/02/21 13:46:36  qboosh
 - pass TARGET, added ExclusiveArch (binary-only objects)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/madwifi.spec?r1=1.8&r2=1.9&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to