Changeset 34603 in vbox for trunk/debian

Timestamp:

Dec 2, 2010 12:35:37 PM (14 years ago)

Author:

vboxsync

Message:

Linux deb/rpm: more fixes

Location:

trunk/debian

Files:

• postinst.in (modified) (2 diffs)
• prerm.in (modified) (2 diffs)
• rules (modified) (5 diffs)

trunk/debian/postinst.in

@@ -63 +63 @@
       > /etc/udev/rules.d/10-vboxdrv.rules
     if [ "$INSTALL_NO_GROUP" != "1" ]; then
-      echo "SUBSYSTEM=${udev_fix}\"usb_device\", GROUP=\"vboxusers\", MODE=\"0664\"" \
+        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\", ENV{DEVTYPE}==\"usb_device\", GROUP=\"vboxusers\", MODE=\"0664\"" \
+    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
-    else
-      echo "SUBSYSTEM=${udev_fix}\"usb_device\", GROUP=\"root\", MODE=\"0664\"" \
+    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\", ENV{DEVTYPE}==\"usb_device\", GROUP=\"root\", MODE=\"0664\"" \
+    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
   fi
   # Remove old udev description file
@@ -78 +81 @@
       rm -f /etc/udev/rules.d/60-vboxdrv.rules 2> /dev/null
   fi
-  # Push the permissions to the USB device nodes.  One of these should match.
-  # Rather nasty to use udevadm trigger for this, but I don't know of any
-  # better way.
-  udevadm trigger --subsystem-match=usb > /dev/null 2>&1
-  udevtrigger --subsystem-match=usb > /dev/null 2>&1
-  udevtrigger --subsystem-match=usb_device > /dev/null 2>&1
-  udevplug -Busb > /dev/null 2>&1
+  # 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)

trunk/debian/prerm.in

@@ -23 +23 @@
 rm -f /etc/vbox/license_agreed
 rm -f /etc/vbox/module_not_compiled
+
+# remove our USB device tree
+rm -rf /dev/vboxusb 2> /dev/null
 
 # defaults
@@ -62 +65 @@
 fi
 
-# Stop vboxnet/vboxdrv manually as we use our own error handling in postrm
+# stop vboxnet/vboxdrv manually as we use our own error handling in postrm
 if [ -x "/etc/init.d/vboxdrv" ]; then
   if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then

trunk/debian/rules

@@ -153 +153 @@
         rm -f debian/AutoConfig.kmk debian/configure.log debian/env.sh
         rm -f debian/modules-stamp debian/build-stamp debian/configure-stamp
+        rm -f debian/virtualbox-*.substvars debian/virtualbox*.debhelper
+        rm -f debian/$(verpkg).mime
         rm -rf $(builddir) $(moddir)
         dh_clean
@@ -176 +178 @@
            $(prefix)/usr/share/applications/virtualbox.desktop)
         install -d -g 0 -o 0 $(prefix)/usr/share/pixmaps
+        install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor
+        cd $(archdir)/icons; for i in *; do \
+            install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
+            mv $$i/* $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
+            rmdir $$i; \
+        done
+        rmdir $(archdir)/icons
+        mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo
         install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides
         sed \
@@ -206 +216 @@
         install -D -g 0 -o 0 -m 644 debian/VBox.sh $(prefix)/usr/bin/VBox
         mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
+        mv $(archdir)/VBoxCreateUSBNode.sh $(prefix)/usr/share/$(package)
         for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \
             $(if $(NOQT),,VirtualBox) VBoxHeadless \
@@ -256 +267 @@
             usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)
         dh_desktop
-        dh_installmenu
         $(if $(NOMODS),,dh_installmodules)
         sed \
@@ -276 +286 @@
         dh_installchangelogs
         dh_installmenu
+        dh_installmime
         dh_link
 ifeq ($(DEBUG),)