Changeset 74979 in vbox

Timestamp:

Oct 22, 2018 6:20:20 PM (6 years ago)

Author:

vboxsync

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

126001

Message:

Installers/linux: adjust for split GUI binaries and bump from 5.2 to 6.0.

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/control (modified) (3 diffs)
• debian/postinst (modified) (1 diff)
• debian/rules (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• rpm/rules (modified) (1 diff)

trunk/src/VBox/Installer/linux/debian/control

@@ -1 @@
-Source: virtualbox-5.2
+Source: virtualbox-6.0
 Section: contrib/misc
 Priority: optional
@@ -14 +14 @@
 XS-Python-Version: >= 2.4
 
-Package: virtualbox-5.2
+Package: virtualbox-6.0
 Architecture: i386 amd64
 Pre-Depends: debconf (>= 1.1) | debconf-2.0
@@ -33 +33 @@
 XB-Python-Version: ${python:Versions}
 
-Package: virtualbox-5.2-dbg
+Package: virtualbox-6.0-dbg
 Architecture: i386 amd64
-Depends: virtualbox-5.2 (= ${binary:Version})
+Depends: virtualbox-6.0 (= ${binary:Version})
 Provides: virtualbox-dbg
 Replaces: virtualbox-dbg

trunk/src/VBox/Installer/linux/debian/postinst

@@ -57 +57 @@
   # The starters need to be Suid root. They drop the privileges before starting
   # the real frontend.
-  if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBox > /dev/null 2>&1; then
-    chmod 4511 /usr/lib/virtualbox/VirtualBox
+  if test -e /usr/lib/virtualbox/VirtualBoxVM; then
+    if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBoxVM > /dev/null 2>&1; then
+      chmod 4511 /usr/lib/virtualbox/VirtualBoxVM
+    fi
+  else
+    if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBox > /dev/null 2>&1; then
+      chmod 4511 /usr/lib/virtualbox/VirtualBox
+    fi
   fi
   if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxHeadless > /dev/null 2>&1; then

trunk/src/VBox/Installer/linux/debian/rules

@@ -51 +51 @@
 
 package  := virtualbox
-verpkg   := virtualbox-5.2
+verpkg   := virtualbox-6.0
 current  := $(shell pwd)
 vboxroot := $(shell cd ../../../..; pwd)

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

@@ -186 +186 @@
 fi
 ln -s ../VBoxVMM.so $RPM_BUILD_ROOT/usr/lib/virtualbox/components/VBoxVMM.so
-for i in VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetNAT VBoxNetAdpCtl; do
+for i in VBoxHeadless VBoxNetDHCP VBoxNetNAT VBoxNetAdpCtl; do
   chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/$i; done
+if test -e $RPM_BUILD_ROOT/usr/lib/virtualbox/VirtualBoxVM; then
+  chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/VirtualBoxVM
+else
+  chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/VirtualBox
+fi
 if [ -f $RPM_BUILD_ROOT/usr/lib/virtualbox/VBoxVolInfo ]; then
   chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/VBoxVolInfo

trunk/src/VBox/Installer/linux/rpm/rules

@@ -49 +49 @@
 endif
 
-verpkg   := VirtualBox-5.2
+verpkg   := VirtualBox-6.0
 current  := $(shell pwd)
 vboxroot := $(shell while ! test -r configure && ! test "$PWD" = "/"; do cd ..; done; pwd)