Changeset 84947 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 25, 2020 11:52:07 AM (4 years ago)

Author:

vboxsync

Message:

/linux/Makefile*,++: BUILD_TYPE -> VBOX_KBUILD_TYPE; BUILD_TARGET_ARCH -> VBOX_KBUILD_TARGET_ARCH

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/linux/Makefile (modified) (2 diffs)
• linux/installer/install.sh.in (modified) (2 diffs)
• linux/installer/vboxadd.sh (modified) (1 diff)
• linux/sharedfolders/Makefile.module (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

@@ -124 +124 @@
         VBox/log-vbox.o \
         VBox/logbackdoor.o
- ifeq ($(BUILD_TARGET_ARCH),amd64)
+ ifeq ($(VBOX_KBUILD_TARGET_ARCH),amd64)
 VBOXMOD_OBJS += common/alloc/heapsimple.o
  endif
 endif # VBOX_WITHOUT_COMBINED_SOURCES
-ifeq ($(BUILD_TARGET_ARCH),x86)
+ifeq ($(VBOX_KBUILD_TARGET_ARCH),x86)
 VBOXMOD_OBJS += \
         common/math/gcc/divdi3.o \
@@ -149 +149 @@
         VBGL_VBOXGUEST \
         VBOX_WITH_HGCM
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+ifeq ($(VBOX_KBUILD_TARGET_ARCH),amd64)
 VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
 endif

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -34 +34 @@
 ROUTINES="routines.sh"
 INSTALLATION_VER="_VERSION_"
-BUILD_TYPE="_BUILDTYPE_"
-USERNAME="_USERNAME_"
+BUILD_VBOX_KBUILD_TYPE="_BUILDTYPE_"
+BUILD_USERNAME="_USERNAME_"
 UNINSTALL_SCRIPTS="vboxadd-x11 vboxvfs vboxadd-timesync vboxadd-service vboxadd"
 
@@ -449 +449 @@
 INSTALL_VER='$INSTALLATION_VER'
 # Build type and user name for logging purposes
-BUILD_TYPE='$BUILD_TYPE'
-USERNAME='$USERNAME'
+BUILD_VBOX_KBUILD_TYPE='$BUILD_BUILDTYPE'
+BUILD_USERNAME='$USERNAME'
 EOF
 

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -62 +62 @@
 # Marker to ignore a particular kernel version which was already installed.
 SKIPFILE_BASE=/var/lib/VBoxGuestAdditions/skip
-export BUILD_TYPE
+export VBOX_KBUILD_TYPE
 export USERNAME
 

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

@@ -37 +37 @@
         VBoxGuestR0LibPhysHeap.o \
         VBoxGuestR0LibSharedFolders.o
-ifeq ($(BUILD_TARGET_ARCH),x86)
+ifeq ($(VBOX_KBUILD_TARGET_ARCH),x86)
 VBOXMOD_OBJS += \
         divdi3.o \
@@ -61 +61 @@
         IN_GUEST_R0 \
         RT_NO_EXPORT_SYMBOL
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+ifeq ($(VBOX_KBUILD_TARGET_ARCH),amd64)
 VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
 endif