Author: zbyniu Date: Sat Nov 28 12:20:56 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- x86_64 version added; cleanup; now builds; rel 0.2
---- Files affected:
packages/kernel-net-wl:
kernel-net-wl.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/kernel-net-wl/kernel-net-wl.spec
diff -u packages/kernel-net-wl/kernel-net-wl.spec:1.1
packages/kernel-net-wl/kernel-net-wl.spec:1.2
--- packages/kernel-net-wl/kernel-net-wl.spec:1.1 Sat Nov 28 11:04:19 2009
+++ packages/kernel-net-wl/kernel-net-wl.spec Sat Nov 28 13:20:50 2009
@@ -1,25 +1,11 @@
# $Revision$, $Date$
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
-%bcond_without kernel # don't build kernel modules
-%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine with_userspace
-%endif
-%if %{without userspace}
-# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%endif
-#
-# main package.
-#
-%define rel 0.1
+%define rel 0.2
%define pname wl
Summary: Linux kernel module to BCM network cards
Name: %{pname}%{_alt_kernel}
@@ -29,13 +15,14 @@
Group: Base/Kernel
Source0:
http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v%{version}.tar.gz
# Source0-md5: 15890e1f9afe844adf2e251d390e28ac
-Source1: http://www.broadcom.com/docs/linux_sta/README.txt
-# Source1-md5: b3510ce9efc0395021b317f54f645b5d
+Source1:
http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v%{version}.tar.gz
+# Source1-md5: ed255d2c98690ef76757d95b2d9e6b32
+Source2: http://www.broadcom.com/docs/linux_sta/README.txt
+# Source2-md5: b3510ce9efc0395021b317f54f645b5d
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.20.2}
BuildRequires: rpmbuild(macros) >= 1.379
-%endif
+ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -43,8 +30,6 @@
device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-,
and BCM4322-based hardware.
-# kernel subpackages.
-
%package -n kernel%{_alt_kernel}-net-wl
Summary: Linux driver for wl
Summary(pl.UTF-8): Sterownik dla Linuksa do wl
@@ -64,55 +49,33 @@
This package contains Linux module.
%prep
-%setup -q -c -n %{pname}-%{version}
+%ifarch %{x8664}
+%define src 1
+%else
+%define src 0
+%endif
+%setup -c -T -q -n %{pname}-%{version} -b%src
cat > Makefile << EOF
+obj-m += wl.o
-obj-m += wl.o
+wl-objs := src/wl/sys/wl_linux.o
+wl-objs += src/wl/sys/wl_iw.o
+wl-objs += src/shared/linux_osl.o
-wl-objs :=
-wl-objs += src/wl/sys/wl_linux.o
-wl-objs += src/wl/sys/wl_iw.o
-wl-objs += src/shared/linux_osl.o
-
-EXTRA_CFLAGS :=
-EXTRA_CFLAGS += -I%{_builddir}/%{pname}-%{version}/src/include
-EXTRA_CFLAGS += -I%{_builddir}/%{pname}-%{version}/src/wl/sys
-EXTRA_CFLAGS += -DCONFIG_MODULE_NAME_SOME_OPTION=1
-%{?debug:CFLAGS += -DCONFIG_MODULE_NAME_DEBUG=1}
-EOF
+EXTRA_CFLAGS := -I%{_builddir}/%{pname}-%{version}/src/include
+EXTRA_CFLAGS += -I%{_builddir}/%{pname}-%{version}/src/wl/sys
+EXTRA_LDFLAGS := $PWD/lib/wlc_hybrid.o_shipped
+EOF
%build
-%if %{with userspace}
-
-
-%endif
-
-%if %{with kernel}
-
%build_kernel_modules -m wl
-# modules placed in subdirectory:
-# %build_kernel_modules -C -m wl
-
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
-
-%if %{with userspace}
-
-
-%endif
-
-%if %{with kernel}
%install_kernel_modules -m wl -d kernel/net/wireless
-# to avoid conflict with in-kernel modules, and prepare modprobe config:
-%install_kernel_modules -s current -n NAME -m wl -d kernel/drivers/net/wireless
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -122,17 +85,10 @@
%postun -n kernel%{_alt_kernel}-net-wl
%depmod %{_kernel_ver}
-%if %{with kernel}
%files -n kernel%{_alt_kernel}-net-wl
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/net/*.ko*
-%endif
-
-%if %{with userspace}
-%files
-%defattr(644,root,root,755)
-
-%endif
+%doc lib/LICENSE.txt
+/lib/modules/%{_kernel_ver}/kernel/net/wireless/*.ko*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -140,7 +96,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2009/11/28 12:20:50 zbyniu
+- x86_64 version added; cleanup; now builds; rel 0.2
+
Revision 1.1 2009/11/28 10:04:19 uzsolt
- initial
- doesn't build
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-net-wl/kernel-net-wl.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
