Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf7bf5f)
b=22632 update mptsas driver to PH16-4.18.20.04
authorBrian J. Murrell <brian.murrell@oracle.com>
Fri, 25 Jun 2010 17:27:12 +0000 (13:27 -0400)
committerJohann Lombardi <johann@sun.com>
Fri, 25 Jun 2010 18:14:06 +0000 (20:14 +0200)
i=wangyb
i=yangsheng

build/lbuild patch | blob | history
build/mptlinux.spec.patch patch | blob | history
lustre/kernel_patches/targets/2.6-oel5.target.in patch | blob | history
lustre/kernel_patches/targets/2.6-rhel5.target.in patch | blob | history
lustre/kernel_patches/targets/2.6-sles10.target.in patch | blob | history

diff --git a/build/lbuild b/build/lbuild
index c99ade4..7cae51c 100755 (executable)
--- 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
             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"
             fi
             rm -f $semaphore
             delete_exit_trap "download"
@@ -554,7 +554,7 @@ download_mptlinux() {
         return 0
     fi
 
         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"
 
 }
     download_file "$location/$file" "$KERNELTREE" "$force"
 
 }
@@ -682,10 +682,12 @@ tarflags() {
 }
 
 untar() {
 }
 
 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() {
 
 
 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
         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 (file)
--- a/build/mptlinux.spec.patch
+++ b/build/mptlinux.spec.patch
@@ -4,10 +4,10 @@
 +%{!?kernel_obj: %define kernel_obj ""}
 +
  %define name mptlinux
 +%{!?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
 -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}
 +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
  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.
  
  Fibre Channel FC909, FC919, FC929, FC919X, FC929X, and FC949X adapters
  SAS SAS1064, SAS1068, and SAS1078 adapters.
  
@@ -248,7 +248,7 @@
 +              continue
 +      fi
  
 +              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
 -      #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;
 -              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
 -
        # 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;
 -                              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
 -              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;
 -                      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
 -              done;
 -
                # RHEL 4
@@ -413,6 +423,8 @@
  
  # changelog  ###################################################################
  %changelog
  
  # changelog  ###################################################################
  %changelog
++* Fri Jun 11 2010 Brian J. Murrell <brian.murrell@oracle.com>
++ - update to 4.18.20.04
 +* Wed Oct 28 2009 Brian J. Murrell <Brian.Murrell@Sun.COM>
 + - split into modules and non-modules packages so that multiple
 +   modules packages can be installed, for several kernels
 +* Wed Oct 28 2009 Brian J. Murrell <Brian.Murrell@Sun.COM>
 + - 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 584fc33..642625d 100644 (file)
--- 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"
 
 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 ia64"
 BIGMEM_ARCHS=""
 
 BASE_ARCHS="i686 x86_64 ia64"
 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 07dd76f..3ff1575 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel5.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in
@@ -8,7 +8,7 @@ LUSTRE_VERSION=@VERSION@
 
 OFED_VERSION=inkernel
 RDAC_VERSION="09.03.0C02.0013"
 
 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 ia64 ppc64"
 BIGMEM_ARCHS=""
 
 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 1990483..a7b11be 100644 (file)
--- 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"
 
 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=""
 
 BASE_ARCHS="i686 ppc x86_64 ia64 ppc64"
 BIGMEM_ARCHS=""
Lustre primary development and releases