Commits

Providence SALUMU  committed 6d4ea8c

fixes virtualbox-guest-additions compilation

  • Participants
  • Parent commits 5efeed5

Comments (0)

Files changed (6)

File app-emulation/virtualbox-guest-additions/ChangeLog

 # 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-additions/ChangeLog,v 1.82 2011/10/12 21:32:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.85 2011/11/06 23:40:53 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.1.6-r1 (06 Nov 2011)
+
+  06 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.1.6.ebuild,
+  +virtualbox-guest-additions-4.1.6-r1.ebuild:
+  Revision bump because upstream re-released tarballs (bug #389773).
+
+*virtualbox-guest-additions-4.1.6 (04 Nov 2011)
+
+  04 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.1.2.ebuild,
+  +virtualbox-guest-additions-4.1.6.ebuild:
+  Version bump. Removed old.
+
+  01 Nov 2011; Tony Vroon <chainsaw@gentoo.org>
+  virtualbox-guest-additions-4.1.4-r1.ebuild:
+  Marked stable on AMD64 based on arch testing by Tomáš "Mepho" Pružina,
+  Blain "doc235" Anderson & Elijah "Armageddon" El Lazkani in security bug
+  #386317.
 
 *virtualbox-guest-additions-4.1.4-r1 (12 Oct 2011)
 

File app-emulation/virtualbox-guest-additions/Manifest

 AUX vboxguest-log-use-c99.patch 562 RMD160 7973598545c9f801120ff87691fb6d068466942a SHA1 7a6e096cf1c1bfb5a878f31171948efebc41e0a9 SHA256 76e830ce0aae1b9afe84516907e5668c6012aea25377bda4c2de1967857b1c82
 AUX virtualbox-guest-additions-3-localconfig 937 RMD160 018d9cab7ddc9dc4cb300d2a518ce0ef827a45e8 SHA1 8680e37b364c99bac1375a1b8b7034ade87b70ee SHA256 477e3d4556a2b12c3c6125c4fecc63092b1f7879756941e53832d04a7c1eb682
 AUX virtualbox-guest-additions-4.1.4-r1-gcc_4_7.patch 801 RMD160 29e259c0ffd2ad672c993f997a33e7b40171fbdd SHA1 76748092c830df53f701fe9ebd89f6ca615d06d3 SHA256 7c1a60fd98724734707483e7ea88ae61a78ccb8e506242d24e68408347d8236b
+AUX virtualbox-guest-additions-4.1.6-r1-nlink-vboxsf.patch 1089 RMD160 4ef27cc31f0e96e50b511552803f6c114f558524 SHA1 092d8ff03a83c26a3f6a37c9f560faa035e0d20a SHA256 f75b887069e934946e4232882117ac83de50a2c4bf2d0d5ec8b13092641a27d5
+AUX virtualbox-guest-additions-4.1.6-r1-nlink.patch 1304 RMD160 5ab3b8fdd4f8899e06ed7876c947927a7ad2e8a8 SHA1 e3a9af6b86fcadb39c2c731a41e7138568520fa0 SHA256 fb43c4f20b3dcbd448f921160a05f1f704985fd3052a16f98f4eec8f877fad34
 AUX virtualbox-guest-additions-7.initd 980 RMD160 326e8a115b6ab8c72dad391f65980bc3207b2274 SHA1 31f343280ef2da8e269e25936d99b92d487a3f56 SHA256 af61d1fe7c4e7c7d49e235406f9b69661eb229a96f3156443872884860becd69
 AUX xorg.conf.vbox 407 RMD160 53dcfdd2b0ff8930d23f30b7f5cf4d525806eef6 SHA1 73024a87ead01a21abdb05c94144af9eec0e3448 SHA256 34bb64aa6702811acf82304c35ff92b029067115563d3d6c78e65a846f2dd686
 DIST VirtualBox-4.0.12.tar.bz2 69566771 RMD160 f25d361c19d25a883918b0e8f2ae9bc1c2dd83e8 SHA1 9e49c6a5a7b7b224a970655643cce52aac43eb0c SHA256 0175c4118af1f9633f33a055a0b0cc0b5a2d95a63b44269af2139eb2fd07e5a9
 DIST VirtualBox-4.1.2.tar.bz2 72730966 RMD160 0004a00c968ee835083416022240e212903f394d SHA1 52e35e0400fb12a5277a6e126478bb8f53c3e46d SHA256 b030faa24d6bad805cc1105876fb04befc0a8acd154c8e7dc1b32f323bc576bc
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
+DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
 EBUILD virtualbox-guest-additions-4.0.12.ebuild 5571 RMD160 a7c9a197759ebfd5e5c622205753ce222f046cde SHA1 2e95620df1403bab81d84ddeed643151868a97c7 SHA256 b8c4aeada887fb67047f73d3b687683312f6ba86b6f04b3e7e0ba0a4367a9ce1
 EBUILD virtualbox-guest-additions-4.1.2.ebuild 5583 RMD160 f651e0b9f54b63bde7a6820dd0df01bfac70a6a7 SHA1 86e67f24b02b25160a8c0b0d3ae255521f9486f5 SHA256 a2ee3d792e1eb2b0ecae5e4b111e7edc967014144b29ddc06210937db35f720c
-EBUILD virtualbox-guest-additions-4.1.4-r1.ebuild 5647 RMD160 286934968718579ec37735539890cdc25a846ecb SHA1 22bb06de6faffb3e00210700845e7ed2142ee923 SHA256 dbfd406ea62fc0b95852b64d40f63c636322898505114b97fbc5dd56f32b6c7e
-MISC ChangeLog 23185 RMD160 c3ff9a7e6dee5881beca2cbdb7ae864643b940b5 SHA1 a6e7d18788eb33e4757e7a37a71f659dbe677f18 SHA256 653e5bd4531580594855dcbb744fc580edcf34255fa37cce8afe949f9171f434
+EBUILD virtualbox-guest-additions-4.1.4-r1.ebuild 5570 RMD160 3b20666f2b5f571eae1a2cb2e46be19d752178e4 SHA1 35884938b9d0b4df5f2a3fff9df79802fe272288 SHA256 e7ef18db2c067b4f957da649fbeae17cffd47d10eac0743b6b10cd374caccd11
+EBUILD virtualbox-guest-additions-4.1.6-r1.ebuild 5722 RMD160 a3cd69ee542c6ca5cc5b61a857f026cf61b17d6a SHA1 c19da513d000130547ded0bd3855ecd4bef188ea SHA256 8a36ae43ad0de00d692761a83f7b1a1c443e10044b1bea54c8f1712dfe318f42
+MISC ChangeLog 23930 RMD160 414a4b57e885208a97ba602043a567b3b16e5088 SHA1 64da409dad1a5701343267581f0a6a6f00d98e55 SHA256 6bd30fd652f4d2cb5ae56e7d99eb5e5c05b1064a6ed0b7b1fe41cb0ae541122b
 MISC metadata.xml 436 RMD160 2b23829451cc725c52c3efaf393d4e4bfc78ce82 SHA1 58b305b79a44d010b66a6310a7d22e3741b26383 SHA256 28f6b6d6d45da1824764ab2cf255e7d209c9d3d72cf668cfe799a95d2433f5e7

File app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.1.6-r1-nlink.patch

+diff --git a/VirtualBox-4.1.6_OSE/src/VBox/Additions/linux/sharedfolders/utils.c b/VirtualBox-4.1.6_OSE/src/VBox/Additions/linux/sharedfolders/utils.c
+index 22d5b01..52b5cdd 100644
+--- a/VirtualBox-4.1.6_OSE/src/VBox/Additions/linux/sharedfolders/utils.c
++++ b/VirtualBox-4.1.6_OSE/src/VBox/Additions/linux/sharedfolders/utils.c
+@@ -110,7 +110,7 @@ void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
+         inode->i_fop   = &sf_dir_fops;
+         /* XXX: this probably should be set to the number of entries
+            in the directory plus two (. ..) */
+-        inode->i_nlink = 1;
++	set_nlink (inode, 1);
+     }
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+     else if (RTFS_IS_SYMLINK(attr->fMode))
+@@ -119,7 +119,7 @@ void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
+         inode->i_mode &= ~sf_g->fmask;
+         inode->i_mode |= S_IFLNK;
+         inode->i_op    = &sf_lnk_iops;
+-        inode->i_nlink = 1;
++	set_nlink (inode, 1);
+     }
+ #endif
+     else
+@@ -129,7 +129,7 @@ void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
+         inode->i_mode |= S_IFREG;
+         inode->i_op    = &sf_reg_iops;
+         inode->i_fop   = &sf_reg_fops;
+-        inode->i_nlink = 1;
++	set_nlink (inode, 1);
+     }
+ 
+     inode->i_uid = sf_g->uid;

File app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild

 # 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-additions/virtualbox-guest-additions-4.1.4-r1.ebuild,v 1.1 2011/10/12 21:32:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild,v 1.2 2011/11/01 11:05:25 chainsaw Exp $
 
 EAPI=2
 
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X"
 
 RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
 	# PaX fixes (see bug #298988)
 	pushd "${WORKDIR}" &>/dev/null || die
 	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	epatch "${FILESDIR}"/virtualbox-guest-additions-4.1.4-r1-gcc_4_7.patch
 	popd &>/dev/null || die
 
 	# Disable things unused or splitted into separate ebuilds

File app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.6-r1.ebuild

+# 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-additions/virtualbox-guest-additions-4.1.6-r1.ebuild,v 1.1 2011/11/06 23:40:53 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod
+
+MY_P=VirtualBox-${PV}
+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-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"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.999
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		sys-libs/pam
+		sys-power/iasl
+		X? ( x11-proto/renderproto )
+		!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}_OSE"
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/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
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	epatch "${FILESDIR}"/virtualbox-guest-additions-4.1.6-r1-nlink.patch
+	epatch "${FILESDIR}"/virtualbox-guest-additions-4.1.6-r1-nlink-vboxsf.patch
+	popd &>/dev/null || die
+
+	# 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
+}
+
+src_configure() {
+		# build the user-space tools, warnings are harmless
+		./configure --nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+}
+
+src_compile() {
+		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
+
+		# 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. (>=3.2.0)
+		linux-mod_src_compile
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		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 /lib/udev/rules.d
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! use 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 <shared_folder_name> <mount_point>"
+		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 ""
+}