Changeset 93644 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Feb 7, 2022 9:15:16 PM (3 years ago)

Author:

vboxsync

Message:

Installer/solaris: The VBoxPython*.so files in directory /opt/VirtualBox/64 were apparently never found by the corresponding vboxxpcom.py file, but no one noticed since 32-bit python2 was default for a very long time. Eliminate this (the files have a unique name which is handled by vboxxpcom.py) and simplify packaging.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• vbox-ips.mog (modified) (2 diffs)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -289 +289 @@
 SOLARIS_COMMON_STRIP_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/
 SOLARIS_COMMON_STRIP_BINS =
-
-## @def SOLARIS_COMMON_64_STRIP_BINS
-# List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/64/ and stripped.
-SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_64_STRIP_BINS
-SOLARIS_COMMON_64_STRIP_BINS.SUBDIRS := yes
-SOLARIS_COMMON_64_STRIP_BINS.STRIP   := yes
-SOLARIS_COMMON_64_STRIP_BINS.MODE    := 0644
-SOLARIS_COMMON_64_STRIP_BINS.SRC     := $(PATH_STAGE_BIN)
-SOLARIS_COMMON_64_STRIP_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/64
-SOLARIS_COMMON_64_STRIP_BINS =
-
 
 ## @def SOLARIS_STRIP_EXES
@@ -452 +441 @@
    SOLARIS_COMMON_STRIP_BINS   += $(SOLARIS_PYTHON_32_ON_64_BINS)
   endif
-  SOLARIS_COMMON_64_STRIP_BINS += $(filter-out $(SOLARIS_PYTHON_32_ON_64_BINS), $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)))
+  SOLARIS_COMMON_STRIP_BINS    += $(filter-out $(SOLARIS_PYTHON_32_ON_64_BINS), $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)))
  else
   SOLARIS_COMMON_STRIP_BINS    += $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)))

trunk/src/VBox/Installer/solaris/vbox-ips.mog

@@ -38 +38 @@
 
 # Drop all API helper libraries for python 2.x other than 2.7
-<transform file path=opt/VirtualBox/64/VBoxPython\.so.*$ -> drop>
-<transform file path=opt/VirtualBox/64/VBoxPython2\.so.*$ -> drop>
-<transform file path=opt/VirtualBox/(64/)?VBoxPython2_[^7].*\.so.*$ -> drop>
+<transform file path=opt/VirtualBox/VBoxPython\.so.*$ -> drop>
+<transform file path=opt/VirtualBox/VBoxPython2\.so.*$ -> drop>
+<transform file path=opt/VirtualBox/VBoxPython2_[^7].*\.so.*$ -> drop>
 
 # Ignore dependencies of vboxshell.py
@@ -46 +46 @@
 
 # Ignore dependencies on libpython2.7.so* since it's getting phased out
-<transform file path=opt/VirtualBox/(64/)?VBoxPython2_7.*\.so.*$ -> set pkg.depend.bypass-generate .*/libpython2\\.7\\.so.*>
+<transform file path=opt/VirtualBox/VBoxPython2_7.*\.so.*$ -> set pkg.depend.bypass-generate .*/libpython2\\.7\\.so.*>
 
 # Tweak: do not try to get the dependencies for libGL.so which is needed by Qt