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