From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AC28138334 for ; Wed, 8 May 2019 14:12:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E243E08A0; Wed, 8 May 2019 14:12:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E314BE08A0 for ; Wed, 8 May 2019 14:12:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54A33343C46 for ; Wed, 8 May 2019 14:12:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE0D4452 for ; Wed, 8 May 2019 14:12:24 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1557324740.426405cb9a0da711324777e15a3b6c78ffa3bc24.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild X-VCS-Directories: app-emulation/virtualbox-guest-additions/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 426405cb9a0da711324777e15a3b6c78ffa3bc24 X-VCS-Branch: master Date: Wed, 8 May 2019 14:12:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 99d633d5-8ac1-432a-8ec9-8ed2be5d5d3c X-Archives-Hash: 9995a04af00310474ba8932ada061bcd commit: 426405cb9a0da711324777e15a3b6c78ffa3bc24 Author: Lars Wendler gentoo org> AuthorDate: Wed May 8 14:11:30 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed May 8 14:12:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426405cb app-emulation/virtualbox-guest-additions: Overhauled kernel mod build Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> .../virtualbox-guest-additions-6.0.6.ebuild | 39 ++++++++-------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild index 5256fbb5d67..36da1068f38 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild @@ -48,34 +48,30 @@ BUILD_TARGETS="all" BUILD_TARGET_ARCH="${ARCH}" S="${WORKDIR}/${MY_P}" +VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" pkg_setup() { export DISTCC_DISABLE=1 #674256 - MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest) - vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)" - use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)" + MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest) + vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)" + use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)" linux-mod_pkg_setup BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}" } -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.sh \ - "${WORKDIR}/vbox-kmod.tar.gz" &>/dev/null || die - unpack ./vbox-kmod.tar.gz - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - cd "${S}" || die +src_prepare() { rm -r kBuild/bin tools || die -} -src_prepare() { + # Provide kernel sources + pushd src/VBox/Additions &>/dev/null || die + ebegin "Extracting guest kernel module sources" + kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die + eend + popd &>/dev/null || die + # PaX fixes (see bug #298988) - pushd "${WORKDIR}" &>/dev/null || die + pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch popd &>/dev/null || die @@ -83,15 +79,6 @@ src_prepare() { cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk - # stupid new header references... - local vboxheader mdir - for vboxheader in {product,revision,version}-generated.h ; do - for mdir in vbox{guest,sf} ; do - ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ - "${WORKDIR}/${mdir}/${vboxheader}" - done - done - # Remove pointless GCC version check sed -e '/^check_gcc$/d' -i configure || die