Changeset 91555 in vbox

Timestamp:

Oct 5, 2021 7:48:33 AM (3 years ago)

Author:

vboxsync

Message:

Config.kmk,configure: Add check for libtpms dependency required for the virtual TPM, bugref:10075

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• configure (modified) (7 diffs)

trunk/Config.kmk

@@ -641 +641 @@
 # Enable TPM device emulation support.
 VBOX_WITH_TPM = 1
+# Enable libtpms, required for the in process TPM emulation.
+#VBOX_WITH_LIBTPMS = 1
 ## @}
 
@@ -4519 +4521 @@
  SDK_VBOX_FUSE_INCS         ?= $(SDK_VBOX_FUSE_DEFAULT_INCS)
  SDK_VBOX_FUSE_LIBS         ?= $(PATH_STAGE_LIB)/VBox-libfuse$(VBOX_SUFF_LIB)
+endif
+
+ifdef VBOX_WITH_LIBTPMS
+ SDK_VBOX_TPMS               = .
+ SDK_VBOX_TPMS_DEFAULT_INCS := $(PATH_ROOT)/src/libs/libtpms-0.9.0
+ SDK_VBOX_TPMS_INCS         ?= $(SDK_VBOX_TPMS_DEFAULT_INCS)
+ SDK_VBOX_TPMS_LIBS         ?= $(PATH_STAGE_LIB)/VBox-libtpms$(VBOX_SUFF_LIB)
 endif
 

trunk/configure

@@ -100 +100 @@
 WITH_LIBVPX=1
 WITH_LIBOPUS=1
+WITH_LIBTPMS=1
 BUILD_LIBXML2=
 BUILD_LIBCURL=
 BUILD_LIBSSL=
 BUILD_LIBVPX=
+BUILD_LIBTPMS=
 PASSIVE_MESA=0
 CC="gcc"
@@ -1798 +1800 @@
 
 #
+# Check for libtpms
+#
+check_libtpms()
+{
+  if [ -z "$BUILD_LIBTPMS" ]; then
+    test_header libtpms
+    if which_wrapper pkg-config > /dev/null; then
+      libtpms_ver=`pkg-config libtpms --modversion 2>> $LOG`
+      if [ $? -eq 0 ]; then
+        FLGTPMS=`pkg-config libtpms --cflags`
+        INCTPMS=`strip_I "$FLGTPMS"`
+        LIBTPMS=`pkg-config libtpms --libs`
+      fi
+      cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+#include <libtpms/tpm_library.h>
+extern "C" int main(void)
+{
+  TPMLIB_MainInit();
+  printf("found, OK.\n");
+}
+EOF
+      [ -n "$INCTPMS" ] && I_INCTPMS=`prefix_I "$INCTPMS"`
+      if test_compile "$LIBTPMS $I_INCTPMS" libtpms libtpms; then
+        if test_execute; then
+          cnf_append "SDK_VBOX_TPMS_INCS" "$INCTPMS"
+          cnf_append "SDK_VBOX_TPMS_LIBS" "`strip_l "$LIBTPMS"`"
+          fi
+      fi
+    fi
+  fi
+}
+
+
+#
 # Check whether static libstdc++ is installed. This library is required
 # for the Linux guest additions.
@@ -2388 +2425 @@
 [ $WITH_LIBVPX  -eq 1 ] && echo "  --disable-libvpx         don't use libvpx for video capturing"
 [ $WITH_LIBOPUS -eq 1 ] && echo "  --disable-libopus        don't use libopus for audio capturing"
+[ $WITH_LIBTPMS -eq 1 ] && echo "  --disable-libtpms        don't use libtpms for TPM emulation"
 [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
 cat << EOF
@@ -2395 +2433 @@
   --build-libxml2          build libxml2 from sources
   --build-libssl           build openssl from sources
+  --build-libtpms          build libtpms from sources
 EOF
 [ $OSE -eq 0 ] && cat << EOF
@@ -2635 +2674 @@
       WITH_LIBOPUS=0
       ;;
+    --disable-libtpms)
+      WITH_LIBTPMS=0
+      ;;
     --disable-sdl)
       WITH_SDL=0
@@ -2821 +2863 @@
 [ $WITH_HARDENING -eq 2 ] && cnf_append "VBOX_WITH_HARDENING" "2"
 [ $WITH_VMMRAW    -eq 0 ] && cnf_append "VBOX_WITH_RAW_MODE" ""
+[ $WITH_LIBTPMS   -eq 0 ] && cnf_append "VBOX_WITH_TPM_LIBTPMS" ""
 if [ $WITH_LIBVPX -eq 0 ]; then
   cnf_append "VBOX_WITH_LIBVPX" ""
@@ -2853 +2896 @@
   [ $WITH_LIBVPX -eq 1 ] && check_vpx
   [ $WITH_LIBOPUS -eq 1 ] && check_libopus
+  [ $WITH_LIBTPMS -eq 1 ] && check_libtpms
   [ "$OS" != "darwin"  ] && check_png
   [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam