Changeset 6757 in vbox
- Timestamp:
- Feb 2, 2008 8:51:14 AM (17 years ago)
- Location:
- trunk/src/VBox/Additions
- Files:
-
- 5 edited
-
Makefile.kmk (modified) (1 diff)
-
linux/Makefile.kmk (modified) (4 diffs)
-
linux/daemon/Makefile.kmk (modified) (3 diffs)
-
linux/module/Makefile.kmk (modified) (4 diffs)
-
linux/sharedfolders/Makefile.kmk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/Makefile.kmk
r6756 r6757 57 57 endif 58 58 ifdef VBOX_WITH_LINUX_ADDITIONS 59 SUBDIRS += linux60 #include $(PATH_SUB_CURRENT)/linux/Makefile.kmk61 59 include $(PATH_SUB_CURRENT)/x11/Makefile.kmk 60 include $(PATH_SUB_CURRENT)/linux/Makefile.kmk 62 61 else if1of ($(BUILD_TARGET), solaris) 63 62 include $(PATH_SUB_CURRENT)/x11/Makefile.kmk -
trunk/src/VBox/Additions/linux/Makefile.kmk
r6595 r6757 16 16 # 17 17 18 DEPTH = ../../../.. 19 include $(PATH_KBUILD)/header.kmk 18 DEPTH ?= ../../../.. 19 SUB_DEPTH = .. 20 include $(PATH_KBUILD)/subheader.kmk 20 21 21 22 # This can only be built on a real Linux system. 22 SUBDIRS =23 23 ifeq ($(filter-out linux l4, $(BUILD_TARGET)),) 24 SUBDIRS += \ 25 module \ 26 daemon \ 27 sharedfolders 24 include $(PATH_SUB_CURRENT)/module/Makefile.kmk 25 include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk 26 include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk 28 27 endif 29 28 30 29 ifndef VBOX_OSE 31 PACKING= $(PATH_BIN)/additions/VBoxLinuxAdditions.run32 OTHER_CLEAN= $(PACKING)33 # OSE only contains the source code for this34 SELINUX_CMPLD =selinux-fedora/vbox_x11.pp30 PACKING += $(PATH_BIN)/additions/VBoxLinuxAdditions.run 31 OTHER_CLEAN += $(PACKING) 32 # OSE only contains the source code for this 33 VBOX_SELINUX_CMPLD := $(PATH_SUB_CURRENT)/selinux-fedora/vbox_x11.pp 35 34 endif 36 35 36 VBOX_PATH_LINUX_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/installer 37 37 38 include $(PATH_KBUILD)/ footer.kmk38 include $(PATH_KBUILD)/subfooter.kmk 39 39 40 40 … … 42 42 # Build the Linux Guest Additions self extracting installer. 43 43 # 44 44 # Note that $(PATH_SUB_CURRENT) was changed by subfooter.kmk above and 45 # any references should be made via variables assigned a know value via := . 46 # 45 47 # We need to depend on all source files for the additions and shared 46 48 # folders kernel modules. 49 ## @todo Replace the wildcard stuff by the correct file lists now that 50 # we've got everything included. 51 # 47 52 $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \ 48 53 $(INSTARGET_vboxmod-bin) \ 49 54 $(PATH_BIN)/additions/vboxadd-timesync \ 50 55 $(PATH_BIN)/additions/VBoxClient \ 51 installer/vboxadd-timesync.sh \52 installer/98vboxadd-xclient \53 installer/vboxadd.sh \54 installer/install.sh \55 ../../Installer/linux/routines.sh \56 installer/x11config.pl \57 installer/Makefile.test \58 installer/test.c \56 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh \ 57 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/98vboxadd-xclient \ 58 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh \ 59 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh \ 60 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh \ 61 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/x11config.pl \ 62 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test \ 63 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c \ 59 64 $(PATH_BIN)/additions/vboxmouse_drv.o \ 60 65 $(PATH_BIN)/additions/vboxmouse_drv_70.so \ … … 66 71 $(PATH_BIN)/additions/vboxvideo_drv_13.so \ 67 72 $(PATH_BIN)/additions/vboxvideo_drv_14.so \ 68 installer/vboxvfs.sh $(PATH_BIN)/additions/mountvboxsf \69 $( SELINUX_CMPLD) \73 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(PATH_BIN)/additions/mountvboxsf \ 74 $(VBOX_SELINUX_CMPLD) \ 70 75 $(wildcard $(PATH_BIN)/additions/src/*) \ 71 76 $(wildcard $(PATH_BIN)/additions/src/*/*) \ … … 80 85 $(QUIET)cp -af $(PATH_BIN)/additions/src $(PATH_TARGET)/install/module 81 86 $(QUIET)$(MKDIR) -p $(PATH_TARGET)/install/module/test 82 $(QUIET)$(INSTALL) -m 0644 installer/Makefile.test $(PATH_TARGET)/install/module/test/Makefile 83 $(QUIET)$(INSTALL) -m 0644 installer/test.c $(PATH_TARGET)/install/module/test/ 84 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxadd-timesync $(PATH_TARGET)/install/vboxadd-timesync 85 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/VBoxClient $(PATH_TARGET)/install/VBoxClient 86 $(QUIET)$(SED) "s;_VERSION_;$(VBOX_VERSION_STRING);g" installer/install.sh | $(SED) "s;_BUILD_;$(shell date);g" | $(SED) "s;_OSE_;$(VBOX_OSE);g" | $(SED) "s;_BUILDTYPE_;$(BUILD_TYPE);g" > $(PATH_TARGET)/install/install_.sh 87 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test $(PATH_TARGET)/install/module/test/Makefile 88 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c $(PATH_TARGET)/install/module/test/ 89 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxadd-timesync $(PATH_TARGET)/install/vboxadd-timesync 90 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/VBoxClient $(PATH_TARGET)/install/VBoxClient 91 $(QUIET)$(SED) "s;_VERSION_;$(VBOX_VERSION_STRING);g" $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh \ 92 | $(SED) "s;_BUILD_;$(shell date);g" \ 93 | $(SED) "s;_OSE_;$(VBOX_OSE);g" \ 94 | $(SED) "s;_BUILDTYPE_;$(BUILD_TYPE);g" \ 95 > $(PATH_TARGET)/install/install_.sh 87 96 $(QUIET)$(INSTALL) -m 0755 $(PATH_TARGET)/install/install_.sh $(PATH_TARGET)/install/install.sh 88 97 $(QUIET)$(RM) $(PATH_TARGET)/install/install_.sh 89 $(QUIET)$(INSTALL) -m 0755 installer/vboxadd-timesync.sh $(PATH_TARGET)/install90 $(QUIET)$(INSTALL) -m 0755 installer/98vboxadd-xclient$(PATH_TARGET)/install91 $(QUIET)$(INSTALL) -m 0755 installer/vboxadd.sh$(PATH_TARGET)/install92 $(QUIET)$(INSTALL) -m 0755 ../../Installer/linux/routines.sh$(PATH_TARGET)/install93 $(QUIET)$(INSTALL) -m 0755 installer/x11config.pl$(PATH_TARGET)/install94 $(QUIET)objcopy -g -R .comment $(PATH_BIN)/additions/vboxmouse_drv.o $(PATH_TARGET)/install/vboxmouse_drv.o95 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_70.so $(PATH_TARGET)/install/vboxmouse_drv_70.so96 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_71.so $(PATH_TARGET)/install/vboxmouse_drv_71.so97 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_14.so $(PATH_TARGET)/install/vboxmouse_drv_14.so98 $(QUIET)objcopy -g -R .comment $(PATH_BIN)/additions/vboxvideo_drv.o $(PATH_TARGET)/install/vboxvideo_drv.o99 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_70.so $(PATH_TARGET)/install/vboxvideo_drv_70.so100 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_71.so $(PATH_TARGET)/install/vboxvideo_drv_71.so101 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_13.so $(PATH_TARGET)/install/vboxvideo_drv_13.so102 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_14.so $(PATH_TARGET)/install/vboxvideo_drv_14.so103 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/mountvboxsf $(PATH_TARGET)/install/mount.vboxsf104 $(QUIET)$(INSTALL) -m 0755 installer/vboxvfs.sh $(PATH_TARGET)/install105 #ifndef VBOX_OSE 106 $(QUIET)$(INSTALL) -m 0755 selinux-fedora/vbox_x11.pp$(PATH_TARGET)/install107 #endif98 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(PATH_TARGET)/install 99 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/98vboxadd-xclient $(PATH_TARGET)/install 100 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh $(PATH_TARGET)/install 101 $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh $(PATH_TARGET)/install 102 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/x11config.pl $(PATH_TARGET)/install 103 $(QUIET)objcopy -g -R .comment $(PATH_BIN)/additions/vboxmouse_drv.o $(PATH_TARGET)/install/vboxmouse_drv.o 104 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_70.so $(PATH_TARGET)/install/vboxmouse_drv_70.so 105 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_71.so $(PATH_TARGET)/install/vboxmouse_drv_71.so 106 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_14.so $(PATH_TARGET)/install/vboxmouse_drv_14.so 107 $(QUIET)objcopy -g -R .comment $(PATH_BIN)/additions/vboxvideo_drv.o $(PATH_TARGET)/install/vboxvideo_drv.o 108 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_70.so $(PATH_TARGET)/install/vboxvideo_drv_70.so 109 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_71.so $(PATH_TARGET)/install/vboxvideo_drv_71.so 110 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_13.so $(PATH_TARGET)/install/vboxvideo_drv_13.so 111 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_14.so $(PATH_TARGET)/install/vboxvideo_drv_14.so 112 $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/mountvboxsf $(PATH_TARGET)/install/mount.vboxsf 113 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(PATH_TARGET)/install 114 ifdef VBOX_SELINUX_CMPLD 115 $(QUIET)$(INSTALL) -m 0755 $(VBOX_SELINUX_CMPLD) $(PATH_TARGET)/install 116 endif 108 117 $(QUIET)$(VBOX_MAKESELF) $(PATH_TARGET)/install $@ \ 109 118 "VirtualBox $(VBOX_VERSION_STRING) Guest Additions for Linux installation" /bin/sh ./install.sh "> /dev/null" -
trunk/src/VBox/Additions/linux/daemon/Makefile.kmk
r6732 r6757 1 1 # $Id$ 2 2 ## @file 3 # Makefile for the VirtualBox Linux Guest Addition Linux Daemon.3 # Sub-Makefile for the VirtualBox Linux Guest Addition Linux Daemon. 4 4 # 5 5 … … 16 16 # 17 17 18 DEPTH = ../../../../.. 19 include $(PATH_KBUILD)/header.kmk 18 DEPTH ?= ../../../../.. 19 SUB_DEPTH = ../.. 20 include $(PATH_KBUILD)/subheader.kmk 20 21 21 22 22 23 ## @todo Replace with VBoxService. 23 PROGRAMS = vboxadd-timesync24 PROGRAMS += vboxadd-timesync 24 25 25 26 vboxadd-timesync_TEMPLATE = VBOXGUESTR3EXE … … 32 33 33 34 34 include $(PATH_KBUILD)/ footer.kmk35 include $(PATH_KBUILD)/subfooter.kmk 35 36 -
trunk/src/VBox/Additions/linux/module/Makefile.kmk
r6693 r6757 1 1 # $Id$ 2 2 ## @file 3 # Makefile for the VirtualBox Linux Guest Additions Kernel Module.3 # Sub-Makefile for the VirtualBox Linux Guest Additions Kernel Module. 4 4 # 5 5 … … 16 16 # 17 17 18 DEPTH = ../../../../.. 19 include $(PATH_KBUILD)/header.kmk 18 DEPTH ?= ../../../../.. 19 SUB_DEPTH = ../.. 20 include $(PATH_KBUILD)/subheader.kmk 20 21 21 INSTALLS = vboxmod-bin vboxmod-sh22 INSTALLS += vboxmod-bin vboxmod-sh 22 23 ifdef VBOX_WITH_ADDITION_DRIVERS 23 SYSMODS = vboxadd24 SYSMODS += vboxadd 24 25 endif 25 26 … … 27 28 # Populate FILES_VBOXADD_NOBIN and FILES_VBOXADD_BIN 28 29 # 29 include files_vboxadd30 include $(PATH_SUB_CURRENT)/files_vboxadd 30 31 31 32 vboxmod-bin_INST = $(INST_ADDITIONS)/src/vboxadd/ … … 55 56 $(VBOX_LIB_IPRT_GUEST_R0) 56 57 57 include $(PATH_KBUILD)/ footer.kmk58 include $(PATH_KBUILD)/subfooter.kmk 58 59 -
trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
r6734 r6757 1 1 # $Id$ 2 2 ## @file 3 # Makefile for the vboxvfs (linux shared folders module).3 # Sub-Makefile for the vboxvfs (linux shared folders module). 4 4 # 5 5 … … 16 16 # 17 17 18 DEPTH = ../../../../.. 19 include $(PATH_KBUILD)/header.kmk 18 DEPTH ?= ../../../../.. 19 SUB_DEPTH = ../.. 20 include $(PATH_KBUILD)/subheader.kmk 20 21 21 22 ifdef VBOX_WITH_ADDITION_DRIVERS 22 SYSMODS 23 SYSMODS += vboxvfs 23 24 endif 24 PROGRAMS = mountvboxsf25 INSTALLS = vboxvfs-bin vboxvfs-sh25 PROGRAMS += mountvboxsf 26 INSTALLS += vboxvfs-bin vboxvfs-sh 26 27 27 28 # 28 29 # Populate FILES_VBOXVFS_NOBIN and FILES_VBOXVFS_BIN 29 30 # 30 include files_vboxvfs31 include $(PATH_SUB_CURRENT)/files_vboxvfs 31 32 32 33 # … … 52 53 KBUILD_BASENAME=KBUILD_STR\(vboxadd\) 53 54 vboxvfs_INCS = \ 54 ../../common/VBoxGuestLib \55 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \ 55 56 $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux 56 57 vboxvfs_SOURCES = \ … … 84 85 85 86 86 include $(PATH_KBUILD)/ footer.kmk87 include $(PATH_KBUILD)/subfooter.kmk
Note:
See TracChangeset
for help on using the changeset viewer.
