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

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/Installer/linux

Files:

• Makefile-footer.gmk (modified) (3 diffs)
• Makefile-header.gmk (modified) (2 diffs)
• install.sh (modified) (2 diffs)
• vboxdrv.sh (modified) (1 diff)

trunk/src/VBox/Installer/linux/Makefile-footer.gmk

@@ -27 +27 @@
 #
 VBOXMOD_0_KFLAGS := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(addprefix -D,$(VBOXMOD_DEFS))
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+ifeq ($(VBOX_KBUILD_TARGET_ARCH),amd64)
 VBOXMOD_0_KFLAGS += -DRT_ARCH_AMD64
 else
@@ -33 +33 @@
 endif
 
-ifeq ($(BUILD_TYPE),debug)
+ifeq ($(VBOX_KBUILD_TYPE),debug)
 # The -Wno-array-bounds is because of a bug in gcc 4.something, see
 # https://sourceware.org/bugzilla/show_bug.cgi?id=10001
@@ -53 +53 @@
 VBOXMOD_EXT := o
 
- ifeq ($(BUILD_TARGET_ARCH),amd64)
+ ifeq ($(VBOX_KBUILD_TARGET_ARCH),amd64)
 VBOXMOD_0_KFLAGS += -mcmodel=kernel
  endif

trunk/src/VBox/Installer/linux/Makefile-header.gmk

@@ -37 +37 @@
 # include $(obj)/Makefile-footer.gmk
 #
-# The kmk kBuild define KBUILD_TARGET_ARCH is available.
+# To avoid potential confusion between kmk/kBuild and linux/kbuild,
+# we use VBOX_KBUILD_TARGET_ARCH instead of KBUILD_TARGET_ARCH and
+# VBOX_KBUILD_TYPE instead of KBUILD_TYPE.  The VBOX_KBUILD_ variable
+# variant takes percedence over the kmk/kBuild ones.
 #
 
@@ -44 +47 @@
 # First, figure out which architecture we're targeting and the build type.
 # (We have to support basic cross building (ARCH=i386|x86_64).)
-# While at it, warn about BUILD_* vars found to help with user problems.
-#
+# While at it, warn about *BUILD_* vars found to help with user problems.
+#
+
+# VBOX_KBUILD_TARGET_ARCH = amd64|x86
 ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
- BUILD_TARGET_ARCH_DEF := amd64
-else
- BUILD_TARGET_ARCH_DEF := x86
-endif
-ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
- $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
- BUILD_TARGET_ARCH :=
-endif
-ifeq ($(BUILD_TARGET_ARCH),)
+ VBOX_KBUILD_TARGET_ARCH_DEFAULT := amd64
+else
+ VBOX_KBUILD_TARGET_ARCH_DEFAULT := x86
+endif
+ifdef VBOX_KBUILD_TARGET_ARCH
+ ifneq ($(filter-out amd64 x86,$(VBOX_KBUILD_TARGET_ARCH)),)
+  $(warning Ignoring unknown VBOX_KBUILD_TARGET_ARCH value '$(VBOX_KBUILD_TARGET_ARCH)'.)
+  VBOX_KBUILD_TARGET_ARCH :=
+ endif
+else
+ ifdef KBUILD_TARGET_ARCH
+  ifneq ($(filter-out amd64 x86,$(KBUILD_TARGET_ARCH)),)
+  $(warning Ignoring unknown KBUILD_TARGET_ARCH value '$(KBUILD_TARGET_ARCH)'.)
+  VBOX_KBUILD_TARGET_ARCH :=
+  endif
+  else
+   ifdef BUILD_TARGET_ARCH
+    $(warning BUILD_TARGET_ARCH is deprecated, use VBOX_KBUILD_TARGET_ARCH instead.)
+    ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
+     $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
+     VBOX_KBUILD_TARGET_ARCH :=
+   endif
+  endif
+ endif
+endif
+ifeq ($(VBOX_KBUILD_TARGET_ARCH),)
  ifeq ($(ARCH),x86_64)
-  BUILD_TARGET_ARCH := amd64
+  VBOX_KBUILD_TARGET_ARCH := amd64
  else
   ifeq ($(ARCH),i386)
-   BUILD_TARGET_ARCH := x86
+   VBOX_KBUILD_TARGET_ARCH := x86
   else
-   BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-  endif
- endif
-else
- ifneq ($(BUILD_TARGET_ARCH),$(BUILD_TARGET_ARCH_DEF))
-  $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).)
- endif
-endif
-
-ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
- $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
- BUILD_TYPE :=
-endif
-ifeq ($(BUILD_TYPE),)
- BUILD_TYPE := release
-else
- ifneq ($(BUILD_TYPE),release)
+   VBOX_KBUILD_TARGET_ARCH := $(VBOX_KBUILD_TARGET_ARCH_DEFAULT)
+  endif
+ endif
+else
+ ifneq ($(VBOX_KBUILD_TARGET_ARCH),$(VBOX_KBUILD_TARGET_ARCH_DEFAULT))
+  $(warning Using VBOX_KBUILD_TARGET_ARCH='$(VBOX_KBUILD_TARGET_ARCH)' from the $(origin VBOX_KBUILD_TARGET_ARCH).)
+ endif
+endif
+
+# VBOX_KBUILD_TYPE = release|debug|profile|strict
+ifdef VBOX_KBUILD_TYPE
+ VBOX_KBUILD_TYPE_VAR := VBOX_KBUILD_TYPE
+ ifneq ($(filter-out release profile debug strict,$(VBOX_KBUILD_TYPE)),)
+  $(warning Ignoring unknown VBOX_KBUILD_TYPE value '$(VBOX_KBUILD_TYPE)'.)
+  VBOX_KBUILD_TYPE :=
+ endif
+else
+ ifdef KBUILD_TYPE
+  VBOX_KBUILD_TYPE_VAR := KBUILD_TYPE
+  VBOX_KBUILD_TYPE := $(KBUILD_TYPE)
+  ifneq ($(filter-out release profile debug strict,$(KBUILD_TYPE)),)
+   $(warning Ignoring unknown KBUILD_TYPE value '$(KBUILD_TYPE)'.)
+   VBOX_KBUILD_TYPE :=
+  endif
+ else
+  ifdef BUILD_TYPE
+   $(warning BUILD_TYPE is deprecated, use VBOX_KBUILD_TYPE instead.)
+   VBOX_KBUILD_TYPE_VAR := BUILD_TYPE
+   VBOX_KBUILD_TYPE := $(BUILD_TYPE)
+   ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
+    $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
+    VBOX_KBUILD_TYPE :=
+   endif
+  endif
+ endif
+endif
+ifeq ($(VBOX_KBUILD_TYPE),)
+ VBOX_KBUILD_TYPE_VAR = VBOX_KBUILD_TYPE
+ VBOX_KBUILD_TYPE := release
+else
+ ifneq ($(VBOX_KBUILD_TYPE),release)
   ifndef VBOX_KERN_QUIET
-   $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
-  endif
- endif
-endif
+   $(warning Using VBOX_KBUILD_TYPE='$(VBOX_KBUILD_TYPE)' from the $(origin $(VBOX_KBUILD_TYPE_VAR)) ($(VBOX_KBUILD_TYPE_VAR)).)
+  endif
+ endif
+endif
+
 ifeq ($(USERNAME),)
  USERNAME := noname

trunk/src/VBox/Installer/linux/install.sh

@@ -36 +36 @@
 # The "BUILD_" prefixes prevent the variables from being overwritten when we
 # read the configuration from the previous installation.
-BUILD_BUILDTYPE="_BUILDTYPE_"
+BUILD_VBOX_KBUILD_TYPE="_BUILDTYPE_"
 BUILD_USERNAME="_USERNAME_"
 CONFIG_DIR="/etc/vbox"
@@ -308 +308 @@
     echo "INSTALL_REV='$SVNREV'" >> $CONFIG_DIR/$CONFIG
     echo "# Build type and user name for logging purposes" >> $CONFIG_DIR/$CONFIG
-    echo "BUILD_TYPE='$BUILD_BUILDTYPE'" >> $CONFIG_DIR/$CONFIG
+    echo "VBOX_KBUILD_TYPE='$BUILD_VBOX_KBUILD_TYPE'" >> $CONFIG_DIR/$CONFIG
     echo "USERNAME='$BUILD_USERNAME'" >> $CONFIG_DIR/$CONFIG
 

trunk/src/VBox/Installer/linux/vboxdrv.sh

@@ -58 +58 @@
 
 [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
-export BUILD_TYPE
+export VBOX_KBUILD_TYPE
 export USERNAME
 export USER=$USERNAME