From d05e23a8ebddaa243224fa25a07d10f369f7ec42 Mon Sep 17 00:00:00 2001 From: x-drum Date: Tue, 3 Nov 2009 01:52:52 +0000 Subject: Version bump; fix initd bug #280738 thanks to Akinori Hattori svn path=/trunk/; revision=744 --- app-emulation/virtualbox-guest-additions/ChangeLog | 19 ++- app-emulation/virtualbox-guest-additions/Manifest | 8 +- .../files/virtualbox-guest-additions-3.initd | 3 +- .../virtualbox-guest-additions-3.0.10.ebuild | 152 +++++++++++++++++++++ .../virtualbox-guest-additions-3.0.8.ebuild | 152 --------------------- 5 files changed, 173 insertions(+), 161 deletions(-) create mode 100644 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.10.ebuild delete mode 100644 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.8.ebuild diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog index e87f2b7..6f9b08b 100644 --- a/app-emulation/virtualbox-guest-additions/ChangeLog +++ b/app-emulation/virtualbox-guest-additions/ChangeLog @@ -1,11 +1,22 @@ # ChangeLog for app-emulation/virtualbox-guest-additions # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.19 2009/09/21 23:38:03 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.21 2009/10/19 01:43:21 fauli Exp $ - 06 Oct 2009; Alessio Cassibba (X-Drum) - -virtualbox-guest-additions-3.0.6.ebuild, + 02 Nov 2009; Alessio Cassibba (X-Drum) + -virtualbox-guest-additions-3.0.8.ebuild, + +virtualbox-guest-additions-3.0.10.ebuild, + files/virtualbox-guest-additions-3.initd: + Version bump; fix initd bug #280738 thanks to Akinori Hattori + + 19 Oct 2009; Christian Faulhammer + virtualbox-guest-additions-3.0.8.ebuild: + stable x86, bug 288836 + +*virtualbox-guest-additions-3.0.8 (06 Oct 2009) + + 06 Oct 2009; Patrick Lauer +virtualbox-guest-additions-3.0.8.ebuild: - Version bump + Bump to 3.0.8, big thanks to X-Drum for testing 21 Sep 2009; Christian Faulhammer virtualbox-guest-additions-3.0.6.ebuild: diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index 3b9edac..81882e4 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,7 +1,7 @@ AUX virtualbox-guest-additions-2-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84 -AUX virtualbox-guest-additions-3.initd 1434 RMD160 b03f21d0d143abc686d514eda1ffa74d6be502c1 SHA1 7345f0aa3b06483ed184fa7f78264468a4843e49 SHA256 0ac8a47686ba2d428a935d263fc13146ce3078a78df32795dc3e97580c93da72 +AUX virtualbox-guest-additions-3.initd 1454 RMD160 617d486535efccfd2cf013ffeb7c2ae9c211a533 SHA1 942b81b99d33e85d7dc6564f0449608620cd5d50 SHA256 d87d8386fbed5c17c4919368d59540ce527bcca7d539fb88927e3b4a849ad9ae AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a -DIST VirtualBox-3.0.8-OSE.tar.bz2 52058158 RMD160 0565592f81e787ceb18a3eea1271d95bfed804cc SHA1 07c16657046f1b5a5562ad2b9041f982ad9dded7 SHA256 6472df6ec77cbc3c742f56db6b7e3f49323620f688ac7c52227aebe4f4a18be1 -EBUILD virtualbox-guest-additions-3.0.8.ebuild 4205 RMD160 57e0b3ddc3b64b6ed2eca13e1e54bf4e6038e6a6 SHA1 dda080ffa32b4f44977169c717b57b05fbb7bdb4 SHA256 d9c4ff2a8d7c2b83426ff07dd6e0f416190d1e5dbca8143a24d083b8383059e8 -MISC ChangeLog 10370 RMD160 1c9144394d6facccda6d2096ba384d7c95cec07e SHA1 8d58a7eeb0dd917ad75520b2151c2d63fe556664 SHA256 40c7222878fe612581d8cf778a8577b41183fac34cfe8423f6272d8492039f27 +DIST VirtualBox-3.0.10-OSE.tar.bz2 52099416 RMD160 4bf389cdd9500571ff665fa959c6cda22db9b5d2 SHA1 90217b54233a4161b45c393ca1301bfd13d3766e SHA256 01c724e70a05d71bfd53ee35f045c044e2b9a2c5010e828f32bebb4bad1d142d +EBUILD virtualbox-guest-additions-3.0.10.ebuild 4205 RMD160 57e0b3ddc3b64b6ed2eca13e1e54bf4e6038e6a6 SHA1 dda080ffa32b4f44977169c717b57b05fbb7bdb4 SHA256 d9c4ff2a8d7c2b83426ff07dd6e0f416190d1e5dbca8143a24d083b8383059e8 +MISC ChangeLog 10782 RMD160 2d9d133d30aa41b35c581a461927c2800cd10046 SHA1 f8db6527b244ad421a1fef67ec7a2212d568cfd0 SHA256 97b1cdb1e927425c7d23216746894bfaeb268807857099762866f1593a8f46f9 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.initd index ab45a5c..7d3d486 100644 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.initd +++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.initd @@ -41,7 +41,8 @@ start() { start-stop-daemon --start --make-pidfile \ --exec /usr/sbin/vboxadd-service --pidfile /var/run/vboxadd-service.pid \ --name vboxadd-service \ - --background + --background -- \ + --foreground eend $? "Failed to start VirtualBox guest additions" } diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.10.ebuild new file mode 100644 index 0000000..43593c6 --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.10.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild,v 1.1 2009/07/16 21:42:07 patrick Exp $ + +inherit eutils linux-mod + +MY_P=VirtualBox-${PV}-OSE +DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" + +RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} + ~x11-drivers/xf86-input-virtualbox-${PV} + x11-apps/xrandr + x11-apps/xrefresh + x11-libs/libXmu + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM + x11-libs/libICE + amd64? ( app-emulation/emul-linux-x86-xlibs ) )" +DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.5-r1 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-devel/dev86 + sys-power/iasl + X? ( x11-proto/renderproto )" + +BUILD_TARGETS="all" +BUILD_TARGET_ARCH="${ARCH}" +MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd) + vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)" + +S=${WORKDIR}/${MY_P/-OSE/_OSE} + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" + enewgroup vboxadd + enewuser vboxadd -1 /bin/sh /var/run/vboxadd vboxadd +} + +src_unpack() { + unpack ${A} + + # Create and unpack a tarball with the sources of the Linux guest + # kernel modules, to include all the needed files + "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz" + unpack ./vbox-kmod.tar.gz + + # Remove shipped binaries (kBuild,yasm), see bug #232775 + cd "${S}" + rm -rf kBuild/bin tools + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk +} + +src_compile() { + linux-mod_src_compile + + # build the user-space tools, warnings are harmless + ./configure --nofatal \ + --disable-xpcom \ + --disable-sdl-ttf \ + --disable-pulse \ + --disable-alsa \ + --build-headless || die "configure failed" + source ./env.sh + + for each in /src/VBox/{Runtime,Additions/common} \ + /src/VBox/Additions/linux/{sharedfolders,daemon} ; do + cd "${S}"${each} + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk VBoxControl failed" + done + + if use X; then + cd "${S}"/src/VBox/Additions/x11/VBoxClient + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk VBoxClient failed" + fi +} + +src_install() { + linux-mod_src_install + + cd "${S}"/out/linux.${ARCH}/release/bin/additions + + insinto /sbin + newins mountvboxsf mount.vboxsf + fperms 4755 /sbin/mount.vboxsf + + newinitd "${FILESDIR}"/${PN}-3.initd ${PN} + + insinto /usr/sbin/ + newins VBoxService vboxadd-service + fperms 0755 /usr/sbin/vboxadd-service + + insinto /usr/bin + doins VBoxControl + fperms 0755 /usr/bin/VBoxControl + + # VBoxClient user service and xrandr wrapper + if use X; then + doins VBoxClient + fperms 0755 /usr/bin/VBoxClient + + cd "${S}"/src/VBox/Additions/x11/Installer + newins VBoxRandR.sh VBoxRandR + fperms 0755 /usr/bin/VBoxRandR + + newins 98vboxadd-xclient VBoxClient-all + fperms 0755 /usr/bin/VBoxClient-all + fi + + # udev rule for vboxdrv + dodir /etc/udev/rules.d + echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="vboxadd", MODE="0660"' \ + >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" + echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0660"' \ + >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" +} + +pkg_postinst() { + linux-mod_pkg_postinst + if ! useq X ; then + elog "use flag X is off, enable it to install the" + elog "X Window System input and video drivers" + fi + elog "Please add:" + elog "/etc/init.d/${PN}" + elog "to the default runlevel in order to load all" + elog "needed modules and services." + elog "" + elog "Warning:" + elog "this ebuild is only needed if you are running gentoo" + elog "inside a VirtualBox Virtual Machine, you don't need" + elog "it to run VirtualBox itself." + elog "" +} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.8.ebuild deleted file mode 100644 index 43593c6..0000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.8.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild,v 1.1 2009/07/16 21:42:07 patrick Exp $ - -inherit eutils linux-mod - -MY_P=VirtualBox-${PV}-OSE -DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} - ~x11-drivers/xf86-input-virtualbox-${PV} - x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - x11-libs/libICE - amd64? ( app-emulation/emul-linux-x86-xlibs ) )" -DEPEND="${RDEPEND} - >=dev-util/kbuild-0.1.5-r1 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-devel/dev86 - sys-power/iasl - X? ( x11-proto/renderproto )" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd) - vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)" - -S=${WORKDIR}/${MY_P/-OSE/_OSE} - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" - enewgroup vboxadd - enewuser vboxadd -1 /bin/sh /var/run/vboxadd vboxadd -} - -src_unpack() { - unpack ${A} - - # Create and unpack a tarball with the sources of the Linux guest - # kernel modules, to include all the needed files - "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz" - unpack ./vbox-kmod.tar.gz - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - cd "${S}" - rm -rf kBuild/bin tools - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk -} - -src_compile() { - linux-mod_src_compile - - # build the user-space tools, warnings are harmless - ./configure --nofatal \ - --disable-xpcom \ - --disable-sdl-ttf \ - --disable-pulse \ - --disable-alsa \ - --build-headless || die "configure failed" - source ./env.sh - - for each in /src/VBox/{Runtime,Additions/common} \ - /src/VBox/Additions/linux/{sharedfolders,daemon} ; do - cd "${S}"${each} - MAKE="kmk" emake TOOL_YASM_AS=yasm \ - KBUILD_PATH="${S}/kBuild" \ - || die "kmk VBoxControl failed" - done - - if use X; then - cd "${S}"/src/VBox/Additions/x11/VBoxClient - MAKE="kmk" emake TOOL_YASM_AS=yasm \ - KBUILD_PATH="${S}/kBuild" \ - || die "kmk VBoxClient failed" - fi -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions - - insinto /sbin - newins mountvboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - newinitd "${FILESDIR}"/${PN}-3.initd ${PN} - - insinto /usr/sbin/ - newins VBoxService vboxadd-service - fperms 0755 /usr/sbin/vboxadd-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - - cd "${S}"/src/VBox/Additions/x11/Installer - newins VBoxRandR.sh VBoxRandR - fperms 0755 /usr/bin/VBoxRandR - - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - fi - - # udev rule for vboxdrv - dodir /etc/udev/rules.d - echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="vboxadd", MODE="0660"' \ - >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" - echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0660"' \ - >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" -} - -pkg_postinst() { - linux-mod_pkg_postinst - if ! useq X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System input and video drivers" - fi - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to load all" - elog "needed modules and services." - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} -- cgit v1.2.3-65-gdbad