Changeset 87098 in vbox for trunk/src

Timestamp:

Dec 16, 2020 11:56:58 PM (4 years ago)

Author:

vboxsync

Message:

Installer/solaris: Clean up #! in vboxshell.py to make it compatible with pkgdepend, and add dependencies to make IPS package work. Eliminate mid-command line TAB chars in Makefile.kmk and simplify patterns to be handled by egrep. Add license to IPS package.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (12 diffs)
• makepackage.sh (modified) (4 diffs)
• vbox-ips.mog (modified) (2 diffs)

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

@@ -67 +67 @@
         $(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).pkg \
         $(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz \
-        $(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).p5p \
+        $(PATH_STAGE_BIN)/$(PKG_FILENAME).p5p \
         $(PATH_STAGE_BIN)/VirtualBoxDebug.tar.bz2 \
         $(VBOX_PATH_SI_SCRATCH)/dist-copy.ts
@@ -213 +213 @@
 SOLARIS_INSTALLER_FILES = \
         vbox.space
+
+## @def SOLARIS_INSTALLER_LICENSE
+# List of files that are copied directly from INST_BIN to VBOX_PATH_SI_SCRATCH_PKG (/).
+# LICENSE is needed by IPS packaging only.
+SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_LICENSE
+SOLARIS_INSTALLER_LICENSE.SUBDIRS := no
+SOLARIS_INSTALLER_LICENSE.STRIP   := no
+SOLARIS_INSTALLER_LICENSE.MODE    := 0644
+SOLARIS_INSTALLER_LICENSE.SRC     := $(PATH_STAGE_BIN)
+SOLARIS_INSTALLER_LICENSE.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)
+SOLARIS_INSTALLER_LICENSE = \
+        LICENSE
 
 ## @def SOLARIS_DRIVER_BINS
@@ -419 +431 @@
         VBox.sh \
         pkginstall.sh \
-        $(if $(VBOX_WITH_PYTHON),vboxshell.py,) \
         smf-vboxballoonctrl.sh \
         smf-vboxautostart.sh \
@@ -559 +570 @@
                 $(VBOX_SI_DEP_ON_MAKEFILE) \
                 | $$(dir $$@)
-        $(call MSG_L1,Creating $(PKG_FILENAME).pkg: Copying files)
+        $(call MSG_L1,Copying files to package staging area)
 # Start with a clean slate, don't want to pick up random garbage.
         $(RM) -Rf -- "$(VBOX_PATH_SI_SCRATCH_PKG)/"
@@ -606 +617 @@
         $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING) \
         ,$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso  $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/,)
-        $(LN_SYMLINK) -f ./pkginstall.sh        $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ipsinstall.sh
-        $(SED)  -e "s/_HARDENED_/$(if $(VBOX_WITH_HARDENED),hardened,)/" \
+        $(LN_SYMLINK) -f ./pkginstall.sh $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ipsinstall.sh
+        $(SED) -e "s/_HARDENED_/$(if $(VBOX_WITH_HARDENED),hardened,)/" \
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/vboxconfig.sh \
                  $(VBOX_PATH_SOL_INST_SRC)/vboxconfig.sh
         $(CHMOD) 0755 $(VBOX_PATH_SOL_INST_SRC)/vboxconfig.sh
-        $(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkgresponse   $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/autoresponse
+        $(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkgresponse $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/autoresponse
+        $(if-expr defined(VBOX_WITH_PYTHON) \
+        ,$(SED) -e "s@^#!.*@#!/usr/bin/python2@" \
+                --output $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/vboxshell.py \
+                $(PATH_STAGE_BIN)/vboxshell.py,)
 
 # VirtualBox: Arch specific files.
@@ -633 +648 @@
 
         $(if-expr defined(VBOX_WITH_EFIFW_PACKING) \
-        ,$(LN_SYMLINK) ../VBoxEFI32.fd ../VBoxEFI64.fd  $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/,)
+        ,$(LN_SYMLINK) ../VBoxEFI32.fd ../VBoxEFI64.fd $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/,)
 
 # Links to /usr/bin.
@@ -640 +655 @@
 
 # Desktop stuff in /usr/share/applications/.
-        $(SED)  -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+        $(SED) -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
                 -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop \
@@ -647 +662 @@
 
 # Desktop stuff in /usr/share/mime/packages/ (S10 cannot deal with icon information in virtualbox.xml).
-        $(SED)  -e '/<icon/d' \
+        $(SED) -e '/<icon/d' \
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/mime/packages/virtualbox.xml \
                 $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.xml
@@ -653 +668 @@
 
 # Desktop stuff in /usr/share/application-registry.
-        $(SED)  -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+        $(SED) -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/application-registry/virtualbox.applications \
                 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.applications.in
@@ -665 +680 @@
 
 # Files related to package creation.
-        $(SED)  -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
+        $(SED) -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
                 -e "s/@VBOX_VENDOR@/$(VBOX_VENDOR)/g" \
                 -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
@@ -673 +688 @@
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/vbox.pkginfo \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo
-        $(SED)  -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
+        $(SED) -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
                 -e "s/@VBOX_VENDOR@/$(VBOX_VENDOR)/g" \
                 -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
@@ -732 +747 @@
 # Creates the IPS style installer package.
 #
-solaris-package-ips:: $(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).p5p
-$(VBOX_PATH_SI_SCRATCH)/$(PKG_FILENAME).p5p: \
+solaris-package-ips:: $(PATH_STAGE_BIN)/$(PKG_FILENAME).p5p
+$(PATH_STAGE_BIN)/$(PKG_FILENAME).p5p: \
                 $(VBOX_PATH_SI_SCRATCH)/dist-copy.ts \
                 $(VBOX_SI_DEP_ON_MAKEFILE) \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -66 +66 @@
     VBOX_PKGNAME=SUNWvbox
 fi
-# need GNU grep because Solaris egrep does not support word matching
-VBOX_GGREP=/usr/gnu/bin/grep
+# any egrep should do the job, the one from /usr/xpg4/bin isn't required
+VBOX_EGREP=/usr/bin/egrep
 # need dynamic regex support which isn't available in S11 /usr/bin/awk
 VBOX_AWK=/usr/xpg4/bin/awk
-
-# check for GNU grep we use which might not ship with all Solaris
-if [ ! -f "$VBOX_GGREP" ] && [ ! -h "$VBOX_GGREP" ]; then
-    echo "## GNU grep not found in $VBOX_GGREP."
-    exit 1
-fi
 
 # bail out on non-zero exit status
@@ -139 +133 @@
     rm -f "$1/$2"
     pkgrecv -a -s "$1/vbox-repo" -d "$1/$2" -m latest "$3"
-    #rm -rf "$1/vbox-repo"
+    rm -rf "$1/vbox-repo"
 }
 
@@ -168 +162 @@
     cd "$1"
     # Exclude directories to not cause install-time conflicts with existing system directories
-    find . ! -type d | "$VBOX_GGREP" -v -wE 'prototype|makepackage\.sh|vbox\.pkginfo|postinstall\.sh|checkinstall\.sh|preremove\.sh|vbox\.space|vbox-ips.mog|virtualbox\.p5m.*|vbox-repo' | LC_COLLATE=C sort | pkgproto >> "$PACKAGE_SPEC"
+    find . ! -type d | "$VBOX_EGREP" -v '^\./(LICENSE|prototype|makepackage\.sh|vbox\.pkginfo|postinstall\.sh|checkinstall\.sh|preremove\.sh|vbox\.space|vbox-ips.mog|virtualbox\.p5m.*)$' | LC_COLLATE=C sort | pkgproto >> "$PACKAGE_SPEC"
     cd -
     "$VBOX_AWK" 'NF == 3 && $1 == "s" && $2 == "none" { $3="/"$3 } { print }' "$PACKAGE_SPEC" > "$PACKAGE_SPEC.tmp"
@@ -178 +172 @@
     # Include opt/VirtualBox and subdirectories as we want uninstall to clean up directory structure.
     # Include var/svc for manifest class action script does not create them.
-    find . -type d | "$VBOX_GGREP" -E 'opt/VirtualBox|var/svc/manifest/application/virtualbox' | LC_COLLATE=C sort | pkgproto >> "$PACKAGE_SPEC"
+    find . -type d | "$VBOX_EGREP" 'opt/VirtualBox|var/svc/manifest/application/virtualbox' | LC_COLLATE=C sort | pkgproto >> "$PACKAGE_SPEC"
     cd -
     "$VBOX_AWK" 'NF == 6 && $1 == "d" && $2 == "none" { $3="/"$3 } { print }' "$PACKAGE_SPEC" > "$PACKAGE_SPEC.tmp"

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

@@ -7 +7 @@
 set name=variant.opensolaris.zone value=global value=nonglobal
 set name=info.classification value=org.opensolaris.category.2008:System/Virtualization
+license LICENSE license="GPLv2 (virtualbox)"
+# The data-xkb was renamed to xkeyboard-config in S11.4, so adjust this when
+# we have moved our builds away from S11.3.
+depend fmri=pkg:/x11/keyboard/data-xkb type=require
+depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend fmri=pkg:/system/font/truetype/dejavu type=require
 
 # Drop system directories to not have conflicting permissions
@@ -54 +60 @@
 <transform dir file path=var/svc/manifest/.*$ -> set group sys>
 <transform file path=var/svc/manifest/.*\.xml$ -> default restart_fmri svc:/system/manifest-import:default>
-
-# todo:
-# resolve dependencies properly for python
-<transform file path=opt/VirtualBox/vboxshell\.py$ -> drop>