diff options
| -rwxr-xr-x | debian/patches/09-initscript.dpatch | 6 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/virtualbox-ose-guest-source.files/Makefile | 2 | ||||
| -rwxr-xr-x | debian/virtualbox-ose-guest-source.files/rules | 2 | ||||
| -rw-r--r-- | debian/virtualbox-ose-guest-source.install | 2 | ||||
| -rw-r--r-- | debian/virtualbox-ose-guest-utils.init | 4 | ||||
| -rw-r--r-- | debian/virtualbox-ose-guest-utils.install | 3 | ||||
| -rw-r--r-- | debian/virtualbox-ose-guest-x11.install | 1 | ||||
| -rw-r--r-- | debian/virtualbox-ose-source.files/Makefile | 2 | ||||
| -rwxr-xr-x | debian/virtualbox-ose-source.files/rules | 7 | ||||
| -rw-r--r-- | debian/virtualbox-ose-source.install | 6 | ||||
| -rw-r--r-- | debian/virtualbox-ose-source.links | 7 |
12 files changed, 41 insertions, 7 deletions
diff --git a/debian/patches/09-initscript.dpatch b/debian/patches/09-initscript.dpatch index 62e4c8eaf..0359bf0db 100755 --- a/debian/patches/09-initscript.dpatch +++ b/debian/patches/09-initscript.dpatch @@ -76,7 +76,7 @@ diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.i fi # ensure the character special exists if [ ! -c $DEVICE ]; then -@@ -185,31 +201,47 @@ +@@ -185,31 +201,51 @@ rmmod vboxdrv 2>/dev/null failure "Cannot change owner $GROUPNAME for device $DEVICE" fi @@ -92,6 +92,8 @@ diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.i + else + failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" + fi ++ else ++ prog_msg vboxnetflt + fi + if ! modprobe vboxnetadp > /dev/null 2>&1; then + if ! find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then @@ -99,6 +101,8 @@ diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.i + else + failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why" + fi ++ else ++ prog_msg vboxnetadp + fi fi succ_msg diff --git a/debian/rules b/debian/rules index 59b32dff1..12089efda 100755 --- a/debian/rules +++ b/debian/rules @@ -56,6 +56,8 @@ build-stamp: env.sh . ./env.sh; $(MAKE) \ BUILD_TYPE=release \ PATH_OUT=$(abspath out) + # VBoxService + $(MAKE) PATH_OUT=$(abspath out) -C src/VBox/Additions/common/VBoxService/ # and vboxdrv.sh $(MAKE) -C src/VBox/Installer/linux $(abspath out/obj/Installer/linux/vboxdrv.sh) \ PATH_OUT=$(abspath out) @@ -127,13 +129,15 @@ binary-arch: build install serverabi dh_installmenu -s dh_install -s -chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl + -chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config15.pl -install -m 755 src/VBox/Additions/x11/Installer/VBoxRandR.sh debian/$(uxname)/usr/bin/VBoxRandR -chrpath -d debian/$(uxname)/usr/bin/VBoxClient -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/input/vboxmouse_drv.so -install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf -chrpath -d debian/$(uname)/sbin/mount.vboxsf - -chrpath -d debian/$(uname)/usr/sbin/vboxadd-timesync + -chrpath -d debian/$(uname)/usr/sbin/vboxadd-service + -chrpath -d debian/$(uname)/usr/sbin/VBoxControl -chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh dh_strip -s --dbg-package=$(sname)-dbg dh_link -s diff --git a/debian/virtualbox-ose-guest-source.files/Makefile b/debian/virtualbox-ose-guest-source.files/Makefile index b174212dd..8076be76b 100644 --- a/debian/virtualbox-ose-guest-source.files/Makefile +++ b/debian/virtualbox-ose-guest-source.files/Makefile @@ -1,3 +1,3 @@ .NOTPARALLEL: -obj-m = vboxadd/ vboxvfs/ +obj-m = vboxadd/ vboxvfs/ vboxvideo_drm/ diff --git a/debian/virtualbox-ose-guest-source.files/rules b/debian/virtualbox-ose-guest-source.files/rules index 2d7c81147..99ffa25dc 100755 --- a/debian/virtualbox-ose-guest-source.files/rules +++ b/debian/virtualbox-ose-guest-source.files/rules @@ -44,6 +44,7 @@ MAKE:=kmk clean: $(MAKE) -C vboxadd clean $(MAKE) -C vboxvfs clean + $(MAKE) -C vboxvideo_drm clean dh_clean binary-modules: prep-deb-files @@ -54,6 +55,7 @@ binary-modules: prep-deb-files # Install the modules dh_install vboxadd/vboxadd.ko /lib/modules/$(KVERS)/misc/ dh_install vboxvfs/vboxvfs.ko /lib/modules/$(KVERS)/misc/ + dh_install vboxvideo_drm/vboxvideo.ko /lib/modules/$(KVERS)/misc/ dh_installdocs dh_installchangelogs dh_compress diff --git a/debian/virtualbox-ose-guest-source.install b/debian/virtualbox-ose-guest-source.install index 42dc31332..bf21c725d 100644 --- a/debian/virtualbox-ose-guest-source.install +++ b/debian/virtualbox-ose-guest-source.install @@ -17,6 +17,8 @@ out/bin/additions/src/vboxvfs/include/internal/* /usr/src/modules/virtualbox-ose out/bin/additions/src/vboxadd/r0drv /usr/src/modules/virtualbox-ose-guest/ +out/bin/additions/src/vboxvideo_drm /usr/src/modules/virtualbox-ose-guest/ + debian/control debian/changelog debian/copyright debian/compat /usr/src/modules/virtualbox-ose-guest/debian debian/virtualbox-ose-guest-source.files/Makefile /usr/src/modules/virtualbox-ose-guest debian/virtualbox-ose-guest-source.files/control.modules.in /usr/src/modules/virtualbox-ose-guest/debian diff --git a/debian/virtualbox-ose-guest-utils.init b/debian/virtualbox-ose-guest-utils.init index 74192022e..4bb0fd586 100644 --- a/debian/virtualbox-ose-guest-utils.init +++ b/debian/virtualbox-ose-guest-utils.init @@ -50,13 +50,13 @@ case "$1" in # other startup script but this requires the vboxdrv kernel module loaded. mount -a -t vboxsf - start-stop-daemon --start --quiet --exec /usr/sbin/vboxadd-timesync -- --daemonize + start-stop-daemon --start --quiet --exec /usr/sbin/VBoxService log_end_msg $? ;; stop) in_virtual_machine || exit 0 log_action_begin_msg 'Stopping VirtualBox Additions'; - start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/vboxadd-timesync + start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/VBoxService log_end_msg $? ;; restart|force-reload) diff --git a/debian/virtualbox-ose-guest-utils.install b/debian/virtualbox-ose-guest-utils.install index 886dee7e3..ee994842f 100644 --- a/debian/virtualbox-ose-guest-utils.install +++ b/debian/virtualbox-ose-guest-utils.install @@ -1 +1,2 @@ -out/bin/additions/vboxadd-timesync /usr/sbin +out/bin/additions/VBoxService /usr/sbin +out/bin/additions/VBoxControl /usr/sbin diff --git a/debian/virtualbox-ose-guest-x11.install b/debian/virtualbox-ose-guest-x11.install index 1d2cc953a..acce3fa9d 100644 --- a/debian/virtualbox-ose-guest-x11.install +++ b/debian/virtualbox-ose-guest-x11.install @@ -1,5 +1,6 @@ out/bin/additions/VBoxClient /usr/bin src/VBox/Additions/x11/Installer/x11config.pl /usr/share/virtualbox +src/VBox/Additions/x11/Installer/x11config15.pl /usr/share/virtualbox src/VBox/Additions/x11/Installer/98vboxadd-xclient /etc/X11/Xsession.d src/VBox/Additions/x11/Installer/vboxvideo.ids /usr/share/xserver-xorg/pci out/bin/additions/vboxmouse_drv.so /usr/lib/xorg/modules/input diff --git a/debian/virtualbox-ose-source.files/Makefile b/debian/virtualbox-ose-source.files/Makefile index b89dae737..dab5cd7b0 100644 --- a/debian/virtualbox-ose-source.files/Makefile +++ b/debian/virtualbox-ose-source.files/Makefile @@ -1,3 +1,3 @@ .NOTPARALLEL: -obj-m = vboxdrv/ vboxnetflt/ +obj-m = vboxdrv/ vboxnetflt/ vboxnetadp/ diff --git a/debian/virtualbox-ose-source.files/rules b/debian/virtualbox-ose-source.files/rules index c983744c9..848879a59 100755 --- a/debian/virtualbox-ose-source.files/rules +++ b/debian/virtualbox-ose-source.files/rules @@ -48,6 +48,12 @@ kdist_clean: clean MAKE:=kmk +clean: + $(MAKE) -C vboxdrv clean + $(MAKE) -C vboxnetflt clean + $(MAKE) -C vboxnetadp clean + dh_clean + binary-modules: prep-deb-files dh_testroot dh_clean -k @@ -56,6 +62,7 @@ binary-modules: prep-deb-files # Install the module dh_install vboxdrv/vboxdrv.ko /lib/modules/$(KVERS)/misc/ dh_install vboxnetflt/vboxnetflt.ko /lib/modules/$(KVERS)/misc/ + dh_install vboxnetadp/vboxnetadp.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 70f577e5e..304db0a78 100644 --- a/debian/virtualbox-ose-source.install +++ b/debian/virtualbox-ose-source.install @@ -8,6 +8,11 @@ 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/vboxnetadp/*.* /usr/src/modules/virtualbox-ose/vboxnetadp +out/bin/src/vboxnetadp/build_in_tmp /usr/src/modules/virtualbox-ose/vboxnetadp +out/bin/src/vboxnetadp/linux /usr/src/modules/virtualbox-ose/vboxnetadp +out/bin/src/vboxnetadp/Makefile /usr/src/modules/virtualbox-ose/vboxnetadp + 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 @@ -21,6 +26,7 @@ out/bin/src/vboxnetflt/include/internal/* /usr/src/modules/virtualbox-ose/includ 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/vboxdrv/common/misc /usr/src/modules/virtualbox-ose/common 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 diff --git a/debian/virtualbox-ose-source.links b/debian/virtualbox-ose-source.links index 2567c4102..a8f57d936 100644 --- a/debian/virtualbox-ose-source.links +++ b/debian/virtualbox-ose-source.links @@ -1,15 +1,22 @@ /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/r0drv /usr/src/modules/virtualbox-ose/vboxnetadp/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/include /usr/src/modules/virtualbox-ose/vboxnetadp/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/alloc /usr/src/modules/virtualbox-ose/vboxnetadp/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/common /usr/src/modules/virtualbox-ose/vboxnetadp/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/generic /usr/src/modules/virtualbox-ose/vboxnetadp/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/math /usr/src/modules/virtualbox-ose/vboxnetadp/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 +/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxnetadp/VBox |