From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:22:43 +0000 (-0700)
Subject: Linux kernel modules: remove pre 2.6 support from makefiles
X-Git-Tag: 2013.09.16-1328054~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f20a2f72a0a2314a448fc38a6d76623d0744ce7;p=thirdparty%2Fopen-vm-tools.git

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>
---

diff --git a/open-vm-tools/modules/linux/vmblock/Makefile b/open-vm-tools/modules/linux/vmblock/Makefile
index 87fb34c24..36529cd69 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 a8cc0b703..3ff28c4b9 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 7b36262e1..e7e3eaf4e 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 4a738d7ee..4d81760cb 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 e22db6c31..4264b475c 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 90f7c94ef..852c93455 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