VirtualBox

Changeset 11519 in vbox


Ignore:
Timestamp:
Aug 20, 2008 2:25:02 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
35063
Message:

Linux additions: properly install and compile the kernel modules

Location:
trunk/src/VBox
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/linux/module/Makefile.module

    r8155 r11519  
    1818# additional information or have any questions.
    1919#
     20
     21#
     22# First, figure out which architecture we're targeting and the build type.
     23# (We have to support basic cross building (ARCH=i386|x86_64).)
     24# While at it, warn about BUILD_* vars found to help with user problems.
     25#
     26ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
     27 $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
     28 BUILD_TARGET_ARCH :=
     29endif
     30ifeq ($(BUILD_TARGET_ARCH),)
     31 ifeq ($(ARCH),x86_64)
     32  BUILD_TARGET_ARCH := amd64
     33 else
     34  ifeq ($(ARCH),i386)
     35   BUILD_TARGET_ARCH := x86
     36  else
     37   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
     38    BUILD_TARGET_ARCH := amd64
     39   else
     40    BUILD_TARGET_ARCH := x86
     41   endif
     42  endif
     43 endif
     44else
     45 $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).)
     46endif
     47
     48ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
     49 $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
     50 BUILD_TYPE :=
     51endif
     52ifeq ($(BUILD_TYPE),)
     53 BUILD_TYPE := release
     54else
     55 $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
     56endif
     57
    2058
    2159# override is required by the Debian guys
    … …  
    4886        strformattype.o \
    4987        strformat-vbox.o
     88ifeq ($(BUILD_TARGET_ARCH),amd64)
     89OBJS += \
     90        alloc/heapsimple.o \
     91        r0drv/linux/spinlock-r0drv-linux.o
     92endif
    5093
    5194ifneq ($(MAKECMDGOALS),clean)

  • trunk/src/VBox/Additions/linux/module/files_vboxadd

    r8494 r11519  
    2727    ${PATH_ROOT}/include/iprt/ctype.h=>include/iprt/ctype.h \
    2828    ${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
     29    ${PATH_ROOT}/include/iprt/heap.h=>include/iprt/heap.h \
    2930    ${PATH_ROOT}/include/iprt/log.h=>include/iprt/log.h \
    3031    ${PATH_ROOT}/include/iprt/mem.h=>include/iprt/mem.h \
    3132    ${PATH_ROOT}/include/iprt/param.h=>include/iprt/param.h \
    3233    ${PATH_ROOT}/include/iprt/semaphore.h=>include/iprt/semaphore.h \
     34    ${PATH_ROOT}/include/iprt/spinlock.h=>include/iprt/spinlock.h \
    3335    ${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
    3436    ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
    … …  
    5557    ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
    5658    ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \
     59    ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapsimple.cpp=>alloc/heapsimple.c \
    5760    ${PATH_ROOT}/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp=>RTErrConvertToErrno.c \
    5861    ${PATH_ROOT}/src/VBox/Runtime/common/log/logformat.cpp=>logformat.c \
    … …  
    7376    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c=>r0drv/linux/semeventmulti-r0drv-linux.c \
    7477    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c=>r0drv/linux/semfastmutex-r0drv-linux.c \
     78    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c=>r0drv/linux/spinlock-r0drv-linux.c \
    7579    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \
    7680    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

    r11472 r11519  
    1818# additional information or have any questions.
    1919#
     20
     21#
     22# First, figure out which architecture we're targeting and the build type.
     23# (We have to support basic cross building (ARCH=i386|x86_64).)
     24# While at it, warn about BUILD_* vars found to help with user problems.
     25#
     26ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
     27 $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
     28 BUILD_TARGET_ARCH :=
     29endif
     30ifeq ($(BUILD_TARGET_ARCH),)
     31 ifeq ($(ARCH),x86_64)
     32  BUILD_TARGET_ARCH := amd64
     33 else
     34  ifeq ($(ARCH),i386)
     35   BUILD_TARGET_ARCH := x86
     36  else
     37   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
     38    BUILD_TARGET_ARCH := amd64
     39   else
     40    BUILD_TARGET_ARCH := x86
     41   endif
     42  endif
     43 endif
     44else
     45 $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).)
     46endif
     47
     48ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
     49 $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
     50 BUILD_TYPE :=
     51endif
     52ifeq ($(BUILD_TYPE),)
     53 BUILD_TYPE := release
     54else
     55 $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
     56endif
     57
    2058
    2159# override is required by the Debian guys

  • trunk/src/VBox/Additions/linux/sharedfolders/files_vboxvfs

    r8155 r11519  
    2626    ${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
    2727    ${PATH_ROOT}/include/iprt/fs.h=>include/iprt/fs.h \
     28    ${PATH_ROOT}/include/iprt/heap.h=>include/iprt/heap.h \
    2829    ${PATH_ROOT}/include/iprt/log.h=>include/iprt/log.h \
    2930    ${PATH_ROOT}/include/iprt/mem.h=>include/iprt/mem.h \
    … …  
    3132    ${PATH_ROOT}/include/iprt/path.h=>include/iprt/path.h \
    3233    ${PATH_ROOT}/include/iprt/semaphore.h=>include/iprt/semaphore.h \
     34    ${PATH_ROOT}/include/iprt/spinlock.h=>include/iprt/spinlock.h \
    3335    ${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
    3436    ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \

  • trunk/src/VBox/Runtime/common/alloc/heapsimple.cpp

    r8245 r11519  
    4444#include "internal/magics.h"
    4545
     46#if defined(IN_GUEST_R0) && defined(RT_OS_LINUX)
     47#include "the-linux-kernel.h"
     48EXPORT_SYMBOL(RTHeapSimpleAlloc);
     49EXPORT_SYMBOL(RTHeapSimpleInit);
     50EXPORT_SYMBOL(RTHeapSimpleFree);
     51#endif
    4652
    4753/*******************************************************************************

  • trunk/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c

    r8245 r11519  
    4444#include <linux/spinlock.h> /** @todo why is this here and not in the-linux-kernel.h? */
    4545
     46#if defined(IN_GUEST_R0)
     47EXPORT_SYMBOL(RTSpinlockCreate);
     48EXPORT_SYMBOL(RTSpinlockDestroy);
     49EXPORT_SYMBOL(RTSpinlockAcquireNoInts);
     50EXPORT_SYMBOL(RTSpinlockReleaseNoInts);
     51#endif
    4652
    4753/*******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette