Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/rules =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/rules (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/rules (revision 4946) @@ -55,5 +55,6 @@ $(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 Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/control.modules.in =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/control.modules.in (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/control.modules.in (revision 4946) @@ -5,5 +5,5 @@ Uploaders: Philipp Hug , Marvin Stark , Michael Meskes , Patrick Winnertz , Daniel Baumann , Hilko Bengen Build-Depends: debhelper (>= 5), dpatch, kbuild -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://www.virtualbox.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile (revision 4946) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile (revision 4946) @@ -0,0 +1,3 @@ +.NOTPARALLEL: + +obj-m = vboxdrv/ vboxnetflt/ Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/NEWS.Debian =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/NEWS.Debian (revision 4946) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/NEWS.Debian (revision 4946) @@ -0,0 +1,13 @@ +virtualbox-ose (2.0.6-dfsg-1) experimental; urgency=low + + The way Host Interface Networking works has been completely rewritten with + VirtualBox 2. The main difference is that the complex bridging configuration + is no longer necessary. With the new mechanism, to enable Host Interface + Networking, all you need to do is to open the Settings dialog of a virtual + machine, go to the “Network” page and select “Host Interface” in the drop down + list for the “Attached to” field. Finally, select the desired host interface + from the list at the bottom of the page, which contains the physical network + interfaces. + + -- Michael Meskes Thu, 20 Nov 2008 14:09:54 +0100 + Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/README.Debian.xml =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/README.Debian.xml (revision 4946) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/README.Debian.xml (revision 4946) @@ -0,0 +1,150 @@ + + +
+ Virtualbox OSE for Debian +
+ Different versions + + The Open Source Edition of VirtualBox contains most but not all + features of the closed-source VirtualBox product that is + distributed under different terms and available from the + Virtualbox + homepage. Missing are: + + + + + Remote Display Protocol (RDP) Server + + + This component implements a complete RDP server on top of + the virtual hardware and allows users to connect to a + virtual machine remotely using any RDP compatible client. + + + + USB support + + VirtualBox implements a virtual USB controller and supports + passing through USB 1.1 and USB 2.0 devices to virtual + machines. + + + + USB over RDP + + This is a combination of the RDP server and USB support + allowing users to make USB devices available to virtual + machines running remotely. + + + + iSCSI initiator + + VirtualBox contains a builtin iSCSI initiator making it + possible to use iSCSI targets as virtual disks without the + guest requiring support for iSCSI. + + + + Emulation for Intel e1000 network devices + + + +
+
+ 64-bit guests + Starting with version 2.0.0 VirtualBox also supports 64-bit guest operating systems, + under the following conditions: + + + You need a 64-bit processor with hardware virtualization support + and a 64-bit host operating system. + + + You must run a 64-bit version of VirtualBox on that OS. This can + then run both 32-bit and 64-bit VMs; a 32-bit VirtualBox can only run 32-bit + VMs, regardless of the hardware. + + + You must enable hardware virtualization; software virtualization is not supported + for 64-bit VMs. + + + There is no specific setting to enable 64-bit support for a guest. + However, you should enable the I/O APIC for virtual machines that you intend to + use in 64-bit mode. +
+
+ How to provide networking to virtual machines +
+ Mechanism + + VirtualBox can use three alternative mechanisms to provide + Ethernet networking to its virtual machines:b + +
+ NAT + + This is the easiest to use type of setup: The virtual + ethernet interface is connected to a virtual NAT router + including a DHCP server that is implemented within + the VirtualBox host software. + + + This is the default mode. It usually does not require + any extra configuration on the host. + +
+
+ Internal network + + In this mode, there is only connectivity within an + emulated network shared between two or more virtual + machines running in the same VirtualBox instance. + +
+
+ Host interface + + The virtual ethernet interface is connected to a + real device on the host filtering out its traffic. + +
+
+
+
+ Incompatibilities with previous versions + + Unfortunately, the configuration files between version version + 1.4.0-svn4130 and 1.5.0 the configuration files are + incompatible. In order to fix this issue please delete the + complete ]]> section in any + ~/.VirtualBox/Machines/NAME/NAME.xml files. + +
+
+ See also + + Additional and updated information may be found on + + + + the + + End-user documentation section of the official + VirtualBox site. + + + + + the + VirtualBox + page in the Debian Wiki. + + + + +
+
Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/wiki.html =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/wiki.html (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/wiki.html (revision 4946) @@ -18,5 +18,5 @@ // Ignore empty or whitespace search term. var value = e.value.replace(/\s+/, ''); - if (value == '' || searchIsDisabled) { + if (value == '' || searchIsDisabled) { searchSetDisabled(true); } else { @@ -192,9 +192,9 @@
-

-

VirtualBox is an x86 emulator developed by innotek (bought by Sun) comparable to VMWare. It has a version called VirtualBox Open Source Edition (OSE) which is freely available as Open Source Software under the terms of the GNU General Public License (GPL).
+

+ -

VirtualBox is an x86 emulator developed by innotek (bought by Sun) comparable to VMWare. It has a version called VirtualBox Open Source Edition (OSE) which is freely available as Open Source Software under the terms of the GNU General Public License (GPL).

Its a relatively new program and still has some minor issues, but in general it is reliable, stable and, above all, very fast. It has been used successfully to do installation tests with Debian Installer.
@@ -202,26 +202,24 @@ This page contains some how-to, tips and tricks that can be useful when setting up and using VirtualBox

-

Installation

-

Currently (2008/01/01), VirtualBox is not supported natively by Etch, the 4.0 version of Debian. To install it, you can use different methods:

  • Using Debian/Etch-backports repository
  • Using Debian/Testing repository

-

Debian/Etch-backports

-

# cd /usr/src
-# tar xvjf virtualbox-ose.tar.bz2
-# cd modules/virtualbox-ose
-# make
-# make install
-# modprobe vboxdrv
-# lsmod | grep vbox
-vboxdrv                55344  0

  • Or simply use module-assistant (as root) 

# module-assistant auto-install virtualbox-ose
-# modprobe vboxdrv
-# lsmod | grep vbox
-vboxdrv                55344  0
-

  • Start VirtualBox: 

KDE > System > VirtualBox OSE
-Gnome > Applications > System tools > VirtualBox OSE
-

-

Debian/Testing

-

Testing repository contains some precompiled kernel module. So you don't need to compile it like previous method. Except that, it's the same mechanism. Be carreful, using testing repository could break your system. Note that virtualbox need to update libc6 and linux-image-2.6

+

+

Installation

+

Currently (2008/01/01), VirtualBox is not supported natively by DebianEtch, the 4.0 version of Debian. To install it, you can use different methods:

+

Debian/Etch-backports

+

# cd /usr/src
+# tar xvjf virtualbox-ose.tar.bz2
+# cd modules/virtualbox-ose
+# make
+# make install
+# modprobe vboxdrv
+# lsmod | grep vbox
+vboxdrv                55344  0

  • Or simply use module-assistant (as root) 

# module-assistant auto-install virtualbox-ose
+# modprobe vboxdrv
+# lsmod | grep vbox
+vboxdrv                55344  0
+

  • Start VirtualBox:

In KDE, go to menu KDE > System > VirtualBox OSE

  • or

In Gnome, goto menu Gnome > Applications > System tools > VirtualBox OSE

+

Debian/Testing (lenny)

+

Testing repository contains some precompiled kernel module. So you don't need to compile it like previous method. Except that, it's the same mechanism. Be carreful, using testing repository could break your system. Note that virtualbox need to update libc6 and linux-image-2.6

Experience

-

Legend :

  • {OK} = OK

  • /!\ = Failed

+

Legend :

  • {OK} = OK

  • /!\ = Failed

Who

@@ -229,5 +227,5 @@ - + @@ -235,63 +233,80 @@ -

Who

Kernel

Disribution

Status

-- SalokineTerata 2008-01-01 19:52:09

-- SalokineTerata 2008-01-01 19:52:09

2.6.22-6~bpo40+1

Debian/Etch-backports

{OK}

-

Errors

-

-

32-bit userland with x64_64 kernel

-

It is know bug that VirtualBox does not work in such scenarios: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456391

-

-1909 VERR VM DRIVER NOT ACCESSIBLE

-

Solution: Add your current user in the group vboxusers.

  • Under KDE:

    • K > Configuration Center > System Administration > User Management

    • Select your user and edit it

    • Go to Groups page

    • Select vboxusers group and validate

  • Reconnect your session
  • Under GNOME:

    • System > Administration > Users and Groups

    • Click on "Manage groups"

    • Select the vboxusers group and click "Properties"

    • Check your username in the list and click "Ok"
    • Logout and login again
  • On the commandline

    • log as user root either by su or sudo (su [return] - <give root password> [return] OR sudo su [return])

    • Use the following command: adduser <youruser> vboxusers

    • Logout and login again

You can verify if your are really member of this group with this command line: 

# id MY_USER
-uid=1000(MY_USER) gid=1000(MY_USER) groupes=1000(MY_USER),8(mail),...127(vboxusers)
-

-

Tips & tricks

-

-

Switching consoles

-

The normal way to switch consoles in Linux is to use the ctrl-alt-Fx key combination. This does not work for a VirtualBox virtual machine (VM); it will switch consoles for the host system instead.

You should use <Host Key>-Fx instead, where <Host Key> is the key defined in File->Preferences->Input.

This also works for ctrl-alt-del and ctrl-alt-backspace

This is documented in the VirtalBox user manual in the section "Keyboard and mouse support in virtual machines", subsection "Typing special characters".

(An alternative method to switch between text consoles is to use alt-left and alt-right, but that does not work for graphical consoles like XOrg or DirectFB.)

-

Setting up bridged networking for VirtualBox

-

By default VirtualBox uses NAT for the network interfaces of virtual machines and use an internal DHCP server to obtain an IP address. This works well but the disadvantage is that the machine will not have an IP address visible outside the VM and so you cannot connect to it from the host system or from other systems.

By attaching the VM's interface to "Host Interface" and creating a bridge on the host system, the VM can be made visible on the local network. This also allows to do fun stuff like netbooting the VM (boot from LAN using PXE). It is comparable to the "bridged networking" option in VMWare.

-

Preparation

-

First install the package bridge-utils.

Next, change the network configuration of the host system so that the network interface becomes part of a bridge. Note that this requires restarting the network, so be careful when doing this on a remote system!

Change the file /etc/network/interfaces to look something like this: 

# The loopback network interface
-auto lo
-iface lo inet loopback
-# An entry for eth0 is no longer needed
-#auto eth0
-#iface eth0 inet dhcp
-# Create the bridge (with the regular IP address of the host)
-auto br0
-iface br0 inet dhcp
-        bridge_ports eth0
-        bridge_fd 2.5
-

In this example the bridge gets its IP address and configuration from DHCP. For static configuration see
-/usr/share/doc/bridge-utils/README.Debian.gz

Restart the networking of the host system using: 

# /etc/init.d/networking restart

After this brctl show should show the bridge and ifconfig should show the bridge has the host's IP address.

-

Configuring the VirtualBox VM

-

There are different ways the TAP interface for the VM can be created:

  • statically (before VirtualBox is even started)

  • on demand (when a VM is being started)

See also the chapter on "Virtual networking" in the VirtalBox user manual.

-

Static interfaces

-

In this case you only need to "define" an interface for use by a particular user once. All defined interfaces are "remembered" in the file /etc/vbox/interfaces and recreated by the VirtualBox init script every time the host system is booted.

Example to create an interface for a user: 

# VBoxAddIF vbox0 <username> br0
-

You can of course create multiple interfaces per users, but all interfaces should have unique names.

To configure the VM to use static bridged networking, go to the "network" page of the VM's settings and change the following fields:

  • Attached to: Host Interface

  • Interface Name: vbox0

  • Setup Application: <empty>

  • Terminate Application: <empty>

-

Dynamic interfaces (on demand)

-

The example below shows the second method. In the example the name of the interface is hardcoded in the script. If you want to be able to create multiple interfaces, you'll have to adapt the script. Note that the script assumes you can execute the needed commands using sudo. 

#! /bin/sh
-set -e
-IF=vbox0
-BRIDGE=br0
-case "$1" in
-    up)
-        # Create a TAP network device
-        sudo VBoxTunctl -u $LOGNAME -t $IF >/dev/null 2>&1
-        # Bring it up (without IP address)
-        sudo ifconfig $IF up
-        # Add it to the bridge
-        sudo brctl addif $BRIDGE $IF
-        # Tell VirtualBox the name of the interface
-        echo $IF
-        ;;
-    down)
-        sudo VBoxTunctl -d $IF >/dev/null 2>&1
-        ;;
-esac
-

Save the script, for example as ~/.VirtualBox/bridge_setup. The script can be tested by running it from the command line. If successful, brctl show should show interface vbox0 added to the bridge.

To configure the VM to use dynamic bridged networking, go to the "network" page of the VM's settings and change the following fields:

  • Attached to: Host Interface

  • Interface Name: <empty>

  • Setup Application: ~/.VirtualBox/bridge_setup up

  • Terminate Application: ~/.VirtualBox/bridge_setup down

When the VM is started after that, the interface should be created automatically and the VM can be used just like it was a system connected directly to your local network.

-

How to remotely start virtual machines using vnc

-

Remote:

  • log onto your remote box
  • install tightvncserver
  • launch it (you don't need a display), pick a password
  • determine which port it is using, a way to do so:
    • netstat -tap | grep vnc
    • Let's say it's 5901
  • unlog from there since the server forked in the background

Local:

  • install xtightvncviewer
  • create a ssh tunnel to your box:
    • ssh -L 5901:localhost:5901 you@remote
  • use it: (note there are two colons)
    • xtightvncviewer localhost::5901

  • then VBoxManage startvm $yourvm &

  • and start as many virtual machines as wanted.

-

External Links

-

VirtualBox (last edited 2008-02-14 20:50:35 by SalokineTerata)

+

+

Errors

+

+

32-bit userland with x64_64 kernel

+

It is know bug that VirtualBox does not work in such scenarios: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456391

However VirtualBox version 2.0 promises support for this, but it is not yet packaged in Debian.

+

-1909 VERR VM DRIVER NOT ACCESSIBLE

+

Solution: Add your current user in the group vboxusers.

  • Under KDE:

    • K > Configuration Center > System Administration > User Management

    • Select your user and edit it

    • Go to Groups page

    • Select vboxusers group and validate

  • Reconnect your session
  • Under GNOME:

    • System > Administration > Users and Groups

    • Click on "Manage groups"

    • Select the vboxusers group and click "Properties"

    • Check your username in the list and click "Ok"
    • Logout and login again
  • On the commandline

    • log as user root either by su or sudo (su [return] - <give root password> [return] OR sudo su [return])

    • Use the following command: adduser <youruser> vboxusers

    • Logout and login again

You can verify if your are really member of this group with this command line: 

# id MY_USER
+uid=1000(MY_USER) gid=1000(MY_USER) groupes=1000(MY_USER),8(mail),...127(vboxusers)
+

+

Tips & tricks

+

+

Switching consoles

+

The normal way to switch consoles in Linux is to use the ctrl-alt-Fx key combination. This does not work for a VirtualBox virtual machine (VM); it will switch consoles for the host system instead.

You should use <Host Key>-Fx instead, where <Host Key> is the key defined in File->Preferences->Input.

This also works for ctrl-alt-del and ctrl-alt-backspace

This is documented in the VirtualBox user manual in the section "Keyboard and mouse support in virtual machines", subsection "Typing special characters".

(An alternative method to switch between text consoles is to use alt-left and alt-right, but that does not work for graphical consoles like XOrg or DirectFB.)

+

Setting up bridged networking for VirtualBox (VirtualBox < 2.1.0)

+

By default VirtualBox uses NAT for the network interfaces of virtual machines and use an internal DHCP server to obtain an IP address. This works well but the disadvantage is that the machine will not have an IP address visible outside the VM and so you cannot connect to it from the host system or from other systems.

By attaching the VM's interface to "Host Interface" and creating a bridge on the host system, the VM can be made visible on the local network. This also allows to do fun stuff like netbooting the VM (boot from LAN using PXE). It is comparable to the "bridged networking" option in VMWare.

NB To use a wireless host device you need one that has support for Master mode (eg. it can be used as an access point, afaik only the Atheros and Prism drivers has this support)

+

Preparation

+

First install the package bridge-utils.

Next, change the network configuration of the host system so that the network interface becomes part of a bridge. Note that this requires restarting the network, so be careful when doing this on a remote system!

Change the file /etc/network/interfaces to look something like this: 

# The loopback network interface
+auto lo
+iface lo inet loopback
+# An entry for eth0 is no longer needed
+#auto eth0
+#iface eth0 inet dhcp
+# Create the bridge (with the regular IP address of the host)
+auto br0
+iface br0 inet dhcp
+        bridge_ports eth0
+        bridge_fd 2.5
+

In this example the bridge gets its IP address and configuration from DHCP. For static configuration see
+/usr/share/doc/bridge-utils/README.Debian.gz

If you don't find the information for static configuration there, try:
+ 

# man bridge-utils-interfaces

Restart the networking of the host system using: 

# /etc/init.d/networking restart

After this brctl show should show the bridge and ifconfig should show the bridge has the host's IP address.

It is also necessary for your user to own the device /dev/net/tun 

Run the following command to change the owner of that device: 

# chown <username> /dev/net/tun

+

Configuring the VirtualBox VM

+

There are different ways the TAP interface for the VM can be created:

  • statically (before VirtualBox is even started)

  • on demand (when a VM is being started)

See also the chapter on "Virtual networking" in the VirtualBox user manual.

+

Static interfaces
+

In this case you only need to "define" an interface for use by a particular user once. All defined interfaces are "remembered" in the file /etc/vbox/interfaces and recreated by the VirtualBox init script every time the host system is booted.

Example to create an interface for a user: 

# VBoxAddIF vbox0 <username> br0
+

You can of course create multiple interfaces per users, but all interfaces should have unique names.

To configure the VM to use static bridged networking, go to the "network" page of the VM's settings and change the following fields:

  • Attached to: Host Interface

  • Interface Name: vbox0

  • Setup Application: <empty>

  • Terminate Application: <empty>

+

Dynamic interfaces (on demand)
+

The example below shows the second method. This example will allow you to use multiple VM's, but the script assumes that each interface will be named in the form "vbox*". You may need to adapt the script to match your needs. Note that the script assumes you can execute the needed commands using sudo. A snippet of a sudoers file is included below as an example. 

#!/bin/sh
+set -e
+BRIDGE="br0"
+case "${1}" in
+        "up" )
+                # Get the last vbox interface that was created or "" if none
+                TAP=$(cat /proc/net/dev | grep vbox | tail -n 1 | cut -d":" -f1 | sed 's/\s*vbox\(\.*\)/\1/')
+                # If there was no previous interface then set to -1 (this is so the += works)
+                [ "${TAP}" = "" ] && TAP=-1
+                # Increment TAP
+                let "TAP+=1"
+                # prepend vbox onto the TAP no
+                TAP="vbox${TAP}"
+                # Create the new TAP device
+                sudo VBoxTunctl -b -u $(whoami) -t ${TAP}
+                # Bring up the TAP (without an ip)
+                sudo ifconfig ${TAP} up
+                # Add the TAP to the Bridge
+                sudo brctl addif ${BRIDGE} ${TAP}
+                # Echo the name of the TAP so VirtualBox knows which one to use
+                # on lenny the echo must be commented for virtuabox to work correctly
+                echo ${TAP}
+                ;;
+        "down" )
+                # VirtualBox tells us which TAP it used
+                TAP=${3}
+                # Bring the TAP down
+                sudo ifconfig ${TAP} down
+                # Remove the TAP
+                sudo VBoxTunctl -d ${TAP} > /dev/null 2>&1
+                ;;
+esac
+

Save the script, for example as ~/.VirtualBox/bridge_setup. The script can be tested by running it from the command line. If successful, brctl show should show interface vbox* (where * will be a number) added to the bridge.

Here is a snippet of a sudoers file to help (replace username and hostname with the appropriate values): 

Cmnd_Alias      VIRTUALBOX = /usr/bin/VBoxTunctl, /sbin/ifconfig vbox* up, /sbin/ifconfig vbox* down, /usr/sbin/brctl addif br0 vbox*
+username     ALL=(ALL) PASSWD: ALL
+username     hostname = NOPASSWD: VIRTUALBOX
+

To configure the VM to use dynamic bridged networking, go to the "network" page of the VM's settings and change the following fields:

  • Attached to: Host Interface

  • Interface Name: <empty>

  • Setup Application: ~/.VirtualBox/bridge_setup up

  • Terminate Application: ~/.VirtualBox/bridge_setup down

When the VM is started after that, the interface should be created automatically and the VM can be used just like it was a system connected directly to your local network.

+

How to remotely start virtual machines using vnc

+

Remote:

  • log onto your remote box
  • install tightvncserver
  • launch it (you don't need a display), pick a password
  • determine which port it is using, a way to do so:
    • netstat -tap | grep vnc
    • Let's say it's 5901
  • unlog from there since the server forked in the background

Local:

  • install xtightvncviewer
  • create a ssh tunnel to your box:
    • ssh -L 5901:localhost:5901 you@remote
  • use it: (note there are two colons)
    • xtightvncviewer localhost::5901

  • then VBoxManage startvm $yourvm &

  • and start as many virtual machines as wanted.

+

External Links

+

VirtualBox (last edited 2008-12-29 13:24:45 by MichaelMeskes)

@@ -308,2 +323,3 @@ + Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/VBox.sh =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/VBox.sh (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.files/VBox.sh (revision 4946) @@ -73,4 +73,7 @@ exec "$INSTALL_DIR/vditool" "$@" ;; + vboxwebserv) + exec "$INSTALL_DIR/vboxwebserv" "$@" + ;; *) echo "Unknown application - $APP" Index: /pkg/boss/main/virtualbox-ose/trunk/debian/changelog =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/changelog (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/changelog (revision 4946) @@ -1,5 +1,36 @@ -virtualbox-ose (2.0.6-1) unstable; urgency=low - - [ Michael Meskes ] +virtualbox-ose (2.1.2-dfsg-1) unstable; urgency=low + + [ Michael Meskes ] + * New upstream version. + * Enabled webservice. + * Install VBoxSysInfo script. + * Removed SUP[Un]install test case. + * Removed xpidl and sdk. This might go into a -dev package if it is really + useful for anyone not developing virtualbox-ose. + * Documented changes in network setup and removed useless scripts and + configs. Closes: #512024 + * Added missing architecture amd64 to guest source package. Closes: #512811 + + -- Alan Baghumian Wed, 04 Feb 2009 16:36:23 -0800 + +virtualbox-ose (2.1.0-dfsg-2) experimental; urgency=low + + * Added versioned build dependency for kbuild. Closes: #510736 + * Added versioned build dependency for qt4. Closes: #510785 + * Re-created two patches against initscript to make them clearer and to + re-add a line lost in the transition. Closes: #474089 + + -- Michael Meskes Sun, 04 Jan 2009 16:58:38 +0100 + +virtualbox-ose (2.1.0-dfsg-1) experimental; urgency=low + + * New upstream version + This one doesn't use /dev/net/tun anymore. Closes: #509524 + * Removed obsoleted vditool, VBoxAddIF.sh and VBoxTunctl. + + -- Michael Meskes Thu, 18 Dec 2008 12:49:34 +0100 + +virtualbox-ose (2.0.6-dfsg-1) experimental; urgency=low + * New upstream version. Closes: #497840 * Do not warn user about losing snapshots anymore, this is supposed to be a @@ -9,5 +40,5 @@ * Documented need for hardware virtualization if running a 64-bit guest. - -- Alan Baghumian Tue, 23 Dec 2008 21:55:43 -0800 + -- Michael Meskes Thu, 20 Nov 2008 14:09:54 +0100 virtualbox-ose (1.6.6-dfsg-3) unstable; urgency=high Index: /pkg/boss/main/virtualbox-ose/trunk/debian/rules =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/rules (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/rules (revision 4946) @@ -21,5 +21,5 @@ # Generate README.Debian as text/html ... -debian/README.Debian.html: debian/virtualbox-ose.README.Debian.xml +debian/README.Debian.html: debian/virtualbox-ose.files/README.Debian.xml xsltproc --nonet --stringparam section.autolabel 1 \ -o $@ \ @@ -40,5 +40,6 @@ --disable-qt3 \ --with-gcc=/usr/bin/gcc-4.2 \ - --with-g++=/usr/bin/g++-4.2 + --with-g++=/usr/bin/g++-4.2 \ + --enable-webservice build: build-stamp @@ -49,9 +50,6 @@ BUILD_TYPE=release \ PATH_OUT=$(abspath out) - # make sure VBoxAddIF.sh is built, too - $(MAKE) -C src/VBox/Installer/linux $(abspath out/bin/VBoxAddIF.sh) \ - PATH_OUT=$(abspath out) - # and vboxnet.sh - $(MAKE) -C src/VBox/Installer/linux $(abspath out/obj/src/VBox/Installer/linux/vboxnet.sh) \ + # and vboxdrv.sh + $(MAKE) -C src/VBox/Installer/linux $(abspath out/obj/Installer/linux/vboxdrv.sh) \ PATH_OUT=$(abspath out) touch $@ @@ -100,5 +98,5 @@ dh_installdirs # This will get installed into the package by dh_installinit - install -m 644 out/obj/src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init + install -m 644 out/obj/Installer/linux/vboxdrv.sh debian/$(sname).init # Install helper scripts for vbox* interfaces dh_installifupdown -p$(sname) @@ -117,5 +115,5 @@ -install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf -install -m 755 src/VBox/Additions/x11/installer/VBoxRandR.sh debian/$(uname)/usr/bin/VBoxRandR - dh_strip -s --dbg-package=$(sname)-dbg -X/usr/share/virtualbox/sdk/bin/xpidl + dh_strip -s --dbg-package=$(sname)-dbg dh_link -s dh_compress -s Index: /pkg/boss/main/virtualbox-ose/trunk/debian/lintian/virtualbox-ose =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/lintian/virtualbox-ose (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/lintian/virtualbox-ose (revision 4946) @@ -19,4 +19,10 @@ virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM32.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM64.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedClipboard.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedFolders.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedOpenGL.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxKeyboard.so virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2GC.gc virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2R0.r0 @@ -29,8 +35,4 @@ virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/tstMicroGC.gc virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxREM2.rel -virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedClipboard.so -virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedFolders.so -virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedOpenGL.so -virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxKeyboard.so virtualbox-ose: setuid-gid-binary usr/lib/virtualbox/VBoxBFE 6755 root/root virtualbox-ose: setuid-gid-binary usr/lib/virtualbox/VBoxHeadless 6755 root/root Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.links =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.links (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.links (revision 4946) @@ -1,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 Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.links =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.links (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.links (revision 4946) @@ -1,8 +1,6 @@ -/usr/lib/virtualbox/xpidl /usr/share/virtualbox/sdk/bin/xpidl - -/usr/share/virtualbox/VBox.sh /usr/bin/vditool /usr/share/virtualbox/VBox.sh /usr/bin/vboxheadless /usr/share/virtualbox/VBox.sh /usr/bin/vboxmanage /usr/share/virtualbox/VBox.sh /usr/bin/vboxsdl +/usr/share/virtualbox/VBox.sh /usr/bin/vboxwebsrv /usr/share/virtualbox/VBox.sh /usr/bin/virtualbox /usr/share/virtualbox/VBox.sh /usr/bin/VBoxHeadless @@ -11,9 +9,3 @@ /usr/share/virtualbox/VBox.sh /usr/bin/VirtualBox -/usr/bin/VBoxTAP /usr/bin/VBoxAddIF -/usr/bin/VBoxTAP /usr/bin/VBoxDeleteIF - /usr/share/virtualbox/VBox.png /usr/share/icons/virtualbox.png - -/usr/lib/virtualbox/VBoxTunctl /usr/bin/VBoxTunctl -/usr/share/virtualbox/VBoxAddIF.sh /usr/bin/VBoxTAP Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.default =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.default (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.default (revision 4946) @@ -7,5 +7,5 @@ # -# Set this to 1 if you would like the vboxdrv module to be loaded by +# Set this to 1 if you would like the virtualbox-ose modules to be loaded by # the init script. LOAD_VBOXDRV_MODULE=0 Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.files/control.modules.in =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.files/control.modules.in (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.files/control.modules.in (revision 4946) @@ -5,5 +5,5 @@ Uploaders: Philipp Hug , Marvin Stark , Michael Meskes , Patrick Winnertz , Daniel Baumann , Hilko Bengen Build-Depends: debhelper (>= 5), dpatch, kbuild -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://www.virtualbox.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk @@ -11,5 +11,5 @@ Package: virtualbox-ose-guest-modules-_KVERS_ -Architecture: i386 +Architecture: i386 amd64 Depends: linux-modules-_KVERS_ | linux-image-_KVERS_ Recommends: virtualbox-ose-guest-utils Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.docs =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.docs (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.docs (revision 4946) @@ -1,2 +1,3 @@ debian/README.Debian.html debian/virtualbox-ose.files/wiki.html +debian/virtualbox-ose.files/NEWS.Debian Index: /pkg/boss/main/virtualbox-ose/trunk/debian/control =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/control (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/control (revision 4946) @@ -15,16 +15,18 @@ docbook-xsl, dpatch, - gcc-4.2, g++-4.2, g++-4.2-multilib [amd64], + gcc-4.2, + gsoap, iasl, - kbuild, + kbuild (>= 1:0.1.5svn2243), libacl1-dev, libasound-dev, + libcap2-dev, libhal-dev, libidl-dev, libpng12-dev, libpulse-dev, - libqt4-dev, + libqt4-dev (>= 4.3.0), libsdl1.2-dev, libx11-dev, @@ -35,5 +37,5 @@ libxrender-dev, libxslt1-dev, - lynx, + lynx-cur, po-debconf (>= 0.5.0), python-dev, Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.install =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.install (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.install (revision 4946) @@ -1,4 +1,34 @@ -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 +debian/virtualbox-ose-source.files/Makefile /usr/src/modules/virtualbox-ose +debian/virtualbox-ose-source.files/control.modules.in /usr/src/modules/virtualbox-ose/debian +debian/virtualbox-ose-source.files/postinst.modules.in /usr/src/modules/virtualbox-ose/debian +debian/virtualbox-ose-source.files/rules /usr/src/modules/virtualbox-ose/debian Index: /pkg/boss/main/virtualbox-ose/trunk/debian/patches/00list =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/patches/00list (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/patches/00list (revision 4946) @@ -4,5 +4,4 @@ 04-vboxdrv-references.dpatch 06-xsession.dpatch -07-init-fail.dpatch 08-init-lsb.dpatch 09-initscript.dpatch Index: /pkg/boss/main/virtualbox-ose/trunk/debian/patches/09-initscript.dpatch =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/patches/09-initscript.dpatch (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/patches/09-initscript.dpatch (revision 4946) @@ -6,79 +6,40 @@ @DPATCH@ -diff -Naurp virtualbox-ose-2.0.4-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-2.0.4-dfsg/src/VBox/Installer/linux/vboxnet.sh.in ---- virtualbox-ose-2.0.4-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-11-21 12:44:47.000000000 +0000 -+++ virtualbox-ose-2.0.4-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-11-21 12:45:40.000000000 +0000 -@@ -34,7 +34,12 @@ - TAPDEV="/dev/net/tun" +diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in +--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in 2008-12-18 16:30:08.000000000 +0100 ++++ virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in 2008-12-18 16:36:51.000000000 +0100 +@@ -32,6 +32,8 @@ + LOG="/var/log/vbox-install.log" NOLSB=%NOLSB% --[ -f /lib/lsb/init-functions ] || NOLSB=yes +# Include virtualbox-ose defaults if available -+if [ -f /etc/default/virtualbox-ose ] ; then -+ . /etc/default/virtualbox-ose -+fi -+ -+[ -f /lib/lsb/init-functions ] && NOLSB= ++[ -f /etc/default/virtualbox-ose ] && . /etc/default/virtualbox-ose + [ -f /lib/lsb/init-functions ] && NOLSB= + [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg - if [ -n "$NOLSB" ]; then - if [ -f /etc/redhat-release ]; then -@@ -168,13 +173,6 @@ - if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then - failure "VBoxTunctl not found" +@@ -153,8 +155,10 @@ + if ! rm -f $DEVICE; then + failure "Cannot remove $DEVICE" + fi +- if ! modprobe vboxdrv > /dev/null 2>&1; then +- failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why" ++ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then ++ if ! modprobe vboxdrv > /dev/null 2>&1; then ++ failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why" ++ fi + fi + sleep .2 fi -- # Fail if we don't have the kernel tun device -- # Make sure that the tun module is loaded (Ubuntu 7.10 needs this) -- modprobe tun > /dev/null 2>&1 -- if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null; then -- failure "Linux tun/tap subsystem not available" -- fi -- succ_msg - # Read the configuration file entries line by line and create the - # interfaces - while read line; do -@@ -185,6 +183,19 @@ - # or two non-comment entries, possibly followed by a comment). - if ((! expr match "$2" "#" > /dev/null) && - (test -z "$4" || expr match "$4" "#" > /dev/null)); then -+ if [ "$module_available" != 1 ] -+ then -+ # Fail if we don't have the kernel tun device -+ # Make sure that the tun module is loaded (Ubuntu 7.10 needs this) -+ # We only test this once, but we have to do it here, because otherwise an empty -+ # configuration file would trigger the modprobe too. -+ modprobe tun > /dev/null 2>&1 -+ if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null -+ then -+ failure "Linux tun/tap subsystem not available" -+ fi -+ module_available=1 -+ fi - # Name our parameters, to make this script slightly less unreadable - interface=$1 - user=$2 -@@ -238,6 +249,7 @@ - fi - fi - done < "$CONFIG" -+ succ_msg - return 0 +@@ -184,8 +188,10 @@ + rmmod vboxdrv 2>/dev/null + failure "Cannot change owner $GROUPNAME for device $DEVICE" + fi +- if ! modprobe vboxnetflt > /dev/null 2>&1; then +- failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" ++ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then ++ if ! modprobe vboxnetflt > /dev/null 2>&1; then ++ failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" ++ fi + fi + succ_msg } - -@@ -331,10 +343,17 @@ - - case "$1" in - start) -+ # try to insert module but do not fail if not possible -+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then -+ /sbin/modprobe -q vboxdrv || true -+ fi - start_network - ;; - stop) - stop_network -+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then -+ /sbin/modprobe -qr vboxdrv || true -+ fi - ;; - restart|reload) - stop_network && start_network Index: /pkg/boss/main/virtualbox-ose/trunk/debian/patches/12-make-module.dpatch =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/patches/12-make-module.dpatch (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/patches/12-make-module.dpatch (revision 4946) @@ -6,7 +6,7 @@ @DPATCH@ -diff -Naurp virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/module/Makefile.module ---- virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module 2008-11-27 14:45:57.000000000 +0100 -+++ virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/module/Makefile.module 2008-11-27 14:50:29.000000000 +0100 +diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/module/Makefile.module +--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module 2008-12-13 23:00:20.000000000 +0100 ++++ virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/module/Makefile.module 2008-12-28 17:23:27.000000000 +0100 @@ -32,12 +32,24 @@ ifeq ($(BUILD_TARGET_ARCH),) BUILD_TARGET_ARCH := amd64 @@ -38,7 +38,7 @@ endif endif -diff -Naurp virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module ---- virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2008-11-27 14:45:57.000000000 +0100 -+++ virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2008-11-27 14:51:08.000000000 +0100 +diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module +--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2008-12-13 23:00:20.000000000 +0100 ++++ virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2008-12-28 17:23:27.000000000 +0100 @@ -32,12 +32,24 @@ ifeq ($(BUILD_TARGET_ARCH),) BUILD_TARGET_ARCH := amd64 @@ -70,7 +70,7 @@ endif endif -diff -Naurp virtualbox-ose-2.0.6-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-2.0.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile ---- virtualbox-ose-2.0.6-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile 2008-11-27 14:45:45.000000000 +0100 -+++ virtualbox-ose-2.0.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2008-11-27 14:49:00.000000000 +0100 +diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile +--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile 2008-12-13 23:00:17.000000000 +0100 ++++ virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2008-12-28 17:23:27.000000000 +0100 @@ -43,12 +43,24 @@ ifeq ($(BUILD_TARGET_ARCH),) BUILD_TARGET_ARCH := amd64 @@ -102,2 +102,34 @@ endif endif +diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile +--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2008-12-15 22:21:46.000000000 +0100 ++++ virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2008-12-28 17:23:49.000000000 +0100 +@@ -34,12 +34,24 @@ ifeq ($(BUILD_TARGET_ARCH),) + BUILD_TARGET_ARCH := amd64 + else + ifeq ($(ARCH),i386) +- BUILD_TARGET_ARCH := x86 ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif + else +- ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),) +- BUILD_TARGET_ARCH := amd64 ++ ifeq ($(ARCH),x86) ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif + else +- BUILD_TARGET_ARCH := x86 ++ ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),) ++ BUILD_TARGET_ARCH := amd64 ++ else ++ BUILD_TARGET_ARCH := x86 ++ endif + endif + endif + endif Index: /pkg/boss/main/virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch (revision 4946) @@ -6,12 +6,12 @@ @DPATCH@ -diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in ---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000 -+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000 -@@ -20,10 +20,10 @@ +diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in +--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in 2008-05-09 09:28:11.000000000 +0000 ++++ virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in 2008-05-09 09:28:41.000000000 +0000 +@@ -19,8 +19,8 @@ # ### BEGIN INIT INFO - # Provides: vboxnet --# Required-Start: $network + # Provides: vboxdrv +-# Required-Start: $syslog -# Required-Stop: +# Required-Start: $remote_fs $network @@ -19,11 +19,18 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 - # Description: VirtualBox permanent host networking setup - ### END INIT INFO + # Short-Description: VirtualBox Linux kernel module +@@ -32,7 +32,7 @@ + LOG="/var/log/vbox-install.log" + NOLSB=%NOLSB% -@@ -50,14 +50,13 @@ if [ -z "$NOLSB" ]; then +-[ -f /lib/lsb/init-functions ] || NOLSB=yes ++[ -f /lib/lsb/init-functions ] && NOLSB= + [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg + + if [ -n "$INSTALL_DIR" ]; then +@@ -60,14 +60,13 @@ + if [ -z "$NOLSB" ]; then . /lib/lsb/init-functions fail_msg() { - [ -f "$VARFILE" ] && rm $VARFILE - echo "" - log_failure_msg "$1" Index: g/boss/main/virtualbox-ose/trunk/debian/patches/07-init-fail.dpatch =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/patches/07-init-fail.dpatch (revision 4945) +++ (revision ) @@ -1,18 +1,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 07-init-fail.dpatch by Michael Meskes -## -## DP: Fix some failures in init script. - -@DPATCH@ - -diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in ---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-04-30 14:05:52.000000000 +0000 -+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000 -@@ -49,6 +49,7 @@ fi - if [ -z "$NOLSB" ]; then - . /lib/lsb/init-functions - fail_msg() { -+ [ -f "$VARFILE" ] && rm $VARFILE - echo "" - log_failure_msg "$1" - } Index: /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.install =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.install (revision 4945) +++ /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.install (revision 4946) @@ -1,4 +1,3 @@ debian/virtualbox-ose.files/vbox.cfg /etc/vbox -debian/virtualbox-ose.files/interfaces /etc/vbox debian/virtualbox-ose.files/*.sh /usr/share/virtualbox debian/virtualbox-ose.files/virtualbox-ose.desktop /usr/share/applications @@ -8,5 +7,4 @@ out/bin/components /usr/lib/virtualbox -out/bin/SUP* /usr/lib/virtualbox out/bin/VBoxREM* /usr/lib/virtualbox out/bin/VBox*.so /usr/lib/virtualbox @@ -18,14 +16,11 @@ out/bin/VBoxSDL /usr/lib/virtualbox out/bin/VBoxSVC /usr/lib/virtualbox -out/bin/VBoxTunctl /usr/lib/virtualbox out/bin/VBoxXPCOM* /usr/lib/virtualbox -out/bin/vditool /usr/lib/virtualbox out/bin/VirtualBox* /usr/lib/virtualbox out/bin/VMM* /usr/lib/virtualbox +out/bin/vboxwebsrv /usr/lib/virtualbox +out/bin/webtest /usr/lib/virtualbox out/bin/nls /usr/share/virtualbox -out/bin/sdk /usr/share/virtualbox out/bin/VBox.png /usr/share/virtualbox -out/bin/VBoxAddIF.sh /usr/share/virtualbox - -out/obj/xpidl /usr/lib/virtualbox +out/bin/VBoxSysInfo.sh /usr/share/virtualbox Index: g/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.if-post-down =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.if-post-down (revision 4945) +++ (revision ) @@ -1,16 +1,0 @@ -#!/bin/sh - -set -e - -case "${IFACE}" in - vbox*) - ARGS="-d ${IFACE}" - ;; - *) - exit 0 - ;; -esac - -test -x /usr/lib/virtualbox/VBoxTunctl || exit 0 - -/usr/lib/virtualbox/VBoxTunctl $ARGS Index: g/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.if-pre-up =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.if-pre-up (revision 4945) +++ (revision ) @@ -1,23 +1,0 @@ -#!/bin/sh - -set -e - -case "${IFACE}" in - vbox*) - ARGS="-t ${IFACE}" - ;; - *) - exit 0 - ;; -esac - -test -x /usr/lib/virtualbox/VBoxTunctl || exit 0 - -if [ -n "${IF_VIRTUALBOX_USER}" ]; then - ARGS="-u ${IF_VIRTUALBOX_USER} $ARGS" -fi -# if [ -n "${IF_VIRTUALBOX_GROUP}" ]; then -# ARGS="-g ${IF_VIRTUALBOX_GROUP} $ARGS" -# fi - -/usr/lib/virtualbox/VBoxTunctl $ARGS Index: g/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.README.Debian.xml =================================================================== --- /pkg/boss/main/virtualbox-ose/trunk/debian/virtualbox-ose.README.Debian.xml (revision 4945) +++ (revision ) @@ -1,216 +1,0 @@ - - -
- Virtualbox OSE for Debian -
- Different versions - - The Open Source Edition of VirtualBox contains most but not all - features of the closed-source VirtualBox product that is - distributed under different terms and available from the - - Virtualbox homepage. - - - - - Remote Display Protocol (RDP) Server - - - This component implements a complete RDP server on top of - the virtual hardware and allows users to connect to a - virtual machine remotely using any RDP compatible client. - - - - USB support - - VirtualBox implements a virtual USB controller and supports - passing through USB 1.1 and USB 2.0 devices to virtual - machines. - - - - USB over RDP - - This is a combination of the RDP server and USB support - allowing users to make USB devices available to virtual - machines running remotely. - - - - iSCSI initiator - - VirtualBox contains a builtin iSCSI initiator making it - possible to use iSCSI targets as virtual disks without the - guest requiring support for iSCSI. - - - - Emulation for Intel e1000 network devices - - - -
-
- 64-bit guests - Starting with version 2.0.0 VirtualBox also supports 64-bit guest operating systems, - under the following conditions: - - - You need a 64-bit processor with hardware virtualization support - and a 64-bit host operating system. - - - You must run a 64-bit version of VirtualBox on that OS. This can - then run both 32-bit and 64-bit VMs; a 32-bit VirtualBox can only run 32-bit - VMs, regardless of the hardware. - - - You must enable hardware virtualization; software virtualization is not supported - for 64-bit VMs. - - - There is no specific setting to enable 64-bit support for a guest. - However, you should enable the I/O APIC for virtual machines that you intend to - use in 64-bit mode. -
-
- How to provide networking to virtual machines -
- Mechanism - - VirtualBox can use three alternative mechanisms to provide - Ethernet networking to its virtual machines:b - -
- NAT - - This is the easiest to use type of setup: The virtual - ethernet interface is connected to a virtual NAT router - including a DHCP server that is implemented within - the VirtualBox host software. - - - This is the default mode. It usually does not require - any extra configuration on the host. - -
-
- Internal network - - In this mode, there is only connectivity within an - emulated network shared between two or more virtual - machines running in the same VirtualBox instance. - -
-
- Host interface - - The virtual ethernet interface is connected to a - TAP device on the host. Adding this - TAP device to a bridging or IP routing - setup is the responsibility of the user. - -
-
-
- Host interface configuration - - By attaching the VM's interface to "Host Interface" and - creating a corresponding TAP interface - the VM can be made visible on the local network. - -
- Using <command>VBoxAddIF</command> - - The VirtualBox includes a helper script, - VBoxAddIF that sets up a - TAP device for a specified user and - optionally connects it to a bridge. This needs to be done - only once for a particular user. Settings for all defined - interfaces are stored in the file - /etc/vbox/interfaces and created by the - /etc/init.d/virtualbox-ose init script - whenever the host system is booted. -
- Sample commandlines for permanently setting up - <emphasis>TAP</emphasis> interface - - # VBoxAddIF vbox0 luser1 br0 - # VBoxAddIF vbox1 luser2 - -
- These interfaces can be removed using the - VBoxDeleteIF command. - - - You can of course create multiple interfaces per user, but - interfaces must have unique names. - -
-
<command>ifup</command> / - <command>ifdown</command> - - Starting with version 1.5.6-3, the virtualbox-ose package - contains helper scripts that allow TAP - interfaces for host-based networking to be configured from - /etc/network/interfaces. The names for - such interfaces must start with vbox. The - owner for this interface can be set using - the virtualbox-user - keyword. -
- Configuration of <emphasis>TAP</emphasis> interface - for VirtualBox - - -iface vbox0 inet static - address 192.168.3.1 - netmask 255.255.255.0 - virtualbox-user luser - - - -
- - -
-
-
-
- Incompatibilities with previous versions - - Unfortunately, the configuration files between version version - 1.4.0-svn4130 and 1.5.0 the configuration files are - incompatible. In order to fix this issue please delete the - complete ]]> section in any - ~/.VirtualBox/Machines/NAME/NAME.xml files. - -
-
- See also - - Additional and updated information may be found on - - - - the - - End-user documentation section of the official - VirtualBox site. - - - - - the - VirtualBox - page in the Debian Wiki. - - - - -
-