[Pkg-virtualbox-commits] r101 - trunk/debian
meskes at alioth.debian.org
meskes at alioth.debian.org
Sun Nov 4 16:38:56 UTC 2007
Author: meskes
Date: 2007-11-04 16:38:56 +0000 (Sun, 04 Nov 2007)
New Revision: 101
Added:
trunk/debian/virtualbox-ose-guest-source.README.Debian
trunk/debian/virtualbox-ose-guest-source.control.modules.in
trunk/debian/virtualbox-ose-guest-source.links
trunk/debian/virtualbox-ose-guest-source.postinst.modules.in
trunk/debian/virtualbox-ose-guest-source.rules
trunk/debian/virtualbox-ose-source.control.modules.in
trunk/debian/virtualbox-ose-source.postinst.modules.in
trunk/debian/virtualbox-ose-source.rules
Removed:
trunk/debian/control.modules.in
trunk/debian/postinst.modules.in
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
Guest source package correctly builds a guest-modules package now.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-11-02 16:31:16 UTC (rev 100)
+++ trunk/debian/changelog 2007-11-04 16:38:56 UTC (rev 101)
@@ -1,4 +1,4 @@
-virtualbox-ose (1.5.2-dfsg2-1) unstable; urgency=low
+virtualbox-ose (1.5.2-dfsg2-1) UNRELEASED; urgency=low
[ Daniel Baumann ]
* Added debug package.
@@ -11,8 +11,8 @@
* Checked license of linux installer and additions.
* Repackaged dfsg orig tarball accordingly.
* Added linux installer, closes: #448749
- * Added linux additions, closes: #440517
* Provide programs with upstream upper/lower case mix as used by upstream.
+ * Added linux additions in two seperate packages, closes: #440517
-- Michael Meskes <meskes at debian.org> Thu, 01 Nov 2007 14:47:10 +0100
Deleted: trunk/debian/control.modules.in
===================================================================
--- trunk/debian/control.modules.in 2007-11-02 16:31:16 UTC (rev 100)
+++ trunk/debian/control.modules.in 2007-11-04 16:38:56 UTC (rev 101)
@@ -1,25 +0,0 @@
-Source: virtualbox-ose
-Section: misc
-Priority: optional
-Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
-Uploaders: Philipp Hug <debian at hug.cx>, Marvin Stark <marv at der-marv.de>, Michael Meskes <meskes at debian.org>, Patrick Winnertz <patrick.winnertz at skolelinux.org>, Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, kbuild
-Standards-Version: 3.7.2
-Homepage: http://www.virtualbox.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk
-
-Package: virtualbox-ose-modules-_KVERS_
-Architecture: amd64 i386
-Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
-Recommends: virtualbox-ose
-Provides: virtualbox-ose-modules
-Description: VirtualBox modules for Linux (kernel _KVERS_)
- This package contains the set of loadable kernel modules for VirtualBox.
- .
- This package contains the compiled kernel modules for _KVERS_
- .
- If you have compiled your own kernel, you will most likely need to build
- your own virtualbox-modules. The virtualbox-source package has been
- provided for use with the Debian's module-assistant or kernel-package
- utilities to produce a version of virtualbox-modules for your kernel.
Deleted: trunk/debian/postinst.modules.in
===================================================================
--- trunk/debian/postinst.modules.in 2007-11-02 16:31:16 UTC (rev 100)
+++ trunk/debian/postinst.modules.in 2007-11-04 16:38:56 UTC (rev 101)
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-case "${1}" in
- configure)
- modprobe vboxdrv || true
- invoke-rc.d udev reload
- ;;
-
- abort-upgrade|abort-deconfigure|abort-remove)
-
- ;;
-
- *)
- echo "${0} called with unknown argument \`${1}'" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2007-11-02 16:31:16 UTC (rev 100)
+++ trunk/debian/rules 2007-11-04 16:38:56 UTC (rev 101)
@@ -113,20 +113,25 @@
rm -r debian/$(sname)/usr/lib/virtualbox/additions/src
mkdir -p debian/$(psource)/usr/src/modules/$(sname)/debian
- cp debian/*.modules.in* debian/control debian/changelog debian/copyright debian/compat debian/$(psource)/usr/src/modules/$(sname)/debian
- cp debian/$(psource).rules debian/$(psource)/usr/src/modules/$(sname)/debian/rules
+ cp debian/control debian/changelog debian/copyright debian/compat debian/$(psource)/usr/src/modules/$(sname)/debian
+ cp debian/$(psource).control.modules.in debian/$(psource)/usr/src/modules/$(sname)/debian/control.modules.in
+ cp debian/$(psource).postinst.modules.in debian/$(psource)/usr/src/modules/$(sname)/debian/postinst.modules.in
+ cp debian/$(psource).rules debian/$(psource)/usr/src/modules/$(sname)/debian/rules
+ cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules
+
mkdir -p debian/$(gsource)/usr/src/modules/$(gname)/debian
- cp debian/*.modules.in* debian/control debian/changelog debian/copyright debian/compat debian/$(gsource)/usr/src/modules/$(gname)/debian
+ cp debian/control debian/changelog debian/copyright debian/compat debian/$(gsource)/usr/src/modules/$(gname)/debian
+ cp debian/$(gsource).control.modules.in debian/$(gsource)/usr/src/modules/$(gname)/debian/control.modules.in
+ cp debian/$(gsource).postinst.modules.in debian/$(gsource)/usr/src/modules/$(gname)/debian/postinst.modules.in
cp debian/$(gsource).rules debian/$(gsource)/usr/src/modules/$(gname)/debian/rules
- cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules
cd debian/$(gsource)/usr/src && tar c modules | bzip2 -9 > $(gname).tar.bz2 && rm -rf modules
# Install virtualbox guest additions
mkdir -p debian/$(uname)/usr/lib/virtualbox
mv debian/$(sname)/usr/lib/virtualbox/additions debian/$(uname)/usr/lib/virtualbox
-
+
dh_install
binary-arch: build install
Added: trunk/debian/virtualbox-ose-guest-source.README.Debian
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.README.Debian (rev 0)
+++ trunk/debian/virtualbox-ose-guest-source.README.Debian 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1,23 @@
+virtualbox-ose for Debian
+-------------------------
+
+The Debian virtualbox-ose-guest-source package can be used in several ways,
+
+ - Using module-assistant(1) commands provided by the module-assistant Debian
+ package:
+
+ # module-assistant prepare virtualbox-ose-guest
+ # module-assistant auto-install virtualbox-ose-guest
+
+ - Using the make-kpkg(1) command provided by the kernel-package Debian
+ package. See the "modules_image" section of the make-kpkg(1) man page.
+
+ - Unpacking /usr/src/virtualbox-*.tar.bz2 and installing the module on your own.
+
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Tue, 4 Sep 2007 22:17:00 +0200
+
+The way the device node is created is kind of ugly, but follows upstream's way.
+http://blino.org/blog/mandriva/kernel/register_vboxadd_device.html suggest a
+better way that might get integrated into the package later on.
+
+ -- Michael Meskes <meskes at debian.org> Sun, 04 Nov 2007 17:32:10 +0100
Added: trunk/debian/virtualbox-ose-guest-source.control.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.control.modules.in (rev 0)
+++ trunk/debian/virtualbox-ose-guest-source.control.modules.in 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1,24 @@
+Source: virtualbox-ose
+Section: misc
+Priority: optional
+Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
+Uploaders: Philipp Hug <debian at hug.cx>, Marvin Stark <marv at der-marv.de>, Michael Meskes <meskes at debian.org>, Patrick Winnertz <patrick.winnertz at skolelinux.org>, Daniel Baumann <daniel at debian.org>
+Build-Depends: debhelper (>= 5), dpatch, kbuild
+Standards-Version: 3.7.2
+Homepage: http://www.virtualbox.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk
+
+Package: virtualbox-ose-guest-modules-_KVERS_
+Architecture: amd64 i386
+Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
+Provides: virtualbox-ose-guest-modules
+Description: VirtualBox guest addition modules for Linux (kernel _KVERS_)
+ This package contains the set of loadable kernel modules for VirtualBox Guest Additions.
+ .
+ This package contains the compiled kernel modules for _KVERS_
+ .
+ If you have compiled your own kernel, you will most likely need to build
+ your own virtualbox-ose-guest-modules. The virtualbox-ose-guest-source package has been
+ provided for use with the Debian's module-assistant or kernel-package
+ utilities to produce a version of virtualbox-ose-guest-modules for your kernel.
Added: trunk/debian/virtualbox-ose-guest-source.links
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.links (rev 0)
+++ trunk/debian/virtualbox-ose-guest-source.links 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1 @@
+/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-ose-guest-source
Added: trunk/debian/virtualbox-ose-guest-source.postinst.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.postinst.modules.in (rev 0)
+++ trunk/debian/virtualbox-ose-guest-source.postinst.modules.in 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+set -e
+
+dev=/dev/vboxadd
+
+#DEBHELPER#
+
+case "${1}" in
+ configure)
+ modprobe vboxadd || true
+ modprobe vboxvfs || true
+ invoke-rc.d udev reload
+ if [ ! -c $dev ]; then
+ maj=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/devices`
+ if [ ! -z "$maj" ]; then
+ min=0
+ else
+ min=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/misc`
+ if [ ! -z "$min" ]; then
+ maj=10
+ fi
+ fi
+ test -z "$maj" && {
+ rmmod vboxvfs
+ rmmod vboxadd
+ echo "Cannot locate the VirtualBox device"
+ exit 1
+ }
+
+ mknod -m 0664 $dev c $maj $min || {
+ rmmod vboxvfs
+ rmmod vboxadd
+ echo "Cannot create device $dev with major $maj and minor $min"
+ exit 1
+ }
+ fi
+ ;;
+
+ abort-upgrade|abort-deconfigure|abort-remove)
+
+ ;;
+
+ *)
+ echo "${0} called with unknown argument \`${1}'" 1>&2
+ exit 1
+ ;;
+esac
+
+exit 0
Added: trunk/debian/virtualbox-ose-guest-source.rules
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.rules (rev 0)
+++ trunk/debian/virtualbox-ose-guest-source.rules 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1,70 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+# The short upstream name, used for the module source directory
+uname:=virtualbox-ose-guest-utils
+
+### KERNEL SETUP
+### Setup the stuff needed for making kernel module packages
+### taken from /usr/share/kernel-package/sample.module.rules
+
+# prefix of the target package name
+PACKAGE=virtualbox-ose-guest-modules
+# modifieable for experiments or debugging m-a
+MA_DIR ?= /usr/share/modass
+# load generic variable handling
+-include $(MA_DIR)/include/generic.make
+# load default rules, including kdist, kdist_image, ...
+-include $(MA_DIR)/include/common-rules.make
+
+# module assistant calculates all needed things for us and sets
+# following variables:
+# KSRC (kernel source directory), KVERS (kernel version string), KDREV
+# (revision of the Debian kernel-image package), CC (the correct
+# compiler), VERSION (the final package version string), PKGNAME (full
+# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
+
+# The kdist_configure target is called by make-kpkg modules_config and
+# by kdist* rules by dependency. It should configure the module so it is
+# ready for compilation (mostly useful for calling configure).
+# prep-deb-files from module-assistant creates the neccessary debian/ files
+kdist_configure: prep-deb-files
+
+# the kdist_clean target is called by make-kpkg modules_clean and from
+# kdist* rules. It is responsible for cleaning up any changes that have
+# been made by the other kdist_commands (except for the .deb files created)
+kdist_clean: clean
+ $(MAKE) $(MFLAGS) -f debian/rules clean
+#
+### end KERNEL SETUP
+
+MAKE:=kmk
+
+binary-modules: prep-deb-files
+ dh_testroot
+ dh_clean -k
+
+ # Build the modules
+ (cd vboxadd; $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC))
+ (cd vboxvfs; $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC))
+
+ # Install the modules
+ dh_install vboxadd/vboxadd.ko /lib/modules/$(KVERS)/misc/
+ dh_install vboxvfs/vboxvfs.ko /lib/modules/$(KVERS)/misc/
+
+ dh_installdocs
+ dh_installchangelogs
+ dh_compress
+ dh_fixperms
+ dh_installmodules
+ dh_installdeb
+ dh_gencontrol -- -v$(VERSION)
+ dh_md5sums
+ dh_builddeb --destdir=$(DEB_DESTDIR)
+ dh_clean -k
+
+.PHONY: build clean binary-arch binary-indep binary install binary-modules kdist kdist_configure kdist_image kdist_clean
Property changes on: trunk/debian/virtualbox-ose-guest-source.rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debian/virtualbox-ose-source.control.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-source.control.modules.in (rev 0)
+++ trunk/debian/virtualbox-ose-source.control.modules.in 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1,25 @@
+Source: virtualbox-ose
+Section: misc
+Priority: optional
+Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
+Uploaders: Philipp Hug <debian at hug.cx>, Marvin Stark <marv at der-marv.de>, Michael Meskes <meskes at debian.org>, Patrick Winnertz <patrick.winnertz at skolelinux.org>, Daniel Baumann <daniel at debian.org>
+Build-Depends: debhelper (>= 5), dpatch, kbuild
+Standards-Version: 3.7.2
+Homepage: http://www.virtualbox.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk
+
+Package: virtualbox-ose-modules-_KVERS_
+Architecture: amd64 i386
+Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
+Recommends: virtualbox-ose
+Provides: virtualbox-ose-modules
+Description: VirtualBox modules for Linux (kernel _KVERS_)
+ This package contains the set of loadable kernel modules for VirtualBox.
+ .
+ This package contains the compiled kernel modules for _KVERS_
+ .
+ If you have compiled your own kernel, you will most likely need to build
+ your own virtualbox-ose-modules. The virtualbox-ose-source package has been
+ provided for use with the Debian's module-assistant or kernel-package
+ utilities to produce a version of virtualbox-ose-modules for your kernel.
Added: trunk/debian/virtualbox-ose-source.postinst.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-source.postinst.modules.in (rev 0)
+++ trunk/debian/virtualbox-ose-source.postinst.modules.in 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+case "${1}" in
+ configure)
+ modprobe vboxdrv || true
+ invoke-rc.d udev reload
+ ;;
+
+ abort-upgrade|abort-deconfigure|abort-remove)
+
+ ;;
+
+ *)
+ echo "${0} called with unknown argument \`${1}'" 1>&2
+ exit 1
+ ;;
+esac
+
+exit 0
Added: trunk/debian/virtualbox-ose-source.rules
===================================================================
--- trunk/debian/virtualbox-ose-source.rules (rev 0)
+++ trunk/debian/virtualbox-ose-source.rules 2007-11-04 16:38:56 UTC (rev 101)
@@ -0,0 +1,75 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+# some default definitions, important!
+#
+# Name of the source package
+psource:=virtualbox-ose-source
+gsource:=virtualbox-ose-guest-source
+
+# The short upstream name, used for the module source directory
+sname:=virtualbox-ose
+uname:=virtualbox-ose-guest-utils
+
+### KERNEL SETUP
+### Setup the stuff needed for making kernel module packages
+### taken from /usr/share/kernel-package/sample.module.rules
+
+# prefix of the target package name
+PACKAGE=virtualbox-ose-modules
+# modifieable for experiments or debugging m-a
+MA_DIR ?= /usr/share/modass
+# load generic variable handling
+-include $(MA_DIR)/include/generic.make
+# load default rules, including kdist, kdist_image, ...
+-include $(MA_DIR)/include/common-rules.make
+
+# module assistant calculates all needed things for us and sets
+# following variables:
+# KSRC (kernel source directory), KVERS (kernel version string), KDREV
+# (revision of the Debian kernel-image package), CC (the correct
+# compiler), VERSION (the final package version string), PKGNAME (full
+# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
+
+# The kdist_configure target is called by make-kpkg modules_config and
+# by kdist* rules by dependency. It should configure the module so it is
+# ready for compilation (mostly useful for calling configure).
+# prep-deb-files from module-assistant creates the neccessary debian/ files
+kdist_configure: prep-deb-files
+
+# the kdist_clean target is called by make-kpkg modules_clean and from
+# kdist* rules. It is responsible for cleaning up any changes that have
+# been made by the other kdist_commands (except for the .deb files created)
+kdist_clean: clean
+ $(MAKE) $(MFLAGS) -f debian/rules clean
+#
+### end KERNEL SETUP
+
+MAKE:=kmk
+
+binary-modules: prep-deb-files
+ dh_testroot
+ dh_clean -k
+
+ # Build the module
+ $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC)
+
+ # Install the module
+ dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
+
+ dh_installdocs
+ dh_installchangelogs
+ dh_compress
+ dh_fixperms
+ dh_installmodules
+ dh_installdeb
+ dh_gencontrol -- -v$(VERSION)
+ dh_md5sums
+ dh_builddeb --destdir=$(DEB_DESTDIR)
+ dh_clean -k
+
+.PHONY: build clean binary-arch binary-indep binary install binary-modules kdist kdist_configure kdist_image kdist_clean
Property changes on: trunk/debian/virtualbox-ose-source.rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-virtualbox-commits
mailing list