diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2012-12-04 09:40:13 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2012-12-04 09:40:13 +0000 |
| commit | f678768ab41164e7416f49a6894e311d762d4eb1 (patch) | |
| tree | 6860a12deff7ea791e1ff08ebd21679feb6f9961 /app-emulation | |
| parent | Version bump to latest, drop older. (diff) | |
| download | gentoo-2-f678768ab41164e7416f49a6894e311d762d4eb1.tar.gz gentoo-2-f678768ab41164e7416f49a6894e311d762d4eb1.tar.bz2 gentoo-2-f678768ab41164e7416f49a6894e311d762d4eb1.zip | |
Fixed installation of udev files (bug #430424)
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-emulation')
4 files changed, 28 insertions, 17 deletions
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog index c00ba16062bc..50bf6925ba3d 100644 --- a/app-emulation/virtualbox-bin/ChangeLog +++ b/app-emulation/virtualbox-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/virtualbox-bin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.143 2012/11/10 21:08:37 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.144 2012/12/04 09:40:13 polynomial-c Exp $ + + 04 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> + files/10-virtualbox.rules, virtualbox-bin-4.2.2.ebuild, + virtualbox-bin-4.2.4.ebuild: + Fixed installation of udev files (bug #430424). *virtualbox-bin-4.2.4 (10 Nov 2012) diff --git a/app-emulation/virtualbox-bin/files/10-virtualbox.rules b/app-emulation/virtualbox-bin/files/10-virtualbox.rules index 8efff249f8fc..014c164a37f5 100644 --- a/app-emulation/virtualbox-bin/files/10-virtualbox.rules +++ b/app-emulation/virtualbox-bin/files/10-virtualbox.rules @@ -1,7 +1,7 @@ # create second tree of USB devices according to # http://www.virtualbox.org/ticket/7759#comment:5 -SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" -SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb_device", ACTION!="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild index 23fca6d11ea0..73c45ede2bec 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.1 2012/10/24 04:41:40 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $ EAPI=2 -inherit eutils unpacker fdo-mime gnome2 pax-utils +inherit eutils unpacker fdo-mime gnome2 pax-utils udev MY_PV=${PV/beta/BETA} MY_PV=${MY_PV/rc/RC} @@ -307,11 +307,14 @@ src_install() { echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" doenvd "${T}/90virtualbox" - insinto /lib/udev/rules.d + local udevdir="$(udev_get_udevdir)" + insinto ${udevdir}/rules.d doins "${FILESDIR}"/10-virtualbox.rules - # move udev scripts into /lib/udev (bug #372491) - mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev - fperms 0750 /lib/udev/VBoxCreateUSBNode.sh + sed "s@%UDEVDIR%@${udevdir}@" \ + -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die + # move udev scripts into ${udevdir} (bug #372491) + mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die + fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh } pkg_postinst() { diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild index 7103010e75b7..b2217d8a768e 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.1 2012/11/10 21:08:38 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $ EAPI=2 -inherit eutils unpacker fdo-mime gnome2 pax-utils +inherit eutils unpacker fdo-mime gnome2 pax-utils udev MY_PV=${PV/beta/BETA} MY_PV=${MY_PV/rc/RC} @@ -307,11 +307,14 @@ src_install() { echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" doenvd "${T}/90virtualbox" - insinto /lib/udev/rules.d + local udevdir="$(udev_get_udevdir)" + insinto ${udevdir}/rules.d doins "${FILESDIR}"/10-virtualbox.rules - # move udev scripts into /lib/udev (bug #372491) - mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev - fperms 0750 /lib/udev/VBoxCreateUSBNode.sh + sed "s@%UDEVDIR%@${udevdir}@" \ + -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die + # move udev scripts into ${udevdir} (bug #372491) + mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die + fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh } pkg_postinst() { |