Changeset 15691 in vbox

Timestamp:

Dec 19, 2008 1:29:23 PM (16 years ago)

Author:

vboxsync

Message:

Linux host kernel modules: removed 2.4 cruft; fixed VBOX_WITH_64_BITS_GUESTS

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/linux/Makefile (modified) (3 diffs)
• VBoxNetFlt/linux/Makefile (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -228 +228 @@
 ifeq ($(BUILD_TARGET_ARCH),amd64)
  KFLAGS  += -DRT_ARCH_AMD64
- # must be consistent with Config.kmk!
- KFLAGS  += -DVBOX_WITH_64_BITS_GUESTS
 else
  KFLAGS  += -DRT_ARCH_X86
 endif
+# must be consistent with Config.kmk!
+KFLAGS  += -DVBOX_WITH_64_BITS_GUESTS
 ifeq ($(BUILD_TYPE),debug)
  KFLAGS  += -DDEBUG -DDEBUG_$(USER) -g
@@ -251 +251 @@
 endif
 
-ifeq ($(KERN_VERSION),24)
-# 2.4
-TOPDIR         = $(KERN_DIR)
-MODULE_EXT    := o
-EXTRA_CFLAGS  := -DVBOX_LINUX_2_4 -DEXPORT_SYMTAB
-$(MODULE)-objs = $(OBJS)
-else
 # 2.6 and later
 MODULE_EXT    := ko
 $(MODULE)-y   := $(OBJS)
-endif
 
 # build defs
@@ -272 +264 @@
 $(MODULE):
         $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
-
-ifeq ($(KERN_VERSION),24)
-#
-# 2.4 Module linking
-#
-$(MODULE).o: $(OBJS)
-        $(LD) -o $@ -r $(OBJS)
-
-include $(KERN_DIR)/Rules.make
-
-endif
 
 install: $(MODULE)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile

@@ -210 +210 @@
 ifeq ($(BUILD_TARGET_ARCH),amd64)
  KFLAGS  += -DRT_ARCH_AMD64
- # must be consistent with Config.kmk!
- KFLAGS  += -DVBOX_WITH_64_BITS_GUESTS
 else
  KFLAGS  += -DRT_ARCH_X86
 endif
+# must be consistent with Config.kmk!
+KFLAGS  += -DVBOX_WITH_64_BITS_GUESTS
 ifeq ($(BUILD_TYPE),debug)
  KFLAGS  += -DDEBUG -DDEBUG_$(USER) -g