From eccb70a7f91b2d22582587f26d1a28bb31408b45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 May 2019 00:10:51 +0100 Subject: gentoo resync : 18.05.2019 --- app-emulation/virtualbox-guest-additions/Manifest | 2 +- .../virtualbox-guest-additions-6.0.6.ebuild | 38 ++++++++-------------- 2 files changed, 14 insertions(+), 26 deletions(-) (limited to 'app-emulation/virtualbox-guest-additions') diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index dd48e3a8a027..04d24d23a06e 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -16,5 +16,5 @@ EBUILD virtualbox-guest-additions-5.2.22.ebuild 6043 BLAKE2B 1a50b4b4ba3b2ed7009 EBUILD virtualbox-guest-additions-5.2.26.ebuild 6118 BLAKE2B 20f06b42279f7ab9bb60d2bdb26c7bede86ac1c64ed91ad42bb5ac0e9d484aa0da7901c34e9d663c64e4c4672802e9104eeb5009fead6b41c66b7ed6e2026d49 SHA512 341d5319d2f593ead1f258b480f19c9a1c5a85c8068134c24546828ec3b56ed825672593ede34d62286b048e5d1d19dd3d6923fc6e0fd9fabc03ddd1bc5f701a EBUILD virtualbox-guest-additions-5.2.28.ebuild 6120 BLAKE2B a51f969b41ac40a359d649b2793478e2366449ddb3ca78386c6a88ad1729cae20266773b88f90763ec66cdf06fbf0add5f33e0b2eb6ac97d616fa1a47519d7b2 SHA512 09394ee4fdb0c1c651d58f4d9cabbcc340d61af0a3c393df31acf9e252494b73ba179869d19326ae436aec52258e6d2c195d23ffb757a528b556c084d863ac12 EBUILD virtualbox-guest-additions-6.0.4.ebuild 6172 BLAKE2B d4abf0e0ccf13ef40b886f02be9c2baac081aacd3d8dfdde9d8c71402ea130ddb6e342670da930efa5c719b950873ce4077d8e9e4b66fdd1d3c397ee3b4b6af1 SHA512 1eff74c0b77cb2559b33c5c8f286d9e29c3c04a2cb8a868424f9310c65b6331c01950365094d96a875209edca74ba96d8319f62409cf5f2690c79ef154895171 -EBUILD virtualbox-guest-additions-6.0.6.ebuild 6208 BLAKE2B 505e4454f3505de0d006e197773ec2e57aed29c910868a998a8c2340d6f71de3d9159a36f7b0bbe261949d7a4a7fe863f841658579ff17ac8b6e704a65994aa8 SHA512 8c3242d660911d5bd41861c290bdd778f7da0328846696f3ad229ec396cf87408e9bc69fde42fdf1036141e72f6d9b1186f49bad407ba8c225ce1e67004f8257 +EBUILD virtualbox-guest-additions-6.0.6.ebuild 6005 BLAKE2B abe32d5d102f191ae10da3101c2ee53e006a78ff4dacb7f2aad28256c6c5732b753422df88998817710d039f0b824b2c8f9a65fbcd094b6e0b8e3a7a81822eca SHA512 9a82cf85ba34f1eb48e4b0bbfe61e5cf73b3daf34240cc7fca9c115675c64c90ec78ae0769a6de8d6345c491cb60afb342fe853cfc03aa778c5cff6506141826 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 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 5256fbb5d67c..8162053ffd78 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,31 @@ 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 - +src_prepare() { # Remove shipped binaries (kBuild,yasm), see bug #232775 - cd "${S}" || die 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 +80,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 -- cgit v1.2.3