← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Makefile.kmk
76
76
else
77
77
 VBoxDDU_SDKS.win        = WINPSDK
78
78
endif
 
79
ifdef VBOX_WITH_NEW_IO_CODE
 
80
 VBoxDDU_DEFS           += VBOX_WITH_NEW_IO_CODE
 
81
endif
79
82
VBoxDDU_SOURCES          = \
80
83
        Storage/VBoxHDD.cpp \
81
84
        Storage/VDIHDDCore.cpp \
82
85
        Storage/VHDHDDCore.cpp \
83
86
        Storage/VmdkHDDCore.cpp \
84
87
        Storage/RawHDDCore.cpp \
 
88
        Storage/ParallelsHDDCore.cpp \
85
89
        VBoxDDUDeps.cpp
86
90
ifdef VBOX_WITH_USB
87
91
 VBoxDDU_INCS.os2       += \
121
125
# VBoxDD (shared object)
122
126
#
123
127
VBoxDD_TEMPLATE         = VBOXR3
 
128
ifdef VBOX_WITH_DTRACE_R3
 
129
 VBoxDD_TEMPLATE        = VBOXR3OSX105
 
130
endif
124
131
VBoxDD_SDKS.win         = WINPSDK DXSDK W2K3DDK VBOX_NTDLL
125
132
VBoxDD_SOURCES          = \
126
133
        Builtins.cpp
143
150
ifdef VBOX_WITH_E1000
144
151
 VBoxDD_DEFS           += VBOX_WITH_E1000
145
152
endif
 
153
ifdef VBOX_WITH_VIRTIO
 
154
 VBoxDD_DEFS           += VBOX_WITH_VIRTIO
 
155
endif
146
156
ifdef VBOX_WITH_BUSLOGIC
147
157
 VBoxDD_DEFS           += VBOX_WITH_BUSLOGIC
148
158
endif
262
272
DevicesR3_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
263
273
DevicesR3_DEFS         += VBOX_HGCM_HOST_CODE \
264
274
                          $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
265
 
DevicesR3_INCS         := \
266
 
        $(PATH_SUB_CURRENT)
 
275
DevicesR3_DEFS         += VBOX_WITH_HGCM
 
276
DevicesR3_DEFS.linux   += _GNU_SOURCE
 
277
DevicesR3_DEFS.l4      += _GNU_SOURCE
 
278
 
 
279
DevicesR3_INCS          = \
 
280
        .
 
281
 
267
282
DevicesR3_SOURCES       = \
268
283
        Input/DevPS2.cpp \
269
284
        Bus/DevPCI.cpp \
275
290
        PC/ACPI/VBoxAcpi.cpp \
276
291
        PC/DevRTC.cpp \
277
292
        PC/DevPcBios.cpp \
 
293
        PC/DevFwCommon.cpp \
278
294
        PC/DevPcArch.c \
279
 
        VMMDev/VBoxDev.cpp \
 
295
        VMMDev/VMMDev.cpp \
280
296
        VMMDev/VMMDevHGCM.cpp \
281
297
        Network/DevPCNet.cpp \
282
298
        Audio/DevIchAc97.cpp \
289
305
ifdef VBOX_DYNAMIC_NET_ATTACH
290
306
 DevicesR3_DEFS += VBOX_DYNAMIC_NET_ATTACH
291
307
endif
 
308
ifdef VBOX_BIOS_DMI_FALLBACK
 
309
 DevicesR3_DEFS += VBOX_BIOS_DMI_FALLBACK
 
310
endif
292
311
 
293
312
ifdef VBOX_WITH_E1000
294
313
 DevicesR3_DEFS        += VBOX_WITH_E1000
298
317
        Network/DevEEPROM.cpp
299
318
endif
300
319
 
 
320
ifdef VBOX_WITH_VIRTIO
 
321
 DevicesR3_DEFS        += VBOX_WITH_VIRTIO
 
322
 DevicesR3_SOURCES     += \
 
323
        VirtIO/Virtio.cpp \
 
324
        Network/DevVirtioNet.cpp
 
325
endif
 
326
 
301
327
ifdef VBOX_WITH_HGSMI
302
328
 DevicesR3_DEFS         += VBOX_WITH_HGSMI
303
329
 DevicesR3_SOURCES      += \
309
335
ifdef VBOX_WITH_VIDEOHWACCEL
310
336
 DevicesR3_DEFS         += VBOX_WITH_VIDEOHWACCEL
311
337
endif
312
 
 
 
338
ifdef VBOX_WITH_DMI_CHASSIS
 
339
 DevicesR3_DEFS         += VBOX_WITH_DMI_CHASSIS
 
340
endif
 
341
ifdef VBOX_WITH_DMI_OEMSTRINGS
 
342
 DevicesR3_DEFS         += VBOX_WITH_DMI_OEMSTRINGS
 
343
endif
313
344
 
314
345
ifdef VBOX_WITH_INIP
315
346
DevicesR3_INCS         += \
408
439
 endif
409
440
endif
410
441
 
411
 
DevicesR3_DEFS         += VBOX_WITH_HGCM
412
 
DevicesR3_DEFS.linux   += _GNU_SOURCE
413
 
DevicesR3_DEFS.l4      += _GNU_SOURCE
 
442
ifdef VBOX_WITH_DTRACE_R3
 
443
 DevicesR3_TEMPLATE    = VBOXR3OSX105
 
444
 DevicesR3_DEFS        += VBOX_WITH_DTRACE
 
445
 DevicesR3_INCS        += $(DevicesR3_0_OUTDIR)
 
446
 DevicesR3_INTERMEDIATES += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h
 
447
 $$(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h: $(PATH_CURRENT)/VBoxDD-dtrace.d | $$(dir $$@)
 
448
        dtrace -C -h -o $@ -s $<
 
449
endif
414
450
 
415
451
ifdef VBOX_WITH_DYNAMIC_DSDT
416
 
DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxdsl.hex
417
 
PC/ACPI/VBoxAcpi.cpp_DEPS     = $(PATH_DevicesR3)/vboxdsl.hex
 
452
 DevicesR3_CLEAN       += $(PATH_DevicesR3)/vboxdsl.hex
 
453
 PC/ACPI/VBoxAcpi.cpp_DEPS = $(PATH_DevicesR3)/vboxdsl.hex
418
454
 
419
 
$$(PATH_DevicesR3)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
 
455
 $$(PATH_DevicesR3)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
420
456
        $(call MSG_TOOL,bin2c,DevicesR3,$<,$@)
421
457
        $(QUIET)$(VBOX_BIN2C) -export VboxDslSource $< $@
422
458
 
423
 
vboxdsl.hex:: $$(PATH_DevicesR3)/vboxdsl.hex
424
 
 
425
 
else
426
 
# VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
427
 
DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxaml.hex $(PATH_DevicesR3)/vboxaml.aml
428
 
PC/ACPI/VBoxAcpi.cpp_DEPS     = $(PATH_DevicesR3)/vboxaml.hex
429
 
 
430
 
$$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
 
459
 vboxdsl.hex:: $$(PATH_DevicesR3)/vboxdsl.hex
 
460
 
 
461
else  # !VBOX_WITH_DYNAMIC_DSDT
 
462
 # VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
 
463
 DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxaml.hex $(PATH_DevicesR3)/vboxaml.aml
 
464
 PC/ACPI/VBoxAcpi.cpp_DEPS = $(PATH_DevicesR3)/vboxaml.hex
 
465
 
 
466
 $$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
431
467
        $(call MSG_TOOL,iasl,DevicesR3,$<,$@)
432
468
        $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
433
469
 
434
 
vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
 
470
 vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
435
471
 
436
 
endif
437
 
PC/ACPI/VBoxAcpi.cpp_INCS     = $(PATH_DevicesR3)
 
472
endif # !VBOX_WITH_DYNAMIC_DSDT
 
473
PC/ACPI/VBoxAcpi.cpp_INCS = $(PATH_DevicesR3)
438
474
 
439
475
# For finding PCIInternal.h from VBox/pci.h.
440
 
Bus/DevPCI.cpp_INCS     = Bus
 
476
Bus/DevPCI.cpp_INCS      = Bus
441
477
 
442
478
# For finding and generating vbetables.h (see Graphics/BIOS/Makefile.kmk).
443
479
Graphics/DevVGA.cpp_INCS = $(PATH_VgaBiosBin)
444
480
Graphics/DevVGA.cpp_DEPS = $(PATH_VgaBiosBin)/vbetables.h
445
481
 
446
482
 
447
 
 
448
483
#
449
484
# VBoxDDGC (sysmod)
450
485
#
480
515
        Network/DevE1000Phy.cpp
481
516
endif
482
517
 
 
518
ifdef VBOX_WITH_VIRTIO
 
519
 VBoxDDGC_DEFS         += VBOX_WITH_VIRTIO
 
520
 VBoxDDGC_SOURCES      += \
 
521
        VirtIO/Virtio.cpp \
 
522
        Network/DevVirtioNet.cpp
 
523
endif
 
524
 
 
525
ifdef VBOX_WITH_HGSMI
 
526
 VBoxDDGC_DEFS         += VBOX_WITH_HGSMI
 
527
endif
 
528
 
483
529
ifdef VBOX_WITH_USB
484
530
VBoxDDGC_DEFS          += VBOX_WITH_USB IN_USB_GC
485
531
VBoxDDGC_SOURCES       += \
567
613
        Network/DevE1000Phy.cpp
568
614
endif
569
615
 
 
616
ifdef VBOX_WITH_VIRTIO
 
617
 VBoxDDR0_DEFS         += VBOX_WITH_VIRTIO
 
618
 VBoxDDR0_SOURCES      += \
 
619
        VirtIO/Virtio.cpp \
 
620
        Network/DevVirtioNet.cpp
 
621
endif
 
622
 
 
623
ifdef VBOX_WITH_HGSMI
 
624
 VBoxDDR0_DEFS         += VBOX_WITH_HGSMI
 
625
endif
 
626
 
570
627
ifdef VBOX_WITH_USB
571
628
VBoxDDR0_DEFS          += VBOX_WITH_USB IN_USB_R0
572
629
VBoxDDR0_SOURCES       += \
675
732
Drivers_DEFS      += VBOX_WITH_FAULT_INJECTION
676
733
endif
677
734
 
678
 
VBOX_WITH_SLIRP_ALIAS=1
679
735
Drivers_INCS      := \
680
736
        $(PATH_SUB_CURRENT) \
681
737
        Network/slirp
705
761
VBOX_SLIRP_SOURCES = \
706
762
        Network/DrvNAT.cpp \
707
763
        Network/slirp/bootp.c \
708
 
        Network/slirp/cksum.c \
709
764
        Network/slirp/debug.c \
710
765
        Network/slirp/if.c \
711
766
        Network/slirp/ip_icmp.c \
712
767
        Network/slirp/ip_input.c \
713
768
        Network/slirp/ip_output.c \
714
 
        Network/slirp/mbuf.c \
715
769
        Network/slirp/misc.c \
716
770
        Network/slirp/sbuf.c \
717
771
        Network/slirp/slirp.c \
720
774
        Network/slirp/tcp_output.c \
721
775
        Network/slirp/tcp_subr.c \
722
776
        Network/slirp/tcp_timer.c \
723
 
        Network/slirp/tftp.c \
724
777
        Network/slirp/udp.c \
725
778
        Network/slirp/dnsproxy/hash.c \
726
779
        Network/slirp/dnsproxy/dnsproxy.c
727
780
 
 
781
ifdef VBOX_WITH_SLIRP_BSD_MBUF
 
782
 VBOX_SLIRP_BSD_ARCH = $(subst x86,i386,$(KBUILD_TARGET_ARCH))
 
783
 VBOX_SLIRP_BSD_SOURCES += \
 
784
        Network/slirp/bsd/kern/kern_mbuf.c \
 
785
        Network/slirp/bsd/kern/uipc_mbuf.c \
 
786
        Network/slirp/bsd/kern/uipc_mbuf2.c \
 
787
        Network/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/in_cksum.c
 
788
else
 
789
# some notes dnsproxy will probably deprecate
 
790
# tftp.c is temporally out of global slirp section
 
791
 VBOX_SLIRP_SOURCES += \
 
792
        Network/slirp/mbuf.c \
 
793
        Network/slirp/cksum.c \
 
794
        Network/slirp/tftp.c
 
795
endif
 
796
 
728
797
VBOX_SLIRP_ALIAS_SOURCES = \
729
798
        Network/slirp/libalias/alias.c \
730
799
        Network/slirp/libalias/alias_db.c \
731
800
        Network/slirp/libalias/alias_mod.c \
732
801
        Network/slirp/libalias/alias_proxy.c \
733
802
        Network/slirp/libalias/alias_ftp.c \
 
803
        Network/slirp/libalias/alias_dns.c \
734
804
        Network/slirp/libalias/alias_nbt.c \
735
805
        Network/slirp/libalias/alias_util.c
736
806
 
737
807
# some day will be deleted
738
 
VBOX_WITHOUT_SLIRP_CLIENT_ETHER=1
739
808
 
740
809
Drivers_SOURCES += $(VBOX_SLIRP_SOURCES)
741
810
define def_vbox_slirp_cflags
742
811
  $(file)_DEFS += \
743
812
      $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),RTMEM_WRAP_TO_EF_APIS,) \
744
 
      $(if $(VBOX_WITH_SLIRP_ALIAS),VBOX_WITH_SLIRP_ALIAS,) \
745
 
      $(if $(VBOX_WITHOUT_SLIRP_CLIENT_ETHER),VBOX_WITHOUT_SLIRP_CLIENT_ETHER,) \
746
813
      $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,) \
747
 
      $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,)
748
 
 ifdef VBOX_WITH_SLIRP_ALIAS
749
 
  $(file)_INCS += $(1)/slirp
750
 
  $(file)_INCS += $(1)/slirp/libalias
 
814
      $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,) \
 
815
      $(if $(VBOX_WITH_SLIRP_BSD_MBUF),VBOX_WITH_SLIRP_BSD_MBUF,)
 
816
 ifdef VBOX_WITH_SLIRP_BSD_MBUF
 
817
  $(file)_INCS += $(1)/slirp/bsd/sys
 
818
  $(file)_INCS += $(1)/slirp/bsd/sys/sys
 
819
  $(file)_INCS += $(1)/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/include
 
820
  $(file)_INCS += $(1)/slirp/bsd/netinet
751
821
 endif
 
822
 $(file)_INCS += $(1)/slirp
 
823
 $(file)_INCS += $(1)/slirp/libalias
752
824
 ifeq ($(KBUILD_TARGET),win)
753
825
  $(file)_CFLAGS = -wd4018
754
826
 else
755
 
  $(file)_CFLAGS = -Wno-sign-compare
 
827
  $(file)_CFLAGS += -Wno-sign-compare
 
828
  ifdef VBOX_WITH_SLIRP_BSD_MBUF
 
829
   $(file)_CFLAGS += -Wno-format
 
830
   $(file)_CFLAGS += -Wno-bad-function-cast
 
831
  endif
756
832
 endif
757
833
endef
 
834
 
758
835
$(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network)))
759
836
 
760
 
ifdef VBOX_WITH_SLIRP_ALIAS
761
837
Drivers_SOURCES += $(VBOX_SLIRP_ALIAS_SOURCES)
762
838
define def_vbox_slirp_alias_cflags
763
839
  $(file)_DEFS += VBOX_SLIRP_ALIAS
767
843
endef
768
844
$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network)))
769
845
$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_alias_cflags, Network)))
 
846
 
 
847
ifdef VBOX_WITH_SLIRP_BSD_MBUF
 
848
VBOX_SLIRP_BSD_SOURCES += $(VBOX_SLIRP_BSD_SOURCES.${KBUILD_TARGET_ARCH})
 
849
Drivers_SOURCES += $(VBOX_SLIRP_BSD_SOURCES)
 
850
define def_vbox_slirp_bsd_cflags
 
851
  $(file)_DEFS += VBOX_SLIRP_BSD
 
852
  $(file)_INCS += $(1)/slirp/dnsproxy
 
853
endef
 
854
$(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network)))
 
855
$(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_bsd_cflags, Network)))
770
856
endif
771
857
 
772
858
# -- OS specific --
785
871
Drivers_SOURCES      := $(filter-out \
786
872
        Storage/DrvHostFloppy% \
787
873
        , $(Drivers_SOURCES)) \
788
 
        Audio/ossaudio.c
789
 
Drivers_SOURCES.freebsd =
 
874
        Audio/ossaudio.c \
 
875
        Serial/DrvHostSerial.cpp
 
876
Drivers_SOURCES.freebsd = \
 
877
        Network/DrvTAP.cpp
790
878
endif # freebsd
791
879
 
792
880
 
932
1020
 Drivers_DEFS.solaris    += VUSB_HAVE_USBPROXY_DEVICE
933
1021
 Drivers_SOURCES.solaris += \
934
1022
        USB/USBProxyDevice.cpp \
935
 
        USB/solaris/USBProxyDevice-solaris.cpp
 
1023
        USB/solaris/$(if $(VBOX_WITH_NEW_USB_CODE_ON_SOLARIS),USBProxyDevice2-solaris.cpp,USBProxyDevice-solaris.cpp)
 
1024
 
 
1025
 Drivers_DEFS.freebsd      += VUSB_HAVE_USBPROXY_DEVICE
 
1026
 Drivers_SOURCES.freebsd   += \
 
1027
        USB/USBProxyDevice.cpp \
 
1028
        USB/freebsd/USBProxyDevice-freebsd.cpp
936
1029
endif # VBOX_WITH_USB
937
1030
 
938
1031
ifdef VBOX_WITH_PDM_ASYNC_COMPLETION