Changeset 59147 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2015 10:26:42 AM (9 years ago)

Author:

vboxsync

Message:

forward-ported r104727 (run: added debug versions of .r0 and .rc modules to VirtualBox-dbg.tar.bz2)

Location:

trunk/src/VBox/Installer

Files:

• Config.kmk (modified) (1 diff)
• linux/Makefile.kmk (modified) (8 diffs)

trunk/src/VBox/Installer/Config.kmk

@@ -26 +26 @@
 # Generic stuff.
 #
-VBOX_PATH_INST_COMMON_SRC := $(PATH_SUB_CURRENT)/common
+VBOX_PATH_INST_COMMON_SRC := $(PATH_ROOT)/src/VBox/Installer/common
 
 

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -189 +189 @@
         VBoxDDR0.r0 \
         VMMR0.r0
+ifdef VBOX_NO_LINUX_RUN_INSTALLER
+ VBOX_LNX_STRIP_OBJ += \
+        VBoxDD2R0.debug \
+        VBoxDDR0.debug \
+        VMMR0.debug
+else
+ VBOX_LNX_DBG_BIN = \
+        VBoxDD2R0.debug \
+        VBoxDDR0.debug \
+        VMMR0.debug
+endif
 
 ifdef VBOX_WITH_RAW_MODE
@@ -195 +206 @@
         VBoxDDRC.rc \
         VMMRC.rc
+ ifdef VBOX_NO_LINUX_RUN_INSTALLER
+  VBOX_LNX_STRIP_OBJ += \
+        VBoxDD2RC.debug \
+        VBoxDDRC.debug \
+        VMMRC.debug
+ else
+  VBOX_LNX_DBG_BIN += \
+        VBoxDD2RC.debug \
+        VBoxDDRC.debug \
+        VMMRC.debug
+ endif
 endif
 
@@ -353 +375 @@
 
 # Cleanup of the files we copy/symlink from bin.
-OTHER_CLEAN += $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_ARCH_FILES)) \
-               $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN))
+OTHER_CLEAN += $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(filter-out src,$(VBOX_LNX_ARCH_FILES)) src/vboxhost) \
+               $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,\
+                  $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
 
 #
@@ -448 +471 @@
         $(QUIET)$(if $(VBOX_NO_LINUX_RUN_INSTALLER),,objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_INST_OUT_DIR)/archive,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH),$@) $@)
 
+# pattern rule for copying VBOX_LNX_DBG_BIN files to archive-dbg/
+$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_DBG_BIN)): \
+                $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
+        $(call MSG_INST_FILE,$<,$@)
+        $(QUIET)$(CP) $< $@
+
 # pattern rule for striping and copying the VBOX_LNX_STRIP_OBJ files to archive/
 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_OBJ)): \
@@ -460 +489 @@
 endif
 
+# pattern rule for linking the VBOX_LNX_NO_STRIP into archive/
+$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_NO_STRIP)): \
+                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
+        $(call MSG_INST_SYM,$<,$@)
+        $(QUIET)$(RM) -f $@
+        $(QUIET)$(LN_SYMLINK) $< $@
+
 # special rule for the kernel modules
 $(VBOX_LNX_INST_OUT_DIR)/archive/src: $(PATH_STAGE_BIN)/src | $(dir $@)
@@ -466 +502 @@
         $(QUIET)$(MKDIR) $@
         $(QUIET)$(LN_SYMLINK) $< $@/vboxhost
-
-# pattern rule for linking the VBOX_LNX_NO_STRIP into archive/
-$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_NO_STRIP)): \
-                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
-        $(call MSG_INST_SYM,$<,$@)
-        $(QUIET)$(RM) -f $@
-        $(QUIET)$(LN_SYMLINK) $< $@
 
 # rules for creating directories in archive (the pattern rules depends on these).
@@ -507 +536 @@
 #
 $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2: \
-                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/, $(VBOX_LNX_STRIP_BIN))
+                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,\
+                    $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
@@ -513 +543 @@
         $(QUIET)tar --dereference --owner 0 --group 0 \
                 -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
-                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN))
+                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
 else
         $(QUIET)tar --dereference --owner 0 --group 0 \
                 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
-                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN))
+                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
 endif