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

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

Files:

• Makefile.kmk (modified) (1 diff)
• installer/vboxadd.sh (modified) (1 diff)

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

@@ -370 +370 @@
         $(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" \

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

@@ -29 +29 @@
 ### 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"