From 87e8cf612348fb324b27a7c2dc377c1f188c1a67 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 14 May 2008 10:01:30 +0000 Subject: [PATCH] Patch from Bart Van Assche : The script generate-kernel-patch generates a kernel tree based on the sources and the in-tree kernel patches in the SCST Subversion repository. When I submitted the first version of the generate-kernel-patch script most but not all in-tree patches were present as separate files in the SCST Subversion repository. The patch below moves the two remaining patches that are contained inline in the generate-kernel-patch script to separate files. This should make it possible to use the script on future Linux kernels without having to modify the script itself. The patch below does not contain functional changes, it only moves two patches out of the script. Modified: * scripts/generate-kernel-patch'>scripts/generate-kernel-patch Added: * srpt/src/Makefile.infiniband.Linux-2.6.24.patch'>srpt/src/Makefile.infiniband.Linux-2.6.24.patch * srpt/src/Kconfig.infiniband.Linux-2.6.24.patch'>srpt/src/Kconfig.infiniband.Linux-2.6.24.patch Also Makefile and Kconfig files were renamed (".drivers." was replaced by ".scsi.") git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@369 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 26 +++---------------- ...tch => Kconfig.drivers.Linux-2.6.24.patch} | 0 ...atch => Kconfig.drivers.Linux-2.6.7.patch} | 0 .../{Kconfig.scsi_tgt => Kconfig.scst} | 0 ...ch => Makefile.drivers.Linux-2.6.15.patch} | 0 ...ch => Makefile.drivers.Linux-2.6.24.patch} | 0 ...tch => Makefile.drivers.Linux-2.6.7.patch} | 0 .../{Makefile.scsi_tgt => Makefile.scst} | 0 .../src/Kconfig.infiniband.Linux-2.6.24.patch | 12 +++++++++ .../Makefile.infiniband.Linux-2.6.24.patch | 9 +++++++ 10 files changed, 25 insertions(+), 22 deletions(-) rename scst/kernel/in-tree/{Kconfig.scsi.Linux-2.6.24.patch => Kconfig.drivers.Linux-2.6.24.patch} (100%) rename scst/kernel/in-tree/{Kconfig.scsi.Linux-2.6.7.patch => Kconfig.drivers.Linux-2.6.7.patch} (100%) rename scst/kernel/in-tree/{Kconfig.scsi_tgt => Kconfig.scst} (100%) rename scst/kernel/in-tree/{Makefile.scsi.Linux-2.6.15.patch => Makefile.drivers.Linux-2.6.15.patch} (100%) rename scst/kernel/in-tree/{Makefile.scsi.Linux-2.6.24.patch => Makefile.drivers.Linux-2.6.24.patch} (100%) rename scst/kernel/in-tree/{Makefile.scsi.Linux-2.6.7.patch => Makefile.drivers.Linux-2.6.7.patch} (100%) rename scst/kernel/in-tree/{Makefile.scsi_tgt => Makefile.scst} (100%) create mode 100644 srpt/src/Kconfig.infiniband.Linux-2.6.24.patch create mode 100644 srpt/src/Makefile.infiniband.Linux-2.6.24.patch diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index af4dc5a40..8307b56da 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -145,29 +145,11 @@ done # Directory drivers/infiniband/ulp/srpt/ -cat <<'EOF' -diff -uprN orig/linux-2.6.24/drivers/infiniband/Kconfig linux-2.6.24/drivers/infiniband/Kconfig ---- orig/linux-2.6.24/drivers/infiniband/Kconfig 2008-01-24 23:58:37.000000000 +0100 -+++ linux-2.6.24/drivers/infiniband/Kconfig 2008-05-09 13:55:27.000000000 +0200 -@@ -51,6 +51,8 @@ +add_patch "srpt/src/Kconfig.infiniband.Linux-${kernel_version}.patch" \ + "linux-${kernel_version}/drivers/infiniband/Kconfig" - source "drivers/infiniband/ulp/srp/Kconfig" - -+source "drivers/infiniband/ulp/srpt/Kconfig" -+ - source "drivers/infiniband/ulp/iser/Kconfig" - - endif # INFINIBAND -diff -uprN orig/linux-2.6.24/drivers/infiniband/Makefile linux-2.6.24/drivers/infiniband/Makefile ---- orig/linux-2.6.24/drivers/infiniband/Makefile 2008-01-24 23:58:37.000000000 +0100 -+++ linux-2.6.24/drivers/infiniband/Makefile 2008-05-09 13:57:00.000000000 +0200 -@@ -7,4 +7,5 @@ - obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ - obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ - obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ -+obj-$(CONFIG_INFINIBAND_SRPT) += ulp/srpt/ - obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/ -EOF +add_patch "srpt/src/Makefile.infiniband.Linux-${kernel_version}.patch" \ + "linux-${kernel_version}/drivers/infiniband/Makefile" add_file "srpt/src/Kconfig" "drivers/infiniband/ulp/srpt/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.24.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.24.patch similarity index 100% rename from scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.24.patch rename to scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.24.patch diff --git a/scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.7.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.7.patch similarity index 100% rename from scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.7.patch rename to scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.7.patch diff --git a/scst/kernel/in-tree/Kconfig.scsi_tgt b/scst/kernel/in-tree/Kconfig.scst similarity index 100% rename from scst/kernel/in-tree/Kconfig.scsi_tgt rename to scst/kernel/in-tree/Kconfig.scst diff --git a/scst/kernel/in-tree/Makefile.scsi.Linux-2.6.15.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.15.patch similarity index 100% rename from scst/kernel/in-tree/Makefile.scsi.Linux-2.6.15.patch rename to scst/kernel/in-tree/Makefile.drivers.Linux-2.6.15.patch diff --git a/scst/kernel/in-tree/Makefile.scsi.Linux-2.6.24.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.24.patch similarity index 100% rename from scst/kernel/in-tree/Makefile.scsi.Linux-2.6.24.patch rename to scst/kernel/in-tree/Makefile.drivers.Linux-2.6.24.patch diff --git a/scst/kernel/in-tree/Makefile.scsi.Linux-2.6.7.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.7.patch similarity index 100% rename from scst/kernel/in-tree/Makefile.scsi.Linux-2.6.7.patch rename to scst/kernel/in-tree/Makefile.drivers.Linux-2.6.7.patch diff --git a/scst/kernel/in-tree/Makefile.scsi_tgt b/scst/kernel/in-tree/Makefile.scst similarity index 100% rename from scst/kernel/in-tree/Makefile.scsi_tgt rename to scst/kernel/in-tree/Makefile.scst diff --git a/srpt/src/Kconfig.infiniband.Linux-2.6.24.patch b/srpt/src/Kconfig.infiniband.Linux-2.6.24.patch new file mode 100644 index 000000000..ff3cd5e1f --- /dev/null +++ b/srpt/src/Kconfig.infiniband.Linux-2.6.24.patch @@ -0,0 +1,12 @@ +diff -uprN orig/linux-2.6.24/drivers/infiniband/Kconfig linux-2.6.24/drivers/infiniband/Kconfig +--- orig/linux-2.6.24/drivers/infiniband/Kconfig 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24/drivers/infiniband/Kconfig 2008-05-09 13:55:27.000000000 +0200 +@@ -51,6 +51,8 @@ + + source "drivers/infiniband/ulp/srp/Kconfig" + ++source "drivers/infiniband/ulp/srpt/Kconfig" ++ + source "drivers/infiniband/ulp/iser/Kconfig" + + endif # INFINIBAND diff --git a/srpt/src/Makefile.infiniband.Linux-2.6.24.patch b/srpt/src/Makefile.infiniband.Linux-2.6.24.patch new file mode 100644 index 000000000..909251197 --- /dev/null +++ b/srpt/src/Makefile.infiniband.Linux-2.6.24.patch @@ -0,0 +1,9 @@ +diff -uprN orig/linux-2.6.24/drivers/infiniband/Makefile linux-2.6.24/drivers/infiniband/Makefile +--- orig/linux-2.6.24/drivers/infiniband/Makefile 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24/drivers/infiniband/Makefile 2008-05-09 13:57:00.000000000 +0200 +@@ -7,4 +7,5 @@ + obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ + obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ + obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ ++obj-$(CONFIG_INFINIBAND_SRPT) += ulp/srpt/ + obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/