From mboxrd@z Thu Jan 1 00:00:00 1970 From: mjeanson@efficios.com (Michael Jeanson) Date: Wed, 17 Jun 2015 16:28:02 -0400 Subject: [lttng-dev] [PATCH lttng-modules] Fix: version checks for kernel 4.0 Message-ID: <1434572882-29119-1-git-send-email-mjeanson@efficios.com> Signed-off-by: Michael Jeanson --- probes/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/probes/Makefile b/probes/Makefile index 4de157b..f0325c8 100644 --- a/probes/Makefile +++ b/probes/Makefile @@ -61,10 +61,12 @@ obj-m += $(shell \ -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 37 \) ] ; then \ echo "lttng-probe-net.o" ; fi;) obj-m += $(shell \ - if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \ + if [ $(VERSION) -ge 4 \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \ echo "lttng-probe-sock.o" ; fi;) obj-m += $(shell \ - if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \ + if [ $(VERSION) -ge 4 \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \ echo "lttng-probe-udp.o" ; fi;) endif @@ -79,8 +81,8 @@ ifneq ($(CONFIG_EXT3_FS),) ext3_dep = $(srctree)/fs/ext3/*.h ext3_dep_check = $(wildcard $(ext3_dep)) ext3 = $(shell \ - if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \ - if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 -a \ + if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \ + if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \ -z "$(ext3_dep_check)" ] ; then \ echo "warn" ; \ exit ; \ @@ -106,7 +108,8 @@ endif ifneq ($(CONFIG_JBD),) obj-m += $(shell \ - if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \ + if [ $(VERSION) -ge 4 \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \ echo "lttng-probe-jbd.o" ; fi;) endif @@ -172,7 +175,8 @@ obj-m += $(ext4) endif 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-printk.o" ; fi;) ifneq ($(CONFIG_FRAME_WARN),0) CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 -- 1.9.1