Fix: Support 4.x kernel versions in Makefile

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/Makefile b/Makefile
index 812ba9ba182c20944694346dfe0529c644266c5a..283cc46ae0d530d8d9340af80c2bf0385dd784b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,8 @@ lttng-tracer-objs += $(shell \
 endif # CONFIG_PERF_EVENTS
 
 lttng-tracer-objs += $(shell \
-       if [ $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 ] ; then \
+       if [ $(VERSION) -ge 4 \
+               -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
                echo "lttng-tracepoint.o" ; fi;)
 
 obj-m += probes/

diff --git a/probes/Makefile b/probes/Makefile
index 8e4ceb7b3e4903b87542b33ab6546c40dbe3c019..081136a2a3dd91686d1f446afa3a848ce5f14640 100644 (file)
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -169,37 +169,43 @@ CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200
 endif
 
 obj-m +=  $(shell \
-       if [ \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \
+       if [ $(VERSION) -ge 4 \
+               -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \
                -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \
                -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \
                -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 0 -a $(SUBLEVEL) -ge 41 \) ] ; then \
                echo "lttng-probe-random.o" ; fi;)
 
 obj-m +=  $(shell \
-       if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 ] ; then \
+       if [ $(VERSION) -ge 4 \
+               -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 2 \) ] ; then \
                echo "lttng-probe-rcu.o" ; fi;)
 
 ifneq ($(CONFIG_REGMAP),)
 obj-m +=  $(shell \
-       if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 ] ; then \
+       if [ $(VERSION) -ge 4 \
+               \( -o $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 2 \) ] ; then \
                echo "lttng-probe-regmap.o" ; fi;)
 endif
 
 ifneq ($(CONFIG_PM_RUNTIME),)
 obj-m +=  $(shell \
-       if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 ] ; then \
+       if [ $(VERSION) -ge 4 \
+               -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 2 \) ] ; then \
                echo "lttng-probe-rpm.o" ; fi;)
 endif
 
 ifneq ($(CONFIG_SUNRPC),)
 obj-m +=  $(shell \
-       if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 ] ; then \
+       if [ $(VERSION) -ge 4 \
+               -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) ] ; then \
                echo "lttng-probe-sunrpc.o" ; fi;)
 endif
 
 ifneq ($(CONFIG_VIDEO_V4L2),)
 obj-m += $(shell \
-       if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 14 ] ; then \
+       if [ $(VERSION) -ge 4 \
+               -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 14 \) ] ; then \
                echo "lttng-probe-v4l2.o" ; fi;)
 endif