[intel-media-driver] Update to 19.2.1
by Nicolas Chauvet
commit c73438b614f8c3e64ffa3eae48515caf5fb90e2b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Aug 1 19:42:16 2019 +0200
Update to 19.2.1
intel-media-driver.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index e27d80c..119d23f 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -1,7 +1,7 @@
#global pre .pre3
Name: intel-media-driver
-Version: 19.2
+Version: 19.2.1
Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
@@ -97,6 +97,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Thu Aug 01 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 19.2.1-1
+- Update to 19.2.1
+
* Fri Jul 05 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 19.2-1
- Update to Final 19.2
diff --git a/sources b/sources
index 061d83f..1a1eb49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1736101470e19ff15a69c3ad1591f8b intel-media-19.2.tar.gz
+0f68f480cd49e49516148a9c4909308c intel-media-19.2.1.tar.gz
5 years, 4 months
- 1
- 0
[VirtualBox-kmod/f30] Fixes for kernel 5.3
by Sérgio M. Basto
Summary of changes:
f551508... Fixes for kernel 5.3 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 4 months
- 1
- 0
[VirtualBox-kmod] Fixes for kernel 5.3
by Sérgio M. Basto
commit f551508fe43a19fd44849b355c7740269f5548ff
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Aug 1 01:51:33 2019 +0100
Fixes for kernel 5.3
Fixes_for_Kernel_5.3.patch | 131 +++++++++++++++++++++++++++++++++++++++++++++
VirtualBox-kmod.spec | 10 ++--
2 files changed, 137 insertions(+), 4 deletions(-)
---
diff --git a/Fixes_for_Kernel_5.3.patch b/Fixes_for_Kernel_5.3.patch
new file mode 100644
index 0000000..ad46591
--- /dev/null
+++ b/Fixes_for_Kernel_5.3.patch
@@ -0,0 +1,131 @@
+--- ./vboxnetflt/linux/VBoxNetFlt-linux.c.orig 2019-07-12 09:38:15.000000000 +0100
++++ ./vboxnetflt/linux/VBoxNetFlt-linux.c 2019-07-29 01:22:23.996876714 +0100
+@@ -2123,7 +2123,10 @@ static int vboxNetFltLinuxEnumeratorCall
+ #endif
+ if (in_dev != NULL)
+ {
+- for_ifa(in_dev) {
++ /* macros for_ifa() and endfor_ifa() disappear for kernel 5.3
++ * Code them directly */
++ 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 +2140,7 @@ static int vboxNetFltLinuxEnumeratorCall
+
+ pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
+ /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
+- } endfor_ifa(in_dev);
++ }
+ }
+
+ /*
+--- ./vboxguest/r0drv/linux/mp-r0drv-linux.c.orig 2019-07-12 09:38:58.000000000 +0100
++++ ./vboxguest/r0drv/linux/mp-r0drv-linux.c 2019-07-29 01:21:59.678619335 +0100
+@@ -283,12 +283,16 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnW
+ 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 */);
+-# else
++#else
+ int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
+-# endif
++#endif
++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ Assert(!rc); NOREF(rc);
++#endif
+ }
+ #endif
+
+@@ -326,7 +330,9 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER p
+ {
+ #ifdef CONFIG_SMP
+ IPRT_LINUX_SAVE_EFL_AC();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ int rc;
++#endif
+ RTMPARGS Args;
+
+ RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +343,18 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER p
+ Args.cHits = 0;
+
+ RTThreadPreemptDisable(&PreemptState);
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#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)
+ rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+-# else /* older kernels */
++#else /* older kernels */
+ rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
+-# endif /* older kernels */
++#endif /* older kernels */
+ RTThreadPreemptRestore(&PreemptState);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ Assert(rc == 0); NOREF(rc);
++#endif
+ IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+ RT_NOREF(pfnWorker, pvUser1, pvUser2);
+--- ./vboxdrv/r0drv/linux/mp-r0drv-linux.c.orig 2019-07-12 09:38:58.000000000 +0100
++++ ./vboxdrv/r0drv/linux/mp-r0drv-linux.c 2019-07-29 01:22:54.706201738 +0100
+@@ -283,12 +283,16 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnW
+ 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 */);
+-# else
++#else
+ int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
+-# endif
++#endif
++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ Assert(!rc); NOREF(rc);
++#endif
+ }
+ #endif
+
+@@ -326,7 +330,9 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER p
+ {
+ #ifdef CONFIG_SMP
+ IPRT_LINUX_SAVE_EFL_AC();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ int rc;
++#endif
+ RTMPARGS Args;
+
+ RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +343,18 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER p
+ Args.cHits = 0;
+
+ RTThreadPreemptDisable(&PreemptState);
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#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)
+ rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+-# else /* older kernels */
++#else /* older kernels */
+ rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
+-# endif /* older kernels */
++#endif /* older kernels */
+ RTThreadPreemptRestore(&PreemptState);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ Assert(rc == 0); NOREF(rc);
++#endif
+ IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+ RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 871c4d9..326e221 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -45,7 +45,7 @@
Name: VirtualBox-kmod
Version: 6.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -55,7 +55,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip
-#Patch1: new-kernel-5.2.patch
+Patch1: Fixes_for_Kernel_5.3.patch
Patch2: kernel-5.patch
@@ -82,15 +82,14 @@ Kernel module for VirtualBox
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
+%patch1 -p1
%patch2 -p1
-
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
mv vboxsf-%{commit1}/ vboxsf/
%endif
-#patch1 -p1
popd
# error out if there was something wrong with kmodtool
@@ -151,6 +150,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Mon Jul 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.10-2
+- Fixes for kernel 5.3
+
* Wed Jul 17 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.10-1
- Update to 6.0.10
5 years, 4 months
- 1
- 0