← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-13 23:06:00 UTC
  • mfrom: (0.3.2 upstream) (0.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20091013230600-xhu2pwizq0wo63l9
Tags: 3.0.8-dfsg-1ubuntu1
https://launchpad.net/bugs/444812
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/434503
* Merge from debian unstable (LP: #444812), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
* Try to remove existing dkms modules before adding the new modules
  (LP: #434503)
  - debian/virtualbox-ose-source.postinst
  - debian/virtualbox-ose-guest-source.postinst
* Don't fail if dkms modules have already been removed
  - debian/virtualbox-ose-source.prerm
  - debian/virtualbox-ose-guest-source.prerm

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/Makefile.kmk
173
173
ifdef VBOX_MAIN_RELEASE_LOG ## @todo (dmik): temporary, until RTThreadSelf/RTThreadAdopt are properly updated
174
174
 RuntimeR3_DEFS         += RTCRITSECT_STRICT
175
175
endif
 
176
ifdef IPRT_WITH_FUTEX_BASED_SEMS
 
177
 RuntimeR3_DEFS.linux   += IPRT_WITH_FUTEX_BASED_SEMS
 
178
endif
176
179
RuntimeR3_INCS          = \
177
180
        include \
178
181
        $(SDK_VBOX_ZLIB_INCS)
412
415
        r3/posix/timer-posix.cpp \
413
416
        r3/posix/tls-posix.cpp \
414
417
        r3/posix/utf8-posix.cpp
415
 
RuntimeR3_SOURCES.linux.x86 += \
416
 
        r3/posix/semevent-posix.cpp \
417
 
        r3/posix/semeventmulti-posix.cpp \
418
 
        r3/posix/semmutex-posix.cpp
419
 
RuntimeR3_SOURCES.linux.amd64 += \
420
 
        r3/linux/semevent-linux.cpp \
421
 
        r3/linux/semeventmulti-linux.cpp
422
 
ifdef RT_NEW_LINUX_MUTEX_CODE
423
 
 RuntimeR3_SOURCES.linux.amd64 += \
424
 
        r3/linux/semmutex-linux.cpp
 
418
ifdef IPRT_WITH_FUTEX_BASED_SEMS
 
419
 RuntimeR3_SOURCES.linux += \
 
420
        r3/linux/semevent-linux.cpp \
 
421
        r3/linux/semeventmulti-linux.cpp \
 
422
        r3/linux/semmutex-linux.cpp
425
423
else
 
424
 RuntimeR3_SOURCES.linux.x86 += \
 
425
        r3/posix/semevent-posix.cpp \
 
426
        r3/posix/semeventmulti-posix.cpp \
 
427
        r3/posix/semmutex-posix.cpp
426
428
 RuntimeR3_SOURCES.linux.amd64 += \
427
 
        r3/posix/semmutex-posix.cpp
 
429
        r3/linux/semevent-linux.cpp \
 
430
        r3/linux/semeventmulti-linux.cpp
 
431
 ifdef RT_NEW_LINUX_MUTEX_CODE
 
432
  RuntimeR3_SOURCES.linux.amd64 += \
 
433
        r3/linux/semmutex-linux.cpp
 
434
 else
 
435
  RuntimeR3_SOURCES.linux.amd64 += \
 
436
        r3/posix/semmutex-posix.cpp
 
437
 endif
428
438
endif
429
439
 
430
440
RuntimeR3_SOURCES.os2   = \