summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/virtualbox-ose-source.files/Makefile3
-rwxr-xr-xdebian/virtualbox-ose-source.files/rules3
-rw-r--r--debian/virtualbox-ose-source.install29
-rw-r--r--debian/virtualbox-ose-source.links14
5 files changed, 49 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index be60b05dd..ed71a5ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
virtualbox-ose (2.1.0-dfsg-1) experimental; urgency=low
- * New upstream version.
+ * New upstream version
+ This one doesn't use /dev/net/tun anymore. Closes: #509524
* Removed obsoleted vditool and VBoxAddIF.sh.
-- Michael Meskes <meskes@debian.org> Thu, 18 Dec 2008 12:49:34 +0100
diff --git a/debian/virtualbox-ose-source.files/Makefile b/debian/virtualbox-ose-source.files/Makefile
new file mode 100644
index 000000000..b89dae737
--- /dev/null
+++ b/debian/virtualbox-ose-source.files/Makefile
@@ -0,0 +1,3 @@
+.NOTPARALLEL:
+
+obj-m = vboxdrv/ vboxnetflt/
diff --git a/debian/virtualbox-ose-source.files/rules b/debian/virtualbox-ose-source.files/rules
index 45103d713..c983744c9 100755
--- a/debian/virtualbox-ose-source.files/rules
+++ b/debian/virtualbox-ose-source.files/rules
@@ -54,7 +54,8 @@ binary-modules: prep-deb-files
# Build the module
$(MAKE) -C $(KSRC) M=$(CURDIR)
# Install the module
- dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
+ dh_install vboxdrv/vboxdrv.ko /lib/modules/$(KVERS)/misc/
+ dh_install vboxnetflt/vboxnetflt.ko /lib/modules/$(KVERS)/misc/
dh_installdocs
dh_installchangelogs
dh_compress
diff --git a/debian/virtualbox-ose-source.install b/debian/virtualbox-ose-source.install
index afef3a0d2..40e0a06c7 100644
--- a/debian/virtualbox-ose-source.install
+++ b/debian/virtualbox-ose-source.install
@@ -1,4 +1,31 @@
-out/bin/src/* /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/*.* /usr/src/modules/virtualbox-ose/vboxdrv
+out/bin/src/vboxdrv/build_in_tmp /usr/src/modules/virtualbox-ose/vboxdrv
+out/bin/src/vboxdrv/linux /usr/src/modules/virtualbox-ose/vboxdrv
+out/bin/src/vboxdrv/Makefile /usr/src/modules/virtualbox-ose/vboxdrv
+
+out/bin/src/vboxnetflt/*.* /usr/src/modules/virtualbox-ose/vboxnetflt
+out/bin/src/vboxnetflt/build_in_tmp /usr/src/modules/virtualbox-ose/vboxnetflt
+out/bin/src/vboxnetflt/linux /usr/src/modules/virtualbox-ose/vboxnetflt
+out/bin/src/vboxnetflt/Makefile /usr/src/modules/virtualbox-ose/vboxnetflt
+
+out/bin/src/vboxdrv/SUPDrvIDC.h /usr/src/modules/virtualbox-ose/include/
+out/bin/src/vboxdrv/version-generated.h /usr/src/modules/virtualbox-ose/include/
+out/bin/src/vboxdrv/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt
+out/bin/src/vboxdrv/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox
+out/bin/src/vboxdrv/include/internal/* /usr/src/modules/virtualbox-ose/include/internal
+
+out/bin/src/vboxnetflt/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt
+out/bin/src/vboxnetflt/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox
+out/bin/src/vboxnetflt/include/internal/* /usr/src/modules/virtualbox-ose/include/internal
+
+out/bin/src/vboxdrv/r0drv /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/alloc /usr/src/modules/virtualbox-ose
+out/bin/src/vboxnetflt/common /usr/src/modules/virtualbox-ose
+out/bin/src/vboxnetflt/generic /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/math /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/VBox /usr/src/modules/virtualbox-ose
+
+out/bin/src/vboxnetflt/SUPR0IdcClientInternal.h /usr/src/modules/virtualbox-ose/
debian/control debian/changelog debian/copyright debian/compat /usr/src/modules/virtualbox-ose/debian
debian/virtualbox-ose-source.files/* /usr/src/modules/virtualbox-ose/debian
diff --git a/debian/virtualbox-ose-source.links b/debian/virtualbox-ose-source.links
index f5661caa6..2567c4102 100644
--- a/debian/virtualbox-ose-source.links
+++ b/debian/virtualbox-ose-source.links
@@ -1 +1,15 @@
/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-ose-source
+/usr/src/modules/virtualbox-ose/r0drv /usr/src/modules/virtualbox-ose/vboxdrv/r0drv
+/usr/src/modules/virtualbox-ose/r0drv /usr/src/modules/virtualbox-ose/vboxnetflt/r0drv
+/usr/src/modules/virtualbox-ose/include /usr/src/modules/virtualbox-ose/vboxdrv/include
+/usr/src/modules/virtualbox-ose/include /usr/src/modules/virtualbox-ose/vboxnetflt/include
+/usr/src/modules/virtualbox-ose/alloc /usr/src/modules/virtualbox-ose/vboxdrv/alloc
+/usr/src/modules/virtualbox-ose/alloc /usr/src/modules/virtualbox-ose/vboxnetflt/alloc
+/usr/src/modules/virtualbox-ose/common /usr/src/modules/virtualbox-ose/vboxdrv/common
+/usr/src/modules/virtualbox-ose/common /usr/src/modules/virtualbox-ose/vboxnetflt/common
+/usr/src/modules/virtualbox-ose/generic /usr/src/modules/virtualbox-ose/vboxdrv/generic
+/usr/src/modules/virtualbox-ose/generic /usr/src/modules/virtualbox-ose/vboxnetflt/generic
+/usr/src/modules/virtualbox-ose/math /usr/src/modules/virtualbox-ose/vboxdrv/math
+/usr/src/modules/virtualbox-ose/math /usr/src/modules/virtualbox-ose/vboxnetflt/math
+/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxdrv/VBox
+/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxnetflt/VBox