commit: 86767361309137ffb3530de1f8ae736421ca60c2 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Jun 6 05:13:26 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Jun 6 07:48:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86767361
app-emulation/virtualbox-modules: drop 6.1.50-r2 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> app-emulation/virtualbox-modules/Manifest | 1 - ...tualbox-modules-7.0.14-kernel-6.6-warning.patch | 27 ------------- .../virtualbox-modules-7.0.14-kernel-6.9.patch | 46 ---------------------- .../virtualbox-modules-6.1.50-r2.ebuild | 39 ------------------ 4 files changed, 113 deletions(-) diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index 85ad62b78780..527c17d2884f 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -1,7 +1,6 @@ DIST vbox-host-kernel-module-src-7.1.10.tar.xz 767632 BLAKE2B 8c2b40cb2c123be8e6f8dd3b56f7f0af20b1dd9fa1013690e53ba03f3d54bea8e6b2a9460fd9535d90879459f230c397387efe2877b7fb526a1248b9d7fc10fb SHA512 7311712e1d9f1c9556a47f47db17e7f0c45d3e816c2cc46b013ab4dd676797856dd40013a7d3058d93482c51aa71118d8e47efe407aae80f5c8eb541513a8fff DIST vbox-host-kernel-module-src-7.1.8.tar.xz 767424 BLAKE2B 846a0f77892aad8edd7ee6935e2c846daa8cd6b42fb2eccc78813e0d5e19c371849e94a8f75a12a2bf2a65e641b4c22ff3a9c4ff9b3f5747bbd02e07867a4a89 SHA512 5430de7428b4951abe7e55243d63fa533ce720ae27c6664349db76d3f7522f4bcbd46d334f7fdad9dc731c6f2ce8c993c11bd4194f98f9a5a17c2a83160eda1c DIST vbox-host-kernel-module-src-7.2.0_BETA1.tar.xz 808492 BLAKE2B 3236be8e944a7b342a55650c2a88223f8fcfbd702811a55ef4ba8e989ed0449b231c8a356f966f610b731f4b1d5c78801558e1e919190a6f782c7101d4ef07c3 SHA512 74a90d6086d0ef21569490e092d4a6ad090ee459fbe75e3893d6c526dc8f941e292c1d001e484fd4c4974c478146398779b6176ec36b3550601ac922d8536b94 -DIST vbox-kernel-module-src-6.1.50.tar.xz 680700 BLAKE2B c3a10ce8f3eb7e6c0c05f81cd3c072296557b9f9f6f501bb0aec3f04aabfe1fbb67b553510104139cef290c09ff9e67161085781b8d28c968dfafd15958a1b1a SHA512 7822e421b595263cbdaae08103255742360ca7ab0c385818ec895f10570c5b9ed5c7614742d8fa8bc2414cd426907cd1c49d735cde8caf9d2b7692898058f592 DIST vbox-kernel-module-src-7.0.22.tar.xz 720516 BLAKE2B acbc2953661a61a49b502abf286d8d63e089b23baa12ffac8dff8c96a82698dfe45769dd46c86762e98ae3b5ea5b6dd3aa69bd9079210a11838ef7cc8cd7f754 SHA512 5a1a38825fba9eec036db4ae7ccfa7b37e399edbb4ed6c99fc1f03f2e61396867a7f0d059cf862f17992b7896867d334ea7edaed4205f61abe4328cef07bd8db DIST vbox-kernel-module-src-7.0.26.tar.xz 721876 BLAKE2B 355ac80cc96f4ad259a0fdbb909803bbec884c1d25fc9061f45f7039a0857b4f6cc93d4739cf85a82b9544aae06bf7b689d5d530ffc2fe97a874ef57d123423f SHA512 5980721197b908d5d991b258be395a8b542b8183eac7b146b147e4dbea9ff0b0408de5733b12d02a159b689bde29966a55fa7b64c953b9abe4180dbf6e0ebcb6 DIST vbox-kernel-module-src-7.1.4.tar.xz 738112 BLAKE2B 4313b21cd96b0a89edccbcc6bd5402271121df3fb97452d3487ba8b6f07fc952034f8ffa10bfebbde765e6672515041be7a42335d64faece19ec813ec03ce84f SHA512 e4261575209afe28dbc5108d6fd15fb29760aab8e12a9bca14781a7287653aa4366c159fa6af3a8df8d6685846325e23ad82f1aae353c0ec42328933449e77af diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.6-warning.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.6-warning.patch deleted file mode 100644 index 64bafa84e365..000000000000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.6-warning.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://www.virtualbox.org/changeset/103168/vbox -https://bugs.gentoo.org/923277 - ---- a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -+++ b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -@@ -244,9 +244,21 @@ - #if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64) - if (fKernel) - { -+# if RTLNX_VER_MIN(6,6,0) -+ /* In kernel 6.6 mk_pte() macro was fortified with additional -+ * check which does not allow to use our custom mask anymore -+ * (see kernel commit ae1f05a617dcbc0a732fbeba0893786cd009536c). -+ * For this particular mapping case, an existing mask PAGE_KERNEL_ROX -+ * can be used instead. PAGE_KERNEL_ROX was introduced in -+ * kernel 5.8, however, lets apply it for kernels 6.6 and newer -+ * to be on a safe side. -+ */ -+ return PAGE_KERNEL_ROX; -+# else - pgprot_t fPg = MY_PAGE_KERNEL_EXEC; - pgprot_val(fPg) &= ~_PAGE_RW; - return fPg; -+# endif - } - return PAGE_READONLY_EXEC; - #else diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.9.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.9.patch deleted file mode 100644 index 2b2928303c91..000000000000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.9.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://www.virtualbox.org/ticket/22033 -https://bugs.gentoo.org/937445 - ---- a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -+++ b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -@@ -114,6 +114,14 @@ - # define LNX_MM_UP_WRITE(a_pMm) up_write(&(a_pMm)->mmap_sem) - #endif - -+/* -+ * p.._large alias for p.._leaf is gone in 6.9 -+ */ -+#if RTLNX_VER_MIN(6,9,0) -+# define p4d_large p4d_leaf -+# define pmd_large pmd_leaf -+# define pud_large pud_leaf -+#endif - - /********************************************************************************************************************************* - * Structures and Typedefs * ---- a/vboxnetflt/linux/VBoxNetFlt-linux.c -+++ b/vboxnetflt/linux/VBoxNetFlt-linux.c -@@ -926,7 +926,10 @@ static void vboxNetFltLinuxSkBufToSG(PVB - for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++) - { - skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i]; --# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2) -+# if RTLNX_VER_MIN(6,9,0) -+ pSG->aSegs[iSeg].cb = pFrag->len; -+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->offset; -+# elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2) - pSG->aSegs[iSeg].cb = pFrag->bv_len; - pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; - # else /* < KERNEL_VERSION(5, 4, 0) */ -@@ -947,7 +950,10 @@ static void vboxNetFltLinuxSkBufToSG(PVB - for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++) - { - skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i]; --# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2) -+# if RTLNX_VER_MIN(6,9,0) -+ pSG->aSegs[iSeg].cb = pFrag->len; -+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->offset; -+# elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2) - pSG->aSegs[iSeg].cb = pFrag->bv_len; - pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; - # else /* < KERNEL_VERSION(5, 4, 0) */ diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r2.ebuild deleted file mode 100644 index 942f98b249e9..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from VirtualBox-*.run -# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb - -EAPI=8 - -inherit linux-mod-r1 - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/"; -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"; -S="${WORKDIR}" - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" - -CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.14-kernel-6.6-warning.patch - "${FILESDIR}"/${PN}-7.0.14-kernel-6.9.patch -) - -src_compile() { - local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc ) - local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -}
