Changeset 51294 in vbox for trunk/src

Timestamp:

May 19, 2014 4:05:54 PM (11 years ago)

Author:

vboxsync

Message:

Installer/linux: add vbox-img

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (1 diff)
• debian/LocalConfig.kmk (modified) (1 diff)
• deffiles (modified) (1 diff)
• install.sh (modified) (2 diffs)
• rpm/LocalConfig.kmk (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (2 diffs)
• scripts/install.sh (modified) (3 diffs)
• uninstall.sh (modified) (1 diff)

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

@@ -306 +306 @@
 endif
 
+# vbox-img
+if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VBOX_IMG)
+  VBOX_LNX_STRIP_BIN += \
+        vbox-img
+endif
+
 # EFI firmware
 ifdef VBOX_WITH_EFIFW_PACKING

trunk/src/VBox/Installer/linux/debian/LocalConfig.kmk

@@ -30 +30 @@
 VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox
 VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)
+VBOX_WITH_VBOX_IMG         := 1

trunk/src/VBox/Installer/linux/deffiles

@@ -69 +69 @@
     vboxefi64.fv \
     vboxwebsrv \
+    vbox-img \
     components/comreg.dat \
     components/xpti.dat \

trunk/src/VBox/Installer/linux/install.sh

@@ -112 +112 @@
     check_binary "/usr/bin/VBoxAutostart" "$install_dir" &&
     check_binary "/usr/bin/vboxwebsrv" "$install_dir"
+    check_binary "/usr/bin/vbox-img" "$install_dir"
 }
 
@@ -403 +404 @@
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxAutostart
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/vboxwebsrv
+    ln -sf $INSTALLATION_DIR/vbox-img /usr/bin/vbox-img
     ln -sf $INSTALLATION_DIR/VBox.png /usr/share/pixmaps/VBox.png
     # Unity and Nautilus seem to look here for their icons

trunk/src/VBox/Installer/linux/rpm/LocalConfig.kmk

@@ -29 +29 @@
 VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox
 VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)
+VBOX_WITH_VBOX_IMG         := 1
 
 # gcc 4.5 produces some more false positives

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -116 +116 @@
 rmdir icons
 mv virtualbox.xml $RPM_BUILD_ROOT/usr/share/mime/packages
-for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart; do
+for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart vbox-img; do
   mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
 if %WEBSVC%; then
@@ -195 +195 @@
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxautostart
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxwebsrv
+ln -s /usr/lib/virtualbox/vbox-img $RPM_BUILD_ROOT/usr/bin/vbox-img
 ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
 mv virtualbox.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualbox.desktop

trunk/src/VBox/Installer/linux/scripts/install.sh

@@ -143 +143 @@
         NO_HELPERS="true"
         ;;
+    --no-vbox-img)
+        NO_VBOX_IMG="true"
+        ;;
     --python-command)
         test "${#}" -gt 1 ||
@@ -220 +223 @@
 test -n "${NO_WEB_SERVICE}" &&
     test ! -r "${INSTALL_SOURCE}/vboxwebsrv"
+test -n "${NO_VBOX_IMG}" &&
+    test ! -r "${INSTALL_SOURCE}/vbox-img"
 test -n "${NO_WEB_SERVICE}" &&
     test ! -r "${INSTALL_SOURCE}/webtest"
@@ -258 +263 @@
 ln -s "VBox" "${PREFIX}/bin/vboxautostart"
 test -z "${NO_WEB_SERVICE}" && ln -s "VBox" "${PREFIX}/bin/vboxwebsrv"
+echo "NO_VBOX_IMG = ${NO_VBOX_IMG}"
+test -z "${NO_VBOX_IMG}" && ln -sv "${RELATIVE_PREFIX}${INSTALL_FOLDER}/vbox-img" "${PREFIX}/bin/vbox-img"
 rmdir ${INSTALL_SOURCE}/additions
 rm "${INSTALL_SOURCE}/scripts/install.sh"

trunk/src/VBox/Installer/linux/uninstall.sh

@@ -103 +103 @@
   /usr/bin/VBoxNetNAT \
   /usr/bin/vboxwebsrv \
+  /usr/bin/vbox-img \
   /usr/bin/VBoxAddIF \
   /usr/bin/VBoxDeleteIf \