Changeset 72795 in vbox

Timestamp:

Jul 2, 2018 3:57:38 PM (7 years ago)

Author:

vboxsync

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

123338

Message:

configure: remove mkisofs, which we no longer use.
bugref:9200: Infrastructure/Linux: need an openSUSE 15 chroot
Neither trunk nor 5.2 need mkisofs, so remove it from configure rather than
adding it to the openSUSE 15 chroot.

File:

• trunk/configure (modified) (5 diffs)

trunk/configure

@@ -115 +115 @@
 XSLTPROC="xsltproc"
 GENISOIMAGE="genisoimage"
-MKISOFS="mkisofs"
 INCCRYPTO=""
 LIBCRYPTO="-lssl -lcrypto"
@@ -660 +659 @@
 
 #
-# Check for mkisofs, needed to build the CDROM image containing the additions
-#
-check_mkisofs()
-{
-  test_header mkisofs
-  if which_wrapper $GENISOIMAGE > /dev/null; then
-    mkisofs_ver=`$GENISOIMAGE --version`
-    if [ $? -ne 0 ]; then
-      log_failure "mkisofs not found"
-      fail
-    else
-      log_success "found $mkisofs_ver"
-      cnf_append "VBOX_MKISOFS" "`which_wrapper $GENISOIMAGE`"
-    fi
-  elif check_avail "$MKISOFS" MKISOFS; then
-    mkisofs_ver=`$MKISOFS --version`
-    if [ $? -ne 0 ]; then
-      log_failure "mkisofs not working"
-      fail
-    else
-      log_success "found $mkisofs_ver"
-      cnf_append "VBOX_MKISOFS" "`which_wrapper $MKISOFS`"
-    fi
-  fi
-}
-
-
-#
 # Check for libxml2, needed by VBoxSettings and Runtime.
 # 2.6.24 is known to NOT work, 2.6.26 is known to work (there is no 2.6.25 release)
@@ -2341 +2312 @@
   --with-kbuild=DIR        kbuild directory [$KBUILDDIR]
   --with-iasl=PATH         location of the iasl compiler [$IASL]
-  --with-mkisofs=PATH      location of mkisofs [$MKISOFS]
   --with-makeself=PATH     location of makeself [$MAKESELF]
 EOF
@@ -2474 +2444 @@
       LINUX=`echo $option | cut -d'=' -f2`
       ;;
-    --with-mkisofs=*)
-      MKISOFS=`echo $option | cut -d'=' -f2`
-      ;;
     --with-makeself=*)
       MAKESELF=`echo $option | cut -d'=' -f2`
@@ -2757 +2724 @@
   # [ "$OS" != "darwin" ] && check_yasm
   [ "$OS" != "darwin"  ] && check_xsltproc
-  [ "$OS" != "darwin"  ] && check_mkisofs
 fi