[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: 4137a9fd4847f8a6f349e0fa4b57cbebdfb89638
Author: Viorel Munteanu gentoo org>
AuthorDate: Wed Jun 5 04:42:51 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Wed Jun 5 04:46:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4137a9fd
app-emulation/virtualbox-modules: remove old script
This script is no longer used.
Signed-off-by: Viorel Munteanu gentoo.org>
.../files/create_vbox_modules_tarball.sh | 29 --
1 file changed, 29 deletions(-)
diff --git
a/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
b/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
deleted file mode 100755
index 756d243542bc..
--- a/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Create a virtualbox modules tarball from a VirtualBox binary package.
-# We cannot download the package by this script because of the unpredictable
-# build number being in the filename.
-#
-# usage: create_vbox_modules_tarball.sh VirtualBox-4.1.18-78361-Linux_amd64.run
-
-[ -f "$1" ] || exit 1
-
-VBOX_PACKAGE="$1"
-VERSION_SUFFIX=""
-
-if [[ ${VBOX_PACKAGE} = *_BETA* ]] || [[ ${VBOX_PACKAGE} = *_RC* ]] ; then
- VERSION_SUFFIX="$(echo ${VBOX_PACKAGE} | sed
's@.*VirtualBox-[[:digit:]\.]\+\(_[[:alpha:]]\+[[:digit:]]\).*@\L\1@')"
-
-fi
-
-VBOX_VER="$(echo ${VBOX_PACKAGE} | sed
's@.*VirtualBox-\([[:digit:]\.]\+\).*@\1@')${VERSION_SUFFIX}"
-
-
-sh ${VBOX_PACKAGE} --noexec --keep --nox11 || exit 2
-cd install || exit 3
-tar -xaf VirtualBox.tar.bz2 || exit 4
-cd src/vboxhost || exit 5
-tar -cvJf ../../../vbox-kernel-module-src-${VBOX_VER}.tar.xz . || exit 6
-cd ../../.. && rm install -rf
-
-exit 0
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox-modules/
commit: d5a8a0587f77a45f57cb2d248d10fd3e4aea1121
Author: Viorel Munteanu gentoo org>
AuthorDate: Thu Jan 25 15:46:45 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Thu Jan 25 15:46:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a8a058
app-emulation/virtualbox-modules: drop 6.1.46-r1
Signed-off-by: Viorel Munteanu gentoo.org>
app-emulation/virtualbox-modules/Manifest | 1 -
.../virtualbox-modules-7.0.10-kernel-6.4.10.patch | 13
.../virtualbox-modules-6.1.46-r1.ebuild| 36 --
3 files changed, 50 deletions(-)
diff --git a/app-emulation/virtualbox-modules/Manifest
b/app-emulation/virtualbox-modules/Manifest
index 37eaeea69756..58665361fd1c 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,3 @@
-DIST vbox-kernel-module-src-6.1.46.tar.xz 680036 BLAKE2B
46963957424fab934152ff945a3f1c0da9ca395f6ce7834e249805d155e2d41ec94b9feaed5c214d90fab547509ca48282fa7603b7f9434e7a5d596ea75177f9
SHA512
b60cf42e8213cb4c7f68090d118a477b4535cca7011f495b8ed3a254070dd8912853bb6c647cb4c86448e241005ad2467888d4731aee994c1ac80d2f38e153b3
DIST vbox-kernel-module-src-6.1.48.tar.xz 680552 BLAKE2B
243cd013a7e027634b7f6338056708cbbfb4ccf46b569c21e60b0e2450dd1ad1395c6881eb235f2cab68a65c0911322604e732fdde06eb389f83171f38ded5ae
SHA512
e26e8e4dce70d0dd07a336a6681d49e0fd5991ed92997139311cefa9cb55d03066c6400d4bdb9dbf54fba683192cfc5a63a98076525f3b3066269dc8fc498598
DIST vbox-kernel-module-src-6.1.50.tar.xz 680700 BLAKE2B
c3a10ce8f3eb7e6c0c05f81cd3c072296557b9f9f6f501bb0aec3f04aabfe1fbb67b553510104139cef290c09ff9e67161085781b8d28c968dfafd15958a1b1a
SHA512
7822e421b595263cbdaae08103255742360ca7ab0c385818ec895f10570c5b9ed5c7614742d8fa8bc2414cd426907cd1c49d735cde8caf9d2b7692898058f592
DIST vbox-kernel-module-src-7.0.12.tar.xz 718284 BLAKE2B
8b427f9764ad7cb216d3b8dcfa05e8b564a8b67cf3beb7ec048b2529a31580eb59eb0e41a887bb85503542cae18d873d91108a522fc0ba106d119a73ce629f34
SHA512
0b64ad2ddc6eaf56759e636aa6c8e5dba998e232ec42a7bf0cf92dc00e7a6c0ebb11e9d7500a8a407e0c92a162ebb71cdb15cbfd4f570c1860641a7fdba21bd0
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.10-kernel-6.4.10.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.10-kernel-6.4.10.patch
deleted file mode 100644
index 189a2ce4085e..
---
a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.10-kernel-6.4.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/912168
-
a/vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ b/vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -47,7 +47,7 @@
- #if RTLNX_VER_MIN(2,6,24)
- # include
- #endif
--#if RTLNX_VER_MIN(6,5,0)
-+#if RTLNX_VER_MIN(6,4,10)
- # include
- #endif
- #include
diff --git
a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.46-r1.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.46-r1.ebuild
deleted file mode 100644
index 2b866fda3662..
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.46-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 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.10-kernel-6.4.10.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
-}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: a37c48205b2da2046afa9241f7cd045df4ebe7c4
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Jun 1 15:44:07 2023 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Thu Jun 1 15:56:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37c4820
app-emulation/virtualbox-modules: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31265
Signed-off-by: Viorel Munteanu gentoo.org>
.../virtualbox-modules-7.0.6-kernel-6.3.patch | 27 --
1 file changed, 27 deletions(-)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.6-kernel-6.3.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.6-kernel-6.3.patch
deleted file mode 100644
index 3ea343791773..
---
a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.6-kernel-6.3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Linux: vboxdrv: Introduce initial support for kernel 6.3.x series,
bugref:10381.
-https://www.virtualbox.org/changeset/98867/vbox
-
-Index: trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-===
a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-+++ b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-@@ -1402,5 +1402,9 @@
- {
- flush_dcache_page(pMemLnx->apPages[rc]);
-+#if RTLNX_VER_MIN(6,3,0)
-+vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
-+#else
- papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
-+#endif
- }
-
-@@ -1873,5 +1877,8 @@
- /* Thes flags help making 100% sure some bad stuff wont
happen (swap, core, ++).
- * See remap_pfn_range() in mm/memory.c */
--#ifRTLNX_VER_MIN(3,7,0)
-+
-+#ifRTLNX_VER_MIN(6,3,0)
-+vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
-+#elif RTLNX_VER_MIN(3,7,0)
- vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
- #else
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox-modules/
commit: 16f171d9bbc6820a7e417ec75413fe4c2bc631d1
Author: Viorel Munteanu gentoo org>
AuthorDate: Mon Apr 3 06:11:57 2023 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Mon Apr 3 06:12:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f171d9
app-emulation/virtualbox-modules: fix compilation with kernel 6.3
Bug: https://bugs.gentoo.org/903638
Signed-off-by: Viorel Munteanu gentoo.org>
.../virtualbox-modules-7.0.6-kernel-6.3.patch | 27 ++
.../virtualbox-modules-6.1.42-r1.ebuild| 61 ++
.../virtualbox-modules-7.0.6-r1.ebuild | 61 ++
3 files changed, 149 insertions(+)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.6-kernel-6.3.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.6-kernel-6.3.patch
new file mode 100644
index ..3ea343791773
--- /dev/null
+++
b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.6-kernel-6.3.patch
@@ -0,0 +1,27 @@
+Linux: vboxdrv: Introduce initial support for kernel 6.3.x series,
bugref:10381.
+https://www.virtualbox.org/changeset/98867/vbox
+
+Index: trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+===
+--- a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+@@ -1402,5 +1402,9 @@
+ {
+ flush_dcache_page(pMemLnx->apPages[rc]);
++#if RTLNX_VER_MIN(6,3,0)
++vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
++#else
+ papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
++#endif
+ }
+
+@@ -1873,5 +1877,8 @@
+ /* Thes flags help making 100% sure some bad stuff wont
happen (swap, core, ++).
+ * See remap_pfn_range() in mm/memory.c */
+-#ifRTLNX_VER_MIN(3,7,0)
++
++#ifRTLNX_VER_MIN(6,3,0)
++vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
++#elif RTLNX_VER_MIN(3,7,0)
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+ #else
diff --git
a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42-r1.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42-r1.ebuild
new file mode 100644
index ..3258677a03ed
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2022-2023 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 toolchain-funcs
+
+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"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+PATCHES=(
+ "${FILESDIR}"/virtualbox-modules-7.0.6-kernel-6.3.patch
+)
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR}
KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+ if linux_chkconfig_present CC_IS_CLANG; then
+ ewarn "Warning: building ${PN} with a clang-built kernel is
experimental."
+
+ BUILD_PARAMS+=' CC=${CHOST}-clang'
+ if linux_chkconfig_present LD_IS_LLD; then
+ BUILD_PARAMS+=' LD=ld.lld'
+ if linux_chkconfig_present LTO_CLANG_THIN; then
+ # kernel enables cache by default leading to
sandbox violations
+ BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir=
LDFLAGS_MODULE=--thinlto-cache-dir='
+ fi
+ fi
+ fi
+}
+
+src_install() {
+ linux-mod_src_install
+ insinto /usr/lib/modules-load.d/
+ newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+ # Remove vboxpci.ko from current running kernel
+ # This module is obsolete, removed in december 2019, so it may be
missing. No || die
+ # TODO: consider removing this line in the near future
+ find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+ linux-mod_pkg_postinst
+}
diff --git
a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6-r1.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6-r1.ebuild
new file mode 100644
index ..e4544d662bf5
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox/, ...
commit: f2247b6b3f3b1a8d17c323a3671edf043b501438
Author: Viorel Munteanu gmail com>
AuthorDate: Wed Nov 2 05:59:04 2022 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Wed Nov 2 06:39:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2247b6b
app-emulation/virtualbox*: drop 6.1.36, 6.1.38
Bug: https://bugs.gentoo.org/877601
Signed-off-by: Viorel Munteanu gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27894
Signed-off-by: Viorel Munteanu gentoo.org>
app-emulation/virtualbox-additions/Manifest| 2 -
.../virtualbox-additions-6.1.36.ebuild | 30 -
.../virtualbox-additions-6.1.38.ebuild | 30 -
app-emulation/virtualbox-extpack-oracle/Manifest | 2 -
.../virtualbox-extpack-oracle-6.1.36.ebuild| 41 --
.../virtualbox-extpack-oracle-6.1.38.ebuild| 41 --
app-emulation/virtualbox-guest-additions/Manifest | 2 -
.../virtualbox-guest-additions-6.1.36.ebuild | 280 -
.../virtualbox-guest-additions-6.1.38.ebuild | 281 -
.../files/virtualbox-modules-5.2.8-pax-const.patch | 44 --
.../virtualbox-modules/files/virtualbox.conf | 4 -
.../virtualbox-modules-6.1.36.ebuild | 65 --
.../virtualbox-modules-6.1.38.ebuild | 65 --
app-emulation/virtualbox/Manifest | 2 -
.../virtualbox/virtualbox-6.1.36-r2.ebuild | 654
app-emulation/virtualbox/virtualbox-6.1.38.ebuild | 663 -
16 files changed, 2206 deletions(-)
diff --git a/app-emulation/virtualbox-additions/Manifest
b/app-emulation/virtualbox-additions/Manifest
index 9ab6de8f40e3..d5b7af278fbd 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,2 @@
-DIST VBoxGuestAdditions_6.1.36.iso 63803392 BLAKE2B
bcd795e4f4ed5b25542011370b0d0ede0a163c89df597d085d731627bf041a5bc8eb8d60c2041bfe1654986751e16bb382680ad487d90def2e8a7d9fab21dd24
SHA512
cf07e77ac882eb9cd6da39c6491f2536ac8c1e4bddb27e50bb6d1016ab7a291746cd59c6966c54ba007bb4cb79b82ebcfacec5984a6e7453f60ad167014542aa
-DIST VBoxGuestAdditions_6.1.38.iso 63887360 BLAKE2B
36688f43d8be5b0f408715f9ad902caf1e298d01f77e5fbb236e15c56da5097c91a4df846b786cb3fa4aa9b97d0360c627b757eebc0503a675b7eb6b752015a0
SHA512
df7051988174227af733d2fb4fd703c885f9637345077090034f3392b2c4deef8ac87d0b9e76f29149609b6e2b7158109377c9af5fdbcdc5691ae6e401c4731b
DIST VBoxGuestAdditions_6.1.40.iso 63883264 BLAKE2B
b9a22604b7dc135e9944bb46e7fb59e6202e692dd75de89763c6fe432328f65bacf4d893221a5e6f90ed3236fd36af2f6608932402e0ae967eb1ed24f6b1153a
SHA512
149311a826c20f9bc8212e7580d3b552b4cd82f7e9dbaf4e44f363807f8132f0a81eb39082fc8876fcd5fb527d7d7c8ae1b3b6d8372b9bb39273d88fbd84a185
DIST VBoxGuestAdditions_7.0.2.iso 52957184 BLAKE2B
8740a9c57268b96995d9412a7799f1c5d7901619f909eb8bef244e3fbadf5a6d94f35f40fa437eb8eda563a77110723bfad4eac518a93fc00e7ee246fd820ac8
SHA512
8084e97b37c6a4471bea8df4ba8464b4c709b4c9b69141c92adec70c12bc32fab583fa20ab04135bcab67f4902b88dbc9539c88909ab65e3eef6bce4c93c692a
diff --git
a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
deleted file mode 100644
index 7cc456fe3207..
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/;
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso;
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
- return 0
-}
-
-src_install() {
- insinto /usr/share/${PN/-additions}
- newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git
a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.38.ebuild
b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.38.ebuild
deleted file mode 100644
index 7cc456fe3207..
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.38.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/;
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso;
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: 9d0b3a7793ef1bdf42d4f5acc30bb427eb5b17e4
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Apr 22 18:10:15 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Apr 25 12:59:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0b3a77
app-emulation/virtualbox-modules: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/20505
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
...les-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch | 96 --
1 file changed, 96 deletions(-)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch
deleted file mode 100644
index 168d7c24f5a..000
---
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-===
a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-+++ b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-@@ -56,9 +56,12 @@
- * Whether we use alloc_vm_area (3.2+) for executable memory.
- * This is a must for 5.8+, but we enable it all the way back to 3.2.x for
- * better W^R compliance (fExecutable flag). */
--#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING)
-+#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING)
- # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
- #endif
-+#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING)
-+# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
-+#endif
-
- /*
- * 2.6.29+ kernels don't work with remap_pfn_range() anymore because
-@@ -502,7 +505,43 @@
- }
-
-
-+#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
- /**
-+ * User data passed to the apply_to_page_range() callback.
-+ */
-+typedef struct LNXAPPLYPGRANGE
-+{
-+/** Pointer to the memory object. */
-+PRTR0MEMOBJLNX pMemLnx;
-+/** The page protection flags to apply. */
-+pgprot_t fPg;
-+} LNXAPPLYPGRANGE;
-+/** Pointer to the user data. */
-+typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE;
-+/** Pointer to the const user data. */
-+typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
-+
-+/**
-+ * Callback called in apply_to_page_range().
-+ *
-+ * @returns Linux status code.
-+ * @param pPtePointer to the page table entry for the given
address.
-+ * @param uAddr The address to apply the new protection to.
-+ * @param pvUser The opaque user data.
-+ */
-+static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned
long uAddr, void *pvUser)
-+{
-+PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
-+PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
-+uint32_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT;
-+
-+set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg));
-+return 0;
-+}
-+#endif
-+
-+
-+/**
- * Maps the allocation into ring-0.
- *
- * This will update the RTR0MEMOBJLNX::Core.pv and RTR0MEMOBJ::fMappedToRing0
members.
-@@ -584,6 +623,11 @@
- else
- # endif
- {
-+# if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+if (fExecutable)
-+pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to
clear NX when memory ready, W^X fashion. */
-+# endif
-+
- # ifdef VM_MAP
- pMemLnx->Core.pv = vmap(>apPages[0], pMemLnx->cPages,
VM_MAP, fPg);
- # else
-@@ -1851,6 +1895,21 @@
- preempt_enable();
- return VINF_SUCCESS;
- }
-+# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem;
-+if ( pMemLnx->fExecutable
-+&& pMemLnx->fMappedToRing0)
-+{
-+LNXAPPLYPGRANGE Args;
-+Args.pMemLnx = pMemLnx;
-+Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/);
-+int rcLnx = apply_to_page_range(current->active_mm, (unsigned
long)pMemLnx->Core.pv + offSub, cbSub,
-+rtR0MemObjLinuxApplyPageRange, (void
*));
-+if (rcLnx)
-+return VERR_NOT_SUPPORTED;
-+
-+return VINF_SUCCESS;
-+}
- # endif
-
- NOREF(pMem);
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox-modules/
commit: 55c76738a29a26890dcadd99a494f58a2a926f63
Author: Lars Wendler gentoo org>
AuthorDate: Tue Mar 9 17:26:50 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Mar 9 17:27:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c76738
app-emulation/virtualbox-modules: Fixed build with binutils-2.36
Signed-off-by: Lars Wendler gentoo.org>
.../virtualbox-modules-6.1.18-binutils-2.36.patch | 39 ++
.../virtualbox-modules-6.1.18.ebuild | 1 +
2 files changed, 40 insertions(+)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
new file mode 100644
index 000..2eaeb1ea338
--- /dev/null
+++
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
@@ -0,0 +1,39 @@
+--- virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c
virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c
+@@ -1472,29 +1472,32 @@
+ __asm__("\
+ .section .text \n\
+ \n\
+-.p2align 2,,3 \n\
++.p2align 4 \n\
+ .global SUPR0TracerFireProbe\n\
++.type SUPR0TracerFireProbe, @function \n\
+ SUPR0TracerFireProbe: \n\
+ ");
+ # if defined(RT_ARCH_AMD64)
+-__asm__(" \
+-movqg_pfnSupdrvProbeFireKernel(%rip), %rax
\n\
++__asm__("\
++movqg_pfnSupdrvProbeFireKernel(%rip), %rax \n\
+ jmp *%rax \n\
+ ");
+ # elif defined(RT_ARCH_X86)
+ __asm__("\
+-movlg_pfnSupdrvProbeFireKernel, %eax
\n\
++movlg_pfnSupdrvProbeFireKernel, %eax\n\
+ jmp *%eax \n\
+ ");
+ # else
+ # error "Which arch is this?"
+ # endif
+ __asm__("\
++.size SUPR0TracerFireProbe, . - SUPR0TracerFireProbe\n\
+ \n\
+ .type supdrvTracerProbeFireStub,@function \n\
+ .global supdrvTracerProbeFireStub \n\
+ supdrvTracerProbeFireStub: \n\
+ ret \n\
++.size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub \n\
+ \n\
+ .previous \n\
+ ");
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
index bbc7f312dbe..17dbf76a1d4 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
@@ -31,6 +31,7 @@ MODULESD_VBOXNETFLT_ENABLED="no"
PATCHES=(
"${FILESDIR}/${P}-linux-5.11.patch" #762994
+ "${FILESDIR}/${P}-binutils-2.36.patch"
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: 07db9e78f7661472c3da8ae7342457d7479f33af Author: Louis Sautier gentoo org> AuthorDate: Mon Feb 22 21:40:36 2021 + Commit: Louis Sautier gentoo org> CommitDate: Mon Feb 22 21:42:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07db9e78 app-emulation/virtualbox-modules: fix patch filename for #735786 Bug: https://bugs.gentoo.org/735786 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Louis Sautier gentoo.org> ...1.18-kernel-5.11.ebuild => virtualbox-modules-6.1.18-linux-5.11.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-kernel-5.11.ebuild b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch similarity index 100% rename from app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-kernel-5.11.ebuild rename to app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox-modules/
commit: f9d40ea3a468742fafb3dc6cd5071ba1126b5133
Author: Louis Sautier gentoo org>
AuthorDate: Mon Feb 22 19:50:21 2021 +
Commit: Louis Sautier gentoo org>
CommitDate: Mon Feb 22 19:53:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d40ea3
app-emulation/virtualbox-modules: fix build with kernel 5.11
Closes: https://bugs.gentoo.org/762994
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Louis Sautier gentoo.org>
.../files/virtualbox-modules-6.1.18-kernel-5.11.ebuild | 16
.../virtualbox-modules/virtualbox-modules-6.1.18.ebuild | 4
2 files changed, 20 insertions(+)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-kernel-5.11.ebuild
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-kernel-5.11.ebuild
new file mode 100644
index 000..844e37e9fda
--- /dev/null
+++
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-kernel-5.11.ebuild
@@ -0,0 +1,16 @@
+Fixes build with kernel 5.11.
+
+Bug: https://www.virtualbox.org/ticket/20198
+Bug: https://bugs.gentoo.org/762994
+From: jospez...@gmx.de
+
+--- a/vboxnetflt/linux/VBoxNetFlt-linux.c
b/vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -38,6 +38,7 @@
+ #include
+ #endif
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
index a884e1456d0..bbc7f312dbe 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
@@ -29,6 +29,10 @@ MODULESD_VBOXDRV_ENABLED="yes"
MODULESD_VBOXNETADP_ENABLED="no"
MODULESD_VBOXNETFLT_ENABLED="no"
+PATCHES=(
+ "${FILESDIR}/${P}-linux-5.11.patch" #762994
+)
+
pkg_setup() {
linux-mod_pkg_setup
BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR}
KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: 4af93ce8ff9b89ce69d99f9f136a84ad12f3acd5
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Feb 2 16:41:54 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 5 15:04:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af93ce8
app-emulation/virtualbox-modules: remove unused patch
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14533
Signed-off-by: Lars Wendler gentoo.org>
...x-modules-6.0.12-linux-5.3+-compatibility.patch | 76 -
.../virtualbox-modules-6.0.14-kernel-5.4_rc6.patch | 308 -
2 files changed, 384 deletions(-)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
deleted file mode 100644
index ff573dd69b6..000
---
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://bugs.gentoo.org/694560
-
-https://www.virtualbox.org/ticket/18911#comment:5
-
a/vboxnetflt//linux/VBoxNetFlt-linux.c
-+++ b/vboxnetflt//linux/VBoxNetFlt-linux.c
-@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct
notifier_block *self, unsign
- #endif
- if (in_dev != NULL)
- {
--for_ifa(in_dev) {
-+struct in_ifaddr *ifa;
-+
-+for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
- if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
- return NOTIFY_OK;
-
-@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct
notifier_block *self, unsign
-
- pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
- /* :fAdded */ true, kIntNetAddrType_IPv4, >ifa_address);
--} endfor_ifa(in_dev);
-+}
- }
-
- /*
a/vboxdrv/r0drv/linux/mp-r0drv-linux.c
-+++ b/vboxdrv/r0drv/linux/mp-r0drv-linux.c
-@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void
*pvUser1, void *pvUser2)
- if (RTCpuSetCount() > 1)
- {
- /* Fire the function on all other CPUs without waiting for
completion. */
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+smp_call_function(rtmpLinuxAllWrapper, , 0 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- int rc = smp_call_function(rtmpLinuxAllWrapper, , 0 /* wait */);
-+Assert(!rc); NOREF(rc);
- # else
- int rc = smp_call_function(rtmpLinuxAllWrapper, , 0 /* retry */,
0 /* wait */);
--# endif
- Assert(!rc); NOREF(rc);
-+# endif
- }
- #endif
-
-@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
*pvUser1, void *pvUser2)
- {
- #ifdef CONFIG_SMP
- IPRT_LINUX_SAVE_EFL_AC();
--int rc;
- RTMPARGS Args;
-
- RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
-@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
*pvUser1, void *pvUser2)
- Args.cHits = 0;
-
- RTThreadPreemptDisable();
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
--rc = smp_call_function(rtmpLinuxWrapper, , 1 /* wait */);
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+smp_call_function(rtmpLinuxWrapper, , 1 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+int rc = smp_call_function(rtmpLinuxWrapper, , 1 /* wait */);
-+Assert(rc == 0); NOREF(rc);
- # else /* older kernels */
--rc = smp_call_function(rtmpLinuxWrapper, , 0 /* retry */, 1 /* wait
*/);
-+int rc = smp_call_function(rtmpLinuxWrapper, , 0 /* retry */, 1 /*
wait */);
-+Assert(rc == 0); NOREF(rc);
- # endif /* older kernels */
- RTThreadPreemptRestore();
-
--Assert(rc == 0); NOREF(rc);
- IPRT_LINUX_RESTORE_EFL_AC();
- #else
- RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch
deleted file mode 100644
index 2c52aa6757c..000
---
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-https://www.virtualbox.org/changeset/81586/vbox
-https://www.virtualbox.org/changeset/81587/vbox
-https://www.virtualbox.org/changeset/81649/vbox (partially)
-
6.0.14/vboxdrv/include/iprt/cdefs.h
-+++ 6.0.14/vboxdrv/include/iprt/cdefs.h
-@@ -1166,7 +1166,7 @@
- * Tell the compiler that we're falling through to the next case in a switch.
- * @sa RT_FALL_THRU */
- #if RT_GNUC_PREREQ(7, 0)
--# define RT_FALL_THROUGH() __attribute__((fallthrough))
-+# define RT_FALL_THROUGH() __attribute__((__fallthrough__))
- #else
- # define
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox-modules/
commit: c6d0023b9e4aaab23038adb446310c74df4ebc45
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Sep 24 19:31:13 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Sep 24 19:56:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d0023b
app-emulation/virtualbox-modules: add linux-5.3+ compatibility
Closes: https://bugs.gentoo.org/694560
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
...x-modules-6.0.12-linux-5.3+-compatibility.patch | 76 ++
.../virtualbox-modules-6.0.12.ebuild | 2 +
2 files changed, 78 insertions(+)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
new file mode 100644
index 000..ff573dd69b6
--- /dev/null
+++
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/694560
+
+https://www.virtualbox.org/ticket/18911#comment:5
+
+--- a/vboxnetflt//linux/VBoxNetFlt-linux.c
b/vboxnetflt//linux/VBoxNetFlt-linux.c
+@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct
notifier_block *self, unsign
+ #endif
+ if (in_dev != NULL)
+ {
+-for_ifa(in_dev) {
++struct in_ifaddr *ifa;
++
++for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
+ if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
+ return NOTIFY_OK;
+
+@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct
notifier_block *self, unsign
+
+ pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
+ /* :fAdded */ true, kIntNetAddrType_IPv4, >ifa_address);
+-} endfor_ifa(in_dev);
++}
+ }
+
+ /*
+--- a/vboxdrv/r0drv/linux/mp-r0drv-linux.c
b/vboxdrv/r0drv/linux/mp-r0drv-linux.c
+@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void
*pvUser1, void *pvUser2)
+ if (RTCpuSetCount() > 1)
+ {
+ /* Fire the function on all other CPUs without waiting for
completion. */
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++smp_call_function(rtmpLinuxAllWrapper, , 0 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ int rc = smp_call_function(rtmpLinuxAllWrapper, , 0 /* wait */);
++Assert(!rc); NOREF(rc);
+ # else
+ int rc = smp_call_function(rtmpLinuxAllWrapper, , 0 /* retry */,
0 /* wait */);
+-# endif
+ Assert(!rc); NOREF(rc);
++# endif
+ }
+ #endif
+
+@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
*pvUser1, void *pvUser2)
+ {
+ #ifdef CONFIG_SMP
+ IPRT_LINUX_SAVE_EFL_AC();
+-int rc;
+ RTMPARGS Args;
+
+ RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
*pvUser1, void *pvUser2)
+ Args.cHits = 0;
+
+ RTThreadPreemptDisable();
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+-rc = smp_call_function(rtmpLinuxWrapper, , 1 /* wait */);
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++smp_call_function(rtmpLinuxWrapper, , 1 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++int rc = smp_call_function(rtmpLinuxWrapper, , 1 /* wait */);
++Assert(rc == 0); NOREF(rc);
+ # else /* older kernels */
+-rc = smp_call_function(rtmpLinuxWrapper, , 0 /* retry */, 1 /* wait
*/);
++int rc = smp_call_function(rtmpLinuxWrapper, , 0 /* retry */, 1 /*
wait */);
++Assert(rc == 0); NOREF(rc);
+ # endif /* older kernels */
+ RTThreadPreemptRestore();
+
+-Assert(rc == 0); NOREF(rc);
+ IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+ RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
index 7257cb3b581..90528f50249 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
@@ -21,6 +21,8 @@ IUSE="pax_kernel"
RDEPEND="!=app-emulation/virtualbox-"
+PATCHES=( "${FILESDIR}"/${PN}-6.0.12-linux-5.3+-compatibility.patch )
+
S="${WORKDIR}"
BUILD_TARGETS="all"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: b16c2460c7efcd2e54ea2efeb400970b3dd99891
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Tue Jan 29 10:01:38 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Feb 6 09:32:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b16c2460
app-emulation/virtualbox-modules: remove unused patches
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10928
Signed-off-by: Lars Wendler gentoo.org>
.../files/virtualbox-modules-4.1.4-pax-const.patch | 44 --
.../files/virtualbox-modules-5.1.30-udp.patch | 35 -
2 files changed, 79 deletions(-)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch
deleted file mode 100644
index f9878848ae1..000
---
a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch
+++ /dev/null
@@ -1,44 +0,0 @@
vboxdrv/SUPDrvIDC.h
-+++ vboxdrv/SUPDrvIDC.h
-@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM
- {
- /** The symbol address. */
- PFNRT pfnSymbol;
--} Out;
-+} __no_const Out;
- } u;
- } SUPDRVIDCREQGETSYM;
- /** Pointer to a SUPDRV IDC get symbol request. */
vboxnetflt/include/VBox/intnet.h
-+++ vboxnetflt/include/VBox/intnet.h
-@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY
- DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY
*pIfFactory, const char *pszName,
-PINTNETTRUNKSWPORT
pSwitchPort, uint32_t fFlags,
-PINTNETTRUNKIFPORT
*ppIfPort));
--} INTNETTRUNKFACTORY;
-+} __no_const INTNETTRUNKFACTORY;
- /** Pointer to the trunk factory. */
- typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY;
-
vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE;
-
- # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
-
--typedef struct net_device_ops OVR_OPSTYPE;
-+typedef net_device_ops_no_const OVR_OPSTYPE;
- # define OVR_OPS netdev_ops
- # define OVR_XMIT pOrgOps->ndo_start_xmit
-
vboxpci/include/VBox/rawpci.h
-+++ vboxpci/include/VBox/rawpci.h
-@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY
- DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY pFactory,
- PVM pVM,
- PRAWPCIPERVM pPciData));
--} RAWPCIFACTORY;
-+} __no_const RAWPCIFACTORY;
-
- #define RAWPCIFACTORY_UUID_STR "ea089839-4171-476f-adfb-9e7ab1cbd0fb"
-
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
deleted file mode 100644
index b9f695e49a1..000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/work/vboxnetflt/linux/VBoxNetFlt-linux.c
b/work/vboxnetflt/linux/VBoxNetFlt-linux.c
-index f824654..b61d82c 100644
work/vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ work/vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -126,6 +126,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER;
- # endif
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+#define SKB_GSO_UDP 0
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
- # define VBOX_HAVE_SKB_VLAN
- #else
-diff --git a/work/vboxpci/linux/VBoxPci-linux.c
b/work/vboxpci/linux/VBoxPci-linux.c
-index 2dbf47f..e361ef3 100644
work/vboxpci/linux/VBoxPci-linux.c
-+++ work/vboxpci/linux/VBoxPci-linux.c
-@@ -353,12 +353,16 @@ static void vboxPciFileClose(struct file* file)
- static int vboxPciFileWrite(struct file* file, unsigned long long offset,
unsigned char* data, unsigned int size)
- {
- int ret;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+ret = kernel_write(file, data, size, );
-+#else
- mm_segment_t fs_save;
-
- fs_save = get_fs();
- set_fs(get_ds());
- ret = vfs_write(file, data, size, );
- set_fs(fs_save);
-+#endif
- if (ret < 0)
- printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: 9bf27fc3a7bf3fd1312c0700e1f53c83edc9e5b4 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Nov 13 04:56:23 2018 + Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 13 08:33:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf27fc3 app-emulation/virtualbox-modules: change module load order vboxnetadp, vboxnetflt and vboxpci depend on vboxdrv Module Size Used by vboxdrv 425984 3 vboxpci,vboxnetadp,vboxnetflt But since OpenRC commit d70b1c55b67b44b98c23ceed25bc428481f7e00a modprobe is run with '--first-time' option, thus produsing harmless, but stil nasty looking error: '* Failed to load vboxdrv' on boot This commit changes module load order to prevent seeing the error. This does not change behavior on older openrc systems. Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> Signed-off-by: Lars Wendler gentoo.org> app-emulation/virtualbox-modules/files/virtualbox.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/virtualbox-modules/files/virtualbox.conf b/app-emulation/virtualbox-modules/files/virtualbox.conf index 452f0a9ff3e..c8c79a24988 100644 --- a/app-emulation/virtualbox-modules/files/virtualbox.conf +++ b/app-emulation/virtualbox-modules/files/virtualbox.conf @@ -1,4 +1,4 @@ +vboxdrv vboxnetflt vboxnetadp -vboxdrv vboxpci
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox-modules/
commit: 2973c351fff931847f9da4a871d4ad44eb85b746
Author: Sergey Alirzaev gmail com>
AuthorDate: Tue Apr 10 13:37:55 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Apr 11 07:54:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2973c351
app-emulation/virtualbox-modules: fix patching for pax
Bug: https://bugs.gentoo.org/643466
.../files/virtualbox-modules-5.2.8-pax-const.patch | 44 ++
.../virtualbox-modules-5.2.8.ebuild| 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch
new file mode 100644
index 000..6251e33ce59
--- /dev/null
+++
b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch
@@ -0,0 +1,44 @@
+--- vboxdrv/SUPDrvIDC.h
vboxdrv/SUPDrvIDC.h
+@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM
+ {
+ /** The symbol address. */
+ PFNRT pfnSymbol;
+-} Out;
++} __no_const Out;
+ } u;
+ } SUPDRVIDCREQGETSYM;
+ /** Pointer to a SUPDRV IDC get symbol request. */
+--- vboxnetflt/include/VBox/intnet.h
vboxnetflt/include/VBox/intnet.h
+@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY
+ DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY
*pIfFactory, const char *pszName,
+PINTNETTRUNKSWPORT
pSwitchPort, uint32_t fFlags,
+PINTNETTRUNKIFPORT
*ppIfPort));
+-} INTNETTRUNKFACTORY;
++} __no_const INTNETTRUNKFACTORY;
+ /** Pointer to the trunk factory. */
+ typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY;
+
+--- vboxnetflt/linux/VBoxNetFlt-linux.c
vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE;
+
+ # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
+
+-typedef struct net_device_ops OVR_OPSTYPE;
++typedef net_device_ops_no_const OVR_OPSTYPE;
+ # define OVR_OPS netdev_ops
+ # define OVR_XMIT pOrgOps->ndo_start_xmit
+
+--- vboxpci/include/VBox/rawpci.h
vboxpci/include/VBox/rawpci.h
+@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY
+ DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY pFactory,
+ PVM pVM,
+ PRAWPCIPERVM pVmData));
+-} RAWPCIFACTORY;
++} __no_const RAWPCIFACTORY;
+
+ #define RAWPCIFACTORY_UUID_STR "ea089839-4171-476f-adfb-9e7ab1cbd0fb"
+
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild
index 91e66b6535c..81bd3967d83 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild
@@ -39,7 +39,7 @@ pkg_setup() {
src_prepare() {
if use pax_kernel && kernel_is -ge 3 0 0 ; then
- eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+ eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
fi
default
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/, app-emulation/virtualbox-modules/
commit: 148d258205d9dac8c75d6b5ae041e6a96de5b075
Author: Guilherme Amadio gentoo org>
AuthorDate: Mon Nov 27 14:02:30 2017 +
Commit: Guilherme Amadio gentoo org>
CommitDate: Mon Nov 27 23:00:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148d2582
app-emulation/virtualbox-modules: support linux 4.14.x, fix bug #636484
SKB_GSO_UDP has been removed in linux by commit
d9d30adf56777c402c0027c0e6ae21f17cc0a365.
Reported-by: Fabio Rossi inwind.it>
Suggested-by: Herb Miller Jr. hlmjr.com>
Closes: https://bugs.gentoo.org/636484
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-emulation/virtualbox-modules/Manifest | 2 +-
.../files/virtualbox-modules-5.1.30-udp.patch | 35 ++
.../virtualbox-modules-5.1.30.ebuild | 4 +++
3 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/app-emulation/virtualbox-modules/Manifest
b/app-emulation/virtualbox-modules/Manifest
index 3832b270b67..b601fb3ae1a 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,3 +1,3 @@
DIST vbox-kernel-module-src-5.1.26.tar.xz 625384 SHA256
5ba4f728c5b62c3d93828d99c5b54b8fb24a16bc8674e704714c4f71eb95ddc4 SHA512
c77e0d8dfade2abac95162e7e7a424be4875e44d43bcf2a13e0e50caa69f5fd0d21c77f03bb2cd4cbd5df4ab31e9fbd49ecd9220a49af8cd10081b960e014010
WHIRLPOOL
519246aeae6637cb8eb4b841552dc5e63f9a3d761fa6bcec43601c8a3194264457e4e78d200e975e31266af2944aa81f7487cf389f43d93db08f60a700a7758e
DIST vbox-kernel-module-src-5.1.28.tar.xz 625464 SHA256
d6f3b7afa98d2b526d8da3c8906addc307eea069db371d012ebbffc1ccdf9dd2 SHA512
c8ae6c065ad42e57eee9a54f288ba60fd9b32efe18cb74c8a035d547b30e7d857c9091307485a8dfc77eec45de29d3217c6871140e167e2438759c314c47680a
WHIRLPOOL
c6508d63cacfcd3ac901f276cd793dc83c595bc73965518baa544b5cf5157ea52363b759f03586f743d6c2e0fda7252b98136c96cef28ecfb31f6915d4ce5709
-DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 SHA256
879b1bc45b9f1a3fd929d2fd2e67dcaffe4074839f6364bf0e64618bfe2b3b2e SHA512
8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a
WHIRLPOOL
aa6fc3a0516514c2ca0c39ea28200559582fdd648e96084a5ca1daabfd1f478312199576ad27336eba124b443fbe122364efde2c60ca3386872cd1274333f4df
+DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 BLAKE2B
00d33cad237af1f0d5b4dbea38f84e0327d10d97fc309a8c7536433cb4fddf3614e6de160646077040b4fdc6dd126cfa2250081084ca0243cc572d9f5e9d5dfd
SHA512
8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
new file mode 100644
index 000..b9f695e49a1
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
@@ -0,0 +1,35 @@
+diff --git a/work/vboxnetflt/linux/VBoxNetFlt-linux.c
b/work/vboxnetflt/linux/VBoxNetFlt-linux.c
+index f824654..b61d82c 100644
+--- work/vboxnetflt/linux/VBoxNetFlt-linux.c
work/vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -126,6 +126,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER;
+ # endif
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++#define SKB_GSO_UDP 0
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
+ # define VBOX_HAVE_SKB_VLAN
+ #else
+diff --git a/work/vboxpci/linux/VBoxPci-linux.c
b/work/vboxpci/linux/VBoxPci-linux.c
+index 2dbf47f..e361ef3 100644
+--- work/vboxpci/linux/VBoxPci-linux.c
work/vboxpci/linux/VBoxPci-linux.c
+@@ -353,12 +353,16 @@ static void vboxPciFileClose(struct file* file)
+ static int vboxPciFileWrite(struct file* file, unsigned long long offset,
unsigned char* data, unsigned int size)
+ {
+ int ret;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ret = kernel_write(file, data, size, );
++#else
+ mm_segment_t fs_save;
+
+ fs_save = get_fs();
+ set_fs(get_ds());
+ ret = vfs_write(file, data, size, );
+ set_fs(fs_save);
++#endif
+ if (ret < 0)
+ printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
index 6600e4fb53b..5a079275586 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
@@ -47,6 +47,10 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
fi
+ if kernel_is -ge 4 14 0 ; then
+ epatch "${FILESDIR}"/${PN}-5.1.30-udp.patch
+ fi
+
default
}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: 98b12a0a101cc7d315e2f6e4c8b68a9886476cfe Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Aug 29 08:54:16 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Sep 2 14:27:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b12a0a app-emulation/virtualbox-modules: remove unused patch .../files/virtualbox-modules-5.1.10-ALIGN-backport.patch | 12 1 file changed, 12 deletions(-) diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.10-ALIGN-backport.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.10-ALIGN-backport.patch deleted file mode 100644 index 1bc3fdddcb3..000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.10-ALIGN-backport.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h -=== a/vboxdrv/SUPDrvInternal.h -+++ b/vboxdrv/SUPDrvInternal.h -@@ -65,7 +65,4 @@ - # include - # endif --# endif --# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0) --# undef ALIGN - # endif - # ifndef KBUILD_STR
[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
commit: 07e32708487ebda499271dc5ed06a97d8cd5743d
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Fri Jul 8 17:18:24 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Aug 11 08:07:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e32708
app-emulation/virtualbox-modules: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/1861
Signed-off-by: Patrice Clement gentoo.org>
.../files/virtualbox-modules-3.17.patch| 49 --
1 file changed, 49 deletions(-)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
deleted file mode 100644
index 1d059c5..000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -rupN work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2014-01-14
04:27:06.0 -0600
-+++ work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2014-09-03
11:12:28.247795756 -0500
-@@ -191,7 +191,7 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
- struct page **papPagesIterator = papPages;
- pVmArea->nr_pages = cPages;
- pVmArea->pages= papPages;
--if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, ))
-+if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, papPagesIterator))
- {
- PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
- pHdrEx->pVmArea = pVmArea;
-diff -rupN work/vboxnetadp/linux/VBoxNetAdp-linux.c
work.new/vboxnetadp/linux/VBoxNetAdp-linux.c
work/vboxnetadp/linux/VBoxNetAdp-linux.c 2013-10-09 06:02:09.0
-0500
-+++ work.new/vboxnetadp/linux/VBoxNetAdp-linux.c 2014-09-03
11:13:55.999687819 -0500
-@@ -52,6 +52,25 @@
-
- #define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
-
-+/***
-+source for the 4th parameter alloc_netdev fix for kernel 3.17-rc1 is:
-+https://github.com/proski/madwifi/commit/c5246021b7b8580c2aeb0a145903acc07d246ac1
-+*/
-+#ifndef NET_NAME_UNKNOWN
-+#undef alloc_netdev
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
-+ alloc_netdev(sizeof_priv, name, setup)
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
-+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
-+ alloc_netdev_mq(sizeof_priv, name, setup, 1)
-+#else
-+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
-+ alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
-+#endif
-+#endif
-+/***/
-+
-
/***
- * Internal Functions
*
-
***/
-@@ -183,6 +202,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
- /* No need for private data. */
- pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV),
-pThis->szName[0] ? pThis->szName :
VBOXNETADP_LINUX_NAME,
-+ NET_NAME_UNKNOWN,
-vboxNetAdpNetDevInit);
- if (pNetDev)
- {
