Changeset 39325 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Nov 16, 2011 10:00:12 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74890

Message:

Installers/linux: restore debug logging in kernel modules.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.include.footer (modified) (1 diff)
• Makefile.include.header (modified) (1 diff)
• install.sh (modified) (1 diff)
• run-inst.sh (modified) (3 diffs)

trunk/src/VBox/Installer/linux/Makefile.include.footer

@@ -36 +36 @@
 KFLAGS   := -D__KERNEL__ -DMODULE $(MOD_DEFS)
 ifeq ($(BUILD_TYPE),debug)
- KFLAGS  += -DDEBUG
+ KFLAGS  += -DDEBUG -DDEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) -DDEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))
 endif
 

trunk/src/VBox/Installer/linux/Makefile.include.header

@@ -76 +76 @@
   $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
  endif
+endif
+ifeq ($(USERNAME),)
+ USERNAME := noname
 endif
 

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

@@ -443 +443 @@
     echo "INSTALL_VER='$VERSION'" >> $CONFIG_DIR/$CONFIG
     echo "INSTALL_REV='$SVNREV'" >> $CONFIG_DIR/$CONFIG
+    echo "# Build type and user name for logging purposes" >> $CONFIG_DIR/$CONFIG
+    echo "BUILD_TYPE='$BUILD_TYPE'" >> $CONFIG_DIR/$CONFIG
+    echo "USERNAME='$USERNAME'" >> $CONFIG_DIR/$CONFIG
 
     # Make kernel module

trunk/src/VBox/Installer/linux/run-inst.sh

@@ -31 +31 @@
 ARCH="_ARCH_"
 INSTALLATION_VER="_VERSION_"
+INSTALLATION_REV="_SVNREV_"
+BUILD_TYPE="_BUILDTYPE_"
+USERNAME="_USERNAME_"
 UNINSTALL_SCRIPTS="_UNINSTALL_SCRIPTS_"
 
@@ -273 +276 @@
 link_into_fs "src" "/usr/src"
 
-# Install, set up and start init scripts
-for i in "$INSTALLATION_DIR/init/"*; do
-  if test -r "$i"; then
-    install_init_script "$i" "`basename "$i"`"
-    test -n "$DO_SETUP" && setup_init_script "`basename "$i"`" 1>&2
-    start_init_script "`basename "$i"`"
-  fi
-done
-
-# Remember our installation configuration
+# Remember our installation configuration before we call any init scripts
 cat > "$CONFIG_DIR/$CONFIG" << EOF
 # $PACKAGE installation record.
@@ -294 +288 @@
 # Package version
 INSTALL_VER='$INSTALLATION_VER'
+INSTALL_REV='$INSTALLATION_REV'
+# Build type and user name for logging purposes
+BUILD_TYPE='$BUILD_TYPE'
+USERNAME='$USERNAME'
 EOF
+
+# Install, set up and start init scripts
+for i in "$INSTALLATION_DIR/init/"*; do
+  if test -r "$i"; then
+    install_init_script "$i" "`basename "$i"`"
+    test -n "$DO_SETUP" && setup_init_script "`basename "$i"`" 1>&2
+    start_init_script "`basename "$i"`"
+  fi
+done
 
 cp $ROUTINES $INSTALLATION_DIR