diff options
14 files changed, 148 insertions, 69 deletions
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest index bb464625..bbbe1a7f 100644 --- a/app-emulation/virtualbox-extpack-oracle/Manifest +++ b/app-emulation/virtualbox-extpack-oracle/Manifest @@ -1 +1 @@ -DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.8-121009.tar.gz 19469421 BLAKE2B 81651876802ad767339f3984a26375118f01e4b99b4247398e0cea8d749905431b40945f8a72d0c7802b2743080f01d3044aafd21600c4927773994c5a114a1f SHA512 2b69e2acab91ce95e9807006c79862fc0d1d10fdd269bd9cdf8f11b6704821823b103c7a4a76ad99c10e0868bd397ffe0e72b2eb2aa4fc2bd81ff968c71c2280 +DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8 diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.8.121009.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.4.119785.ebuild index abee24fc..1c8dbec2 100644 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.8.121009.ebuild +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.4.119785.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,12 +20,12 @@ MY_PN="Oracle_VM_VirtualBox_Extension_Pack" MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" DESCRIPTION="PUEL extensions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" LICENSE="PUEL" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~x86" IUSE="" RESTRICT="mirror strip" diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index 3b434231..1e512921 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,2 +1,2 @@ -DIST VirtualBox-5.2.8.tar.bz2 118500065 BLAKE2B 64d0cc0f928d224332f59e7966ee1bed8adcf097d27c577b6ecea5cbf203e170e38acca9f2371d6d7aa11f63b73e705b43a0516ccbe5993171f928406b8a3876 SHA512 49a3bd1c60d2c4cbd3799ece5fbfe15d9b6a00c5af9692478a1365a8eb4975228410e17dba24a388c0cf5387cb79fb7492feb4e6b2f531bc17322c3d61de7887 +DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798 DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.4.ebuild index 358d4369..49e477b5 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.4.ebuild @@ -148,3 +148,39 @@ src_install() { systemd_dounit "${FILESDIR}/${PN}.service" } + +pkg_postinst() { + if ! use X ; then + elog "use flag X is off, enable it to install the" + elog "X Window System video driver." + fi + elog "" + elog "Please add users to the \"vboxguest\" group so they can" + elog "benefit from seamless mode, auto-resize and clipboard." + elog "" + elog "The vboxsf group has been added to make automount services work." + elog "These services are part of the shared folders support." + 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 driver, use the following" + elog "file as your /etc/X11/xorg.conf:" + elog " /usr/share/doc/${PF}/xorg.conf.vbox" + 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 "" +} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.4.ebuild index c7c1172e..d420616a 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.4.ebuild @@ -31,6 +31,6 @@ src_compile() { } src_install() { - insinto usr/"$(get_libdir)"/modules-load.d/ + insinto /usr/lib/modules-load.d/ doins "${FILESDIR}"/virtualbox.conf } diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index ae456ecf..f24e5773 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -1,2 +1,2 @@ -DIST VirtualBox-5.2.8.tar.bz2 118500065 BLAKE2B 64d0cc0f928d224332f59e7966ee1bed8adcf097d27c577b6ecea5cbf203e170e38acca9f2371d6d7aa11f63b73e705b43a0516ccbe5993171f928406b8a3876 SHA512 49a3bd1c60d2c4cbd3799ece5fbfe15d9b6a00c5af9692478a1365a8eb4975228410e17dba24a388c0cf5387cb79fb7492feb4e6b2f531bc17322c3d61de7887 +DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b diff --git a/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd b/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd deleted file mode 100644 index 39378536..00000000 --- a/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd +++ /dev/null @@ -1 +0,0 @@ -d /dev/vboxusb 0750 root vboxusers diff --git a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild b/app-emulation/virtualbox/virtualbox-5.2.4.ebuild index f1aa59de..d64c9f56 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.2.4.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils +inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" MY_P=VirtualBox-${MY_PV} +SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.0-patches-01.tar.xz" +S="${WORKDIR}/${MY_P}" DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.0-patches-01.tar.xz" +HOMEPAGE="http://www.virtualbox.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~x86" IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" RDEPEND="!app-emulation/virtualbox-bin @@ -47,6 +48,7 @@ RDEPEND="!app-emulation/virtualbox-bin x11-libs/libXinerama ) ) + java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) @@ -70,15 +72,13 @@ DEPEND="${RDEPEND} dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) - java? ( >=virtual/jdk-1.6 ) + java? ( >=virtual/jre-1.6:= ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) ${PYTHON_DEPS}" -RDEPEND="${RDEPEND} - java? ( >=virtual/jre-1.6 )" QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so usr/lib/virtualbox/VBoxSDL.so @@ -112,8 +112,6 @@ QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so usr/lib/virtualbox/VBoxNetDHCP.so usr/lib/virtualbox/VBoxNetNAT.so" -S="${WORKDIR}/${MY_P}" - REQUIRED_USE=" java? ( sdk ) python? ( sdk ) @@ -146,21 +144,29 @@ pkg_setup() { } src_prepare() { + # Remove shipped binaries (kBuild,yasm), see bug #232775 rm -r kBuild/bin tools || die + # Replace pointless GCC version check with something less stupid. + # This is needed for the qt5 version check. sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die + # Don't use "echo -n" sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die + # Disable things unused or split into separate ebuilds sed -e "s@MY_LIBDIR@$(get_libdir)@" \ "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die + # Respect LDFLAGS sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die + # Do not use hard-coded ld (related to bug #488176) sed -e '/QUIET)ld /s@ld @$(LD) @' \ -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die + # Use PAM only when pam USE flag is enbaled (bug #376531) if ! use pam ; then elog "Disabling PAM removes the possibility to use the VRDP features." sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die @@ -168,16 +174,19 @@ src_prepare() { src/VBox/HostServices/Makefile.kmk || die fi + # add correct java path if use java ; then sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ -i "${S}"/Config.kmk || die java-pkg-opt-2_src_prepare fi + # Only add nopie patch when we're on hardened if gcc-specs-pie ; then eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch" fi + # Only add paxmark patch when we're on pax_kernel if use pax_kernel ; then eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch fi @@ -193,36 +202,33 @@ src_configure() { --with-g++="$(tc-getCXX)" --disable-dbus --disable-kmods - $(usex alsa '' --disable-alsa) - $(usex debug --build-debug '') - $(usex doc '' --disable-docs) - $(usex java '' --disable-java) - $(usex lvm '' --disable-devmapper) - $(usex pulseaudio '' --disable-pulse) - $(usex python '' --disable-python) - $(usex vboxwebsrv --enable-webservice '') - $(usex vnc --enable-vnc '') ) + use alsa || myconf+=( --disable-alsa ) + use debug && myconf+=( --build-debug ) + use doc || myconf+=( --disable-docs ) + use java || myconf+=( --disable-java ) + use lvm || myconf+=( --disable-devmapper ) + use opengl || myconf+=( --disable-opengl ) + use pulseaudio || myconf+=( --disable-pulse ) + use python || myconf+=( --disable-python ) + use vboxwebsrv && myconf+=( --enable-webservice ) + use vnc && myconf+=( --enable-vnc ) if ! use headless ; then - myconf+=( - $(usex opengl '' --disable-opengl) - $(usex qt5 '' --disable-qt) - ) + use qt5 || myconf+=( --disable-qt ) else - myconf+=( - --build-headless - --disable-opengl - ) + myconf+=( --build-headless --disable-opengl ) fi if use amd64 && ! has_multilib_profile ; then myconf+=( --disable-vmmraw ) fi + # not an autoconf script ./configure ${myconf[@]} || die "configure failed" } src_compile() { source ./env.sh || die + # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" @@ -258,21 +264,26 @@ src_install() { fperms ${perms} ${path}/${binary} } + # Create configuration files insinto /etc/vbox newins "${FILESDIR}/${PN}-4-config" vbox.cfg + # Set the correct libdir sed \ -e "s@MY_LIBDIR@$(get_libdir)@" \ -i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" + # Install the wrapper script exeinto ${vbox_inst_path} newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox" fowners root:vboxusers ${vbox_inst_path}/VBox fperms 0750 ${vbox_inst_path}/VBox + # Install binaries and libraries insinto ${vbox_inst_path} doins -r components + # *.rc files for x86_64 are only available on multilib systems local rcfiles="*.rc" if use amd64 && ! has_multilib_profile ; then rcfiles="" @@ -281,29 +292,34 @@ src_install() { vbox_inst ${each} done + # These binaries need to be suid root. for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do vbox_inst ${each} 4750 done + # Install EFI Firmware files (bug #320757) pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die for fwfile in VBoxEFI{32,64}.fd ; do vbox_inst ${fwfile} 0644 done popd &>/dev/null || die + # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) + # VBoxXPCOMIPCD (bug #524202) for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do pax-mark -m "${D}"${vbox_inst_path}/${each} done + # Symlink binaries to the shipped wrapper for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do dosym ${vbox_inst_path}/VBox /usr/bin/${each} done dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl - if use pam ; then - dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so - fi + # VRDPAuth only works with this (bug #351949) + dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so + # set an env-variable for 3rd party tools echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" doenvd "${T}/90virtualbox" @@ -369,6 +385,7 @@ src_install() { fi if use udev ; then + # New way of handling USB device nodes for VBox (bug #356215) local udevdir="$(get_udevdir)" insinto ${udevdir} doins VBoxCreateUSBNode.sh @@ -390,8 +407,6 @@ src_install() { if use doc ; then dodoc UserManual.pdf fi - - newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf } pkg_postinst() { @@ -402,7 +417,41 @@ pkg_postinst() { && udevadm trigger --subsystem-match=usb fi - tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf + if ! use headless && use qt5 ; then + elog "To launch VirtualBox just type: \"virtualbox\"." + fi + elog "You must be in the vboxusers group to use VirtualBox." + elog "" + elog "The latest user manual is available for download at:" + elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" + elog "" + elog "For advanced networking setups you should emerge:" + elog "net-misc/bridge-utils and sys-apps/usermode-utilities" + elog "" + elog "IMPORTANT!" + elog "If you upgrade from app-emulation/virtualbox-ose make sure to run" + elog "\"env-update\" as root and logout and relogin as the user you wish" + elog "to run ${PN} as." + elog "" + elog "Starting with version 4.0.0, ${PN} has USB-1 support." + elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + elog "package." + elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" + elog "the \"extension\" USE flag. For installation of the guest additions ISO" + elog "image, please emerge" + elog " app-emulation/virtualbox-additions" + elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + if ! use udev ; then + elog "" + elog "WARNING!" + elog "Without USE=udev, USB devices will likely not work in ${PN}." + elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then + elog "" + elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\"" + elog "or else USB in ${PN} won't work." + fi } pkg_postrm() { diff --git a/sys-kernel/virtualbox-guest-dkms/Manifest b/sys-kernel/virtualbox-guest-dkms/Manifest index 00be23d6..640477ef 100644 --- a/sys-kernel/virtualbox-guest-dkms/Manifest +++ b/sys-kernel/virtualbox-guest-dkms/Manifest @@ -1 +1 @@ -DIST virtualbox-guest-dkms-5.2.8-1-x86_64.pkg.tar.xz 582516 BLAKE2B 318206d4ab1acd52f7b0282fed97424f4133e39f25d09aa61d1df9e5c1d8c21a65586f042d17f8b7fcb0f802453424ce07407a97ef58e9ec907540a9ba759772 SHA512 c9042663a42c445911e933d37c1175349ae2d7c92b346fed7ab74da80682f97378aa84961c5b57ef1302c35882c80f73f89248057f6ae149e485789eb92c317d +DIST virtualbox-guest-dkms-5.2.4-1-x86_64.pkg.tar.xz 581104 BLAKE2B 6c6fea795267c60482dc960cdc4411729c05dd2b1a7918e6f84a35c3d0ddbc144c35a943181ee6a76f9e414304650bb6e91278f346b3a6e318584d56d3497b51 SHA512 f5bc71f84abd5b37653db8e57fd91363c690d2878b604bef0d1d9db1beaccf9dce2d0ce856d807c7b34c9949005ec67732646a59d4b13bde6795fee3411cde2d diff --git a/sys-kernel/virtualbox-guest-dkms/files/dkms.patch b/sys-kernel/virtualbox-guest-dkms/files/dkms.patch index 7799c253..86d19605 100644 --- a/sys-kernel/virtualbox-guest-dkms/files/dkms.patch +++ b/sys-kernel/virtualbox-guest-dkms/files/dkms.patch @@ -1,27 +1,20 @@ diff -Nur a/dkms.conf b/dkms.conf ---- a/dkms.conf 2018-02-28 07:51:25.000000000 +0000 -+++ b/dkms.conf 2018-04-11 14:50:24.512910897 +0100 -@@ -14,18 +14,10 @@ - # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +--- a/dkms.conf 2017-12-19 21:31:10.000000000 +0000 ++++ b/dkms.conf 2017-12-22 02:51:53.824679071 +0000 +@@ -15,7 +15,7 @@ # --PACKAGE_NAME="vboxguest" --PACKAGE_VERSION=5.2.8_OSE -+PACKAGE_NAME="virtualbox-guest-dkms" -+PACKAGE_VERSION=5.2.8 + PACKAGE_NAME="vboxguest" +-PACKAGE_VERSION=5.2.4_OSE ++PACKAGE_VERSION=5.2.4 AUTOINSTALL=yes --BUILT_MODULE_NAME[0]="vboxguest" --BUILT_MODULE_LOCATION[0]="vboxguest" --DEST_MODULE_LOCATION[0]="/kernel/misc" -- --BUILT_MODULE_NAME[1]="vboxsf" --BUILT_MODULE_LOCATION[1]="vboxsf" --DEST_MODULE_LOCATION[1]="/kernel/misc" + BUILT_MODULE_NAME[0]="vboxguest" +@@ -25,7 +25,3 @@ + BUILT_MODULE_NAME[1]="vboxsf" + BUILT_MODULE_LOCATION[1]="vboxsf" + DEST_MODULE_LOCATION[1]="/kernel/misc" - -BUILT_MODULE_NAME[2]="vboxvideo" -BUILT_MODULE_LOCATION[2]="vboxvideo" -DEST_MODULE_LOCATION[2]="/kernel/misc" -+BUILT_MODULE_NAME[0]="vboxsf" -+BUILT_MODULE_LOCATION[0]="vboxsf" -+DEST_MODULE_LOCATION[0]="/extra/dkms" diff --git a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.8.ebuild b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild index 95d49fe6..c4823e9c 100644 --- a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.8.ebuild +++ b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild @@ -29,8 +29,8 @@ src_compile() { } src_install() { - dodir usr/src/${P} - insinto usr/src/${P} + dodir /usr/src/${P} + insinto /usr/src/${P} doins -r ${S}/* } diff --git a/sys-kernel/virtualbox-modules-dkms/Manifest b/sys-kernel/virtualbox-modules-dkms/Manifest index d4618dfc..0ccb741a 100644 --- a/sys-kernel/virtualbox-modules-dkms/Manifest +++ b/sys-kernel/virtualbox-modules-dkms/Manifest @@ -1 +1 @@ -DIST vbox-kernel-module-src-5.2.8.tar.xz 636172 BLAKE2B 0a0be16ee830dbf60e9bd8e0aa977ad020374d65c4ea19689bd20f7399da87633ac9ef57e2297963937e4d5eb82173a50beacd8ddd1b54943fe8d24fe723e3f4 SHA512 8875048d827ebbedec37864e219033305a228903b01d7ca22b371b02de9b23099d3bc76ddef4887b633f1215e73daa5db6e35c8d2e21f90200f439b15792d05f +DIST vbox-kernel-module-src-5.2.4.tar.xz 634212 BLAKE2B d8be416f958f672c2ab50b5197f708bc1febca292d5262eec710c07561be7de810fb1dfd5961ef9367c91e0ac1b6033419f85444471e8d40406d4ab860de2a23 SHA512 3c2113a8781cde1a44954267ee469db91c843305a5b1468b1fd346af3f3626a3d98c8a958ec0e255401f569f75e652dbbb1a85fd6cc6b203cf170745c630cee1 diff --git a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf index bf066269..80cc6b40 100644 --- a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf +++ b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf @@ -1,7 +1,9 @@ PACKAGE_NAME="virtualbox-modules-dkms" -PACKAGE_VERSION="5.2.8" +PACKAGE_VERSION="5.2.4" AUTOINSTALL="yes" +MAKE[0]="'make' -j`nproc` KERNEL_UNAME=${kernelver}" + BUILT_MODULE_NAME[0]="vboxdrv" DEST_MODULE_LOCATION[0]="/extra/dkms" BUILT_MODULE_NAME[1]="vboxnetflt" diff --git a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.8.ebuild b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild index 5bc67058..00923566 100644 --- a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.8.ebuild +++ b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild @@ -30,10 +30,10 @@ src_compile() { } src_install() { - dodir usr/src/${P} - insinto usr/src/${P} + cp ${FILESDIR}/dkms.conf ${S} + dodir /usr/src/${P} + insinto /usr/src/${P} doins -r ${S}/* - doins ${FILESDIR}/dkms.conf } pkg_postinst() { |