Author: shadzik Date: Sun Mar 25 02:37:58 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- moved to AC-branch
- driver version 3.5.17
- new kernel module build style (rpmbuild(macros) >= 1.330)
- own Makefile (original one doesn't fits us)
- new Source0
---- Files affected:
SPECS:
kernel-net-e100.spec (1.49 -> 1.49.2.1)
---- Diffs:
================================================================
Index: SPECS/kernel-net-e100.spec
diff -u SPECS/kernel-net-e100.spec:1.49 SPECS/kernel-net-e100.spec:1.49.2.1
--- SPECS/kernel-net-e100.spec:1.49 Sat Aug 12 19:02:49 2006
+++ SPECS/kernel-net-e100.spec Sun Mar 25 04:37:53 2007
@@ -5,28 +5,19 @@
%define _orig_name e100
-
-%{?with_dist_kernel:%define _mod_name %{_orig_name}_intel }
-%{!?with_dist_kernel:%define _mod_name %{_orig_name} }
-
Summary: Intel(R) PRO/100 driver for Linux
Summary(pl): Sterownik do karty Intel(R) PRO/100
Name: kernel-net-%{_orig_name}
-Version: 2.3.33
+Version: 3.5.17
%define _rel 1
Release: [EMAIL PROTECTED]
License: BSD
Vendor: Intel Corporation
Group: Base/Kernel
-Source0:
ftp://aiedownload.intel.com/df-support/2896/eng/%{_orig_name}-%{version}.tar.gz
-# Source0-md5: 847918a08443aac122205c122d5c3f98
+Source0: http://dl.sourceforge.net/e1000/%{_orig_name}-%{version}.tar.gz
+# Source0-md5: 519bc00c3315e127530dbe6968358634
URL: http://support.intel.com/support/network/adapter/pro100/
-%{?with_dist_kernel:BuildRequires: kernel-source > 2.4 }
-BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) >= 1.118
-%ifarch sparc
-BuildRequires: crosssparc64-gcc
-%endif
+BuildRequires: rpmbuild(macros) >= 1.330
%{?with_dist_kernel:%requires_releq_kernel_up}
Requires(post,postun): /sbin/depmod
Provides: kernel(e100)
@@ -34,11 +25,6 @@
Obsoletes: linux-net-e100
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%ifarch sparc
-%define _target_base_arch sparc64
-%define _target_cpu sparc64
-%endif
-
%description
This package contains the Linux driver for the Intel(R) PRO/100 family
of 10/100 Ethernet network adapters.
@@ -68,33 +54,17 @@
%prep
%setup -q -n %{_orig_name}-%{version}
+cat > src/Makefile <<'EOF'
+obj-m := e100.o
+e100-objs := ethtool.o
+EOF
%build
-%ifarch %{ix86}
-%{__make} -C src SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA"
KSRC=%{_kernelsrcdir}
-%endif
-%ifarch ppc
-%{__make} -C src SMP=1 CC="%{kgcc} -msoft-float -DSTB_WA" KSRC=%{_kernelsrcdir}
-%endif
-%ifnarch %{ix86} ppc
-%{__make} -C src SMP=1 CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
-%endif
-mv -f src/%{_orig_name}.o src/%{_orig_name}-smp.o
-
-%{__make} -C src clean KSRC=%{_kernelsrcdir}
-
-%ifarch ppc
-%{__make} -C src CC="%{kgcc} -msoft-float -DSTB_WA" KSRC=%{_kernelsrcdir}
-%else
-%{__make} -C src CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
-%endif
+%build_kernel_modules -C src -m e100
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc
-install -d
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc
-install src/%{_orig_name}-smp.o
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc/%{_mod_name}.o
-install src/%{_orig_name}.o
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc/%{_mod_name}.o
+%install_kernel_modules -m src/e1000 -d kernel/drivers/net -n e1000 -s current
%clean
rm -rf $RPM_BUILD_ROOT
@@ -114,12 +84,14 @@
%files
%defattr(644,root,root,755)
%doc e100.7 README LICENSE
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc/*
+/etc/modprobe.d/%{_kernel_ver}/e100.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/*
%files -n kernel-smp-net-%{_orig_name}
%defattr(644,root,root,755)
%doc e100.7 README LICENSE
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc/*
+/etc/modprobe.d/%{_kernel_ver}/e100.conf
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -127,6 +99,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.49.2.1 2007/03/25 02:37:53 shadzik
+- moved to AC-branch
+- driver version 3.5.17
+- new kernel module build style (rpmbuild(macros) >= 1.330)
+- own Makefile (original one doesn't fits us)
+- new Source0
+
Revision 1.49 2006/08/12 17:02:49 ankry
- spacing, new bconds, etc.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-net-e100.spec?r1=1.49&r2=1.49.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
