Author: shadzik Date: Thu Apr 12 15:16:25 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- proper kernel-module-build version
---- Files affected:
SPECS:
bcm5700.spec (1.55 -> 1.56)
---- Diffs:
================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.55 SPECS/bcm5700.spec:1.56
--- SPECS/bcm5700.spec:1.55 Wed Mar 14 01:13:57 2007
+++ SPECS/bcm5700.spec Thu Apr 12 17:16:20 2007
@@ -3,8 +3,6 @@
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
-%bcond_without up # don't build UP module
-%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
@@ -12,10 +10,6 @@
%undefine with_dist_kernel
%endif
-%ifarch sparc
-%undefine with_smp
-%endif
-
%define _rel 5
Summary: Linux driver for the Broadcom's NetXtreme BCM57xx Network
Interface Cards
Summary(pl.UTF-8): Sterownik dla Linuksa do kart sieciowych Broadcom
NetXtreme BCM57xx
@@ -30,8 +24,8 @@
Source1: %{name}-Makefile
URL: http://www.broadcom.com/drivers/downloaddrivers.php
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.153
+%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.20.2}
+BuildRequires: rpmbuild(macros) >= 1.379
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,8 +44,8 @@
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun): %releq_kernel_up
+%requires_releq_kernel
+Requires(postun): %releq_kernel
%endif
%description -n kernel-net-bcm5700
@@ -61,61 +55,11 @@
%description -n kernel-net-bcm5700 -l pl.UTF-8
Sterownik dla Linuksa do kart sieciowych Broadcom BCM57xx.
-%package -n kernel-smp-net-bcm5700
-Summary: Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network
Interface Cards
-Summary(pl.UTF-8): Sterownik dla Linuksa SMP do kart sieciowych Broadcom
BCM57xx
-Release: [EMAIL PROTECTED]
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun): %releq_kernel_smp
-%endif
-
-%description -n kernel-smp-net-bcm5700
-Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network
-Interface Cards.
-
-%description -n kernel-smp-net-bcm5700 -l pl.UTF-8
-Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx.
-
%prep
%setup -q
%build
-cd src
-
-%if %{with kernel}
-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
- %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-
- install %{SOURCE1} Makefile
-
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- %{?debug:DBG=1} \
-%if "%{_target_base_arch}" != "%{_arch}"
- ARCH=%{_target_base_arch} \
- CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
-%endif
- HOSTCC="%{__cc}" \
- CPP="%{__cpp}" \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
-
- mv bcm5700{,-$cfg}.ko
-done
-%endif
+%build_kernel_modules -C src -m bcm5700
%install
rm -rf $RPM_BUILD_ROOT
@@ -145,12 +89,6 @@
%postun -n kernel-net-bcm5700
%depmod %{_kernel_ver}
-%post -n kernel-smp-net-bcm5700
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel-smp-net-bcm5700
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -159,25 +97,20 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel-net-bcm5700
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm5700.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-bcm5700
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/bcm5700.ko*
-%endif
-%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.56 2007/04/12 15:16:20 shadzik
+- proper kernel-module-build version
+
Revision 1.55 2007/03/14 00:13:57 glen
- up bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/bcm5700.spec?r1=1.55&r2=1.56&f=u
_______________________________________________
pld-cvs-commit mailing list
[EMAIL PROTECTED]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
