Changeset 39266 in vbox

Timestamp:

Nov 10, 2011 3:42:20 PM (13 years ago)

Author:

vboxsync

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

74803

Message:

deb: sync

Location:

trunk

Files:

• debian/postinst.in (modified) (3 diffs)
• debian/postrm (modified) (1 diff)
• debian/rules (modified) (4 diffs)
• src/VBox/Installer/linux/debian/postrm (modified) (1 diff)

trunk/debian/postinst.in

@@ -17 +17 @@
 #  abort-remove:      (our version): removing this package failed
 #  abort-deconfigure: (our version): error during resolving conflicts
+
+#include installer-common.sh
 
 LOG="/var/log/vbox-install.log"
@@ -40 +42 @@
   fi
 
-  # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox)
-  if [ -d /etc/udev/rules.d -a "$INSTALL_NO_UDEV" != "1" ]; then
-    udev_call=""
-    udev_app=`which udevadm 2> /dev/null`
-    if [ $? -eq 0 ]; then
-      udev_call="${udev_app} version 2> /dev/null"
-    else
-      udev_app=`which udevinfo 2> /dev/null`
-      if [ $? -eq 0 ]; then
-        udev_call="${udev_app} -V 2> /dev/null"
-      fi
-    fi
-    udev_fix="="
-    if [ "${udev_call}" != "" ]; then
-      udev_out=`${udev_call}`
-      udev_ver=`expr "$udev_out" : '[^0-9]*\([0-9]*\)'`
-      if [ "$udev_ver" = "" -o "$udev_ver" -lt 55 ]; then
-        udev_fix=""
-      fi
-    fi
-    echo "KERNEL=${udev_fix}\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"root\", MODE=\"0600\"" \
-      > /etc/udev/rules.d/10-vboxdrv.rules
-    if [ "$INSTALL_NO_GROUP" != "1" ]; then
-        usb_group=vboxusers
-    else
-        usb_group=root
-    fi
-    usb_createnode="/usr/share/virtualbox/VBoxCreateUSBNode.sh"
-    echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"add\", RUN=\"${usb_createnode} \$major \$minor \$attr{bDeviceClass} ${usb_group}\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
-    echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"add\", ENV{DEVTYPE}==\"usb_device\", RUN=\"${usb_createnode} \$major \$minor \$attr{bDeviceClass} ${usb_group}\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
-    echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"remove\", RUN=\"${usb_createnode} --remove \$major \$minor\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
-    echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN=\"${usb_createnode} --remove \$major \$minor\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
-  fi
-  # Remove old udev description file
-  if [ -f /etc/udev/rules.d/60-vboxdrv.rules ]; then
-      rm -f /etc/udev/rules.d/60-vboxdrv.rules 2> /dev/null
-  fi
-  # Build our device tree
-  for i in /sys/bus/usb/devices/*; do
-    if test -r "$i/dev"; then
-      dev="`cat "$i/dev" 2> /dev/null`"
-      major="`expr "$dev" : '\(.*\):' 2> /dev/null`"
-      minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null`"
-      class="`cat $i/bDeviceClass 2> /dev/null`"
-      sh ${usb_createnode} "$major" "$minor" "$class" ${usb_group} 2>/dev/null
-    fi
-  done
-
   # create users groups (disable with INSTALL_NO_GROUP=1 in /etc/default/virtualbox)
   if [ "$INSTALL_NO_GROUP" != "1" ]; then
@@ -98 +48 @@
     addgroup --system vboxusers || true
   fi
+
+  # install udev rule (disable with INSTALL_NO_UDEV=1 in
+  # /etc/default/virtualbox) and /dev/vboxdrv and /dev/vboxusb/*/* device nodes
+  install_device_node_setup root 0600 /usr/share/virtualbox "${usb_group}"
 
   # The starters need to be Suid root. They drop the privileges before starting

trunk/debian/postrm

@@ -30 +30 @@
   update-rc.d vboxweb-service remove >/dev/null || exit $?
 fi
+if [ "$1" = "purge" -a ! -f /etc/init.d/vboxballoonctrl-service ] ; then
+  update-rc.d vboxballoonctrl-service remove >/dev/null || exit $?
+fi
 
 # remove installed extension packs

trunk/debian/rules

@@ -67 +67 @@
 
 # Location of custom built Qt libraries (see below)
-qtstdc6  := /home/vbox/Qt-4.4.3-stdc++6-$(arch)
+qtstdc6  := /home/vbox/Qt-4.7.4-stdc++6-$(arch)
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
-             $(if $(filter _Debian_etch,$(debrel)),$(if $(ose),,--build-libcurl),) \
-             $(if $(filter _Debian_etch _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
+             $(if $(filter _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
              $(if $(HEADLESS),--build-headless,) \
              $(if $(DEBUG),--build-debug,) \
@@ -92 +91 @@
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter _Debian_etch _Ubuntu_hardy,$(debrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(filter _Ubuntu_hardy,$(debrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
 
 configure: debian/configure-stamp
@@ -311 +310 @@
             debian/prerm.in > debian/prerm
         sed -e 's|%VER%|$(ver)|g' \
+            -e '/#include installer-common.sh/ {' \
+            -e "r $(vboxroot)/src/VBox/Installer/linux/installer-common.sh" \
+            -e 'd' \
+            -e '}' \
             debian/postinst.in > debian/postinst
         dh_installdebconf
@@ -344 +347 @@
           -Vpulse=$(if $(HEADLESS),,libpulse0) \
           -Vsdlttf=$(if $(HEADLESS),,libsdl-ttf2.0-0) \
-          -Vdkms=$(if $(filter _Debian_etch _Debian_lenny,$(debrel)),,dkms)
+          -Vdkms=$(if $(filter _Debian_lenny,$(debrel)),,dkms)
         dh_md5sums
         dh_builddeb --destdir $(pkgdir)

trunk/src/VBox/Installer/linux/debian/postrm

@@ -33 +33 @@
   update-rc.d vboxballoonctrl-service remove >/dev/null || exit $?
 fi
- 
+
 # remove installed extension packs
 if [ "$1" = "purge" ]; then