X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ixgbe.spec;h=6aab28b8fa6f6e24b0873ff9be325c7871f94189;hb=refs%2Ftags%2Fauto%2Fth%2Fixgbe-4.1.2-1;hp=9c502c323d5ee6c8fb5bf37399a79d09d9fb4b74;hpb=11e6b97fed6ef02592ce4f879f55f8fa8f685f50;p=packages%2Fixgbe.git

diff --git a/ixgbe.spec b/ixgbe.spec
index 9c502c3..6aab28b 100644
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -1,33 +1,25 @@
 # 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)
 
-%ifarch sparc
-%undefine	with_smp
-%endif
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
 
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine	with_userspace
-%endif
-
-%define		rel	2
+%define		rel	1
 %define		pname	ixgbe
 Summary:	Intel(R) 10 Gigabit driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) 10 Gigabit
 Name:		%{pname}%{_alt_kernel}
-Version:	3.9.15
-Release:	%{rel}
+Version:	4.1.2
+Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5:	24f5a3c93f5ee0232ff69409c2eba08d
+# Source0-md5:	191f7b0f31596cc0edc7e870ca05d037
+Patch0:		linux-4.1.patch
+Patch1:		linux-4.2.patch
 URL:		http://sourceforge.net/projects/e1000/
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-BuildRequires:	rpmbuild(macros) >= 1.379
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.701
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,60 +30,81 @@ adapters with 82598EB chipset.
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych z rodziny
 Intel(R) 10 Gigabit opartych o układ 82598EB.
 
-%package -n kernel%{_alt_kernel}-net-ixgbe
-Summary:	Intel(R) 10 Gigabit driver for Linux
-Summary(pl.UTF-8):	Sterownik do karty Intel(R) 10 Gigabit
-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-ixgbe
-This package contains the Linux driver for the Intel(R) 10 Gigabit
-adapters with 82598EB chipset.
-
-%description -n kernel%{_alt_kernel}-net-ixgbe -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych z rodziny
-Intel(R) 10 Gigabit opartych o układ 82598EB.
+%define	kernel_pkg()\
+%package -n kernel%{_alt_kernel}-net-ixgbe\
+Summary:	Intel(R) 10 Gigabit driver for Linux\
+Summary(pl.UTF-8):	Sterownik do karty Intel(R) 10 Gigabit\
+Release:	%{rel}@%{_kernel_ver_str}\
+Group:		Base/Kernel\
+Requires(post,postun):	/sbin/depmod\
+%requires_releq_kernel\
+Requires(postun):	%releq_kernel\
+\
+%description -n kernel%{_alt_kernel}-net-ixgbe\
+This package contains the Linux driver for the Intel(R) 10 Gigabit\
+adapters with 82598EB chipset.\
+\
+%description -n kernel%{_alt_kernel}-net-ixgbe -l pl.UTF-8\
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych z rodziny\
+Intel(R) 10 Gigabit opartych o układ 82598EB.\
+\
+%files	-n kernel%{_alt_kernel}-net-ixgbe\
+%defattr(644,root,root,755)\
+%doc ixgbe.7 README\
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf\
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*\
+\
+%post	-n kernel%{_alt_kernel}-net-ixgbe\
+%depmod %{_kernel_ver}\
+\
+%postun	-n kernel%{_alt_kernel}-net-ixgbe\
+%depmod %{_kernel_ver}\
+%{nil}
+
+%define build_kernel_pkg()\
+%build_kernel_modules -C src -m %{pname}\
+%install_kernel_modules -D installed -m src/%{pname} -d kernel/drivers/net -n %{pname} -s current\
+%{nil}
+
+%define install_kernel_pkg()\
+install -d $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}\
+# blacklist kernel module\
+cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf <<'EOF'\
+blacklist ixgbe\
+alias ixgbe ixgbe-current\
+EOF\
+%{nil}
+
+%{expand:%create_kernel_packages}
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
+%patch1 -p1
+
+cp src/Makefile src/Makefile.%{name}
 cat > src/Makefile <<'EOF'
 obj-m := ixgbe.o
 ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_api.o ixgbe_param.o \
-ixgbe_ethtool.o kcompat.o ixgbe_82598.o ixgbe_82599.o ixgbe_sriov.o \
-ixgbe_mbx.o ixgbe_dcb.o ixgbe_dcb_82598.o ixgbe_dcb_82599.o ixgbe_phy.o \
-ixgbe_dcb_nl.o
-
-EXTRA_CFLAGS=-DDRIVER_IXGBE
+ixgbe_lib.o ixgbe_ethtool.o kcompat.o ixgbe_82598.o \
+ixgbe_82599.o ixgbe_ptp.o ixgbe_x540.o ixgbe_x550.o ixgbe_sriov.o \
+ixgbe_mbx.o ixgbe_dcb.o ixgbe_dcb_82598.o ixgbe_dcb_82599.o \
+ixgbe_sysfs.o ixgbe_procfs.o ixgbe_phy.o ixgbe_fcoe.o \
+ixgbe_dcb_nl.o ixgbe_debugfs.o
+
+EXTRA_CFLAGS+=-DDRIVER_IXGBE
+EXTRA_CFLAGS+=-DIXGBE_PTP
 EOF
 
 %build
-%build_kernel_modules -C src -m %{pname}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -m src/%{pname} -d kernel/drivers/net -n %{pname} -s current
-# blacklist kernel module
-cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf <<'EOF'
-blacklist ixgbe
-alias ixgbe ixgbe-current
-EOF
+install -d $RPM_BUILD_ROOT
+
+%{expand:%install_kernel_packages}
+cp -a installed/* $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-%post	-n kernel%{_alt_kernel}-net-ixgbe
-%depmod %{_kernel_ver}
-
-%postun	-n kernel%{_alt_kernel}-net-ixgbe
-%depmod %{_kernel_ver}
-
-%files	-n kernel%{_alt_kernel}-net-ixgbe
-%defattr(644,root,root,755)
-%doc ixgbe.7 README
-/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*