From efc494ea565b17440197985fd256f3ad4a205163 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Fri, 13 Aug 2010 18:00:54 +0400 Subject: [PATCH 1/1] b=22632 update mptsas driver to PH16-4.18.20.04 i=wangyb i=yangsheng --- build/lbuild | 16 ++++++++------- build/mptlinux.spec.patch | 24 ++++++++++++++++------ lustre/kernel_patches/targets/2.6-oel5.target.in | 2 +- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/targets/2.6-sles10.target.in | 2 +- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/build/lbuild b/build/lbuild index c99ade4..7cae51c 100755 --- a/build/lbuild +++ b/build/lbuild @@ -491,7 +491,7 @@ download_file() { touch $semaphore if ! wget -nv "$from" -O "$to" || [ ! -s "$to" ]; then # the trap will remove the files via the fatal below - fatal 1 "Could not download ${to##*/} from ${from%%/*}/." + fatal 1 "Could not download ${to##*/} from ${from%/*}/." fi rm -f $semaphore delete_exit_trap "download" @@ -554,7 +554,7 @@ download_mptlinux() { return 0 fi - file="MPTLINUX_RHEL5_SLES10_PH15-${MPTLINUX_VERSION}.zip" + file="SUN_MPTLINUX_RHEL5_PH16-${MPTLINUX_VERSION}.tar.gz" download_file "$location/$file" "$KERNELTREE" "$force" } @@ -682,10 +682,12 @@ tarflags() { } untar() { - local file="$1" + local tarfile="$1" + shift + local extractfile="$@" - echo "Untarring ${file##*/}..." - tar $(tarflags "$file") "$file" + echo "Untarring ${tarfile##*/}..." + tar $(tarflags "$tarfile") "$tarfile" $extractfile } @@ -709,10 +711,10 @@ unpack_rdac() { unpack_mptlinux() { - if ! unzip -p $KERNELTREE/MPTLINUX_RHEL5_SLES10_PH15-4.16.00.00-2.zip | tar xzvf - srpms-2/mptlinux-4.16.00.00-2.src.rpm; then + if ! untar $KERNELTREE/SUN_MPTLINUX_RHEL5_PH16-${MPTLINUX_VERSION}.tar.gz pkg1-rhel5/srpms-1/mptlinux-${MPTLINUX_VERSION}-1.src.rpm; then return 1 fi - mv srpms-2/mptlinux-4.16.00.00-2.src.rpm . + mv pkg1-rhel5/srpms-1/mptlinux-${MPTLINUX_VERSION}-1.src.rpm . } diff --git a/build/mptlinux.spec.patch b/build/mptlinux.spec.patch index e979a80..56bf6fb 100644 --- a/build/mptlinux.spec.patch +++ b/build/mptlinux.spec.patch @@ -4,10 +4,10 @@ +%{!?kernel_obj: %define kernel_obj ""} + %define name mptlinux - %define version 4.16.00.00 --%define release 2 + %define version 4.18.20.04 +-%define release 1 -Summary: MPT Fusion drivers for 53C1030, FC9XX, and SAS Adapters -+%define release 2sun1 ++%define release 1sun1 +Summary: Common files for the MPT Fusion drivers for 53C1030, FC9XX, and SAS Adapters Name: %{name} Version: %{version} @@ -19,7 +19,7 @@ Source0: %{name}-%{version}.tar.gz Source1: fusion.mptctl URL: http://www.lsilogic.com -@@ -22,228 +24,272 @@ +@@ -22,238 +24,274 @@ Fibre Channel FC909, FC919, FC929, FC919X, FC929X, and FC949X adapters SAS SAS1064, SAS1068, and SAS1078 adapters. @@ -248,7 +248,7 @@ + continue + fi -- echo "The mpt driver for kernel ${kernel} is now version 4.16.00.00"; +- echo "The mpt driver for kernel ${kernel} is now version 4.18.20.04"; - #backup original fusion drivers here if not already done - for driver_name in mptbase.ko mptscsih.ko mptctl.ko mptlan.ko mptspi.ko mptfc.ko mptsas.ko; do - if [ ! -e $MPTLINUX_IPATH/${driver_name}.orig ]; then @@ -257,7 +257,7 @@ - fi; - cp -f $MPTLINUX_IPATH/${driver_name}.new $MPTLINUX_IPATH/${driver_name} - done; -+ echo "The mpt driver for kernel ${kernel} is now version 4.16.00.00" ++ echo "The mpt driver for kernel ${kernel} is now version 4.18.20.04" # Remake the initrd image for the user, depending on their OS if [ -f /etc/redhat-release ]; then - @@ -268,6 +268,12 @@ - mv $MPTLINUX_IPATH/${driver_name} \ - $MPTLINUX_IPATH/${driver_name}.orig - fi; +- # to handle kmods partially need to handle week updates +- MPTLINUX_KPATH=/lib/modules/${kernel}/extra/mptbase +- if [ -e $MPTLINUX_KPATH/${driver_name} ]; then +- mv $MPTLINUX_KPATH/${driver_name} \ +- $MPTLINUX_KPATH/${driver_name}.orig +- fi; - done; - # RHEL 4 @@ -367,6 +373,10 @@ - if [ -f $MPTLINUX_IPATH/${driver_name}.orig ]; then - mv -f $MPTLINUX_IPATH/${driver_name}.orig $MPTLINUX_IPATH/${driver_name} - fi; +- MPTLINUX_KPATH=/lib/modules/${kernel}/extra/mptbase +- if [ -e $MPTLINUX_KPATH/${driver_name}.orig ]; then +- mv -f $MPTLINUX_KPATH/${driver_name}.orig $MPTLINUX_KPATH/${driver_name} +- fi; - done; - # RHEL 4 @@ -413,6 +423,8 @@ # changelog ################################################################### %changelog ++* Fri Jun 11 2010 Brian J. Murrell ++ - update to 4.18.20.04 +* Wed Oct 28 2009 Brian J. Murrell + - split into modules and non-modules packages so that multiple + modules packages can be installed, for several kernels diff --git a/lustre/kernel_patches/targets/2.6-oel5.target.in b/lustre/kernel_patches/targets/2.6-oel5.target.in index afb5e51..6cbd050 100644 --- a/lustre/kernel_patches/targets/2.6-oel5.target.in +++ b/lustre/kernel_patches/targets/2.6-oel5.target.in @@ -8,7 +8,7 @@ LUSTRE_VERSION=@VERSION@ OFED_VERSION=inkernel RDAC_VERSION="09.03.0C02.0013" -MPTLINUX_VERSION="4.16.00.00-2" +MPTLINUX_VERSION="4.18.20.04" BASE_ARCHS="i686 x86_64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index 265d827..e38bcfb 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -7,7 +7,7 @@ EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ LUSTRE_VERSION=@VERSION@ RDAC_VERSION="09.03.0C02.0013" -MPTLINUX_VERSION="4.16.00.00-2" +MPTLINUX_VERSION="4.18.20.04" BASE_ARCHS="i686 x86_64 ia64 ppc64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in index 73464b4..8268a50 100644 --- a/lustre/kernel_patches/targets/2.6-sles10.target.in +++ b/lustre/kernel_patches/targets/2.6-sles10.target.in @@ -18,7 +18,7 @@ LUSTRE_VERSION=@VERSION@ OFED_VERSION=1.5.1 RDAC_VERSION="09.03.0C02.0013" -MPTLINUX_VERSION="4.16.00.00-2" +MPTLINUX_VERSION="4.18.20.04" BASE_ARCHS="i686 ppc x86_64 ia64 ppc64" BIGMEM_ARCHS="" -- 1.8.3.1