From 12ce29c71d1da850b5a44d92ad9756dfa3f6292e Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 8 Nov 2018 16:11:57 -0500 Subject: [PATCH] Drop support for kernels < 3.0 from Makefiles Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- Makefile | 5 +--- probes/Kbuild | 73 +++++++++++++-------------------------------------- 2 files changed, 19 insertions(+), 59 deletions(-) diff --git a/Makefile b/Makefile index ae2b1953..c7b8a417 100644 --- a/Makefile +++ b/Makefile @@ -66,10 +66,7 @@ ifneq ($(KERNELRELEASE),) endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS ifneq ($(CONFIG_PERF_EVENTS),) - lttng-tracer-objs += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \ - echo "lttng-context-perf-counters.o" ; fi;) + lttng-tracer-objs += lttng-context-perf-counters.o endif # CONFIG_PERF_EVENTS ifneq ($(CONFIG_PREEMPT_RT_FULL),) diff --git a/probes/Kbuild b/probes/Kbuild index 0b1e016f..b43dd497 100644 --- a/probes/Kbuild +++ b/probes/Kbuild @@ -35,14 +35,8 @@ ifneq ($(CONFIG_KVM),) ifneq ($(wildcard $(kvm_dep)),) CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm - obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \ - echo "lttng-probe-kvm-x86.o" ; fi;) - obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \ - echo "lttng-probe-kvm-x86-mmu.o" ; fi;) + obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86.o + obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86-mmu.o else $(warning File $(kvm_dep) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.) endif # $(wildcard $(kvm_dep)) @@ -66,10 +60,7 @@ ifneq ($(CONFIG_X86),) endif # $(wildcard $(x86_exceptions_dep)) endif # CONFIG_X86 -obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \ - echo "lttng-probe-signal.o" ; fi;) +obj-$(CONFIG_LTTNG) += lttng-probe-signal.o ifneq ($(CONFIG_BLOCK),) # need blk_cmd_buf_len @@ -81,10 +72,7 @@ endif # CONFIG_BLOCK ifneq ($(CONFIG_NET),) obj-$(CONFIG_LTTNG) += lttng-probe-napi.o obj-$(CONFIG_LTTNG) += lttng-probe-skb.o - obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 37 \) ] ; then \ - echo "lttng-probe-net.o" ; fi;) + obj-$(CONFIG_LTTNG) += lttng-probe-net.o obj-$(CONFIG_LTTNG) += $(shell \ if [ $(VERSION) -ge 4 \ -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \ @@ -96,10 +84,7 @@ ifneq ($(CONFIG_NET),) endif # CONFIG_NET ifneq ($(CONFIG_SND_SOC),) - obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \ - echo "lttng-probe-asoc.o" ; fi;) + obj-$(CONFIG_LTTNG) += lttng-probe-asoc.o endif # CONFIG_SND_SOC ifneq ($(CONFIG_EXT3_FS),) @@ -141,23 +126,14 @@ ifneq ($(CONFIG_JBD),) endif # CONFIG_JBD ifneq ($(CONFIG_REGULATOR),) - obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \ - echo "lttng-probe-regulator.o" ; fi;) + obj-$(CONFIG_LTTNG) += lttng-probe-regulator.o endif # CONFIG_REGULATOR ifneq ($(CONFIG_SCSI),) - obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 35 \) ] ; then \ - echo "lttng-probe-scsi.o" ; fi;) + obj-$(CONFIG_LTTNG) += lttng-probe-scsi.o endif # CONFIG_SCSI -obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 36 \) ] ; then \ - echo "lttng-probe-vmscan.o" ; fi;) +obj-$(CONFIG_LTTNG) += lttng-probe-vmscan.o # lock probe does not work, so disabling it for now #ifneq ($(CONFIG_LOCKDEP),) @@ -166,32 +142,22 @@ obj-$(CONFIG_LTTNG) += $(shell \ ifneq ($(CONFIG_BTRFS_FS),) btrfs_dep = $(srctree)/fs/btrfs/*.h - btrfs = $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 39 \) ] ; then \ - echo "lttng-probe-btrfs.o" ; fi;) - ifneq ($(btrfs),) - ifeq ($(wildcard $(btrfs_dep)),) - $(warning Files $(btrfs_dep) not found. Probe "btrfs" is disabled. Use full kernel source tree to enable it.) - btrfs = - endif # $(wildcard $(btrfs_dep)) - endif # $(btrfs) - obj-$(CONFIG_LTTNG) += $(btrfs) + ifneq ($(wildcard $(btrfs_dep)),) + obj-$(CONFIG_LTTNG) += lttng-probe-btrfs.o + else + $(warning Files $(btrfs_dep) not found. Probe "btrfs" is disabled. Use full kernel source tree to enable it.) + endif # $(wildcard $(btrfs_dep)) endif # CONFIG_BTRFS_FS -obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \ - echo "lttng-probe-compaction.o" ; fi;) +obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o ifneq ($(CONFIG_EXT4_FS),) ext4_dep = $(srctree)/fs/ext4/*.h - ext4 = lttng-probe-ext4.o - ifeq ($(wildcard $(ext4_dep)),) + ifneq ($(wildcard $(ext4_dep)),) + obj-$(CONFIG_LTTNG) += lttng-probe-ext4.o + else $(warning Files $(ext4_dep) not found. Probe "ext4" is disabled. Use full kernel source tree to enable it.) - ext4 = endif # $(wildcard $(ext4_dep)) - obj-$(CONFIG_LTTNG) += $(ext4) endif # CONFIG_EXT4_FS obj-$(CONFIG_LTTNG) += $(shell \ @@ -249,10 +215,7 @@ endif # CONFIG_VIDEO_V4L2 obj-$(CONFIG_LTTNG) += lttng-probe-workqueue.o ifneq ($(CONFIG_KALLSYMS_ALL),) - obj-$(CONFIG_LTTNG) += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 36 \) ] ; then \ - echo "lttng-probe-writeback.o" ; fi;) + obj-$(CONFIG_LTTNG) += lttng-probe-writeback.o else ifdef CONFIG_LOCALVERSION # Check if dot-config is included. $(warning CONFIG_KALLSYMS_ALL is disabled, therefore probe "writeback" is disabled. Rebuild your kernel with this configuration option enabled in order to trace this subsystem.) -- 2.34.1