Changeset 94767 in vbox

Timestamp:

May 1, 2022 9:54:25 PM (3 years ago)

Author:

vboxsync

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

151153

Message:

ValKit/Makefile.kmk: Fixed makefile vandalism from r150778 that added "$(QUIET)$(RM) -f $(VBOX_VALIDATIONKIT_ISO_RSP)" to the list of phony targets. Removed non-phony stuff from the phony list and dropped the response file from the OTHERS target list. Some other cleanups too, of as usual. bugref:10195

File:

• trunk/src/VBox/ValidationKit/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -152 +152 @@
 
 VBOX_VALIDATIONKIT_ISO_RSP = $(PATH_TARGET)/VBoxValidationKitISO.rsp
-OTHERS                    += $(VBOX_VALIDATIONKIT_ISO_RSP)
 OTHERS_CLEAN              += $(VBOX_VALIDATIONKIT_ISO_RSP)
 
@@ -368 +367 @@
 
 #
-# Build the Validation Kit guest ISO recipe consumed by RTIsoMaker.
-#
-# We need this recipe file because passing all those arguments to RTIsoMaker will blow up
-# the maximum command line length on some OSes.
+# Build the Validation Kit guest ISO response file for RTIsoMaker.
+#
+# We need this response file because passing all those arguments to RTIsoMaker
+# will blow up the maximum command line length on some OSes.
 #
 $(VBOX_VALIDATIONKIT_ISO_RSP): | $$(dir $$@)
-        $(call MSG_L1,Creating Validation Kit guest ISO recipe $@)
-        $(APPEND) -nt $@ \
-                --iso-level 3 \
-                --rock-ridge \
-                --joliet \
-                --rational-attribs \
-                --random-order-verification 2048 \
+        $(call MSG_L1,Creating Validation Kit guest ISO response file $@ )
+        kmk_builtin_append -nt "$@" \
+                '--iso-level=3' \
+                '--rock-ridge' \
+                '--joliet' \
+                '--rational-attribs' \
+                '--random-order-verification=2048' \
                 $(foreach spec,$(VBOX_VALIDATIONKIT_FILESPEC) \
                         ,$(if $(findstring =,$(spec)), $(spec), /$(lastword $(subst /$(INST_VALIDATIONKIT), ,$(spec))=$(spec))) ) \
@@ -393 +392 @@
                                                    $(subst =, $(SP), $(spec)), \
                                                    $(subst $(PATH_OUT_BASE), testcase,$(spec))))) \
-                --volume-id \"VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)\" \
-                --name-setup joliet \
-                --volume-id \"VBoxValK $(VBOX_SVN_REV)\"
+                '--volume-id="VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)"' \
+                '--name-setup=joliet' \
+                '--volume-id="VBoxValK $(VBOX_SVN_REV)"'
 
 #
@@ -421 +420 @@
 
 # Alias for creating the iso.
-.PHONY: $(QUIET)$(RM) -f $(VBOX_VALIDATIONKIT_ISO_RSP) validationkit-iso
+.PHONY: validationkit-iso
 validationkit-iso: $(VBOX_PATH_VALIDATIONKIT)/VBoxValidationKit.iso