Sophie

Sophie

distrib > Mageia > 7 > armv7hl > by-pkgid > 5a4101ae675a5d4bc678eb22d4aae8b1 > files > 18

virtualbox-6.1.18-1.mga7.src.rpm


As reported in:
https://bugs.mageia.org/show_bug.cgi?id=27936

adding Mageia version branding, breaks loading the VBoxDtrace extension with the error:

Failed to load
'/usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack.xml':
Invalid version string: 6.1.16_Mageia

Fix it up by using the _NO_PUB variant when generating the xml.

Signed-off-by: Thomas Backlund <tmb@mageia.org>

--- VirtualBox-6.1.16/Config.kmk.orig
+++ VirtualBox-6.1.16/Config.kmk
@@ -3237,6 +3237,7 @@ VBOX_EDIT_VERSION_CMD_FN = $(SED) \
 	-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
 	-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
 	-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
+	-e 's/@VBOX_VERSION_STRING_NO_PUB@/$(VBOX_VERSION_STRING_NO_PUB)/g' \
 	-e 's/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g' \
 	-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
 	-e 's/@VBOX_VENDOR_SHORT@/$(VBOX_VENDOR_SHORT)/g' \
--- VirtualBox-6.1.16/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml.orig
+++ VirtualBox-6.1.16/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml
@@ -2,7 +2,7 @@
 <VirtualBoxExtensionPack xmlns="http://www.virtualbox.org/VirtualBoxExtensionPack" version="1.0">
     <Name>Oracle VBoxDTrace Extension Pack</Name>
     <Description>Experimental and unsupported extension pack providing DTrace features to VirtualBox.</Description>
-    <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING@</Version>
+    <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING_NO_PUB@</Version>
     <MainModule>VBoxDTraceMain</MainModule>
 </VirtualBoxExtensionPack>