Changeset 38194 in vbox
- Timestamp:
- Jul 27, 2011 9:55:19 AM (13 years ago)
- Location:
- trunk/src/VBox/Additions
- Files:
-
- 6 edited
-
linux/Makefile.kmk (modified) (5 diffs)
-
linux/drm/Makefile.kmk (modified) (2 diffs)
-
linux/installer/deffiles (modified) (2 diffs)
-
linux/sharedfolders/Makefile.kmk (modified) (4 diffs)
-
x11/Installer/98vboxadd-xclient (modified) (1 diff, 1 prop)
-
x11/Installer/x11config.sh (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/linux/Makefile.kmk
r38187 r38194 311 311 lnx_add_inst-exec_INST = $(VBOX_LNX_ADD_INST_MOD_DIR) 312 312 lnx_add_inst-exec_INSTTYPE = stage 313 lnx_add_inst-exec_MODE = a+rx,u+w 314 lnx_add_inst-exec_SOURCES = \ 313 lnx_add_inst-exec_EXEC_SOURCES = \ 315 314 $(VBOX_REL_X11_ADD_INST)98vboxadd-xclient \ 316 315 $(VBOX_REL_X11_ADD_INST)x11config.sh … … 320 319 lnx_add_inst-noexec_INST = $(VBOX_LNX_ADD_INST_SHARE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME)/ 321 320 lnx_add_inst-noexec_INSTTYPE = stage 322 lnx_add_inst-noexec_MODE = a+r,u+w323 321 lnx_add_inst-noexec_SOURCES = \ 324 322 $(VBOX_REL_X11_ADD_INST)vboxclient.desktop \ … … 333 331 lnx_add_inst-license_INST = $(VBOX_LNX_ADD_INST_OUT_DIR) 334 332 lnx_add_inst-license_INSTTYPE = stage 335 lnx_add_inst-license_MODE = a+r,u+w336 333 lnx_add_inst-license_SOURCES = \ 337 334 $(VBOX_BRAND_LICENSE_TXT)=>LICENSE … … 345 342 LnxAdd-scripts_INST = $(VBOX_LNX_ADD_INST_STAGE_DIR) 346 343 LnxAdd-scripts_INSTTYPE = stage 347 LnxAdd-scripts_MODE = a+rx,u+w348 344 LnxAdd-scripts_SOURCES = \ 345 $(VBOX_REL_LNX_ADD_INST)deffiles 346 LnxAdd-scripts_EXEC_SOURCES = \ 349 347 $(VBOX_REL_LNX_INST_SRC)routines.sh \ 350 348 $(VBOX_REL_LNX_ADD_INST)vboxadd.sh=>vboxadd \ 351 349 $(VBOX_REL_LNX_ADD_INST)vboxadd-service.sh=>vboxadd-service \ 352 350 $(VBOX_REL_LNX_ADD_INST)vboxadd-x11.sh=>vboxadd-x11 \ 353 $(VBOX_REL_LNX_ADD_INST)deffiles354 351 355 352 … … 377 374 # this file needs editing before it can be included in the generic installer. 378 375 $(VBOX_LNX_ADD_INST_STAGE_DIR)install.sh: \ 379 $(VBOX_PATH_LNX_INST_SRC)run-inst.sh | $$(dir $$@) 376 $(VBOX_PATH_LNX_INST_SRC)run-inst.sh | $$(dir $$@) 377 $(RM) -f -- $@ 380 378 $(QUIET)$(SED) \ 381 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \ 382 -e "s;_PACKAGE_NAME_;VirtualBox Guest Additions;g" \ 383 -e "s;_PACKAGE_;VBoxGuestAdditions;g" \ 384 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \ 385 -e "s;_BUILD_;$(shell date);g" \ 386 -e "s;_OSE_;$(VBOX_OSE);g" \ 387 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \ 388 -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \ 389 -e "s;_UNINSTALL_SCRIPTS_;vboxadd-x11 vboxadd-timesync vboxadd-service vboxadd;g" \ 390 --output $(VBOX_LNX_ADD_INST_OUT_DIR)install.sh \ 391 $< 392 $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_ADD_INST_OUT_DIR)install.sh $@ 393 $(QUIET)$(RM) $(VBOX_LNX_ADD_INST_OUT_DIR)install.sh 379 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \ 380 -e "s;_PACKAGE_NAME_;VirtualBox Guest Additions;g" \ 381 -e "s;_PACKAGE_;VBoxGuestAdditions;g" \ 382 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \ 383 -e "s;_BUILD_;$(shell date);g" \ 384 -e "s;_OSE_;$(VBOX_OSE);g" \ 385 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \ 386 -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \ 387 -e "s;_UNINSTALL_SCRIPTS_;vboxadd-x11 vboxadd-timesync vboxadd-service vboxadd;g" \ 388 --output $@ \ 389 $< 390 $(QUIET)$(CHMOD) 0755 $@ 394 391 OTHER_CLEAN += \ 395 392 $(VBOX_LNX_ADD_INST_OUT_DIR)install.sh \ -
trunk/src/VBox/Additions/linux/drm/Makefile.kmk
r35380 r38194 5 5 6 6 # 7 # Copyright (C) 2006-201 0Oracle Corporation7 # Copyright (C) 2006-2011 Oracle Corporation 8 8 # 9 9 # This file is part of VirtualBox Open Source Edition (OSE), as … … 19 19 include $(KBUILD_PATH)/subheader.kmk 20 20 21 INSTALLS += vboxvideo_drm-mod vboxvideo_drm-sh22 ifdef VBOX_WITH_ADDITION_DRIVERS23 # Only do a test build on kernels as of 2.6.2724 SYSMODS += $(if $(strip $(foreach inc,$(VBOX_LINUX_INCS),\25 $(wildcard $(inc)/drm/drmP.h))),vboxvideo_drm,)26 endif27 28 21 # 29 22 # Populate FILES_VBOXVIDEO_DRM_NOBIN 30 23 # 24 INSTALLS += vboxvideo_drm-mod 31 25 include $(PATH_SUB_CURRENT)/files_vboxvideo_drm 26 vboxvideo_drm-mod_INST = $(INST_ADDITIONS)src/vboxvideo/ 27 vboxvideo_drm-mod_SOURCES = \ 28 $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_NOBIN)) 29 vboxvideo_drm-mod_EXEC_SOURCES = \ 30 $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN)) \ 31 $(vboxvideo_drm-mod_0_OUTDIR)/build_in_tmp \ 32 $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers 33 vboxvideo_drm-mod_CLEAN += $(vboxvideo_drm-mod_0_OUTDIR)/build_in_tmp 32 34 33 vboxvideo_drm-mod_INST = $(INST_ADDITIONS)src/vboxvideo/ 34 vboxvideo_drm-mod_MODE = a+r,u+w 35 vboxvideo_drm-mod_SOURCES = $(subst ",,$(FILES_VBOXVIDEO_DRM_NOBIN)) 36 37 vboxvideo_drm-sh_INST = $(INST_ADDITIONS)src/vboxvideo/ 38 vboxvideo_drm-sh_MODE = a+rx,u+w 39 vboxvideo_drm-sh_SOURCES = $(subst ",,$(FILES_VBOXVIDEO_DRM_BIN)) 40 vboxvideo_drm-sh_SOURCES += \ 41 $(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp \ 42 $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers 43 vboxvideo_drm-sh_CLEAN += $(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp 44 45 46 # 47 # The module (for syntax checking). 48 # The DEBUG_HASH* stuff is for CONFIG_DYNAMIC_DEBUG-enabled kernels 49 # 50 vboxvideo_drm_TEMPLATE = VBOXGUESTR0 51 vboxvideo_drm_NOINST = 1 52 vboxvideo_drm_CFLAGS = -fshort-wchar 53 vboxvideo_drm_DEFS = \ 54 MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \ 55 KBUILD_MODNAME=KBUILD_STR\(vboxvideo\) \ 56 KBUILD_BASENAME=KBUILD_STR\(vboxvideo\) \ 57 DEBUG_HASH=2 DEBUG_HASH2=3 58 vboxvideo_drm_SOURCES = vboxvideo_drm.c 59 60 # detect fc6 2.6.18 61 vboxvideo_drm_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\ 62 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 63 $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\ 64 then echo yes; fi),KERNEL_FC6,),)) 65 # detect rhel5 2.6.18 66 vboxvideo_drm_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\ 67 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 68 $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\ 69 then echo yes; fi),KERNEL_FC6,),)) 70 71 72 ## Scripts needed for building kernel modules 73 74 $$(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp: \ 35 # Script needed for building the kernel module. 36 $$(vboxvideo_drm-mod_0_OUTDIR)/build_in_tmp: \ 75 37 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \ 76 38 $(VBOX_VERSION_STAMP) \ 77 39 | $$(dir $$@) 78 40 $(call MSG_TOOL,Creating,,$@) 79 $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvideo;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" < $< > $@ 80 $(QUIET)chmod 0755 $@ 41 $(QUIET)$(RM) -f -- $@ 42 $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvideo;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" \ 43 --output=$@ $< 44 $(QUIET)$(CHMOD) 0755 $@ 45 46 47 # 48 # The kernel module. 49 # 50 # Note! Syntax checking only. Don't bother if drmP.h is missing (introduced 51 # in 2.6.27). 52 # Note! The DEBUG_HASH* stuff is for CONFIG_DYNAMIC_DEBUG-enabled kernels. 53 # 54 if defined(VBOX_WITH_ADDITION_DRIVERS) \ 55 && "$(strip $(foreach inc,$(VBOX_LINUX_INCS),$(wildcard $(inc)/drm/drmP.h)))" != "" 56 SYSMODS += vboxvideo_drm 57 vboxvideo_drm_TEMPLATE = VBOXGUESTR0 58 vboxvideo_drm_NOINST = 1 59 vboxvideo_drm_CFLAGS = -fshort-wchar 60 vboxvideo_drm_DEFS = \ 61 MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \ 62 KBUILD_MODNAME=KBUILD_STR\(vboxvideo\) \ 63 KBUILD_BASENAME=KBUILD_STR\(vboxvideo\) \ 64 DEBUG_HASH=2 DEBUG_HASH2=3 65 # detect fc6 2.6.18 66 vboxvideo_drm_DEFS += \ 67 $(foreach inc,$(VBOX_LINUX_INCS),\ 68 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 69 $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\ 70 then echo yes; fi),KERNEL_FC6,),)) 71 # detect rhel5 2.6.18 72 vboxvideo_drm_DEFS += \ 73 $(foreach inc,$(VBOX_LINUX_INCS),\ 74 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 75 $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\ 76 then echo yes; fi),KERNEL_FC6,),)) 77 vboxvideo_drm_SOURCES = vboxvideo_drm.c 78 79 endif 81 80 82 81 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Additions/linux/installer/deffiles
r32436 r38194 1 #!/bin/sh 1 ## @file 2 # VirtualBox linux Guest Additions default files list 2 3 # 3 # VirtualBox linux Guest Additions default files list4 4 5 5 # … … 79 79 /usr/src/vboxvideo \ 80 80 " 81 -
trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
r35380 r38194 5 5 6 6 # 7 # Copyright (C) 2006-201 0Oracle Corporation7 # Copyright (C) 2006-2011 Oracle Corporation 8 8 # 9 9 # This file is part of VirtualBox Open Source Edition (OSE), as … … 19 19 include $(KBUILD_PATH)/subheader.kmk 20 20 21 PROGRAMS += mount.vboxsf22 INSTALLS += vboxsf-mod vboxsf-sh23 ifdef VBOX_WITH_ADDITION_DRIVERS24 SYSMODS += vboxsf25 endif26 21 27 22 # 28 23 # Populate FILES_VBOXSF_NOBIN 29 24 # 25 INSTALLS += vboxsf-mod 30 26 include $(PATH_SUB_CURRENT)/files_vboxsf 27 vboxsf-mod_INST = $(INST_ADDITIONS)src/vboxsf/ 28 vboxsf-mod_SOURCES = \ 29 $(subst $(DQUOTE),,$(FILES_VBOXSF_NOBIN)) 30 vboxsf-mod_EXEC_SOURCES = \ 31 $(subst $(DQUOTE),,$(FILES_VBOXSF_BIN)) \ 32 $(vboxsf-mod_0_OUTDIR)/build_in_tmp \ 33 $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers 34 vboxsf-mod_CLEAN += $(vboxsf-mod_0_OUTDIR)/build_in_tmp 31 35 32 vboxsf-mod_INST = $(INST_ADDITIONS)src/vboxsf/ 33 vboxsf-mod_MODE = a+r,u+w 34 vboxsf-mod_SOURCES = $(subst ",,$(FILES_VBOXSF_NOBIN)) 36 # Script needed for building the kernel module. 37 $$(vboxsf-mod_0_OUTDIR)/build_in_tmp: \ 38 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \ 39 $(VBOX_VERSION_STAMP) \ 40 | $$(dir $$@) 41 $(call MSG_TOOL,Creating,,$@) 42 $(QUIET)$(RM) -f -- $@ 43 $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxsf;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" \ 44 --output $@ $< 45 $(QUIET)$(CHMOD) 0755 $@ 35 46 36 vboxsf-sh_INST = $(INST_ADDITIONS)src/vboxsf/37 vboxsf-sh_MODE = a+rx,u+w38 vboxsf-sh_SOURCES = $(subst ",,$(FILES_VBOXSF_BIN))39 vboxsf-sh_SOURCES += \40 $(vboxsf-sh_0_OUTDIR)/build_in_tmp \41 $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers42 vboxsf-sh_CLEAN += $(vboxsf-sh_0_OUTDIR)/build_in_tmp43 47 44 48 … … 47 51 # The DEBUG_HASH* stuff is for CONFIG_DYNAMIC_DEBUG-enabled kernels 48 52 # 49 vboxsf_TEMPLATE = VBOXGUESTR0 50 vboxsf_NOINST = 1 51 vboxsf_CFLAGS = -fshort-wchar 52 vboxsf_DEFS = \ 53 MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \ 54 KBUILD_MODNAME=KBUILD_STR\(vboxsf\) \ 55 KBUILD_BASENAME=KBUILD_STR\(vboxsf\) \ 56 DEBUG_HASH=2 DEBUG_HASH2=3 57 vboxsf_INCS = \ 58 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \ 59 $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux 60 vboxsf_SOURCES = \ 61 vfsmod.c \ 62 utils.c \ 63 dirops.c \ 64 lnkops.c \ 65 regops.c 66 vboxsf_LIBS = \ 67 $(VBOX_LIB_VBGL_R0) 53 ifdef VBOX_WITH_ADDITION_DRIVERS 54 SYSMODS += vboxsf 55 vboxsf_TEMPLATE = VBOXGUESTR0 56 vboxsf_NOINST = 1 57 vboxsf_CFLAGS = -fshort-wchar 58 vboxsf_DEFS = \ 59 MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \ 60 KBUILD_MODNAME=KBUILD_STR\(vboxsf\) \ 61 KBUILD_BASENAME=KBUILD_STR\(vboxsf\) \ 62 DEBUG_HASH=2 DEBUG_HASH2=3 63 # detect fc6 2.6.18 64 vboxsf_DEFS += \ 65 $(foreach inc, $(VBOX_LINUX_INCS),\ 66 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 67 $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\ 68 then echo yes; fi),KERNEL_FC6,),)) 69 # detect rhel5 2.6.18 70 vboxsf_DEFS += \ 71 $(foreach inc, $(VBOX_LINUX_INCS),\ 72 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 73 $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\ 74 then echo yes; fi),KERNEL_FC6,),)) 68 75 69 # detect fc6 2.6.18 70 vboxsf_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\ 71 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 72 $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\ 73 then echo yes; fi),KERNEL_FC6,),)) 74 # detect rhel5 2.6.18 75 vboxsf_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\ 76 $(if $(wildcard $(inc)/linux/utsrelease.h),\ 77 $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\ 78 then echo yes; fi),KERNEL_FC6,),)) 79 76 vboxsf_INCS = \ 77 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \ 78 $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux 79 vboxsf_SOURCES = \ 80 vfsmod.c \ 81 utils.c \ 82 dirops.c \ 83 lnkops.c \ 84 regops.c 85 vboxsf_LIBS = \ 86 $(VBOX_LIB_VBGL_R0) 87 endif 80 88 81 89 # 82 90 # The mount util. 83 91 # 92 PROGRAMS += mount.vboxsf 84 93 mount.vboxsf_TEMPLATE = VBOXGUESTR3EXE 85 94 mount.vboxsf_DEFS = _GNU_SOURCE … … 88 97 vbsfmount.c 89 98 90 ## Scripts needed for building kernel modules91 92 $$(vboxsf-sh_0_OUTDIR)/build_in_tmp: \93 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \94 $(VBOX_VERSION_STAMP) \95 | $$(dir $$@)96 $(call MSG_TOOL,Creating,,$@)97 $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxsf;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<98 $(QUIET)chmod 0755 $@99 100 99 include $(KBUILD_PATH)/subfooter.kmk 101 100 -
trunk/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-
Property svn:executable
set to
*
r32394 r38194 1 1 #!/bin/sh 2 # 2 ## @file 3 3 # Start the Guest Additions X11 Client 4 4 # 5 # Copyright (C) 2007-2010 Oracle Corporation 5 6 # 7 # Copyright (C) 2007-2011 Oracle Corporation 6 8 # 7 9 # This file is part of VirtualBox Open Source Edition (OSE), as -
Property svn:executable
set to
-
trunk/src/VBox/Additions/x11/Installer/x11config.sh
-
Property svn:executable
set to
*
-
Property svn:executable
set to
Note:
See TracChangeset
for help on using the changeset viewer.
