Changeset 97650 in vbox

Timestamp:

Nov 22, 2022 10:56:25 AM (2 years ago)

Author:

vboxsync

Message:

Linux: Adjust startup scripts for building kernel modules for UEK7 on OL8 distribution (adjustments to r154646), bugdbref:34811820.

Location:

trunk/src/VBox

Files:

• Additions/linux/installer/vboxadd.sh (modified) (2 diffs)
• Installer/linux/vboxdrv.sh (modified) (2 diffs)

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

@@ -70 +70 @@
 QUIET=
 test -z "${TARGET_VER}" && TARGET_VER=`uname -r`
-
-# Prepend PATH for building UEK7 on OL8 distribution.
-case $(uname -r) in
-    5.15.0-*.el8uek*) PATH="/opt/rh/gcc-toolset-11/root/usr/bin:$PATH"
-esac
 
 # Marker to ignore a particular kernel version which was already installed.
@@ -472 +467 @@
     export KERN_VER
     info "Building the modules for kernel $KERN_VER."
+
+    # Prepend PATH for building UEK7 on OL8 distribution.
+    case "$KERN_VER" in
+        5.15.0-*.el8uek*) PATH="/opt/rh/gcc-toolset-11/root/usr/bin:$PATH";;
+    esac
 
     # Detect if kernel was built with clang.

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

@@ -47 +47 @@
 MODPROBE=/sbin/modprobe
 SCRIPTNAME=vboxdrv.sh
-
-# Prepend PATH for building UEK7 on OL8 distribution.
-case $(uname -r) in
-    5.15.0-*.el8uek*) PATH="/opt/rh/gcc-toolset-11/root/usr/bin:$PATH"
-esac
 
 # The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
@@ -103 +98 @@
 
 KERN_VER=`uname -r`
+
+# Prepend PATH for building UEK7 on OL8 distribution.
+case "$KERN_VER" in
+    5.15.0-*.el8uek*) PATH="/opt/rh/gcc-toolset-11/root/usr/bin:$PATH";;
+esac
+
 if test -e "${MODULE_SRC}/vboxpci"; then
     MODULE_LIST="vboxdrv vboxnetflt vboxnetadp vboxpci"