[Pkg-ofed-commits] r441 - /branches/ofed-1.4.2/ofa-kernel/trunk/debian/

[gmpc-guest at alioth.debian.org]

Author: gmpc-guest
Date: Sat Aug  8 13:15:51 2009
New Revision: 441

URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=441
Log:
Do not build ipath module on i386; 64bit only

Modified:
    branches/ofed-1.4.2/ofa-kernel/trunk/debian/changelog
    branches/ofed-1.4.2/ofa-kernel/trunk/debian/rules

Modified: branches/ofed-1.4.2/ofa-kernel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ofa-kernel/trunk/debian/changelog?rev=441&op=diff
==============================================================================
--- branches/ofed-1.4.2/ofa-kernel/trunk/debian/changelog (original)
+++ branches/ofed-1.4.2/ofa-kernel/trunk/debian/changelog Sat Aug  8 13:15:51 2009
@@ -1,3 +1,9 @@
+ofa-kernel (1.4.2-2) unstable; urgency=low
+
+  * Disable ipath build on i386.
+
+ -- Guy Coates <gmpc at sanger.ac.uk>  Sat, 08 Aug 2009 14:04:17 +0100
+
 ofa-kernel (1.4.2-1) unstable; urgency=low
 
   * New upstream release

Modified: branches/ofed-1.4.2/ofa-kernel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ofa-kernel/trunk/debian/rules?rev=441&op=diff
==============================================================================
--- branches/ofed-1.4.2/ofa-kernel/trunk/debian/rules (original)
+++ branches/ofed-1.4.2/ofa-kernel/trunk/debian/rules Sat Aug  8 13:15:51 2009
@@ -26,6 +26,8 @@
 CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
+DEB_HOST_ARCH ?= $(shell  dpkg-architecture  -qDEB_HOST_ARCH)
+
 # Ofed quilt script assumes kernel versions with extra bits on the end are SLES/RH kernels 
 # and so applies the wrong patch sets. We cut the extra versions off and feed just the base
 # kernel version to OFED build scripts
@@ -69,11 +71,24 @@
 kdist_config: prep-deb-files
 # Run quilt stage manually so we can set the correct kernel patchsetpwd
 	./ofed_scripts/ofed_patch.sh --kernel-version=$(BASEKERNEL)
+#	echo "$(DEB_HOST_ARCH)"
+ifeq "$(DEB_HOST_ARCH)" "amd64"
 	./configure --kernel-sources=$(KSRC) --kernel-version=$(KVERS) \
-        --with-core-mod --with-ipoib-mod --with-ipoib-cm --with-sdp-mod --with-srp-mod --with-srp-target-mod \
+	--with-core-mod --with-ipoib-mod --with-ipoib-cm --with-sdp-mod --with-srp-mod --with-srp-target-mod \
 	--with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-mthca-mod --with-mlx4-mod --with-mlx4_core-mod \
 	--with-mlx4_en-mod --with-mlx4_inf-mod --with-rds-mod --with-madeye-mod  --with-ipath_inf-mod \
-        --with-qlgc_vnic-mod --with-qlgc_vnic_stats-mod --with-cxgb3-mod --with-nes-mod	--with-nfsrdma-mod
+	--with-qlgc_vnic-mod --with-qlgc_vnic_stats-mod --with-cxgb3-mod --with-nes-mod	--with-nfsrdma-mod
+endif
+# ipath_inf-mod does not build on 32bit architectures
+
+ifeq "$(DEB_HOST_ARCH)" "i386"
+	./configure --kernel-sources=$(KSRC) --kernel-version=$(KVERS) \
+	--with-core-mod --with-ipoib-mod --with-ipoib-cm --with-sdp-mod --with-srp-mod --with-srp-target-mod \
+	--with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-mthca-mod --with-mlx4-mod --with-mlx4_core-mod \
+	--with-mlx4_en-mod --with-mlx4_inf-mod --with-rds-mod --with-madeye-mod  \
+	--with-qlgc_vnic-mod --with-qlgc_vnic_stats-mod --with-cxgb3-mod --with-nes-mod --with-nfsrdma-mod
+endif
+
 
 # Broken opts
 # --with-iser-mod