From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QcJZ1-0003NO-4B for garchives@archives.gentoo.org; Thu, 30 Jun 2011 15:53:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37D6B1C058; Thu, 30 Jun 2011 15:53:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D3EAD1C058 for ; Thu, 30 Jun 2011 15:53:51 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C9811B4046 for ; Thu, 30 Jun 2011 15:53:51 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2245) id E566420054; Thu, 30 Jun 2011 15:53:49 +0000 (UTC) From: "Lars Wendler (polynomial-c)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, polynomial-c@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox-guest-additions: virtualbox-guest-additions-3.2.12.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: virtualbox-guest-additions-3.2.12.ebuild ChangeLog X-VCS-Directories: app-emulation/virtualbox-guest-additions X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler Content-Type: text/plain; charset=utf8 Message-Id: <20110630155349.E566420054@flycatcher.gentoo.org> Date: Thu, 30 Jun 2011 15:53:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 05b579628fcb0a60209f8206a0156f19 polynomial-c 11/06/30 15:53:49 Modified: virtualbox-guest-additions-3.2.12.ebuild ChangeLo= g Log: Fixed compilation with linux kernel >=3D2.6.33 (bug #373585) =20 (Portage version: 2.2.0_alpha41/cvs/Linux x86_64) Revision Changes Path 1.6 app-emulation/virtualbox-guest-additions/virtualbox-= guest-additions-3.2.12.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild?rev=3D1.6= &view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild?rev=3D1.6= &content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild?r1=3D1.5&= r2=3D1.6 Index: virtualbox-guest-additions-3.2.12.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-addition= s/virtualbox-guest-additions-3.2.12.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- virtualbox-guest-additions-3.2.12.ebuild 3 Feb 2011 07:55:48 -0000 1.= 5 +++ virtualbox-guest-additions-3.2.12.ebuild 30 Jun 2011 15:53:49 -0000 1= .6 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additi= ons/virtualbox-guest-additions-3.2.12.ebuild,v 1.5 2011/02/03 07:55:48 to= mka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additi= ons/virtualbox-guest-additions-3.2.12.ebuild,v 1.6 2011/06/30 15:53:49 po= lynomial-c Exp $ =20 inherit eutils linux-mod =20 @@ -15,17 +15,17 @@ IUSE=3D"X" =20 RDEPEND=3D"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 )" + ~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 )" DEPEND=3D"${RDEPEND} >=3Ddev-util/kbuild-0.1.5-r1 >=3Ddev-lang/yasm-0.6.2 @@ -39,150 +39,155 @@ BUILD_TARGETS=3D"all" BUILD_TARGET_ARCH=3D"${ARCH}" MODULE_NAMES=3D"vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest= ) - vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)" + vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)" =20 S=3D${WORKDIR}/${MY_P/-OSE/_OSE} =20 pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS=3D"KERN_DIR=3D${KV_DIR} KERNOUT=3D${KV_OUT_DIR}" - enewgroup vboxguest - enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest + linux-mod_pkg_setup + BUILD_PARAMS=3D"KERN_DIR=3D${KV_DIR} KERNOUT=3D${KV_OUT_DIR}" + enewgroup vboxguest + enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest } =20 src_unpack() { - unpack ${A} + unpack ${A} =20 - # 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 - - # PaX fixes (see bug #298988) - epatch "${FILESDIR}"/vboxguest-log-use-c99.patch - - # 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}-3-localconfig" LocalConfig.kmk - - # stupid new header references... - for vboxheader in {product,revision}-generated.h ; do - for mdir in vbox{guest,sf} ; do - ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ - "${WORKDIR}/${mdir}/${vboxheader}" - done + # 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 + + if kernel_is -ge 2 6 33 ; then + # evil patch for new kernels - header moved + grep -lR linux/autoconf.h * | xargs sed -i -e \ + 's:::' + fi + + # PaX fixes (see bug #298988) + epatch "${FILESDIR}"/vboxguest-log-use-c99.patch + + # 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}-3-localconfig" LocalConfig.kmk + + # stupid new header references... + for vboxheader in {product,revision}-generated.h ; do + for mdir in vbox{guest,sf} ; do + ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ + "${WORKDIR}/${mdir}/${vboxheader}" done + done } =20 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=3D"kmk" emake TOOL_YASM_AS=3Dyasm \ - KBUILD_PATH=3D"${S}/kBuild" \ - || die "kmk VBoxControl failed" - done - - if use X; then - cd "${S}"/src/VBox/Additions/x11/VBoxClient - MAKE=3D"kmk" emake TOOL_YASM_AS=3Dyasm \ - KBUILD_PATH=3D"${S}/kBuild" \ - || die "kmk VBoxClient failed" - fi - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3D3.2.0) - 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=3D"kmk" emake TOOL_YASM_AS=3Dyasm \ + KBUILD_PATH=3D"${S}/kBuild" \ + || die "kmk VBoxControl failed" + done + + if use X; then + cd "${S}"/src/VBox/Additions/x11/VBoxClient + MAKE=3D"kmk" emake TOOL_YASM_AS=3Dyasm \ + KBUILD_PATH=3D"${S}/kBuild" \ + || die "kmk VBoxClient failed" + fi + + # Now creating the kernel modules. We must do this _after_ + # we compiled the user-space tools as we need two of the + # automatically generated header files. (>=3D3.2.0) + linux-mod_src_compile } =20 src_install() { - linux-mod_src_install + linux-mod_src_install =20 - cd "${S}"/out/linux.${ARCH}/release/bin/additions + cd "${S}"/out/linux.${ARCH}/release/bin/additions =20 - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - newinitd "${FILESDIR}"/${PN}-7.initd ${PN} - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-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 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - fi - - # udev rule for vboxdrv - dodir /etc/udev/rules.d - echo 'KERNEL=3D=3D"vboxguest", OWNER=3D"vboxguest", GROUP=3D"vboxguest= ", MODE=3D"0660"' \ - >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" - echo 'KERNEL=3D=3D"vboxuser", OWNER=3D"vboxguest", GROUP=3D"vboxguest"= , MODE=3D"0660"' \ - >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - insinto /usr/share/doc/${PF} - doins "${FILESDIR}"/xorg.conf.vbox + insinto /sbin + newins mount.vboxsf mount.vboxsf + fperms 4755 /sbin/mount.vboxsf + + newinitd "${FILESDIR}"/${PN}-7.initd ${PN} + + insinto /usr/sbin/ + newins VBoxService vboxguest-service + fperms 0755 /usr/sbin/vboxguest-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 98vboxadd-xclient VBoxClient-all + fperms 0755 /usr/bin/VBoxClient-all + fi + + # udev rule for vboxdrv + dodir /etc/udev/rules.d + echo 'KERNEL=3D=3D"vboxguest", OWNER=3D"vboxguest", GROUP=3D"vboxguest"= , MODE=3D"0660"' \ + >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" + echo 'KERNEL=3D=3D"vboxuser", OWNER=3D"vboxguest", GROUP=3D"vboxguest",= MODE=3D"0660"' \ + >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" + + # VBoxClient autostart file + insinto /etc/xdg/autostart + doins "${FILESDIR}"/vboxclient.desktop + + # sample xorg.conf + insinto /usr/share/doc/${PF} + doins "${FILESDIR}"/xorg.conf.vbox } =20 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 "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X drivers, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.xorg" - elog "" - elog "Also make sure you use the Mesa library for OpenGL:" - elog " eselect opengl set xorg-x11" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf " - 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 "" + 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 "" + elog "Please add users to the \"vboxguest\" group so they can" + elog "benefit from seamless mode, auto-resize and clipboard." + elog "" + elog "Please add:" + elog "/etc/init.d/${PN}" + elog "to the default runlevel in order to start" + elog "needed services." + elog "To use the VirtualBox X drivers, use the following" + elog "file as your /etc/X11/xorg.conf:" + elog " /usr/share/doc/${PF}/xorg.conf.xorg" + elog "" + elog "Also make sure you use the Mesa library for OpenGL:" + elog " eselect opengl set xorg-x11" + elog "" + elog "An autostart .desktop file has been installed to start" + elog "VBoxClient in desktop sessions." + elog "" + elog "You can mount shared folders with:" + elog " mount -t vboxsf " + 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 "" } 1.70 app-emulation/virtualbox-guest-additions/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox-guest-additions/ChangeLog?rev=3D1.70&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox-guest-additions/ChangeLog?rev=3D1.70&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox-guest-additions/ChangeLog?r1=3D1.69&r2=3D1.70 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-addition= s/ChangeLog,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- ChangeLog 28 Jun 2011 20:50:39 -0000 1.69 +++ ChangeLog 30 Jun 2011 15:53:49 -0000 1.70 @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/virtualbox-guest-additions # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additi= ons/ChangeLog,v 1.69 2011/06/28 20:50:39 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additi= ons/ChangeLog,v 1.70 2011/06/30 15:53:49 polynomial-c Exp $ + + 30 Jun 2011; Lars Wendler + virtualbox-guest-additions-3.2.12.ebuild: + Fixed compilation with linux kernel >=3D2.6.33. Thanks to Jimis Hol fo= r + reporting this issue in bug #373585. =20 *virtualbox-guest-additions-4.0.10 (28 Jun 2011) =20