[Pkg-virtualbox-commits] r10 - in dists/trunk/virtualbox/debian: . patches

hug at alioth.debian.org hug at alioth.debian.org
Mon Jun 18 16:13:57 UTC 2007 

Author: hug
Date: 2007-06-18 16:13:57 +0000 (Mon, 18 Jun 2007)
New Revision: 10

Added:
   dists/trunk/virtualbox/debian/60-vboxdrv.rules
   dists/trunk/virtualbox/debian/postinst.modules.in
   dists/trunk/virtualbox/debian/virtualbox.postinst
Modified:
   dists/trunk/virtualbox/debian/changelog
   dists/trunk/virtualbox/debian/control
   dists/trunk/virtualbox/debian/patches/03-configure.dpatch
   dists/trunk/virtualbox/debian/patches/04-host-module.dpatch
   dists/trunk/virtualbox/debian/rules
   dists/trunk/virtualbox/debian/virtualbox.dirs
Log:
* Added my latest changes


Added: dists/trunk/virtualbox/debian/60-vboxdrv.rules
===================================================================
--- dists/trunk/virtualbox/debian/60-vboxdrv.rules	                        (rev 0)
+++ dists/trunk/virtualbox/debian/60-vboxdrv.rules	2007-06-18 16:13:57 UTC (rev 10)
@@ -0,0 +1 @@
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"

Modified: dists/trunk/virtualbox/debian/changelog
===================================================================
--- dists/trunk/virtualbox/debian/changelog	2007-06-18 16:06:00 UTC (rev 9)
+++ dists/trunk/virtualbox/debian/changelog	2007-06-18 16:13:57 UTC (rev 10)
@@ -7,8 +7,11 @@
   * Build target for module is now all instead of module
   * Build against correct kernel source
   * Integrated changes by Patrick Winnertz
+  * clean: rm env.sh AutoConfig.kmk configure.log
+  * Install udev rules to automatically create device
+  * Automatically create vboxusers group
 
- -- Philipp Hug <debian at hug.cx>  Sun, 17 Jun 2007 18:13:25 +0100
+ -- Philipp Hug <debian at hug.cx>  Mon, 18 Jun 2007 13:27:09 +0100
 
 virtualbox (1.3.0.20070221+debian-1) unstable; urgency=low
 

Modified: dists/trunk/virtualbox/debian/control
===================================================================
--- dists/trunk/virtualbox/debian/control	2007-06-18 16:06:00 UTC (rev 9)
+++ dists/trunk/virtualbox/debian/control	2007-06-18 16:13:57 UTC (rev 10)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Daniel Baumann <daniel at debian.org>
 Uploaders: Patrick Winnertz <patrick.winnertz at skolelinux.org>, Philipp Hug <debian at hug.cx>
-Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, gcc-3.4, g++-3.4, iasl, libacl1-dev, libasound-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, linux-headers-2.6-amd64 [amd64], linux-headers-2.6-486 [i386], uuid-dev, xalan, xsltproc, zlib1g-dev, libstdc++5, yasm, kbuild
+Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, gcc-3.4, g++-3.4, iasl, libacl1-dev, libasound-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, uuid-dev, xalan, xsltproc, zlib1g-dev, libstdc++5, yasm, kbuild
 Standards-Version: 3.7.2
 
 Package: virtualbox

Modified: dists/trunk/virtualbox/debian/patches/03-configure.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/03-configure.dpatch	2007-06-18 16:06:00 UTC (rev 9)
+++ dists/trunk/virtualbox/debian/patches/03-configure.dpatch	2007-06-18 16:13:57 UTC (rev 10)
@@ -1,7 +1,7 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 03-configure.dpatch by Daniel Baumann <daniel at debian.org>
 ##
-## DP: Disable linux-header check.
+## DP: Use Debians kbuild instead
 
 @DPATCH@
 
@@ -22,7 +22,7 @@
    esac
 -  DEVDIR_BIN="$DEVDIR/$OS.$MACHINE/bin"
 -  KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.$MACHINE"
-+  DEVDIR_BIN="usr/bin"
++  DEVDIR_BIN="/usr/bin"
 +  KBUILDDIR_BIN="/usr/bin"
    log_success "Determined $OS.$MACHINE"
  

Modified: dists/trunk/virtualbox/debian/patches/04-host-module.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/04-host-module.dpatch	2007-06-18 16:06:00 UTC (rev 9)
+++ dists/trunk/virtualbox/debian/patches/04-host-module.dpatch	2007-06-18 16:13:57 UTC (rev 10)
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-host-module.dpatch by  <Torsten Werner <twerner at debian.org>>
+## 04-host-module.dpatch by  <Torsten Werner <twerner at debian.org>>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
@@ -12,7 +12,7 @@
  ifneq ($(MAKECMDGOALS),clean)
  
  # kernel base directory
-+KERN_DIR := $(shell pwd)
++KERN_DIR := $(KDIR)
  ifndef KERN_DIR
   KERN_DIR := /lib/modules/$(shell uname -r)/build
   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)

Added: dists/trunk/virtualbox/debian/postinst.modules.in
===================================================================
--- dists/trunk/virtualbox/debian/postinst.modules.in	                        (rev 0)
+++ dists/trunk/virtualbox/debian/postinst.modules.in	2007-06-18 16:13:57 UTC (rev 10)
@@ -0,0 +1,34 @@
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# After the package was installed:
+#       <postinst> configure <old-version>
+#
+# If prerm fails during upgrade or fails on failed upgrade:
+#       <old-postinst> abort-upgrade <new-version>
+#
+# If prerm fails during deconfiguration of a package:
+#       <postinst> abort-deconfigure in-favour <new-package> <version>
+#                  removing <old-package> <version>
+#
+# If prerm fails during replacement due to conflict:
+#       <postinst> abort-remove in-favour <new-package> <version>
+
+#DEBHELPER#
+
+case "$1" in
+    configure)
+    	invoke-rc.d udev reload
+    	modprobe vboxdrv
+	;;
+
+    abort-upgrade|abort-deconfigure|abort-remove)
+	;;
+
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
+	exit 1
+	;;
+esac
+
+exit 0

Modified: dists/trunk/virtualbox/debian/rules
===================================================================
--- dists/trunk/virtualbox/debian/rules	2007-06-18 16:06:00 UTC (rev 9)
+++ dists/trunk/virtualbox/debian/rules	2007-06-18 16:13:57 UTC (rev 10)
@@ -65,10 +65,10 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	rm -f AutoConfig.kmk configure.log env.sh
 
 	# Cleaning package
 	rm -rf out
+	rm -f AutoConfig.kmk configure.log env.sh
 
 	dh_clean
 
@@ -91,8 +91,8 @@
 	install -D -m 0644 src/VBox/Frontends/VirtualBox/images/ico32x01.png debian/virtualbox/usr/share/icons/virtualbox.png
 	install -D -m 0644 debian/pixmap/virtualbox.xpm debian/virtualbox/usr/share/pixmaps/virtualbox.xpm
 
-    #strip some files manually since dh_strip doesn't recognise them:
-    
+	#strip some files manually since dh_strip doesn't recognise them:
+	
 	strip debian/virtualbox/usr/lib/virtualbox/testcase/tstLdrObj.gc
 	strip debian/virtualbox/usr/lib/virtualbox/VMMGC.gc
 	strip debian/virtualbox/usr/lib/virtualbox/VMMR0.r0
@@ -102,15 +102,17 @@
 	strip debian/virtualbox/usr/lib/virtualbox/VBoxDDR0.r0
 	strip debian/virtualbox/usr/lib/virtualbox/VBoxDD2R0.r0
 
+	echo "# VirtualBox installation directory" > $(CURDIR)/debian/virtualbox/etc/vbox/vbox.cfg
+	echo "INSTALL_DIR="\"/usr/lib/virtualbox\" >> $(CURDIR)/debian/virtualbox/etc/vbox/vbox.cfg
 
 	# Installing virtualbox-source
 	mkdir -p debian/virtualbox-source/usr/src/modules
-	mv debian/virtualbox/usr/lib/virtualbox/src debian/virtualbox-source/usr/src/modules/virtualbox-source
+	mv debian/virtualbox/usr/lib/virtualbox/src debian/virtualbox-source/usr/src/modules/virtualbox
 
-	mkdir -p debian/virtualbox-source/usr/src/modules/virtualbox-source/debian
-	cp debian/*modules.in* debian/control debian/rules debian/changelog debian/copyright debian/compat debian/virtualbox-source/usr/src/modules/virtualbox-source/debian
+	mkdir -p debian/virtualbox-source/usr/src/modules/virtualbox/debian
+	cp debian/*modules.in* debian/control debian/rules debian/changelog debian/copyright debian/compat debian/60-vboxdrv.rules debian/virtualbox-source/usr/src/modules/virtualbox/debian
 
-	cd debian/virtualbox-source/usr/src && tar c modules | bzip2 -9 > virtualbox-source.tar.bz2 && rm -rf modules
+	cd debian/virtualbox-source/usr/src && tar c modules | bzip2 -9 > virtualbox.tar.bz2 && rm -rf modules
 
 	dh_install
 
@@ -123,6 +125,7 @@
 
 	# Install the module
 	dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
+	install -D -m 644 $(CURDIR)/debian/60-vboxdrv.rules $(CURDIR)/debian/virtualbox/etc/udev/rules.d/60-vboxdrv.rules
 
 	dh_installdocs
 	dh_installchangelogs

Modified: dists/trunk/virtualbox/debian/virtualbox.dirs
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox.dirs	2007-06-18 16:06:00 UTC (rev 9)
+++ dists/trunk/virtualbox/debian/virtualbox.dirs	2007-06-18 16:13:57 UTC (rev 10)
@@ -1,3 +1,4 @@
 usr/bin
 usr/sbin
 usr/lib
+etc/vbox

Added: dists/trunk/virtualbox/debian/virtualbox.postinst
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox.postinst	                        (rev 0)
+++ dists/trunk/virtualbox/debian/virtualbox.postinst	2007-06-18 16:13:57 UTC (rev 10)
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+action="$1"
+oldversion="$2"
+
+if [ "$action" != configure ]
+  then
+  exit 0
+fi
+
+
+setup_vboxusers_group() {
+        if ! getent group vboxusers >/dev/null; then
+                addgroup --quiet --system vboxusers
+        fi
+}
+
+setup_vboxusers_group
+
+exit 0


Property changes on: dists/trunk/virtualbox/debian/virtualbox.postinst
___________________________________________________________________
Name: svn:executable
   + *

More information about the Pkg-virtualbox-commits mailing list