diff options
author | VMware, Inc <> | 2013-09-17 20:22:43 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-22 22:06:58 -0700 |
commit | 7f20a2f72a0a2314a448fc38a6d76623d0744ce7 (patch) | |
tree | f812e4759021d0bf991c1c020fb5f942024569cb | |
parent | fd70a7c37fa26eedfa6760606ead6c4bc43a56f6 (diff) |
Linux kernel modules: remove pre 2.6 support from makefiles
Since pre 2.6.9 support was moved off to legacy branch we do not need
it here.
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
-rw-r--r-- | open-vm-tools/modules/linux/vmblock/Makefile | 25 | ||||
-rw-r--r-- | open-vm-tools/modules/linux/vmci/Makefile | 25 | ||||
-rw-r--r-- | open-vm-tools/modules/linux/vmhgfs/Makefile | 25 | ||||
-rw-r--r-- | open-vm-tools/modules/linux/vmsync/Makefile | 25 | ||||
-rw-r--r-- | open-vm-tools/modules/linux/vmxnet/Makefile | 25 | ||||
-rw-r--r-- | open-vm-tools/modules/linux/vsock/Makefile | 25 |
6 files changed, 12 insertions, 138 deletions
diff --git a/open-vm-tools/modules/linux/vmblock/Makefile b/open-vm-tools/modules/linux/vmblock/Makefile index 87fb34c2..36529cd6 100644 --- a/open-vm-tools/modules/linux/vmblock/Makefile +++ b/open-vm-tools/modules/linux/vmblock/Makefile @@ -67,9 +67,7 @@ vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) ifndef VM_KBUILD VM_KBUILD := no ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) -VM_KBUILD := 26 -endif +VM_KBUILD := yes endif export VM_KBUILD endif @@ -78,11 +76,7 @@ ifndef VM_KBUILD_SHOWN ifeq ($(VM_KBUILD), no) VM_DUMMY := $(shell echo >&2 "Using standalone build system.") else -ifeq ($(VM_KBUILD), 24) -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") -else -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") -endif +VM_DUMMY := $(shell echo >&2 "Using kernel build system.") endif VM_KBUILD_SHOWN := yes export VM_KBUILD_SHOWN @@ -95,11 +89,7 @@ VMCCVER := $(shell $(CC) -dumpversion) # If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... ifeq ($(VERSION),) -ifeq ($(VM_KBUILD), 24) -DRIVER_KO := $(DRIVER).o -else DRIVER_KO := $(DRIVER).ko -endif .PHONY: $(DRIVER_KO) @@ -151,17 +141,6 @@ endif include $(SRCROOT)/Makefile.kernel -ifdef TOPDIR -ifeq ($(VM_KBUILD), 24) - -O_TARGET := $(DRIVER).o - -obj-y := $($(DRIVER)-y) - -include $(TOPDIR)/Rules.make -endif -endif - else include $(SRCROOT)/Makefile.normal diff --git a/open-vm-tools/modules/linux/vmci/Makefile b/open-vm-tools/modules/linux/vmci/Makefile index a8cc0b70..3ff28c4b 100644 --- a/open-vm-tools/modules/linux/vmci/Makefile +++ b/open-vm-tools/modules/linux/vmci/Makefile @@ -67,9 +67,7 @@ vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) ifndef VM_KBUILD VM_KBUILD := no ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) -VM_KBUILD := 26 -endif +VM_KBUILD := yes endif export VM_KBUILD endif @@ -78,11 +76,7 @@ ifndef VM_KBUILD_SHOWN ifeq ($(VM_KBUILD), no) VM_DUMMY := $(shell echo >&2 "Using standalone build system.") else -ifeq ($(VM_KBUILD), 24) -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") -else -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") -endif +VM_DUMMY := $(shell echo >&2 "Using kernel build system.") endif VM_KBUILD_SHOWN := yes export VM_KBUILD_SHOWN @@ -95,11 +89,7 @@ VMCCVER := $(shell $(CC) -dumpversion) # If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... ifeq ($(VERSION),) -ifeq ($(VM_KBUILD), 24) -DRIVER_KO := $(DRIVER).o -else DRIVER_KO := $(DRIVER).ko -endif .PHONY: $(DRIVER_KO) @@ -151,17 +141,6 @@ endif include $(SRCROOT)/Makefile.kernel -ifdef TOPDIR -ifeq ($(VM_KBUILD), 24) - -O_TARGET := $(DRIVER).o - -obj-y := $($(DRIVER)-y) - -include $(TOPDIR)/Rules.make -endif -endif - else include $(SRCROOT)/Makefile.normal diff --git a/open-vm-tools/modules/linux/vmhgfs/Makefile b/open-vm-tools/modules/linux/vmhgfs/Makefile index 7b36262e..e7e3eaf4 100644 --- a/open-vm-tools/modules/linux/vmhgfs/Makefile +++ b/open-vm-tools/modules/linux/vmhgfs/Makefile @@ -67,9 +67,7 @@ vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) ifndef VM_KBUILD VM_KBUILD := no ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) -VM_KBUILD := 26 -endif +VM_KBUILD := yes endif export VM_KBUILD endif @@ -78,11 +76,7 @@ ifndef VM_KBUILD_SHOWN ifeq ($(VM_KBUILD), no) VM_DUMMY := $(shell echo >&2 "Using standalone build system.") else -ifeq ($(VM_KBUILD), 24) -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") -else -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") -endif +VM_DUMMY := $(shell echo >&2 "Using kernel build system.") endif VM_KBUILD_SHOWN := yes export VM_KBUILD_SHOWN @@ -95,11 +89,7 @@ VMCCVER := $(shell $(CC) -dumpversion) # If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... ifeq ($(VERSION),) -ifeq ($(VM_KBUILD), 24) -DRIVER_KO := $(DRIVER).o -else DRIVER_KO := $(DRIVER).ko -endif .PHONY: $(DRIVER_KO) @@ -151,17 +141,6 @@ endif include $(SRCROOT)/Makefile.kernel -ifdef TOPDIR -ifeq ($(VM_KBUILD), 24) - -O_TARGET := $(DRIVER).o - -obj-y := $($(DRIVER)-y) - -include $(TOPDIR)/Rules.make -endif -endif - else include $(SRCROOT)/Makefile.normal diff --git a/open-vm-tools/modules/linux/vmsync/Makefile b/open-vm-tools/modules/linux/vmsync/Makefile index 4a738d7e..4d81760c 100644 --- a/open-vm-tools/modules/linux/vmsync/Makefile +++ b/open-vm-tools/modules/linux/vmsync/Makefile @@ -67,9 +67,7 @@ vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) ifndef VM_KBUILD VM_KBUILD := no ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) -VM_KBUILD := 26 -endif +VM_KBUILD := yes endif export VM_KBUILD endif @@ -78,11 +76,7 @@ ifndef VM_KBUILD_SHOWN ifeq ($(VM_KBUILD), no) VM_DUMMY := $(shell echo >&2 "Using standalone build system.") else -ifeq ($(VM_KBUILD), 24) -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") -else -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") -endif +VM_DUMMY := $(shell echo >&2 "Using kernel build system.") endif VM_KBUILD_SHOWN := yes export VM_KBUILD_SHOWN @@ -95,11 +89,7 @@ VMCCVER := $(shell $(CC) -dumpversion) # If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... ifeq ($(VERSION),) -ifeq ($(VM_KBUILD), 24) -DRIVER_KO := $(DRIVER).o -else DRIVER_KO := $(DRIVER).ko -endif .PHONY: $(DRIVER_KO) @@ -151,17 +141,6 @@ endif include $(SRCROOT)/Makefile.kernel -ifdef TOPDIR -ifeq ($(VM_KBUILD), 24) - -O_TARGET := $(DRIVER).o - -obj-y := $($(DRIVER)-y) - -include $(TOPDIR)/Rules.make -endif -endif - else include $(SRCROOT)/Makefile.normal diff --git a/open-vm-tools/modules/linux/vmxnet/Makefile b/open-vm-tools/modules/linux/vmxnet/Makefile index e22db6c3..4264b475 100644 --- a/open-vm-tools/modules/linux/vmxnet/Makefile +++ b/open-vm-tools/modules/linux/vmxnet/Makefile @@ -67,9 +67,7 @@ vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) ifndef VM_KBUILD VM_KBUILD := no ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) -VM_KBUILD := 26 -endif +VM_KBUILD := yes endif export VM_KBUILD endif @@ -78,11 +76,7 @@ ifndef VM_KBUILD_SHOWN ifeq ($(VM_KBUILD), no) VM_DUMMY := $(shell echo >&2 "Using standalone build system.") else -ifeq ($(VM_KBUILD), 24) -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") -else -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") -endif +VM_DUMMY := $(shell echo >&2 "Using kernel build system.") endif VM_KBUILD_SHOWN := yes export VM_KBUILD_SHOWN @@ -95,11 +89,7 @@ VMCCVER := $(shell $(CC) -dumpversion) # If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... ifeq ($(VERSION),) -ifeq ($(VM_KBUILD), 24) -DRIVER_KO := $(DRIVER).o -else DRIVER_KO := $(DRIVER).ko -endif .PHONY: $(DRIVER_KO) @@ -151,17 +141,6 @@ endif include $(SRCROOT)/Makefile.kernel -ifdef TOPDIR -ifeq ($(VM_KBUILD), 24) - -O_TARGET := $(DRIVER).o - -obj-y := $($(DRIVER)-y) - -include $(TOPDIR)/Rules.make -endif -endif - else include $(SRCROOT)/Makefile.normal diff --git a/open-vm-tools/modules/linux/vsock/Makefile b/open-vm-tools/modules/linux/vsock/Makefile index 90f7c94e..852c9345 100644 --- a/open-vm-tools/modules/linux/vsock/Makefile +++ b/open-vm-tools/modules/linux/vsock/Makefile @@ -67,9 +67,7 @@ vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) ifndef VM_KBUILD VM_KBUILD := no ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) -VM_KBUILD := 26 -endif +VM_KBUILD := yes endif export VM_KBUILD endif @@ -78,11 +76,7 @@ ifndef VM_KBUILD_SHOWN ifeq ($(VM_KBUILD), no) VM_DUMMY := $(shell echo >&2 "Using standalone build system.") else -ifeq ($(VM_KBUILD), 24) -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") -else -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") -endif +VM_DUMMY := $(shell echo >&2 "Using kernel build system.") endif VM_KBUILD_SHOWN := yes export VM_KBUILD_SHOWN @@ -95,11 +89,7 @@ VMCCVER := $(shell $(CC) -dumpversion) # If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... ifeq ($(VERSION),) -ifeq ($(VM_KBUILD), 24) -DRIVER_KO := $(DRIVER).o -else DRIVER_KO := $(DRIVER).ko -endif .PHONY: $(DRIVER_KO) @@ -151,17 +141,6 @@ endif include $(SRCROOT)/Makefile.kernel -ifdef TOPDIR -ifeq ($(VM_KBUILD), 24) - -O_TARGET := $(DRIVER).o - -obj-y := $($(DRIVER)-y) - -include $(TOPDIR)/Rules.make -endif -endif - else include $(SRCROOT)/Makefile.normal |