VirtualBox

Changeset 68949 in vbox for trunk


Ignore:
Timestamp:
Oct 2, 2017 11:51:11 AM (7 years ago)
Author:
vboxsync
Message:

Removed mkisofs. RTIsoMaker seems to be working okay.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r68940 r68949  
    917917ifeq  ($(KBUILD_TARGET),win)
    918918 VBOX_WITH_SDS =
    919 endif
    920 ## Experimenting with using our own ISO image maker instead of mkisofs.
    921 if 1
    922  VBOX_USE_RTISOMAKER = 1
    923919endif
    924920
     
    19491945VBOX_RTSIGNTOOL ?= $(PATH_OBJ)/bldRTSignTool/bldRTSignTool$(HOSTSUFF_EXE)
    19501946
    1951 # RTIsoMaker - our own ISO maker, will replace VBOX_MKISOFS.
     1947# RTIsoMaker - our own ISO maker.
    19521948VBOX_RTISOMAKER  ?= $(PATH_OBJ)/bldRTIsoMaker/bldRTIsoMaker$(HOSTSUFF_EXE)
    19531949
     
    19871983else if1of ($(KBUILD_TARGET), freebsd netbsd solaris)
    19881984 VBOX_GTAR ?= gtar
    1989 endif
    1990 
    1991 # mkisofs
    1992 ifeq ($(KBUILD_HOST),win)
    1993  VBOX_MKISOFS  ?= $(KBUILD_DEVTOOLS_HST)/bin/mkisofs.exe
    1994 else
    1995  VBOX_MKISOFS  ?= mkisofs
    19961985endif
    19971986
  • trunk/src/VBox/Additions/Makefile.kmk

    r68832 r68949  
    146146# We test for the VBOX_WITH_ADDITIONS_ISO.os.arch so that we don't have to
    147147# do the $(if )'ing down where the GUESTADDITIONS_FILESPEC.os.arch down
    148 # in the dependency list and mkisofs command.
     148# in the dependency list and RTIsoMaker command.
    149149#
    150150
     
    314314                $(VBOX_PATH_ADDITIONS_SRC)/Makefile.kmk \
    315315                | $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),)
    316         $(call MSG_TOOL,mkisofs,,$@)
     316        $(call MSG_TOOL,RTIsoMaker,,$@)
    317317        $(QUIET)$(MKDIR) -p $(@D)
    318  ifdef VBOX_USE_RTISOMAKER
    319318        $(VBOX_RTISOMAKER) \
    320319                --output $@ \
     
    330329               --name-setup=joliet \
    331330                --volume-id="VBox_GAs_$(VBOX_VERSION_STRING_RAW)"
    332  else
    333 # use iso-level 3 which is the most ISO conforming level with least restrictions; iso-level 4 maps to iso-level 2
    334 # with some extra restrictions removal (not conforming to ISO9660) which some platforms like Solaris 10 does not like.
    335         $(VBOX_MKISOFS) -rational-rock -joliet -iso-level 3 \
    336                 -volid "VBOXADDITIONS_$(VBOX_VERSION_STRING_RAW)_$(VBOX_SVN_REV)" -l -graft-points -o $@ \
    337                 $(GUESTADDITIONS_FILESPEC_ALL)
    338  endif
    339331
    340332$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
  • trunk/src/VBox/ValidationKit/Makefile.kmk

    r68821 r68949  
    268268                $(VBOX_PATH_VALIDATIONKIT_SRC)/Makefile.kmk \
    269269               | $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),)
    270         $(call MSG_TOOL,mkisofs,,$@)
     270        $(call MSG_TOOL,RTIsoMaker,,$@)
    271271        $(QUIET)$(MKDIR) -p $(@D)
    272272ifneq ($(KBUILD_TARGET),os2)
    273273        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC $(VBOX_VALIDATIONKIT_FILESPEC)
    274274endif
    275 ifdef VBOX_USE_RTISOMAKER
    276275        $(VBOX_RTISOMAKER) \
    277276                --output $@ \
     
    290289               --name-setup joliet \
    291290                --volume-id "VBoxValK $(VBOX_SVN_REV)"
    292 else
    293 # use iso-level 3 which is the most ISO conforming level with least restrictions; iso-level 4 maps to iso-level 2
    294 # with some extra restrictions removal (not conforming to ISO9660) which some platforms like Solaris 10 does not like.
    295         $(VBOX_MKISOFS) -rational-rock -r -joliet -iso-level 3 \
    296                 -volid "VBOXVALKIT_$(VBOX_VERSION_STRING_RAW)_$(VBOX_SVN_REV)" -l -graft-points -o $@ \
    297                 $(foreach spec,$(VBOX_VALIDATIONKIT_FILESPEC) \
    298                         ,$(if $(findstring =,$(spec)),$(spec), $(lastword $(subst /$(INST_VALIDATIONKIT), ,$(spec))=$(spec))))
    299 endif
    300291
    301292# Alias for creating the iso.
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette