summaryrefslogtreecommitdiff
path: root/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch
blob: d41751535d31d43b041ce17675e734c2645f502f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
diff --git a/Makefile b/Makefile
index df41642..f2f17c8 100644
--- a/Makefile
+++ b/Makefile
@@ -46,18 +46,10 @@ kver_lt = $(shell [ $(KMAJ) -lt $(1) -o \
 	$(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \
         $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -lt $(3) ] && \
 	echo 1 || echo 0)
-kver_le = $(shell [ $(KMAJ) -lt $(1) -o \
-        $(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \
-        $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -le $(3) ] && \
-	echo 1 || echo 0)
-kver_gt = $(shell [ ( $(KMAJ) -gt $(1) ) -o \
+kver_gt = $(shell [ $(KMAJ) -gt $(1) -o \
         $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \
         $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -gt $(3) ] && \
 	echo 1 || echo 0)
-kver_ge = $(shell [ ( $(KMAJ) -gt $(1) ) -o \
-        $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \
-        $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -ge $(3) ] && \
-	echo 1 || echo 0)
 kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0)
 
 #
@@ -66,85 +58,93 @@ kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0)
 # base first the earlier patch sets will not need to be modified.
 #
 
-ifeq ($(call kver_le,3,5,0),1)
+ifeq ($(call kver_lt,3,6,0),1)
 	PATCHES := $(PATCHES) compat-3.5.patch
 endif
 
-ifeq ($(call kver_le,3,4,0),1)
+ifeq ($(call kver_lt,3,5,0),1)
 	PATCHES := $(PATCHES) compat-3.2-3.4.patch
 endif
 
-ifeq ($(call kver_le,3,2,0),1)
+ifeq ($(call kver_lt,3,3,0),1)
 	PATCHES := $(PATCHES) compat-2.6.39-3.2.patch
 endif
 
-ifeq ($(call kver_le,2,6,38),1)
+ifeq ($(call kver_lt,2,6,39),1)
 	PATCHES := $(PATCHES) compat-2.6.38.patch
 endif
 
-ifeq ($(call kver_le,2,6,37),1)
+ifeq ($(call kver_lt,2,6,38),1)
 	PATCHES := $(PATCHES) compat-2.6.36-2.6.37.patch
 endif
 
 # Compatibility patch for kernels > 2.6.32 <= 2.6.35
-ifeq ($(call kver_le,2,6,35),1)
+ifeq ($(call kver_lt,2,6,36),1)
+ifeq ($(call kver_gt,2,6,32),1)
 	PATCHES := $(PATCHES) compat-2.6.33-2.6.35.patch
 endif
+endif
 
 # Compatibility patch for kernels <= 2.6.32
-ifeq ($(call kver_le,2,6,32),1)
+ifeq ($(call kver_lt,2,6,33),1)
 	PATCHES := $(PATCHES) compat-2.6.32.patch
 endif
 
 # Compatibility patch for kernels <= 2.6.31
-ifeq ($(call kver_le,2,6,31),1)
+ifeq ($(call kver_lt,2,6,32),1)
 	PATCHES := $(PATCHES) compat-2.6.31.patch
 endif
 
 # Compatibility patch for kernels <= 2.6.30
-ifeq ($(call kver_le,2,6,30),1)
+ifeq ($(call kver_lt,2,6,31),1)
 	PATCHES := $(PATCHES) compat-2.6.30.patch
 endif
 
 # Compatibility patch for kernels <= 2.6.29
-ifeq ($(call kver_le,2,6,29),1)
+ifeq ($(call kver_lt,2,6,30),1)
 	PATCHES := $(PATCHES) compat-2.6.29.patch
 endif
 
 # Compatibility patch for kernels <= 2.6.28
-ifeq ($(call kver_le,2,6,28),1)
+ifeq ($(call kver_lt,2,6,29),1)
 	PATCHES := $(PATCHES) compat-2.6.28.patch
 endif
 
 # Compatibility patch for kernels >= 2.6.25 and <= 2.6.27
-ifeq ($(call kver_le,2,6,27),1)
+ifeq ($(call kver_lt,2,6,28),1)
+ifeq ($(call kver_gt,2,6,24),1)
 	PATCHES := $(PATCHES) compat-2.6.25-2.6.27.patch
 endif
+endif
 
 # Compatibility patch for kernels <= 2.6.24
-ifeq ($(call kver_le,2,6,24),1)
+ifeq ($(call kver_lt,2,6,25),1)
 	PATCHES := $(PATCHES) compat-2.6.24.patch
 endif
 
 # Compatibility patch for kernels <= 2.6.23
-ifeq ($(call kver_le,2,6,23),1)
+ifeq ($(call kver_lt,2,6,24),1)
 	PATCHES := $(PATCHES) compat-2.6.23.patch
 endif
 
 # Compatibility patch for kernels <= 2.6.22
-ifeq ($(call kver_le,2,6,22),1)
+ifeq ($(call kver_lt,2,6,23),1)
 	PATCHES := $(PATCHES) compat-2.6.22.patch
 endif
 
 # Compatibility patch for kernels >= 2.6.19 and <= 2.6.21
-ifeq ($(call kver_le,2,6,21),1)
+ifeq ($(call kver_lt,2,6,22),1)
+ifeq ($(call kver_gt,2,6,18),1)
 	PATCHES := $(PATCHES) compat-2.6.19-2.6.21.patch
 endif
+endif
 
 # Compatibility patch for kernels >= 2.6.14 and <= 2.6.18
-ifeq ($(call kver_le,2,6,18),1)
+ifeq ($(call kver_lt,2,6,19),1)
+ifeq ($(call kver_gt,2,6,13),1)
 	PATCHES := $(PATCHES) compat-2.6.14-2.6.18.patch
 endif
+endif
 
 # We don't support kernels < 2.6.14 except for explicit distros
 ifeq ($(call kver_lt,2,6,14),1)