commit: a230dfb65002b6391d8cc2a089410242ac0caf32 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Tue Aug 15 12:26:00 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Tue Aug 15 12:45:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a230dfb6
app-emulation/virtualbox-guest-additions: drop 7.0.8-r2 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> app-emulation/virtualbox-guest-additions/Manifest | 1 - ...-guest-additions-7.0.8-kernel-6.4-patch-1.patch | 25 -- ...-guest-additions-7.0.8-kernel-6.4-patch-2.patch | 38 --- .../virtualbox-guest-additions-7.0.8-r2.ebuild | 296 --------------------- 4 files changed, 360 deletions(-) diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index 909d8428eaf5..9d81666cb41f 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,5 +1,4 @@ DIST VirtualBox-6.1.46.tar.bz2 166045588 BLAKE2B 041fad30d7cbe524cfd5c865b225c00df7715a6648ed0d8f7ee3ca4be0d0dabcb324c676ba2ea78288cde89ed8e5412fae75e31bb49f623de2acddb8f10d6ee1 SHA512 695ca4d41ff10d0581e4cffe4a0ec80e0fe380f4c7d5d51ee4d21aeb61646c26edd60301e541894e71c3323e2d7207e23299938c18ee45631afd1e0851946e77 DIST VirtualBox-7.0.10.tar.bz2 175450841 BLAKE2B 49eaa14f716f021f1ecec1ad48a2aa8a3a758cbd9b03cf30d65ddcf5aba11842b0ea8bc2c4d477084a4cea318dc302a4ed426ec9f675a1fe675c5f18c48796c7 SHA512 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd -DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch deleted file mode 100644 index c13d57ee4503..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch +++ /dev/null @@ -1,25 +0,0 @@ -Initial support for kernel 6.4 -https://www.virtualbox.org/changeset/99666/vbox - ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -75,4 +75,11 @@ - #if RTLNX_VER_MAX(2,5,12) - # define PageUptodate(a_pPage) Page_Uptodate(a_pPage) -+#endif -+ -+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ -+#if RTLNX_VER_MIN(6,4,0) -+# define VBOX_ITER_IOV(_iter) iter_iov(_iter) -+#else -+# define VBOX_ITER_IOV(_iter) iter->iov - #endif - -@@ -2400,5 +2407,5 @@ - if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { - # endif -- const struct iovec *pCurIov = iter->iov; -+ const struct iovec *pCurIov = VBOX_ITER_IOV(iter); - size_t cLeft = iter->nr_segs; - size_t cPagesSpan = 0; - diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch deleted file mode 100644 index b390c2f5e48a..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -Initial support for kernel 6.4 -https://www.virtualbox.org/changeset/99667/vbox - ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -77,11 +77,4 @@ - #endif - --/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ --#if RTLNX_VER_MIN(6,4,0) --# define VBOX_ITER_IOV(_iter) iter_iov(_iter) --#else --# define VBOX_ITER_IOV(_iter) iter->iov --#endif -- - - /********************************************************************************************************************************* -@@ -94,4 +87,12 @@ - #else - # define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->type) -+#endif -+ -+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field -+ * of struct iov_iter. */ -+#if RTLNX_VER_MIN(6,4,0) -+# define VBSF_GET_ITER_IOV(_iter) iter_iov(_iter) -+#else -+# define VBSF_GET_ITER_IOV(_iter) iter->iov - #endif - -@@ -2407,5 +2408,5 @@ - if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { - # endif -- const struct iovec *pCurIov = VBOX_ITER_IOV(iter); -+ const struct iovec *pCurIov = VBSF_GET_ITER_IOV(iter); - size_t cLeft = iter->nr_segs; - size_t cPagesSpan = 0; - diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild deleted file mode 100644 index 3ae573b7e126..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 2022-2023 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}a.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-util/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-kernel-6.4-patch-1.patch - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch -) - -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 -}
