Merged revisions 5564-5565,5580,5591,5599,5604,5623,5632-5638,5645-5646,5652-5653 via svnmerge from

svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/branches/3.0.x ................ r5564 | vlnb | 2014-06-04 06:10:31 +0300 (Wed, 04 Jun 2014) | 3 lines Initialize merging from the trunk ................ r5565 | vlnb | 2014-06-04 06:12:05 +0300 (Wed, 04 Jun 2014) | 13 lines Merged revisions 5543,5545 via svnmerge from svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk ........ r5543 | bvassche | 2014-05-23 00:33:53 -0700 (Fri, 23 May 2014) | 1 line RHEL 7 build fixes ........ r5545 | bvassche | 2014-05-23 01:36:36 -0700 (Fri, 23 May 2014) | 1 line scripts/rebuild-rhel-kernel-rpm: Add RHEL 7 RC support ........ ................ r5580 | bvassche | 2014-06-11 17:33:30 +0300 (Wed, 11 Jun 2014) | 1 line ib_srpt: Merge build and login fixes from trunk ................ r5591 | vlnb | 2014-06-12 02:52:43 +0300 (Thu, 12 Jun 2014) | 14 lines Merged revisions 5584 via svnmerge from svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk ........ r5584 | vlnb | 2014-06-11 12:33:18 -0700 (Wed, 11 Jun 2014) | 8 lines scst: RHEL 5 build fix Avoid that building the scst kernel module fails on RHEL 5 due to a missing kvasprintf() implementation. Signed-off-by: Bart Van Assche <bvanassche@acm.org> ........ ................ r5599 | bvassche | 2014-06-13 09:59:13 +0300 (Fri, 13 Jun 2014) | 1 line ib_srpt: Merge from trunk ................ r5604 | vlnb | 2014-06-14 03:31:55 +0300 (Sat, 14 Jun 2014) | 14 lines Merged revisions 5602 via svnmerge from svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk ........ r5602 | vlnb | 2014-06-13 16:57:26 -0700 (Fri, 13 Jun 2014) | 8 lines scst_pr_read_reservation(): Initialize returned buffer Avoid that this function returns an uninitialized buffer to the initiator if buffer_size < 8. Detected by Coverity. Signed-off-by: Bart Van Assche <bvanassche@acm.org> ........ ................ r5623 | vlnb | 2014-06-25 07:00:14 +0300 (Wed, 25 Jun 2014) | 9 lines Merged revisions 5610 via svnmerge from svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk ........ r5610 | vlnb | 2014-06-18 20:51:48 -0700 (Wed, 18 Jun 2014) | 3 lines Update for 3.15 kernels ........ ................ r5632 | bvassche | 2014-06-29 08:18:01 +0300 (Sun, 29 Jun 2014) | 1 line scst_vdisk: 32-bit build fix (merge r5629 from trunk) ................ r5633 | bvassche | 2014-06-29 08:20:31 +0300 (Sun, 29 Jun 2014) | 1 line ib_srpt: Remove existing ib_srpt.ko kernel modules before installation (merge r5621, r5628 and r5630 from trunk) ................ r5634 | bvassche | 2014-06-29 08:22:58 +0300 (Sun, 29 Jun 2014) | 1 line Skip "depmod" while building an RPM (merge r5612 from trunk) ................ r5635 | bvassche | 2014-06-29 08:24:11 +0300 (Sun, 29 Jun 2014) | 1 line ib_srpt: Set SCSI residual fields in SRP_CMD reply (merge r5622 from trunk) ................ r5636 | bvassche | 2014-06-29 08:25:55 +0300 (Sun, 29 Jun 2014) | 1 line nightly build: Add kernel 3.15 build infrastructure (merge r5611 from trunk) ................ r5637 | bvassche | 2014-06-29 08:27:14 +0300 (Sun, 29 Jun 2014) | 1 line regression tests: Sort hash keys before comparing (merge r5582 from trunk) ................ r5638 | bvassche | 2014-06-29 08:28:45 +0300 (Sun, 29 Jun 2014) | 1 line regression tests: Sync with a recent sysfs change (merge r5581 from trunk) ................ r5645 | bvassche | 2014-06-29 09:00:05 +0300 (Sun, 29 Jun 2014) | 1 line nightly build, scripts: Merge from trunk (r5533:r5642) ................ r5646 | bvassche | 2014-06-29 09:10:22 +0300 (Sun, 29 Jun 2014) | 2 lines scst: Switch from the cpu_*() to the cpumask_*() API (merge r5596 from trunk) ................ r5652 | bvassche | 2014-06-30 13:23:11 +0300 (Mon, 30 Jun 2014) | 1 line nightly build: Merge r5642:r5651 from trunk ................ r5653 | bvassche | 2014-06-30 13:25:24 +0300 (Mon, 30 Jun 2014) | 1 line scst: Build fixes for kernel versions <= 2.6.34 (merge r5647 and r5648 from trunk) ................ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5665 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2026-09-06 08:06:56 +00:00 · 2014-07-07 10:28:33 +00:00
parent d3a58749e1
commit b990f13496
50 changed files with 1251 additions and 87 deletions
@@ -2,7 +2,7 @@
 # Shell functions for parsing the Linux kernel version and for downloading
 # from kernel.org.

-kernel_mirror="ftp://ftp.kernel.org/pub/linux/kernel"
+kernel_mirror="http://ftp.kernel.org/pub/linux/kernel"
 kernel_longterm="http://www.kernel.org/pub/linux/kernel"
 kernel_sources="$HOME/software/downloads"

@@ -85,6 +85,9 @@ case "$distro" in
      srpm_url=("http://ftp.scientificlinux.org/linux/scientific/$releasevermajor$releaseverminor/SRPMS/vendor")
    fi
    ;;
+  "Fedora")
+    srpm_url="http://ftp.redhat.com/redhat/rhel/rc/7/Server/source/tree/Packages"
+    ;;
  *)
    echo "Unknown type of distribution: $distro"
    exit 1
@@ -183,7 +186,10 @@ log "Copying SCST patches to the SOURCES directory"

 cd ${rpmbuild_dir}/SOURCES
 copy_patch $scst_dir/scst/kernel/rhel/scst_exec_req_fifo-${kver}.patch scst_exec_req_fifo.patch
-copy_patch $scst_dir/iscsi-scst/kernel/patches/rhel/put_page_callback-${kver}.patch put_page_callback.patch
+f="$scst_dir/iscsi-scst/kernel/patches/rhel/put_page_callback-${kver}.patch"
+if [ -e "$f" ]; then
+    copy_patch "$f" put_page_callback.patch
+fi

 log "Adding SCST patches in kernel.spec"

@@ -319,6 +325,49 @@ diff -u SPECS/kernel.spec{.orig,}
   make ARCH=$Arch %{oldconfig_target} > /dev/null
   echo "# $Arch" > configs/$i
 EOF
+elif [ ${kver#3.10.0-121} != $kver ]; then
+# RHEL/CentOS/SL 7.0
+patch -p1 ${rpmbuild_dir}/SPECS/kernel.spec <<'EOF' || exit $?
+--- kernel.spec.orig	2014-05-23 10:09:17.707202148 +0200
+++ kernel.spec	2014-05-23 10:15:50.883937952 +0200
+@@ -4,6 +4,7 @@
+ Summary: The Linux kernel
+ 
+ # % define buildid .local
+%define buildid .scst
+ 
+ # For a stable, released kernel, released_kernel should be 1. For rawhide
+ # and/or a kernel built from an rc or git snapshot, released_kernel should
+@@ -367,6 +368,9 @@
+ Source2000: cpupower.service
+ Source2001: cpupower.config
+ 
+Patch200: scst_exec_req_fifo.patch
+#Patch201: put_page_callback.patch
+
+ # empty final patch to facilitate testing of kernel patches
+ Patch999999: linux-kernel-test.patch
+ 
+@@ -668,6 +672,9 @@
+ # Drop some necessary files from the source dir into the buildroot
+ cp $RPM_SOURCE_DIR/kernel-%{version}-*.config .
+ 
+ApplyPatch scst_exec_req_fifo.patch
+#ApplyPatch put_page_callback.patch
+
+ ApplyOptionalPatch linux-kernel-test.patch
+ 
+ # Any further pre-build tree manipulations happen here.
+@@ -700,6 +707,8 @@
+ for i in *.config
+ do
+   mv $i .config
+  echo "CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION=y" >> .config
+  sed -i.tmp -e 's/^CONFIG_SCSI_QLA_FC=.*/CONFIG_SCSI_QLA_FC=n/' .config
+   Arch=`head -1 .config | cut -b 3-`
+   make %{?cross_opts} ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true
+ %if %{listnewconfig_fail}
+EOF
 else
    log "Unrecognized kernel version ${kver}"
 fi
@@ -327,7 +376,7 @@ log "Rebuilding kernel"

 cd ${rpmbuild_dir}/SPECS
 {
-  rpmbuild -bb --target=${arch} --with baseonly --with firmware --without kabichk kernel*.spec
+  rpmbuild -bb --target=${arch} --nodeps --with baseonly --with firmware --without kabichk kernel*.spec
  rc=$?
  if [ $rc != 0 ]; then
    exit $rc
@@ -492,7 +492,7 @@ fi
 # Where to store persistenly downloaded kernel tarballs and kernel patches.
 kernel_sources="$HOME/software/downloads"
 # URL for downloading kernel tarballs and kernel patches.
-kernel_mirror="ftp://ftp.kernel.org/pub/linux/kernel"
+kernel_mirror="http://ftp.kernel.org/pub/linux/kernel"
 kernel_longterm="http://www.kernel.org/pub/linux/kernel"
 kernel_versions=""
 # Directory in which the regression test output files will be stored. Must be