- Timestamp:
- Oct 2, 2017 11:51:11 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
Config.kmk (modified) (3 diffs)
-
src/VBox/Additions/Makefile.kmk (modified) (3 diffs)
-
src/VBox/ValidationKit/Makefile.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r68940 r68949 917 917 ifeq ($(KBUILD_TARGET),win) 918 918 VBOX_WITH_SDS = 919 endif920 ## Experimenting with using our own ISO image maker instead of mkisofs.921 if 1922 VBOX_USE_RTISOMAKER = 1923 919 endif 924 920 … … 1949 1945 VBOX_RTSIGNTOOL ?= $(PATH_OBJ)/bldRTSignTool/bldRTSignTool$(HOSTSUFF_EXE) 1950 1946 1951 # RTIsoMaker - our own ISO maker , will replace VBOX_MKISOFS.1947 # RTIsoMaker - our own ISO maker. 1952 1948 VBOX_RTISOMAKER ?= $(PATH_OBJ)/bldRTIsoMaker/bldRTIsoMaker$(HOSTSUFF_EXE) 1953 1949 … … 1987 1983 else if1of ($(KBUILD_TARGET), freebsd netbsd solaris) 1988 1984 VBOX_GTAR ?= gtar 1989 endif1990 1991 # mkisofs1992 ifeq ($(KBUILD_HOST),win)1993 VBOX_MKISOFS ?= $(KBUILD_DEVTOOLS_HST)/bin/mkisofs.exe1994 else1995 VBOX_MKISOFS ?= mkisofs1996 1985 endif 1997 1986 -
trunk/src/VBox/Additions/Makefile.kmk
r68832 r68949 146 146 # We test for the VBOX_WITH_ADDITIONS_ISO.os.arch so that we don't have to 147 147 # do the $(if )'ing down where the GUESTADDITIONS_FILESPEC.os.arch down 148 # in the dependency list and mkisofscommand.148 # in the dependency list and RTIsoMaker command. 149 149 # 150 150 … … 314 314 $(VBOX_PATH_ADDITIONS_SRC)/Makefile.kmk \ 315 315 | $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),) 316 $(call MSG_TOOL, mkisofs,,$@)316 $(call MSG_TOOL,RTIsoMaker,,$@) 317 317 $(QUIET)$(MKDIR) -p $(@D) 318 ifdef VBOX_USE_RTISOMAKER319 318 $(VBOX_RTISOMAKER) \ 320 319 --output $@ \ … … 330 329 --name-setup=joliet \ 331 330 --volume-id="VBox_GAs_$(VBOX_VERSION_STRING_RAW)" 332 else333 # use iso-level 3 which is the most ISO conforming level with least restrictions; iso-level 4 maps to iso-level 2334 # 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 endif339 331 340 332 $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso -
trunk/src/VBox/ValidationKit/Makefile.kmk
r68821 r68949 268 268 $(VBOX_PATH_VALIDATIONKIT_SRC)/Makefile.kmk \ 269 269 | $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),) 270 $(call MSG_TOOL, mkisofs,,$@)270 $(call MSG_TOOL,RTIsoMaker,,$@) 271 271 $(QUIET)$(MKDIR) -p $(@D) 272 272 ifneq ($(KBUILD_TARGET),os2) 273 273 $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC $(VBOX_VALIDATIONKIT_FILESPEC) 274 274 endif 275 ifdef VBOX_USE_RTISOMAKER276 275 $(VBOX_RTISOMAKER) \ 277 276 --output $@ \ … … 290 289 --name-setup joliet \ 291 290 --volume-id "VBoxValK $(VBOX_SVN_REV)" 292 else293 # use iso-level 3 which is the most ISO conforming level with least restrictions; iso-level 4 maps to iso-level 2294 # 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 endif300 291 301 292 # Alias for creating the iso.
Note:
See TracChangeset
for help on using the changeset viewer.

