Changeset 67254 in vbox

Timestamp:

Jun 2, 2017 5:29:13 PM (8 years ago)

Author:

vboxsync

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

115949

Message:

Main/ApplianceExport: Set special user and group names and IDs in the TAR output so the vbox version can be easily identified. Also normalize the file mode mask in the TAR output a little. Hope no OVF/OPC reader are offended by this...

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/ApplianceImplExport.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -493 +493 @@
         $(if $(VBOX_WITH_XPCOM),src-server/xpcom/server.cpp,)
 
+src-server/ApplianceImplExport.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
+
 ifn1of ($(KBUILD_TARGET), win darwin)
         VBoxSVC_SOURCES += $(PATH_ROOT)/src/VBox/Devices/Network/slirp/resolv_conf_parser.c

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -2042 +2042 @@
     /*
      * Open the output file and attach a TAR creator to it.
+     * The OVF 1.1.0 spec specifies the TAR format to be compatible with USTAR
+     * according to POSIX 1003.1-2008.  We use the 1988 spec here as it's the
+     * only variant we currently implement.
      */
     HRESULT hrc;
@@ -2050 +2053 @@
     if (RT_SUCCESS(vrc))
     {
-        /** @todo which format does the standard dictate here actually?
-         *  GNU or USTAR/POSIX? */
         RTVFSFSSTREAM hVfsFssTar;
-        vrc = RTZipTarFsStreamToIoStream(hVfsIosTar, RTZIPTARFORMAT_GNU, 0 /*fFlags*/, &hVfsFssTar);
+        vrc = RTZipTarFsStreamToIoStream(hVfsIosTar, RTZIPTARFORMAT_USTAR, 0 /*fFlags*/, &hVfsFssTar);
         RTVfsIoStrmRelease(hVfsIosTar);
         if (RT_SUCCESS(vrc))
         {
+            RTZipTarFsStreamSetFileMode(hVfsFssTar, 0660, 0440);
+            RTZipTarFsStreamSetOwner(hVfsFssTar, VBOX_VERSION_MAJOR,
+                                       pTask->enFormat == ovf::OVFVersion_0_9 ? "vboxovf09"
+                                     : pTask->enFormat == ovf::OVFVersion_1_0 ? "vboxovf10"
+                                     : pTask->enFormat == ovf::OVFVersion_2_0 ? "vboxovf20"
+                                     :                                          "vboxovf");
+            RTZipTarFsStreamSetGroup(hVfsFssTar, VBOX_VERSION_MINOR,
+                                     "vbox_v" RT_XSTR(VBOX_VERSION_MAJOR) "." RT_XSTR(VBOX_VERSION_MINOR) "."
+                                     RT_XSTR(VBOX_VERSION_MAJOR) "r" RT_XSTR(VBOX_SVN_REV));
+
             hrc = i_writeFSImpl(pTask, writeLock, hVfsFssTar);
             RTVfsFsStrmRelease(hVfsFssTar);
@@ -2189 +2200 @@
             if (RT_SUCCESS(vrc))
             {
+                RTZipTarFsStreamSetFileMode(hVfsFssTar, 0660, 0440);
+                RTZipTarFsStreamSetOwner(hVfsFssTar, VBOX_VERSION_MAJOR, "vboxopc10");
+                RTZipTarFsStreamSetGroup(hVfsFssTar, VBOX_VERSION_MINOR,
+                                         "vbox_v" RT_XSTR(VBOX_VERSION_MAJOR) "." RT_XSTR(VBOX_VERSION_MINOR) "."
+                                         RT_XSTR(VBOX_VERSION_MAJOR) "r" RT_XSTR(VBOX_SVN_REV));
+
                 /*
                  * Let the Medium code do the heavy work.