commit:     5c04fb994a068068d1b510ef6fc1fa70e1e64931
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 17:32:09 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jun  1 06:24:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c04fb99

app-emulation/virtualbox-guest-additions: migrate 6.1.44 to linux-mod-r1

Closes: https://github.com/gentoo/gentoo/pull/31249
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../virtualbox-guest-additions-6.1.44-r1.ebuild    | 282 +++++++++++++++++++++
 1 file changed, 282 insertions(+)

diff --git 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild
new file mode 100644
index 000000000000..ea083a8adc9f
--- /dev/null
+++ 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild
@@ -0,0 +1,282 @@
+# 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}.tar.bz2
+       
https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2";
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +dbus"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+       acct-group/vboxguest
+       acct-group/vboxsf
+       acct-user/vboxguest
+       sys-libs/pam
+       sys-libs/zlib
+       dbus? ( sys-apps/dbus )
+       X? (
+               x11-apps/xrandr
+               x11-apps/xrefresh
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXmu
+               x11-libs/libXt
+       )
+"
+DEPEND="
+       ${RDEPEND}
+       X? (
+               x11-base/xorg-proto
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libXau
+               x11-libs/libXdmcp
+       )
+"
+BDEPEND="
+       >=dev-util/kbuild-0.1.9998.3127
+       <=dev-util/kbuild-0.1.9998.3500
+       >=dev-lang/yasm-0.6.2
+       sys-devel/bin86
+       sys-power/iasl
+"
+PDEPEND="
+       X? ( x11-drivers/xf86-video-vboxvideo )
+"
+
+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() {
+       # 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
+       use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+       # 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
+
+       eapply "${WORKDIR}/virtualbox-patches-6.1.36/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 X && 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 X ; 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 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 "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
+}

Reply via email to