- x32 rebuild

[packages/wl.git] / wl.spec

diff --git a/wl.spec b/wl.spec
index 9e16adcf17017050b71bc5385d97a77ea64dea3d..a2174b780a22f370c7fb0a47b54f8d909246e9e1 100644 (file)
--- a/wl.spec
+++ b/wl.spec
@@ -1,60 +1,38 @@
 # Conditional build:
-%bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
 %bcond_with    verbose         # verbose build (V=1)
-%bcond_with    dkms            # build dkms package
+%bcond_without userspace       # don't build userspace programs
+%bcond_without dkms            # build dkms package
 
-%if %{without kernel}
-%undefine      with_dist_kernel
-%endif
-
-# The goal here is to have main, userspace, package built once with
-# simple release number, and only rebuild kernel packages with kernel
-# version as part of release number, without the need to bump release
-# with every kernel change.
-%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
-%{error:kernel and userspace cannot be built at the same time on PLD builders}
-exit 1
-%endif
-
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
+%if %{without userspace}
+%undefine      with_dkms
 %endif
 
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
-%define                kbrs    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
-%define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
-%define                rel     4
+%define                rel     5
 %define                pname   wl
 %define                file_ver        %(echo %{version} | tr . _)
 Summary:       Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
 Name:          %{pname}%{_alt_kernel}
-Version:       6.30.223.141
+Version:       6.30.223.248
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       other
 Group:         Base/Kernel
 Source0:       http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-%{file_ver}.tar.gz
-# Source0-md5: f4809d9149e8e60ef95021ae93a4bf21
+# Source0-md5: e048154b3f4c7ad6bee36cab5b37486d
 Source1:       http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-%{file_ver}.tar.gz
-# Source1-md5: 039f33d2a3ff2890e42717092d1eb0c4
+# Source1-md5: 0237917f75d121589ec16a44eac5f5b0
 Source2:       http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5: 8a6e8708a5e00ab6d841cde51d70eb1b
 Source3:       dkms.conf
-Patch0:                broadcom-sta-6.30.223.141-kernel-3.10.patch
+Patch0:                linux-3.17.patch
+Patch1:                gcc-4.9.patch
 URL:           http://www.broadcom.com/support/802.11/linux_sta.php
-BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
-ExclusiveArch: %{ix86} %{x8664}
+BuildRequires: rpmbuild(macros) >= 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
+ExclusiveArch: %{ix86} %{x8664} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -85,10 +63,8 @@ Summary:     Broadcom 802.11 a/b/g/n hybrid Linux networking device driver\
 Release:       %{rel}@%{_kernel_ver_str}\
 Group:         Base/Kernel\
 Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\
-%endif\
 \
 %description -n kernel%{_alt_kernel}-net-wl\
 These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux\
@@ -122,7 +98,7 @@ EOF\
 %install_kernel_modules -D installed -m wl -d kernel/drivers/net/wireless\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %ifarch %{x8664}
@@ -131,7 +107,8 @@ EOF\
 %define src 0
 %endif
 %setup -c -T -q -n %{pname}-%{version} -b%{src}
-%patch0 -p2
+%patch0 -p1
+%patch1 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -154,7 +131,7 @@ EXTRA_LDFLAGS       := $(KBUILD_EXTMOD)/lib/wlc_hybrid.o_shipped
 EOF
 
 %build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT