Changeset 39325 in vbox

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

Files:

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

-              r39324
+              r39325
         $(QUIET)$(SED) \
                 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
+                -e "s;_PACKAGE_NAME_;VirtualBox Guest Additions;g" \
+                -e "s;_SVNREV_;$(VBOX_SVN_REV);g" \
+                -e "s;_PACKAGE_NAME_;VirtualBox Guest Additions;g" \
                 -e "s;_PACKAGE_;VBoxGuestAdditions;g" \
                 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
+                -e "s;_USERNAME_;$(USERNAME);g" \
                 -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
                 -e "s;_UNINSTALL_SCRIPTS_;vboxadd-x11 vboxvfs vboxadd-timesync vboxadd-service vboxadd;g" \

-              r39322
+              r39325
 ### END INIT INFO
+. /var/lib/VBoxGuestAdditions/config
+export BUILD_TYPE
+export USERNAME
 PATH=$PATH:/bin:/sbin:/usr/sbin
 PACKAGE=VBoxGuestAdditions
 MODULE_SRC=`/bin/ls /usr/src/vboxguest* 2>/dev/null|cut -d' ' -f1`
+MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
 BUILDINTMP="$MODULE_SRC/build_in_tmp"
 DODKMS="$MODULE_SRC/do_dkms"

r36585	r39325
36	36	KFLAGS := -D__KERNEL__ -DMODULE $(MOD_DEFS)
37	37	ifeq ($(BUILD_TYPE),debug)
38		KFLAGS += -DDEBUG
	38	KFLAGS += -DDEBUG -DDEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) -DDEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))
39	39	endif
40	40

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

-              r39223
+              r39325
     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

-              r39323
+              r39325
 ARCH="_ARCH_"
 INSTALLATION_VER="_VERSION_"
+INSTALLATION_REV="_SVNREV_"
+BUILD_TYPE="_BUILDTYPE_"
+USERNAME="_USERNAME_"
 UNINSTALL_SCRIPTS="_UNINSTALL_SCRIPTS_"
 …
 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.
 …
 # 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

Note: See TracChangeset for help on using the changeset viewer.