SPECS (LINUX_2_6_16): e1000e.spec - LINUX_2_6_16 branch for Ac kernels. Bas...
marcus
marcus at pld-linux.org
Sat Sep 6 14:40:08 CEST 2008
Author: marcus Date: Sat Sep 6 12:40:08 2008 GMT
Module: SPECS Tag: LINUX_2_6_16
---- Log message:
- LINUX_2_6_16 branch for Ac kernels. Based on e1000.spec.
---- Files affected:
SPECS:
e1000e.spec (1.17 -> 1.17.2.1)
---- Diffs:
================================================================
Index: SPECS/e1000e.spec
diff -u SPECS/e1000e.spec:1.17 SPECS/e1000e.spec:1.17.2.1
--- SPECS/e1000e.spec:1.17 Tue Sep 2 08:41:37 2008
+++ SPECS/e1000e.spec Sat Sep 6 14:40:03 2008
@@ -1,10 +1,12 @@
# $Revision$, $Date$
-# Module for kernels <2.6.24
#
# Conditional build:
%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_without up # don't build UP module
%bcond_with verbose # verbose build (V=1)
+%bcond_with grsec_kernel # build for kernel-grsecurity
%ifarch sparc
%undefine with_smp
@@ -13,61 +15,93 @@
%if %{without kernel}
%undefine with_dist_kernel
%endif
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define alt_kernel grsecurity
+%endif
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-%define rel 6
-%define pname e1000e
-Summary: Intel(R) PRO/1000e driver for Linux
-Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000e
-Name: %{pname}%{_alt_kernel}
-Version: 0.4.1.7
-Release: %{rel}
-License: GPL v2
-Group: Base/Kernel
-Source0: http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5: 6ee50d62db27d7af0abfd0cbc61fb76f
-URL: http://dl.sourceforge.net/e1000/
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-BuildRequires: rpmbuild(macros) >= 1.379
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define rel 7
+%define pname e1000e
+Summary: Intel(R) PRO/1000e driver for Linux
+Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000e
+Name: %{pname}%{_alt_kernel}
+Version: 0.4.1.7
+Release: %{rel}
+License: GPL v2
+Group: Base/Kernel
+Source0: http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
+# Source0-md5: 6ee50d62db27d7af0abfd0cbc61fb76f
+URL: http://dl.sourceforge.net/e1000/
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires: rpmbuild(macros) >= 1.330
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
%description
This package contains the Linux driver for the Intel(R) PRO/1000
family of 10/100/1000 Ethernet network adapters. This driver is
-designed to work with the Intel® 82571/2/3/4 PCI-E family of gigabit
+designed to work with the Intel 82571/2/3/4 PCI-E family of gigabit
adapters and 82567 controllers.
%description -l pl.UTF-8
Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
10/100/1000Mbit z rodziny Intel(R) PRO/1000. Ten sterownik jest
-stworzony aby pracować z kartami gigabitowymi rodziny Intel®
+stworzony aby pracowa. z kartami gigabitowymi rodziny Intel
82571/2/3/4 PCI-E oraz kontrolerami 82567.
+
%package -n kernel%{_alt_kernel}-net-%{pname}
-Summary: Intel(R) PRO/1000e driver for Linux
-Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000e
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
+Summary: Intel(R) PRO/1000e driver for Linux
+Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000e
+Release: %{rel}@%{_kernel_ver_str}
+Group: Base/Kernel
+Requires(post,postun): /sbin/depmod
%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun): %releq_kernel
+%requires_releq_kernel_up
+Requires(postun): %releq_kernel_up
%endif
+Provides: kernel(e1000e)
%description -n kernel%{_alt_kernel}-net-%{pname}
This package contains the Linux driver for the Intel(R) PRO/1000
family of 10/100/1000 Ethernet network adapters. This driver is
-designed to work with the Intel® 82571/2/3/4 PCI-E family of gigabit
+designed to work with the Intel 82571/2/3/4 PCI-E family of gigabit
adapters and 82567 controllers.
%description -n kernel%{_alt_kernel}-net-%{pname} -l pl.UTF-8
Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
10/100/1000Mbit z rodziny Intel(R) PRO/1000. Ten sterownik jest
-stworzony aby pracować z kartami gigabitowymi rodziny Intel®
+stworzony aby pracowa. z kartami gigabitowymi rodziny Intel
82571/2/3/4 PCI-E oraz kontrolerami 82567.
+
+%package -n kernel%{_alt_kernel}-smp-net-%{pname}
+Summary: Intel(R) PRO/1000e driver for Linux
+Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000e
+Release: %{rel}@%{_kernel_ver_str}
+Group: Base/Kernel
+Requires(post,postun): /sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun): %releq_kernel_smp
+%endif
+Provides: kernel(e1000e)
+
+%description -n kernel%{_alt_kernel}-smp-net-%{pname}
+This package contains the Linux SMP driver for the Intel(R) PRO/1000
+family of 10/100/1000 Ethernet network adapters. This driver is
+designed to work with the Intel 82571/2/3/4 PCI-E family of gigabit
+adapters and 82567 controllers.
+
+%description -n kernel%{_alt_kernel}-smp-net-%{pname} -l pl.UTF-8
+Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
+10/100/1000Mbit z rodziny Intel(R) PRO/1000. Ten sterownik jest
+stworzony aby pracowa. z kartami gigabitowymi rodziny Intel
+82571/2/3/4 PCI-E oraz kontrolerami 82567.
+
+
%prep
%setup -q -n %{pname}-%{version}
cat > src/Makefile <<'EOF'
@@ -100,11 +134,29 @@
%postun -n kernel%{_alt_kernel}-net-%{pname}
%depmod %{_kernel_ver}
-%files -n kernel%{_alt_kernel}-net-%{pname}
+%post -n kernel%{_alt_kernel}-smp-net-%{pname}
+%depmod %{_kernel_ver}smp
+
+%postun -n kernel%{_alt_kernel}-smp-net-%{pname}
+%depmod %{_kernel_ver}smp
+
+%if %{with kernel}
+%if %{with up}
+%files -n kernel%{_alt_kernel}-net-%{pname}
%defattr(644,root,root,755)
%doc e1000e.7 README
/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*
+%endif
+
+%if %{with smp} && %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-smp-net-%{pname}
+%defattr(644,root,root,755)
+%doc e1000e.7 README
+/etc/modprobe.d/%{_kernel_ver}smp/%{pname}.conf
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/%{pname}*.ko*
+%endif
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -112,54 +164,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.17 2008/09/02 06:41:37 arekm
-- release 6
-
-Revision 1.16 2008/08/06 20:19:37 hawk
-- release 5
-
-Revision 1.15 2008/08/03 10:19:52 arekm
-- release 4
-
-Revision 1.14 2008/07/29 10:33:31 hawk
-- release 3
-
-Revision 1.13 2008/07/25 07:10:06 arekm
-- release 2
-
-Revision 1.12 2008/07/22 13:18:17 hawk
-- updated to 0.4.1.7
-
-Revision 1.11 2008/07/19 08:00:51 arekm
-- release 9
-
-Revision 1.10 2008/07/15 09:15:40 arekm
-- release 8
-
-Revision 1.9 2008/07/02 20:43:25 arekm
-- release 7
-
-Revision 1.8 2008/06/26 06:46:05 arekm
-- release 6
-
-Revision 1.7 2008/06/24 11:24:31 arekm
-- release 5
-
-Revision 1.6 2008/06/23 19:15:06 hawk
-- release 4
-
-Revision 1.5 2008/06/08 16:43:27 hawk
-- release 3
-
-Revision 1.4 2008-05-24 10:07:36 hawk
-- release 2
-
-Revision 1.3 2008-05-23 08:11:58 hawk
-- adapterized
-
-Revision 1.2 2008-05-05 15:42:47 hawk
-- merged blacklisting of old module from e1000.spec
+Revision 1.17.2.1 2008/09/06 12:40:03 marcus
+- LINUX_2_6_16 branch for Ac kernels. Based on e1000.spec.
-Revision 1.1 2008-04-24 10:04:39 blues
-- initial, driver is in 2.6.24
+Revision 1.18 2008/09/06 12:35:27 marcus
+- e1000e driver for 2.6.16.x Ac kernel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e1000e.spec?r1=1.17&r2=1.17.2.1&f=u
More information about the pld-cvs-commit
mailing list