summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virtualbox-guest-additions/Manifest1
-rw-r--r--app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.10-fix-kernel-6.5.patch35
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10-r1.ebuild295
3 files changed, 0 insertions, 331 deletions
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 34410caf1c21..c235674d531d 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,7 +1,6 @@
DIST VirtualBox-6.1.46.tar.bz2 166045588 BLAKE2B 041fad30d7cbe524cfd5c865b225c00df7715a6648ed0d8f7ee3ca4be0d0dabcb324c676ba2ea78288cde89ed8e5412fae75e31bb49f623de2acddb8f10d6ee1 SHA512 695ca4d41ff10d0581e4cffe4a0ec80e0fe380f4c7d5d51ee4d21aeb61646c26edd60301e541894e71c3323e2d7207e23299938c18ee45631afd1e0851946e77
DIST VirtualBox-6.1.48.tar.bz2 165960987 BLAKE2B c981e390ae518b829970827f6032fb19a93685fb58835a9d489c6e14cc60a5c14c65b0a3da5adae7818e73e1b0e558e8fa803160cb67847f18565bb78d656e97 SHA512 fff759f3871e4e8962536002f2bc13e5150a927e280493f5cb0abf06466ce66e45f4c6ef43489b5b3ed8682d8a3ac0eb6fb3dd7c4144924c81612553ec71a95f
DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
-DIST VirtualBox-7.0.10.tar.bz2 175450841 BLAKE2B 49eaa14f716f021f1ecec1ad48a2aa8a3a758cbd9b03cf30d65ddcf5aba11842b0ea8bc2c4d477084a4cea318dc302a4ed426ec9f675a1fe675c5f18c48796c7 SHA512 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd
DIST VirtualBox-7.0.12.tar.bz2 175644088 BLAKE2B 507cbf7b1a8a807bd2602e74bc19a59cb177b9b2bdefa1be582e520666360a42510ca501f20c354746a0f1dadf61fe29135e3edc867e611bfe60a9405cb2bbce SHA512 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f
DIST VirtualBox-7.0.14.tar.bz2 175654864 BLAKE2B 99f4942b864ce481d69983af31393d763452c5b55697ab642b43c155f5fbc2a9963fbe1b7744baef620d0b351e1ac73c1ef978698b9a7e77897bb9cbc18dc17c SHA512 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.10-fix-kernel-6.5.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.10-fix-kernel-6.5.patch
deleted file mode 100644
index 5c537bd7ddb7..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.10-fix-kernel-6.5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://www.virtualbox.org/pipermail/vbox-dev/2023-September/010224.html
-
-From: vbox-dev <vbox-dev-bounces at virtualbox.org> on behalf of Larry Finger via vbox-dev <vbox-dev at virtualbox.org>
-Sent: Friday, August 11, 2023 12:23 AM
-To: vbox-dev at virtualbox.org
-Subject: [vbox-dev] Fix for kernel 6.5 build of VB 7.0.10
-
-Hi,
-
-The 7.0.10 release fixed most problems with kernel 6.5. The first exception was
-the problem with extensible arrays in the kernel's vboxsf module that I
-described earlier. There were some hiccups, but that fix should be in kernel
-6.5-rc6.
-
-One other problem showed up in the compilation of vbox_fb.c. The patch for that,
-released under the MIT license, is shown below:
-
-Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c
-===================================================================
---- a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -196,9 +196,13 @@
- .owner = THIS_MODULE,
- .fb_check_var = drm_fb_helper_check_var,
- .fb_set_par = drm_fb_helper_set_par,
-+#if RTLNX_VER_MIN(6, 5, 0)
-+ FB_DEFAULT_SYS_OPS,
-+#else
- .fb_fillrect = drm_fb_helper_sys_fillrect,
- .fb_copyarea = drm_fb_helper_sys_copyarea,
- .fb_imageblit = drm_fb_helper_sys_imageblit,
-+#endif
- .fb_pan_display = drm_fb_helper_pan_display,
- .fb_blank = drm_fb_helper_blank,
- .fb_setcmap = drm_fb_helper_setcmap,
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10-r1.ebuild
deleted file mode 100644
index 3540b581e1b6..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10-r1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo linux-mod-r1 systemd toolchain-funcs udev
-
-MY_PN="VirtualBox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
- https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
-LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbus gui"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-# TODO: find out what this is, remove comment if obsolete
-
-RDEPEND="
- acct-group/vboxguest
- acct-group/vboxsf
- acct-user/vboxguest
- sys-libs/pam
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- gui? (
- x11-apps/xrandr
- x11-apps/xrefresh
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- )
-"
-# some libs here are indirect dependencies, and also needed at compile time.
-# keeping them in DEPEND to avoid warnings from qa-vdb.
-DEPEND="
- ${RDEPEND}
- gui? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-base/xorg-proto
- )
-"
-BDEPEND="
- >=dev-lang/yasm-0.6.2
- >=dev-build/kbuild-0.1.9998.3127
- sys-devel/bin86
- sys-power/iasl
-"
-PDEPEND="
- gui? ( x11-drivers/xf86-video-vboxvideo )
-"
-
-PATCHES=(
- "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch
- "${FILESDIR}"/virtualbox-guest-additions-7.0.10-fix-kernel-6.5.patch # bug #915665
-)
-
-DOCS=() # Don't install the default README file during einstalldocs
-
-VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src"
-CONFIG_CHECK="DRM_TTM"
-
-src_prepare() {
- eapply "${PATCHES[@]}"
-
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -r kBuild/bin tools || die
-
- # 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
- eend $? || die
- popd &>/dev/null || die
-
- # PaX fixes (see bug #298988)
- eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
-
- # Disable things unused or splitted into separate ebuilds
- cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
- if ! use gui; then
- echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
- fi
-
- # Remove pointless GCC version check
- sed -e '/ check_gcc$/d' -i configure || die
-
- # Respect LDFLAGS (bug #759100)
- sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
-
- eapply "${WORKDIR}/virtualbox-patches-7.0.8/patches"
- eapply_user
-}
-
-src_configure() {
- tc-export AR CC CXX LD RANLIB
-
- # Build the user-space tools, warnings are harmless
- local myconf=(
- --with-gcc="$(tc-getCC)"
- --with-g++="$(tc-getCXX)"
-
- --nofatal
- --disable-xpcom
- --disable-sdl-ttf
- --disable-pulse
- --disable-alsa
- $(usev !dbus --disable-dbus)
- --target-arch=${ARCH}
- --with-linux="${KV_OUT_DIR}"
- --build-headless
- )
-
- # bug #843437
- # Respect LDFLAGS (bug #759100)
- # Cannot use LDFLAGS here because they also get passed to $(LD)
- cat >> LocalConfig.kmk <<-EOF || die
- CFLAGS=${CFLAGS}
- CXXFLAGS=${CXXFLAGS}
- CCLDFLAGS=${LDFLAGS}
- EOF
-
- edo ./configure "${myconf[@]}"
-}
-
-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}"
-
- local myemakeargs=(
- VBOX_BUILD_PUBLISHER=_Gentoo
- VBOX_ONLY_ADDITIONS=1
-
- KBUILD_VERBOSE=2
-
- AS="$(tc-getCC)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- LD="$(tc-getCC)"
-
- TOOL_GCC3_CC="$(tc-getCC)"
- TOOL_GCC3_CXX="$(tc-getCXX)"
- TOOL_GCC3_LD="$(tc-getCC)"
- TOOL_GCC3_AS="$(tc-getCC)"
- TOOL_GCC3_AR="$(tc-getAR)"
- TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
- #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
-
- TOOL_GXX3_CC="$(tc-getCC)"
- TOOL_GXX3_CXX="$(tc-getCXX)"
- TOOL_GXX3_LD="$(tc-getCXX)"
- TOOL_GXX3_AS="$(tc-getCXX)"
- TOOL_GXX3_AR="$(tc-getAR)"
- TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
- #TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
-
- TOOL_GCC3_CFLAGS="${CFLAGS}"
- TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
- VBOX_GCC_OPT="${CXXFLAGS}"
- VBOX_NM="$(tc-getNM)"
- TOOL_YASM_AS=yasm
- )
-
- MAKE="kmk" emake "${myemakeargs[@]}"
-
- # 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)
- # Move this here for bug 836037
- local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
- local modlist=( vboxguest vboxsf )
- use gui && modlist+=( vboxvideo )
- modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
- linux-mod-r1_src_compile
-}
-
-src_install() {
- linux-mod-r1_src_install
-
- insinto /etc/modprobe.d # 485996
- newins - vboxsf.conf <<-EOF
- # modprobe.d configuration file for VBOXSF
-
- # Internal Aliases - Do not edit
- # ------------------------------
- alias fs-vboxsf vboxsf
- EOF
-
- cd out/linux.${ARCH}/release/bin/additions || die
-
- insinto /sbin
- newins mount.vboxsf mount.vboxsf
- fperms 4755 /sbin/mount.vboxsf
-
- if use dbus; then
- newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
- else
- newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
- fi
-
- 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 gui ; then
- doins VBoxClient
- fperms 0755 /usr/bin/VBoxClient
- doins VBoxDRMClient
- fperms 4755 /usr/bin/VBoxDRMClient
-
- pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
- newins 98vboxadd-xclient VBoxClient-all
- fperms 0755 /usr/bin/VBoxClient-all
- popd &>/dev/null || die
- fi
-
- # udev rule for vboxdrv
- local udev_rules_dir="/lib/udev/rules.d"
- dodir ${udev_rules_dir}
- echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
- echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
-
- # VBoxClient autostart file
- insinto /etc/xdg/autostart
- doins "${FILESDIR}"/vboxclient.desktop
-
- # sample xorg.conf
- dodoc "${FILESDIR}"/xorg.conf.vbox
- docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- linux-mod-r1_pkg_postinst
- udev_reload
- if ! use gui ; then
- elog "use flag gui 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 "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 ""
-}
-
-pkg_postrm() {
- udev_reload
-}