* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2016-08-11 8:09 Patrice Clement
0 siblings, 0 replies; 9+ messages in thread
From: Patrice Clement @ 2016-08-11 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 07e32708487ebda499271dc5ed06a97d8cd5743d
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jul 8 17:18:24 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 08:07:58 2016 +0000
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 <monsieurp <AT> 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..0000000
--- 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.000000000 -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, &papPagesIterator))
-+ 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.000000000 -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)
- {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2017-09-02 14:27 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2017-09-02 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 98b12a0a101cc7d315e2f6e4c8b68a9886476cfe
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 29 08:54:16 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 14:27:13 2017 +0000
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..00000000000
--- 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 <linux/modversions.h>
- # endif
--# endif
--# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
--# undef ALIGN
- # endif
- # ifndef KBUILD_STR
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2018-11-13 8:33 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2018-11-13 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 9bf27fc3a7bf3fd1312c0700e1f53c83edc9e5b4
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 04:56:23 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 08:33:27 2018 +0000
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 <gyakovlev <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2019-02-06 9:32 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2019-02-06 9:32 UTC (permalink / raw
To: gentoo-commits
commit: b16c2460c7efcd2e54ea2efeb400970b3dd99891
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 29 10:01:38 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 09:32:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b16c2460
app-emulation/virtualbox-modules: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10928
Signed-off-by: Lars Wendler <polynomial-c <AT> 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..00000000000
--- 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..00000000000
--- 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, &offset);
-+#else
- mm_segment_t fs_save;
-
- fs_save = get_fs();
- set_fs(get_ds());
- ret = vfs_write(file, data, size, &offset);
- set_fs(fs_save);
-+#endif
- if (ret < 0)
- printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2020-05-05 15:04 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-05-05 15:04 UTC (permalink / raw
To: gentoo-commits
commit: 4af93ce8ff9b89ce69d99f9f136a84ad12f3acd5
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb 2 16:41:54 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 5 15:04:53 2020 +0000
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 <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14533
Signed-off-by: Lars Wendler <polynomial-c <AT> 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..00000000000
--- 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->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(&OnlineSet) > 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, &Args, 0 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-+ Assert(!rc); NOREF(rc);
- # else
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 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(&PreemptState);
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+ Assert(rc == 0); NOREF(rc);
- # else /* older kernels */
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+ Assert(rc == 0); NOREF(rc);
- # endif /* older kernels */
- RTThreadPreemptRestore(&PreemptState);
-
-- 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..00000000000
--- 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 RT_FALL_THROUGH() (void)0
- #endif
---- 6.0.14/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
-+++ 6.0.14/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
-@@ -443,9 +443,6 @@
- }
-
- SetPageReserved(&paPages[iPage]);
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
-- MY_SET_PAGES_EXEC(&paPages[iPage], 1);
--#endif
- }
- *pPhys = page_to_phys(paPages);
- pvRet = phys_to_virt(page_to_phys(paPages));
-@@ -491,9 +488,6 @@
- for (iPage = 0; iPage < cPages; iPage++)
- {
- ClearPageReserved(&paPages[iPage]);
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
-- MY_SET_PAGES_NOEXEC(&paPages[iPage], 1);
--#endif
- }
- __free_pages(paPages, cOrder);
- IPRT_LINUX_RESTORE_EFL_AC();
---- 6.0.14/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-+++ 6.0.14/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-@@ -86,6 +86,8 @@
- /** Set if the allocation is contiguous.
- * This means it has to be given back as one chunk. */
- bool fContiguous;
-+ /** Set if executable allocation. */
-+ bool fExecutable;
- /** Set if we've vmap'ed the memory into ring-0. */
- bool fMappedToRing0;
- /** The pages in the apPages array. */
-@@ -289,10 +291,11 @@
- * Only valid if fContiguous == true, ignored otherwise.
- * @param fFlagsLnx The page allocation flags (GPFs).
- * @param fContiguous Whether the allocation must be contiguous.
-+ * @param fExecutable Whether the memory must be executable.
- * @param rcNoMem What to return when we're out of pages.
- */
- static int rtR0MemObjLinuxAllocPages(PRTR0MEMOBJLNX *ppMemLnx, RTR0MEMOBJTYPE enmType, size_t cb,
-- size_t uAlignment, gfp_t fFlagsLnx, bool fContiguous, int rcNoMem)
-+ size_t uAlignment, gfp_t fFlagsLnx, bool fContiguous, bool fExecutable, int rcNoMem)
- {
- size_t iPage;
- size_t const cPages = cb >> PAGE_SHIFT;
-@@ -371,7 +374,8 @@
- for (iPage = 0; iPage < cPages; iPage++)
- {
- pMemLnx->apPages[iPage] = &paPages[iPage];
-- MY_SET_PAGES_EXEC(pMemLnx->apPages[iPage], 1);
-+ if (fExecutable)
-+ MY_SET_PAGES_EXEC(pMemLnx->apPages[iPage], 1);
- if (PageHighMem(pMemLnx->apPages[iPage]))
- BUG();
- }
-@@ -379,6 +383,7 @@
- fContiguous = true;
- #endif /* < 2.4.22 */
- pMemLnx->fContiguous = fContiguous;
-+ pMemLnx->fExecutable = fExecutable;
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
- /*
-@@ -409,7 +414,7 @@
- * This should never happen!
- */
- printk("rtR0MemObjLinuxAllocPages(cb=0x%lx, uAlignment=0x%lx): alloc_pages(..., %d) returned physical memory at 0x%lx!\n",
-- (unsigned long)cb, (unsigned long)uAlignment, rtR0MemObjLinuxOrder(cPages), (unsigned long)page_to_phys(pMemLnx->apPages[0]));
-+ (unsigned long)cb, (unsigned long)uAlignment, rtR0MemObjLinuxOrder(cPages), (unsigned long)page_to_phys(pMemLnx->apPages[0]));
- rtR0MemObjLinuxFreePages(pMemLnx);
- return rcNoMem;
- }
-@@ -438,14 +443,12 @@
- while (iPage-- > 0)
- {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
-- /*
-- * See SetPageReserved() in rtR0MemObjLinuxAllocPages()
-- */
-+ /* See SetPageReserved() in rtR0MemObjLinuxAllocPages() */
- ClearPageReserved(pMemLnx->apPages[iPage]);
- #endif
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22)
--#else
-- MY_SET_PAGES_NOEXEC(pMemLnx->apPages[iPage], 1);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 22)
-+ if (pMemLnx->fExecutable)
-+ MY_SET_PAGES_NOEXEC(pMemLnx->apPages[iPage], 1);
- #endif
- }
-
-@@ -662,10 +665,10 @@
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22)
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_HIGHUSER,
-- false /* non-contiguous */, VERR_NO_MEMORY);
-+ false /* non-contiguous */, fExecutable, VERR_NO_MEMORY);
- #else
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_USER,
-- false /* non-contiguous */, VERR_NO_MEMORY);
-+ false /* non-contiguous */, fExecutable, VERR_NO_MEMORY);
- #endif
- if (RT_SUCCESS(rc))
- {
-@@ -696,19 +699,19 @@
- #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32)
- /* ZONE_DMA32: 0-4GB */
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA32,
-- false /* non-contiguous */, VERR_NO_LOW_MEMORY);
-+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY);
- if (RT_FAILURE(rc))
- #endif
- #ifdef RT_ARCH_AMD64
- /* ZONE_DMA: 0-16MB */
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA,
-- false /* non-contiguous */, VERR_NO_LOW_MEMORY);
-+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY);
- #else
- # ifdef CONFIG_X86_PAE
- # endif
- /* ZONE_NORMAL: 0-896MB */
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_USER,
-- false /* non-contiguous */, VERR_NO_LOW_MEMORY);
-+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY);
- #endif
- if (RT_SUCCESS(rc))
- {
-@@ -738,17 +741,17 @@
- #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32)
- /* ZONE_DMA32: 0-4GB */
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA32,
-- true /* contiguous */, VERR_NO_CONT_MEMORY);
-+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY);
- if (RT_FAILURE(rc))
- #endif
- #ifdef RT_ARCH_AMD64
- /* ZONE_DMA: 0-16MB */
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA,
-- true /* contiguous */, VERR_NO_CONT_MEMORY);
-+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY);
- #else
- /* ZONE_NORMAL (32-bit hosts): 0-896MB */
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_USER,
-- true /* contiguous */, VERR_NO_CONT_MEMORY);
-+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY);
- #endif
- if (RT_SUCCESS(rc))
- {
-@@ -795,7 +798,7 @@
-
- rc = rtR0MemObjLinuxAllocPages(&pMemLnx, enmType, cb, uAlignment, fGfp,
- enmType == RTR0MEMOBJTYPE_PHYS /* contiguous / non-contiguous */,
-- VERR_NO_PHYS_MEMORY);
-+ false /*fExecutable*/, VERR_NO_PHYS_MEMORY);
- if (RT_FAILURE(rc))
- return rc;
-
---- 6.0.14/vboxdrv/r0drv/linux/the-linux-kernel.h
-+++ 6.0.14/vboxdrv/r0drv/linux/the-linux-kernel.h
-@@ -337,8 +337,10 @@
- #endif
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
--# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
--# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */
-+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
-+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# endif
- #else
- # define MY_SET_PAGES_EXEC(pPages, cPages) \
- do { \
---- 6.0.14/vboxdrv/r0drv/linux/thread2-r0drv-linux.c
-+++ 6.0.14/vboxdrv/r0drv/linux/thread2-r0drv-linux.c
-@@ -36,6 +36,9 @@
- #include <iprt/errcore.h>
- #include "internal/thread.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+ #include <uapi/linux/sched/types.h>
-+#endif /* >= KERNEL_VERSION(4, 11, 0) */
-
- RTDECL(RTTHREAD) RTThreadSelf(void)
- {
---- 6.0.14/vboxnetadp/include/iprt/cdefs.h
-+++ 6.0.14/vboxnetadp/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 RT_FALL_THROUGH() (void)0
- #endif
---- 6.0.14/vboxnetadp/r0drv/linux/the-linux-kernel.h
-+++ 6.0.14/vboxnetadp/r0drv/linux/the-linux-kernel.h
-@@ -337,8 +337,10 @@
- #endif
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
--# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
--# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */
-+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
-+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# endif
- #else
- # define MY_SET_PAGES_EXEC(pPages, cPages) \
- do { \
---- 6.0.14/vboxnetflt/include/iprt/cdefs.h
-+++ 6.0.14/vboxnetflt/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 RT_FALL_THROUGH() (void)0
- #endif
---- 6.0.14/vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ 6.0.14/vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -924,8 +924,13 @@
- for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)
- {
- skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
-+ 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) */
- pSG->aSegs[iSeg].cb = pFrag->size;
- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset;
-+# endif /* >= KERNEL_VERSION(5, 4, 0) */
- Log6((" %p", pSG->aSegs[iSeg].pv));
- pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS;
- Assert(iSeg <= pSG->cSegsAlloc);
-@@ -940,8 +945,13 @@
- for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++)
- {
- skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
-+ 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) */
- pSG->aSegs[iSeg].cb = pFrag->size;
- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset;
-+# endif /* >= KERNEL_VERSION(5, 4, 0) */
- Log6((" %p", pSG->aSegs[iSeg].pv));
- pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS;
- Assert(iSeg <= pSG->cSegsAlloc);
---- 6.0.14/vboxnetflt/r0drv/linux/the-linux-kernel.h
-+++ 6.0.14/vboxnetflt/r0drv/linux/the-linux-kernel.h
-@@ -337,8 +337,10 @@
- #endif
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
--# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
--# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */
-+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
-+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# endif
- #else
- # define MY_SET_PAGES_EXEC(pPages, cPages) \
- do { \
---- 6.0.14/vboxpci/include/iprt/cdefs.h
-+++ 6.0.14/vboxpci/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 RT_FALL_THROUGH() (void)0
- #endif
---- 6.0.14/vboxpci/r0drv/linux/the-linux-kernel.h
-+++ 6.0.14/vboxpci/r0drv/linux/the-linux-kernel.h
-@@ -337,8 +337,10 @@
- #endif
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
--# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
--# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */
-+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
-+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
-+# endif
- #else
- # define MY_SET_PAGES_EXEC(pPages, cPages) \
- do { \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2021-02-22 21:44 Louis Sautier
0 siblings, 0 replies; 9+ messages in thread
From: Louis Sautier @ 2021-02-22 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 07db9e78f7661472c3da8ae7342457d7479f33af
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 21:40:36 2021 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 21:42:59 2021 +0000
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 <sbraz <AT> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2021-04-25 12:59 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2021-04-25 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 9d0b3a7793ef1bdf42d4f5acc30bb427eb5b17e4
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 22 18:10:15 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 12:59:30 2021 +0000
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 <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> 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..00000000000
--- 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 pPte Pointer 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(&pMemLnx->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 *)&Args);
-+ if (rcLnx)
-+ return VERR_NOT_SUPPORTED;
-+
-+ return VINF_SUCCESS;
-+ }
- # endif
-
- NOREF(pMem);
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2023-06-01 15:57 Viorel Munteanu
0 siblings, 0 replies; 9+ messages in thread
From: Viorel Munteanu @ 2023-06-01 15:57 UTC (permalink / raw
To: gentoo-commits
commit: a37c48205b2da2046afa9241f7cd045df4ebe7c4
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun 1 15:44:07 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 15:56:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37c4820
app-emulation/virtualbox-modules: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31265
Signed-off-by: Viorel Munteanu <ceamac <AT> 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..000000000000
--- 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 */
--#if RTLNX_VER_MIN(3,7,0)
-+
-+#if RTLNX_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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/
@ 2024-06-05 4:47 Viorel Munteanu
0 siblings, 0 replies; 9+ messages in thread
From: Viorel Munteanu @ 2024-06-05 4:47 UTC (permalink / raw
To: gentoo-commits
commit: 4137a9fd4847f8a6f349e0fa4b57cbebdfb89638
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 04:42:51 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 04:46:46 2024 +0000
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 <ceamac <AT> 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..000000000000
--- 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-06-05 4:47 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-05 15:04 [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2024-06-05 4:47 Viorel Munteanu
2023-06-01 15:57 Viorel Munteanu
2021-04-25 12:59 Conrad Kostecki
2021-02-22 21:44 Louis Sautier
2019-02-06 9:32 Lars Wendler
2018-11-13 8:33 Lars Wendler
2017-09-02 14:27 Michael Palimaka
2016-08-11 8:09 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox