From b2fa7521a75d8e490717780e2d45e427a0ed5b52 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 17 Nov 2016 04:33:38 +0000 Subject: [PATCH 1/7] generate-kernel-patch: fix custom cross-compilation kernel case Otherwise there is non-fatal error like: No such file or directory grep: /lib/modules//build/.config: Permission denied git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7022 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 8f8692fff..7fd772da8 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -114,7 +114,7 @@ function specialize_patch { fi | "$(dirname $0)/specialize-patch" \ ${specialize_patch_options} \ - -v kernel_version="${kver3}" \ + -v kernel_version="${kver}" \ -v SCSI_EXEC_REQ_FIFO_DEFINED="${scsi_exec_req_fifo_defined}" \ -v SCST_IO_CONTEXT="${scst_io_context}" else @@ -456,7 +456,7 @@ add_file "fcst/README" "Documentation/scst/README.fcst" \ # Directory drivers/scst/iscsi-scst/ # Make sure the file iscsi-scst/iscsi_scst_itf_ver.h is up to date. -make -s -C iscsi-scst include/iscsi_scst_itf_ver.h +make KVER=${kver3} -s -C iscsi-scst include/iscsi_scst_itf_ver.h ( for f in $(ls iscsi-scst/include/*h 2>/dev/null) From 7083e395e9d3de6f580a4b497533f0eeb6507ab8 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 17 Nov 2016 04:44:48 +0000 Subject: [PATCH 2/7] generate-kernel-patch: optimize generation of Makefile for qla2x00t git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7023 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- .../{Makefile_in-tree-2.6.35 => Makefile_in-tree} | 0 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.0 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.1 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.10 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.11 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.12 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.13 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.14 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.15 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.16 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.17 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.18 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.19 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.2 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.3 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.4 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.5 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.6 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.7 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.8 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-3.9 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-4.0 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-4.1 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-4.2 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-4.3 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-4.4 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-4.5 | 5 ----- qla2x00t/qla2x00-target/Makefile_in-tree-4.6 | 5 ----- scripts/generate-kernel-patch | 8 +++++++- 33 files changed, 7 insertions(+), 156 deletions(-) rename qla2x00t/qla2x00-target/{Makefile_in-tree-2.6.35 => Makefile_in-tree} (100%) delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.0 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.1 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.10 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.11 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.12 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.13 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.14 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.15 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.16 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.17 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.18 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.19 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.2 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.3 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.4 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.5 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.6 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.7 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.8 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.9 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.0 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.1 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.2 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.3 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.4 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.5 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.6 diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 b/qla2x00t/qla2x00-target/Makefile_in-tree similarity index 100% rename from qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 rename to qla2x00t/qla2x00-target/Makefile_in-tree diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 7fd772da8..d8c15a34a 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -517,8 +517,14 @@ if [ "${qla2x00t}" = "true" ]; then add_file "qla2x00t/qla2x_tgt_def.h" \ "drivers/scsi/qla2xxx/qla2x_tgt_def.h" - add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \ + if [ -e "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" ] + then + add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \ "drivers/scst/qla2xxx-target/Makefile" + else + add_file "qla2x00t/qla2x00-target/Makefile_in-tree" \ + "drivers/scst/qla2xxx-target/Makefile" + fi add_file "qla2x00t/qla2x00-target/Kconfig" \ "drivers/scst/qla2xxx-target/Kconfig" From fc892680c88ef32d70b9f20f825bc86e59693ef0 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 17 Nov 2016 04:55:15 +0000 Subject: [PATCH 3/7] generate-kernel-patch: optimize generation of Makefile for dev_handlers git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7024 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 14 ++++++++++---- ...e.dev_handlers-2.6.35 => Makefile.dev_handlers} | 0 scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.0 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.1 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.10 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.11 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.12 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.13 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.14 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.15 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.16 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.17 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.18 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.19 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.2 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.3 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.4 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.5 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.6 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.7 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.8 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-3.9 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-4.0 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-4.1 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-4.2 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-4.3 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-4.4 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-4.5 | 14 -------------- scst/kernel/in-tree/Makefile.dev_handlers-4.6 | 14 -------------- 33 files changed, 10 insertions(+), 438 deletions(-) rename scst/kernel/in-tree/{Makefile.dev_handlers-2.6.35 => Makefile.dev_handlers} (100%) delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.0 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.1 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.10 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.11 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.12 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.13 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.14 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.15 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.16 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.17 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.18 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.19 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.2 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.3 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.4 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.5 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.6 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.7 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.8 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.9 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.0 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.1 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.2 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.3 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.4 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.5 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.6 diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index d8c15a34a..78bcba0cf 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -413,10 +413,16 @@ done # Directory drivers/scst/dev_handlers/ - -add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" \ - "drivers/scst/dev_handlers/Makefile" \ -| process_patch "scst_11_dev_handlers_makefile.diff" +if [ -e "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" ] +then + add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" \ + "drivers/scst/dev_handlers/Makefile" \ + | process_patch "scst_11_dev_handlers_makefile.diff" +else + add_file "scst/kernel/in-tree/Makefile.dev_handlers" \ + "drivers/scst/dev_handlers/Makefile" \ + | process_patch "scst_11_dev_handlers_makefile.diff" +fi for f in $(ls scst/src/dev_handlers/*.[ch] 2>/dev/null) do diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 b/scst/kernel/in-tree/Makefile.dev_handlers similarity index 100% rename from scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 rename to scst/kernel/in-tree/Makefile.dev_handlers diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.0 b/scst/kernel/in-tree/Makefile.dev_handlers-3.0 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.0 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.1 b/scst/kernel/in-tree/Makefile.dev_handlers-3.1 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.1 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.10 b/scst/kernel/in-tree/Makefile.dev_handlers-3.10 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.10 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.11 b/scst/kernel/in-tree/Makefile.dev_handlers-3.11 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.11 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.12 b/scst/kernel/in-tree/Makefile.dev_handlers-3.12 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.12 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.13 b/scst/kernel/in-tree/Makefile.dev_handlers-3.13 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.13 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.14 b/scst/kernel/in-tree/Makefile.dev_handlers-3.14 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.14 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.15 b/scst/kernel/in-tree/Makefile.dev_handlers-3.15 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.15 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.16 b/scst/kernel/in-tree/Makefile.dev_handlers-3.16 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.16 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.17 b/scst/kernel/in-tree/Makefile.dev_handlers-3.17 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.17 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.18 b/scst/kernel/in-tree/Makefile.dev_handlers-3.18 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.18 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.19 b/scst/kernel/in-tree/Makefile.dev_handlers-3.19 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.19 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.2 b/scst/kernel/in-tree/Makefile.dev_handlers-3.2 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.2 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.3 b/scst/kernel/in-tree/Makefile.dev_handlers-3.3 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.3 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.4 b/scst/kernel/in-tree/Makefile.dev_handlers-3.4 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.4 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.5 b/scst/kernel/in-tree/Makefile.dev_handlers-3.5 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.5 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.6 b/scst/kernel/in-tree/Makefile.dev_handlers-3.6 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.6 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.7 b/scst/kernel/in-tree/Makefile.dev_handlers-3.7 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.7 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.8 b/scst/kernel/in-tree/Makefile.dev_handlers-3.8 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.8 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.9 b/scst/kernel/in-tree/Makefile.dev_handlers-3.9 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.9 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.0 b/scst/kernel/in-tree/Makefile.dev_handlers-4.0 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.0 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.1 b/scst/kernel/in-tree/Makefile.dev_handlers-4.1 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.1 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.2 b/scst/kernel/in-tree/Makefile.dev_handlers-4.2 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.2 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.3 b/scst/kernel/in-tree/Makefile.dev_handlers-4.3 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.3 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.4 b/scst/kernel/in-tree/Makefile.dev_handlers-4.4 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.4 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.5 b/scst/kernel/in-tree/Makefile.dev_handlers-4.5 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.5 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.6 b/scst/kernel/in-tree/Makefile.dev_handlers-4.6 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.6 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o From 66b195dd2fd14dfc035b1d14da84e7037c79f1f3 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 17 Nov 2016 05:06:59 +0000 Subject: [PATCH 4/7] generate-kernel-patch: optimize generation of Makefile for scst git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7025 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 12 +++++++++--- .../{Makefile.scst-2.6.33 => Makefile.scst} | 0 scst/kernel/in-tree/Makefile.scst-2.6.34 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-2.6.35 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-2.6.36 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-2.6.37 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-2.6.38 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-2.6.39 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.0 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.1 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.10 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.11 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.12 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.13 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.14 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.15 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.16 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.17 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.18 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.19 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.2 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.3 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.4 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.5 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.6 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.7 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.8 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-3.9 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-4.0 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-4.1 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-4.2 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-4.3 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-4.4 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-4.5 | 17 ----------------- scst/kernel/in-tree/Makefile.scst-4.6 | 17 ----------------- 35 files changed, 9 insertions(+), 564 deletions(-) rename scst/kernel/in-tree/{Makefile.scst-2.6.33 => Makefile.scst} (100%) delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.34 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.35 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.36 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.37 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.38 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.39 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.0 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.1 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.10 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.11 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.12 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.13 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.14 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.15 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.16 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.17 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.18 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.19 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.2 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.3 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.4 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.5 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.6 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.7 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.8 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.9 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.0 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.1 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.2 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.3 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.4 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.5 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.6 diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 78bcba0cf..1f9099647 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -224,9 +224,15 @@ else include_fcst="false" fi +if [ -e "scst/kernel/in-tree/Makefile.scst-${kver}" ]; then + scst_makefile="Makefile.scst-${kver}" +else + scst_makefile="Makefile.scst" +fi + # Make sure that for kernel 2.6.26 and later the line # "#define CONFIG_SCST_PROC" is removed from scst/include/scst.h. -if grep -qw scst_sysfs scst/kernel/in-tree/Makefile.scst-${kver} \ +if grep -qw scst_sysfs scst/kernel/in-tree/${scst_makefile} \ || [ "${generating_upstream_patch}" = "true" ]; then specialize_patch_options="${specialize_patch_options} -v config_scst_proc_undefined=1" @@ -357,8 +363,8 @@ else fi >"${tmp_Kconfig}" add_file "${tmp_Kconfig}" "drivers/scst/Kconfig" -tmp_Makefile="${tmpdir}/Makefile.scst-${kver}" -cat "scst/kernel/in-tree/Makefile.scst-${kver}" | \ +tmp_Makefile="${tmpdir}/${scst_makefile}" +cat "scst/kernel/in-tree/${scst_makefile}" | \ if [ "$include_proc_impl" != "true" ]; then grep -v 'scst_proc' else diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.33 b/scst/kernel/in-tree/Makefile.scst similarity index 100% rename from scst/kernel/in-tree/Makefile.scst-2.6.33 rename to scst/kernel/in-tree/Makefile.scst diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.34 b/scst/kernel/in-tree/Makefile.scst-2.6.34 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.34 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.35 b/scst/kernel/in-tree/Makefile.scst-2.6.35 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.35 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.36 b/scst/kernel/in-tree/Makefile.scst-2.6.36 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.36 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.37 b/scst/kernel/in-tree/Makefile.scst-2.6.37 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.37 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.38 b/scst/kernel/in-tree/Makefile.scst-2.6.38 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.38 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.39 b/scst/kernel/in-tree/Makefile.scst-2.6.39 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.39 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.0 b/scst/kernel/in-tree/Makefile.scst-3.0 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.0 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.1 b/scst/kernel/in-tree/Makefile.scst-3.1 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.1 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.10 b/scst/kernel/in-tree/Makefile.scst-3.10 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.10 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.11 b/scst/kernel/in-tree/Makefile.scst-3.11 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.11 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.12 b/scst/kernel/in-tree/Makefile.scst-3.12 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.12 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.13 b/scst/kernel/in-tree/Makefile.scst-3.13 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.13 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.14 b/scst/kernel/in-tree/Makefile.scst-3.14 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.14 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.15 b/scst/kernel/in-tree/Makefile.scst-3.15 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.15 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.16 b/scst/kernel/in-tree/Makefile.scst-3.16 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.16 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.17 b/scst/kernel/in-tree/Makefile.scst-3.17 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.17 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.18 b/scst/kernel/in-tree/Makefile.scst-3.18 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.18 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.19 b/scst/kernel/in-tree/Makefile.scst-3.19 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.19 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.2 b/scst/kernel/in-tree/Makefile.scst-3.2 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.2 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.3 b/scst/kernel/in-tree/Makefile.scst-3.3 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.3 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.4 b/scst/kernel/in-tree/Makefile.scst-3.4 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.4 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.5 b/scst/kernel/in-tree/Makefile.scst-3.5 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.5 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.6 b/scst/kernel/in-tree/Makefile.scst-3.6 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.6 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.7 b/scst/kernel/in-tree/Makefile.scst-3.7 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.7 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.8 b/scst/kernel/in-tree/Makefile.scst-3.8 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.8 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.9 b/scst/kernel/in-tree/Makefile.scst-3.9 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.9 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.0 b/scst/kernel/in-tree/Makefile.scst-4.0 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.0 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.1 b/scst/kernel/in-tree/Makefile.scst-4.1 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.1 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.2 b/scst/kernel/in-tree/Makefile.scst-4.2 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.2 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.3 b/scst/kernel/in-tree/Makefile.scst-4.3 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.3 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.4 b/scst/kernel/in-tree/Makefile.scst-4.4 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.4 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.5 b/scst/kernel/in-tree/Makefile.scst-4.5 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.5 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.6 b/scst/kernel/in-tree/Makefile.scst-4.6 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.6 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ From 11be80dac76ec2575dae465dd1b4f34e9ad0f6ab Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 17 Nov 2016 05:12:33 +0000 Subject: [PATCH 5/7] generate-kernel-patch: optimize generation of Makefile for drivers/Kconfig git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7026 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 9 +++++++-- .../in-tree/Kconfig.drivers.Linux-2.6.37.patch | 13 ------------- .../in-tree/Kconfig.drivers.Linux-2.6.38.patch | 13 ------------- .../in-tree/Kconfig.drivers.Linux-2.6.39.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.10.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.11.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.13.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.14.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.15.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.16.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.17.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.18.patch | 13 ------------- .../kernel/in-tree/Kconfig.drivers.Linux-3.19.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch | 13 ------------- scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch | 13 ------------- ...Linux-3.12.patch => Kconfig.drivers.Linux.patch} | 0 31 files changed, 7 insertions(+), 379 deletions(-) delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch rename scst/kernel/in-tree/{Kconfig.drivers.Linux-3.12.patch => Kconfig.drivers.Linux.patch} (100%) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 1f9099647..fbdd66011 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -339,8 +339,13 @@ done # Directory drivers/ ( -add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" \ - "drivers/Kconfig" +if [ -e "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" ]; then + add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" \ + "drivers/Kconfig" +else + add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux.patch" \ + "drivers/Kconfig" +fi add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch"\ "drivers/Makefile" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.12.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux.patch similarity index 100% rename from scst/kernel/in-tree/Kconfig.drivers.Linux-3.12.patch rename to scst/kernel/in-tree/Kconfig.drivers.Linux.patch From 84c71bc53e06a230840cd630d7e9ef7098229180 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 17 Nov 2016 05:18:55 +0000 Subject: [PATCH 6/7] generate-kernel-patch: optimize generation of Makefile.drivers patch git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7027 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 9 +++++++-- .../kernel/in-tree/Makefile.drivers.Linux-3.10.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.11.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.12.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.13.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.14.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.15.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.16.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.17.patch | 12 ------------ .../kernel/in-tree/Makefile.drivers.Linux-3.18.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch | 12 ------------ scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch | 12 ------------ ...Linux-3.19.patch => Makefile.drivers.Linux.patch} | 0 21 files changed, 7 insertions(+), 230 deletions(-) delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch rename scst/kernel/in-tree/{Makefile.drivers.Linux-3.19.patch => Makefile.drivers.Linux.patch} (100%) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index fbdd66011..29847936f 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -347,8 +347,13 @@ else "drivers/Kconfig" fi -add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch"\ - "drivers/Makefile" +if [ -e "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch" ]; then + add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch"\ + "drivers/Makefile" +else + add_patch "scst/kernel/in-tree/Makefile.drivers.Linux.patch"\ + "drivers/Makefile" +fi ) \ | process_patch "scst_01_drivers_kbuild.diff" diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch deleted file mode 100644 index 4d482c340..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ebee555..17f67ae 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -134,6 +134,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.19.patch b/scst/kernel/in-tree/Makefile.drivers.Linux.patch similarity index 100% rename from scst/kernel/in-tree/Makefile.drivers.Linux-3.19.patch rename to scst/kernel/in-tree/Makefile.drivers.Linux.patch From 9ed7b217e3482f6d733e845bf45e5dcbc7f3822c Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 17 Nov 2016 05:24:07 +0000 Subject: [PATCH 7/7] generate-kernel-patch: optimize generation of Makefile for scst_local git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7028 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 6 +++++- scst_local/in-tree/{Makefile-2.6.35 => Makefile} | 0 scst_local/in-tree/Makefile-2.6.36 | 2 -- scst_local/in-tree/Makefile-2.6.37 | 2 -- scst_local/in-tree/Makefile-2.6.38 | 2 -- scst_local/in-tree/Makefile-2.6.39 | 2 -- scst_local/in-tree/Makefile-3.0 | 2 -- scst_local/in-tree/Makefile-3.1 | 2 -- scst_local/in-tree/Makefile-3.10 | 2 -- scst_local/in-tree/Makefile-3.11 | 2 -- scst_local/in-tree/Makefile-3.12 | 2 -- scst_local/in-tree/Makefile-3.13 | 2 -- scst_local/in-tree/Makefile-3.14 | 2 -- scst_local/in-tree/Makefile-3.15 | 2 -- scst_local/in-tree/Makefile-3.16 | 2 -- scst_local/in-tree/Makefile-3.17 | 2 -- scst_local/in-tree/Makefile-3.18 | 2 -- scst_local/in-tree/Makefile-3.19 | 2 -- scst_local/in-tree/Makefile-3.2 | 2 -- scst_local/in-tree/Makefile-3.3 | 2 -- scst_local/in-tree/Makefile-3.4 | 2 -- scst_local/in-tree/Makefile-3.5 | 2 -- scst_local/in-tree/Makefile-3.6 | 2 -- scst_local/in-tree/Makefile-3.7 | 2 -- scst_local/in-tree/Makefile-3.8 | 2 -- scst_local/in-tree/Makefile-3.9 | 2 -- scst_local/in-tree/Makefile-4.0 | 2 -- scst_local/in-tree/Makefile-4.1 | 2 -- scst_local/in-tree/Makefile-4.2 | 2 -- scst_local/in-tree/Makefile-4.3 | 2 -- scst_local/in-tree/Makefile-4.4 | 2 -- scst_local/in-tree/Makefile-4.5 | 2 -- scst_local/in-tree/Makefile-4.6 | 2 -- 33 files changed, 5 insertions(+), 63 deletions(-) rename scst_local/in-tree/{Makefile-2.6.35 => Makefile} (100%) delete mode 100644 scst_local/in-tree/Makefile-2.6.36 delete mode 100644 scst_local/in-tree/Makefile-2.6.37 delete mode 100644 scst_local/in-tree/Makefile-2.6.38 delete mode 100644 scst_local/in-tree/Makefile-2.6.39 delete mode 100644 scst_local/in-tree/Makefile-3.0 delete mode 100644 scst_local/in-tree/Makefile-3.1 delete mode 100644 scst_local/in-tree/Makefile-3.10 delete mode 100644 scst_local/in-tree/Makefile-3.11 delete mode 100644 scst_local/in-tree/Makefile-3.12 delete mode 100644 scst_local/in-tree/Makefile-3.13 delete mode 100644 scst_local/in-tree/Makefile-3.14 delete mode 100644 scst_local/in-tree/Makefile-3.15 delete mode 100644 scst_local/in-tree/Makefile-3.16 delete mode 100644 scst_local/in-tree/Makefile-3.17 delete mode 100644 scst_local/in-tree/Makefile-3.18 delete mode 100644 scst_local/in-tree/Makefile-3.19 delete mode 100644 scst_local/in-tree/Makefile-3.2 delete mode 100644 scst_local/in-tree/Makefile-3.3 delete mode 100644 scst_local/in-tree/Makefile-3.4 delete mode 100644 scst_local/in-tree/Makefile-3.5 delete mode 100644 scst_local/in-tree/Makefile-3.6 delete mode 100644 scst_local/in-tree/Makefile-3.7 delete mode 100644 scst_local/in-tree/Makefile-3.8 delete mode 100644 scst_local/in-tree/Makefile-3.9 delete mode 100644 scst_local/in-tree/Makefile-4.0 delete mode 100644 scst_local/in-tree/Makefile-4.1 delete mode 100644 scst_local/in-tree/Makefile-4.2 delete mode 100644 scst_local/in-tree/Makefile-4.3 delete mode 100644 scst_local/in-tree/Makefile-4.4 delete mode 100644 scst_local/in-tree/Makefile-4.5 delete mode 100644 scst_local/in-tree/Makefile-4.6 diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 29847936f..6af9fd0de 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -643,7 +643,11 @@ fi add_file "scst_local/in-tree/Kconfig" "drivers/scst/scst_local/Kconfig" - add_file "scst_local/in-tree/Makefile-${kver}" "drivers/scst/scst_local/Makefile" + if [ -e "scst_local/in-tree/Makefile-${kver}" ]; then + add_file "scst_local/in-tree/Makefile-${kver}" "drivers/scst/scst_local/Makefile" + else + add_file "scst_local/in-tree/Makefile" "drivers/scst/scst_local/Makefile" + fi add_file "scst_local/scst_local.c" "drivers/scst/scst_local/scst_local.c" ) \ diff --git a/scst_local/in-tree/Makefile-2.6.35 b/scst_local/in-tree/Makefile similarity index 100% rename from scst_local/in-tree/Makefile-2.6.35 rename to scst_local/in-tree/Makefile diff --git a/scst_local/in-tree/Makefile-2.6.36 b/scst_local/in-tree/Makefile-2.6.36 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.36 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-2.6.37 b/scst_local/in-tree/Makefile-2.6.37 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.37 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-2.6.38 b/scst_local/in-tree/Makefile-2.6.38 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.38 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-2.6.39 b/scst_local/in-tree/Makefile-2.6.39 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.39 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.0 b/scst_local/in-tree/Makefile-3.0 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.0 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.1 b/scst_local/in-tree/Makefile-3.1 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.1 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.10 b/scst_local/in-tree/Makefile-3.10 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.10 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.11 b/scst_local/in-tree/Makefile-3.11 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.11 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.12 b/scst_local/in-tree/Makefile-3.12 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.12 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.13 b/scst_local/in-tree/Makefile-3.13 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.13 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.14 b/scst_local/in-tree/Makefile-3.14 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.14 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.15 b/scst_local/in-tree/Makefile-3.15 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.15 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.16 b/scst_local/in-tree/Makefile-3.16 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.16 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.17 b/scst_local/in-tree/Makefile-3.17 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.17 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.18 b/scst_local/in-tree/Makefile-3.18 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.18 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.19 b/scst_local/in-tree/Makefile-3.19 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.19 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.2 b/scst_local/in-tree/Makefile-3.2 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.2 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.3 b/scst_local/in-tree/Makefile-3.3 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.3 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.4 b/scst_local/in-tree/Makefile-3.4 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.4 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.5 b/scst_local/in-tree/Makefile-3.5 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.5 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.6 b/scst_local/in-tree/Makefile-3.6 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.6 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.7 b/scst_local/in-tree/Makefile-3.7 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.7 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.8 b/scst_local/in-tree/Makefile-3.8 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.8 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.9 b/scst_local/in-tree/Makefile-3.9 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.9 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.0 b/scst_local/in-tree/Makefile-4.0 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.0 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.1 b/scst_local/in-tree/Makefile-4.1 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.1 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.2 b/scst_local/in-tree/Makefile-4.2 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.2 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.3 b/scst_local/in-tree/Makefile-4.3 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.3 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.4 b/scst_local/in-tree/Makefile-4.4 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.4 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.5 b/scst_local/in-tree/Makefile-4.5 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.5 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.6 b/scst_local/in-tree/Makefile-4.6 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.6 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o -