From: brian <brian>
Date: Tue, 1 Dec 2009 21:53:00 +0000 (+0000)
Subject: b=20617
X-Git-Tag: GIT_EPOCH_B_HD_KDMU~36
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0a61553957fdca6842e6f39ec16cf15ba8c7749a

b=20617
i=rread

Remove a really naive attempt in the mptlinux.spec to enforce that the kernel
modules package is only installed on the architecture it was built on.  This
of course falls down when you are installing (say) i686 modules into an i686
chroot on an x86_64 machine.
---

diff --git a/build/mptlinux.spec.patch b/build/mptlinux.spec.patch
index da284e5..e979a80 100644
--- a/build/mptlinux.spec.patch
+++ b/build/mptlinux.spec.patch
@@ -1,5 +1,5 @@
 --- mptlinux.spec.dist	2008-11-07 02:16:26.000000000 -0500
-+++ mptlinux.spec	2009-10-28 12:10:05.000000000 -0400
++++ mptlinux.spec	2009-12-01 14:17:11.000000000 -0500
 @@ -1,13 +1,15 @@
 +%{!?kernel_obj: %define kernel_obj ""}
 +
@@ -19,7 +19,7 @@
  Source0: %{name}-%{version}.tar.gz
  Source1: fusion.mptctl
  URL: http://www.lsilogic.com
-@@ -22,228 +24,285 @@
+@@ -22,228 +24,272 @@
  Fibre Channel FC909, FC919, FC929, FC919X, FC929X, and FC949X adapters
  SAS SAS1064, SAS1068, and SAS1078 adapters.
  
@@ -135,6 +135,19 @@
 -			$RPM_BUILD_ROOT/$MPTLINUX_IPATH/${driver_name}.new
 -	done;
 -done;
+-
+-# pre #########################################################################
+-%pre
+-echo pre %{version}
+-system_arch=`uname -m`
+-if [ -f /etc/SuSE-release ] && [ ${system_arch} == i686 ]; then
+-	system_arch=i586;
+-fi;
+-if [ %{_target_cpu} != ${system_arch} ]; then
+-	echo "ERROR: Failed installing this rpm!!!!"
+-	echo "This rpm is intended for %{_target_cpu} platform. It seems your system is ${system_arch}.";
+-	exit 1;
+-fi;
 +	# the Makefile hardcodes the destination path to
 +	# $(PREFIX)/lib/modules/$(KERNEL)/kernel/drivers/message/fusion
 +	# so lets move these to where they really go
@@ -145,25 +158,6 @@
 +done
 +fi
  
- # pre #########################################################################
--%pre
-+%pre modules
- echo pre %{version}
- system_arch=`uname -m`
- if [ -f /etc/SuSE-release ] && [ ${system_arch} == i686 ]; then
--	system_arch=i586;
--fi;
-+	system_arch=i586
-+fi
- if [ %{_target_cpu} != ${system_arch} ]; then
- 	echo "ERROR: Failed installing this rpm!!!!"
--	echo "This rpm is intended for %{_target_cpu} platform. It seems your system is ${system_arch}.";
--	exit 1;
--fi;
-+	echo "This rpm is intended for %{_target_cpu} platform. It seems your system is ${system_arch}."
-+	exit 1
-+fi
- 
  # post #########################################################################
 -%post
 +%post modules