Changeset 68819 in vbox

Timestamp:

Sep 22, 2017 12:37:00 PM (7 years ago)

Author:

vboxsync

Message:

Config.kmk,ValidationKit/Makefile.kmk: Introducing VBOX_RTISOMAKER build tool variable and prepped the validation kit to optionally use it (define VBOX_USE_RTISOMAKER).

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/ValidationKit/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -1949 +1949 @@
 # RTSignTool (certificate extraction tool)
 VBOX_RTSIGNTOOL ?= $(PATH_OBJ)/bldRTSignTool/bldRTSignTool$(HOSTSUFF_EXE)
+
+# RTIsoMaker - our own ISO maker, will replace VBOX_MKISOFS.
+VBOX_RTISOMAKER  ?= $(PATH_OBJ)/bldRTIsoMaker/bldRTIsoMaker$(HOSTSUFF_EXE)
 
 # VBoxCmp (simple /bin/cmp with more sensible output)

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -119 +119 @@
         ,$(if-expr defined(VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch))\
                 ,$(NLTAB)$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/ \
-                        -- $(VBOX_ZIP) -r9 $@ $(INST_TESTBOXSCRIPT) -x '*.pyc',)))
+                        -- $(VBOX_ZIP) -r9X $@ $(INST_TESTBOXSCRIPT) -x '*.pyc',)))
 
 endif # !VBOX_WITHOUT_VALIDATIONKIT_ZIP
@@ -266 +266 @@
                 $(filter-out %=deleteme=, $(subst =,=deleteme= , $(VBOX_VALIDATIONKIT_FILESPEC))) \
                 $(VBOX_SVN_REV_KMK) \
-                $(VBOX_PATH_VALIDATIONKIT_SRC)/Makefile.kmk
+                $(VBOX_PATH_VALIDATIONKIT_SRC)/Makefile.kmk \
+               | $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),)
         $(call MSG_TOOL,mkisofs,,$@)
         $(QUIET)$(MKDIR) -p $(@D)
 ifneq ($(KBUILD_TARGET),os2)
-        $(ECHO) VBOX_VALIDATIONKIT_FILESPEC $(VBOX_VALIDATIONKIT_FILESPEC)
-endif
+        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC $(VBOX_VALIDATIONKIT_FILESPEC)
+endif
+ifdef VBOX_USE_RTISOMAKER
+        $(VBOX_RTISOMAKER) \
+                --output $@ \
+                --iso-level 3 \
+                --rock-ridge \
+                --joliet \
+                --rational-attribs \
+               --random-order-verficiation 2048 \
+                $(foreach spec,$(VBOX_VALIDATIONKIT_FILESPEC) \
+                        ,$(if $(findstring =,$(spec)), $(spec), /$(lastword $(subst /$(INST_VALIDATIONKIT), ,$(spec))=$(spec))) ) \
+                $(foreach spec,$(filter-out %.txt %.dll %.xml %.reg %.img, $(VBOX_VALIDATIONKIT_FILESPEC)) \
+                        ,--chmod=a+x:/$(lastword $(if $(findstring =,$(spec)), \
+                                                   $(subst =, $(SP), $(spec)), \
+                                                   $(subst /$(INST_VALIDATIONKIT), ,$(spec))))) \
+                --volume-id "VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)" \
+               --name-setup joliet \
+                --volume-id "VBoxValK $(VBOX_SVN_REV)"
+
+else
 # use iso-level 3 which is the most ISO conforming level with least restrictions; iso-level 4 maps to iso-level 2
 # with some extra restrictions removal (not conforming to ISO9660) which some platforms like Solaris 10 does not like.
@@ -278 +298 @@
                 $(foreach spec,$(VBOX_VALIDATIONKIT_FILESPEC) \
                         ,$(if $(findstring =,$(spec)),$(spec), $(lastword $(subst /$(INST_VALIDATIONKIT), ,$(spec))=$(spec))))
+endif
 
 # Alias for creating the iso.