[broadcom-wl] improve SPEC file for RHEL 6.x and 7.x AppStream Metadata
by Nicolas Viéville
commit 8d2fecb76c72675412c7d8c7315876d8ea2f50f6
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Apr 7 18:08:16 2019 +0200
improve SPEC file for RHEL 6.x and 7.x AppStream Metadata
broadcom-wl.spec | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/broadcom-wl.spec b/broadcom-wl.spec
index 567c764..3f91b92 100644
--- a/broadcom-wl.spec
+++ b/broadcom-wl.spec
@@ -9,9 +9,15 @@
%global _dracut_conf_d %{_sysconfdir}/dracut.conf.d
%endif
+%if 0%{?rhel} > 7 || 0%{?fedora}
+ %bcond_without python3
+%else
+ %bcond_with python3
+%endif
+
Name: broadcom-wl
Version: 6.30.223.271
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -32,9 +38,13 @@ Requires: wl-kmod >= %{?epoch}:%{version}
ExcludeArch: ppc ppc64
-%if 0%{?fedora} >= 25
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 25
# AppStream metadata generation
+%if %{with python3}
BuildRequires: python3
+%else
+BuildRequires: python
+%endif
BuildRequires: libappstream-glib
%endif
@@ -63,7 +73,7 @@ install -m 0755 -d %{buildroot}%{_dracut_conf_d}
install -p -m 0644 %{SOURCE4} %{buildroot}%{_dracut_conf_d}/
install -m 0755 -d %{buildroot}%{_sysconfdir}/akmods/akmod-wl/
install -p -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/akmods/akmod-wl/
-%if 0%{?fedora} >= 25
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 25
# install AppData and add modalias provides
install -m 0755 -d %{buildroot}%{_datadir}/metainfo/
install -p -m 0644 %{SOURCE7} %{buildroot}%{_datadir}/metainfo/
@@ -71,7 +81,11 @@ fn=%{buildroot}%{_datadir}/metainfo/com.broadcom.wireless.hybrid.driver.metainfo
# As appstream-util deletes all comments in the metainfo.xml file, the
# copyright must be saved and re-written to the resulting file.
copyright_string=$(grep Copyright ${fn})
+%if %{with python3}
python3 %{SOURCE8} README_6.30.223.271.txt "SUPPORTED DEVICES" | xargs appstream-util add-provide ${fn} modalias
+%else
+python %{SOURCE8} README_6.30.223.271.txt "SUPPORTED DEVICES" | xargs appstream-util add-provide ${fn} modalias
+%endif
appstream-util validate-relax --nonet ${fn}
grep -q Copyright ${fn} >/dev/null || sed -i "s%\(^<?xml.*$\)%\1\n${copyright_string}%" ${fn}
%endif
@@ -86,7 +100,7 @@ grep -q Copyright ${fn} >/dev/null || sed -i "s%\(^<?xml.*$\)%\1\n${copyright_st
%else
%doc lib/LICENSE.txt
%endif
-%if 0%{?fedora} >= 25
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 25
%{_datadir}/metainfo/com.broadcom.wireless.hybrid.driver.metainfo.xml
%endif
%config(noreplace) %{_modprobe_d}/broadcom-wl-blacklist.conf
@@ -94,6 +108,9 @@ grep -q Copyright ${fn} >/dev/null || sed -i "s%\(^<?xml.*$\)%\1\n${copyright_st
%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
%changelog
+* Sat Apr 06 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-10
+- improve SPEC file for RHEL 6.x and 7.x AppStream Metadata
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.30.223.271-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 7 months
[rpmfusion-nonfree-release] Add gpg key for fedora nonfree 32
by Nicolas Chauvet
commit b5c9cba6085bf9e8abf83843f9640f9a29b786a9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Apr 7 15:25:56 2019 +0200
Add gpg key for fedora nonfree 32
RPM-GPG-KEY-rpmfusion-nonfree-fedora-32-primary | 29 +++++++++++++++++++++++++
1 file changed, 29 insertions(+)
---
diff --git a/RPM-GPG-KEY-rpmfusion-nonfree-fedora-32-primary b/RPM-GPG-KEY-rpmfusion-nonfree-fedora-32-primary
new file mode 100644
index 0000000..2998ecc
--- /dev/null
+++ b/RPM-GPG-KEY-rpmfusion-nonfree-fedora-32-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFyptB8BEAC2C18FrMlCbotDF+Ki/b1sq+ACh9gl9OziTYCQveo4H/KU6PPV
+9fIDlMuFLlWqIiP32m224etYafTARp3NZdeQGBwe1Cgod+HZ/Q5/lySJirsaPUMC
+WQDGT9zd8BadcprbKpbS4NPg0ZDMi26OfnaJRD7ONmXZBsBJpbqsSJL/mD5v4Rfo
+XmYSBzXNH2ScfRGbzVam5LPgIf7sOqPdVGUM2ZkdJ2Y2p6MHLhJko8LzVr3jhJiH
+9AL0Z7f3xyepA9c8qcUx2IecZAOBIw18s9hyaXPXD4XejNP7WNAmClRhijhxBcML
+TpDglKGe5zoxpXwPsavQxa7uUYVUHc83sfP04Gjj50CZpMpR9kfp/uLvzYf1KQRj
+jM41900ZewXAAOScTp9vouqn23R8B8rLeQfL+HL1y47dC7dA4gvOEoAysznTed2e
+fl6uu4XG9VuK1pEPolXp07nbZ1jxEm4vbWJXCuB6WDJEeRw8AsCsRPfzFk/oUWVn
+kvzD0Xii6wht1fv+cmgq7ddDNuvNJ4aGi5zAmMOC9GPracWPygV+u6w/o7b8N8tI
+LcHKOjOBh2orowUZJf7jF+awHjzVCFFT+fcCzDwh3df+2fLVGVL+MdTWdCif9ovT
+t/SGtUK7hrOLWrDTsi1NFkvWLc8W8BGXsCTr/Qt4OHzP1Gsf17PlfsI3aQARAQAB
+tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgzMikg
+PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCRQQTAQgA
+LxYhBP5ak5PLbicbWpDMGw2adpltwb4YBQJcqbQfAhsDBAsJCAcDFQgKAh4BAheA
+AAoJEA2adpltwb4YBmMP/R/K7SEr6eOFLt9tmsI06BCOLwYtQw1yBPOP/QcX9vZG
+Af6eWk5Otvub38ZKqxkO9j2SdAwr16cDXqL6Vfo45vqRCTaZpOBw2rRQlqgFNvQ2
+7uzzUk8xkwAyh3tqcUuJjdPso/k02ZxPC5xR68pjOyyvb618RXxjuaaOHFqt2/4g
+LEBGcxfuBsKMwM8uZ5r61YRyZle23Ana8edvVOQWeyzF0hx/WXCRke/nCyDEE6OA
+IGhcA0XOjnzzLxTLjvmnjBUaenXnpBS8LA5OPOo0TjvPiAj7DSR8lfQYNorGxisD
+cEJm/upsJii/x3Tm4dwRvlmvZuw4CC7UCQ3FIu3eAsNoqRAeV8ND33T/L3feHkxj
+0fkWwihAcx12ddaRM5iOEMPNmUTyufj9KZy21jAy3AooMiDb8o17u4fb6irUs/YE
+/TL1EG2W8L7R6idgjk//Ip8sNvxr3nwmyv7zJ6vWfhuS/inuEDdvHqqrs+s5n4gk
+jTKf3If3e6unzMNO5945DgvXcx09G0QqgdrRLprT+bj6581YbOnzvZdUqgOaw3M5
+pGdE6wHro7qtbp/HolJYx07l0AW3AW9v+mZSIBXp2UyHXzFN5ycwpgXo+rQ9mFP9
+wzK/najg8b1aC99psZhS/mVVFVQJC5Ozz4j/AMIaXQPaFhAFd6uRQPu7fZX/kjmN
+=U9qR
+-----END PGP PUBLIC KEY BLOCK-----
5 years, 7 months
[rpmfusion-free-release] Add gpg key for fedora free 32
by Nicolas Chauvet
commit 3b2657dd9907b40b143cf6c60062d47249a0b759
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Apr 7 15:22:29 2019 +0200
Add gpg key for fedora free 32
RPM-GPG-KEY-rpmfusion-free-fedora-32-primary | 29 ++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
---
diff --git a/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary b/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
new file mode 100644
index 0000000..1f78b89
--- /dev/null
+++ b/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFvEZi0BEADeq0E2/aYDWMYnUBloxAamr/DBo21/Xida69lQg/C8wGB/jz+i
+J9ZDEnLRDGlotBl3lwOhbzwXxk+4azH77+JIuUDiPkBb6e7rld0EMWNykLuWifV0
+Eq7qVBtr1cQfvLMDySvzIBPEGy3IbFnr7H7diR+A0WiwltVLcv4wW/ESRZUChBxy
+TGgQrYk98TGiJGMWlwi7IzopOliAYrc7oM1XyZQlTffhS5b0ygiwIxGOOjVR3waB
+m//0PVj8hZ+kHBgn2hXnLlWBkCRosxHmg+xcosUBgfBqKBPN8M800F6svvZS1msN
+mef7y2QytA9LSpey6mznqKEY8x8+9Ub4FCGiEEw8SoDCU48NpmADr6PXoJAtihEi
+4NuBiqzpabKDR7IfhEWNgVM840OCmizFyT9L++SDZmww8rUHx55VOzVEf4fSRPXY
+gduexRo377+bj+wdpKfrUddkbdxuDVWweq8k5fZz7Y7HYtM60j9WxtUoLF37MNgZ
+5bwrOU2NhLP+aqwyeE86/BqDdKVzxeq+PAaIl1ujTqbmJYJO0Kmt4G+GPhj6TpTq
++X+Ci+YskPEcp7dqpH38rpuA3ZAVH4tHkW9UFFBHrvnxuOLrrAflondgLTo1xNo6
+E8Qrq7PGCjq/FdVM9tC3hupeKuXz5jaf65qbln4COromTXm5KyNOlWVgMwARAQAB
+tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgzMSkgPHJw
+bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCRQQTAQgALxYh
+BFmn/gf2ZMGydofF0m3u8FHEgZN6BQJbxGYtAhsDBAsJCAcDFQgKAh4BAheAAAoJ
+EG3u8FHEgZN6E5EQAN5kzvCyT/Ev6H/rS4QQE6+Zxb9YCGnlUOwPXcwtAqjGl4Hn
+kt9LXnrd4DThLBLEGZUpBe5/oNuZOLWRWvTG7UHR+pBdtxIyqUlxBhiIwSe+Q7rZ
+gehiXl2PhnaBHyTLoFGczNWiqKSIORnSmVg4SXuteG4So0PzRWBD9r2/7P/mZGyd
+wyiH34YUzsedPOO1sER8o+tQ6C9RlRmhZRQ9hBJIymga1FfCms6X5lEFfbsuSjEt
+acLvLJuO7bxfoYPiC2l+psFAitgT7UeEm/KW/Ul2M2YVONu1pRCkEoJzJ4B1ki9/
+MK6Kw9QyQ6KXmOmzckJaInZQrwtcffjsdCjdQgoPUA//PVsysM4dtE7TPx2iRC2S
+Vci0eGT+XV3tUlDDlMLfx6PhpfAddN3okGIWE0Nwc9yNwwn+R2H/Nrw0Q74qiwP7
+uCgzGQBEKOATwJdm/EbtzSOzTgeunrlb1HO+XgjE+VBxp9vdzS/sOecixPyGdjW3
+B1NIHAU1O9tgQcBNSJ4txKEnKHw92HViHLXpOVIIeXW+2bjtgTtTE3TfAYVnyLMn
+uplg21hoH2L+fC281fgV64CzR+QjOiKWJSvub6wzy1a7/xPce8yaE89SwmxxVroS
+Ia81vrdksRmtLwAhgJfh6YoSdxKWdtB+/hz2QwK+lHV368XzdeAuWQQGpX3T
+=NNM4
+-----END PGP PUBLIC KEY BLOCK-----
5 years, 7 months
[nvidia-kmod] Clean patch
by Leigh Scott
commit c5b7a2e13bbb70c9a8e9ca36161ae813ed6c48dd
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Apr 7 12:40:48 2019 +0100
Clean patch
kernel-5.1.patch | 30 ------------------------------
1 file changed, 30 deletions(-)
---
diff --git a/kernel-5.1.patch b/kernel-5.1.patch
index d33a95b..6415bff 100644
--- a/kernel-5.1.patch
+++ b/kernel-5.1.patch
@@ -122,33 +122,3 @@ diff -uNrp a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel/nvidia-drm
{
return __nv_drm_vma_fault(vmf->vma, vmf);
}
-diff -uNrp kernel/nvidia-uvm/uvm8.c.rej kernel/nvidia-uvm/uvm8.c.rej
---- kernel/nvidia-uvm/uvm8.c.rej 1970-01-01 01:00:00.000000000 +0100
-+++ kernel/nvidia-uvm/uvm8.c.rej 2019-04-07 11:43:37.841351364 +0100
-@@ -0,0 +1,26 @@
-+--- nvidia-uvm/uvm8.c
-++++ nvidia-uvm/uvm8.c
-+@@ -172,7 +172,11 @@ static int uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf)
-+ return VM_FAULT_SIGBUS;
-+ }
-+
-++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
-+ static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-++#else
-++static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-++#endif
-+ {
-+ #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-+ return uvm_vm_fault_sigbus(vmf->vma, vmf);
-+@@ -507,7 +511,11 @@ convert_error:
-+ }
-+ }
-+
-++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
-+ static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
-++#else
-++static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)
-++#endif
-+ {
-+ #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-+ return uvm_vm_fault(vmf->vma, vmf);
5 years, 7 months
[nvidia-kmod] Patch for 5.1rc kernel
by Leigh Scott
commit aaeb0b320da06062578c0ef41cb2c1ecdc7a500c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Apr 7 12:03:13 2019 +0100
Patch for 5.1rc kernel
kernel-5.1.patch | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 7 ++-
2 files changed, 160 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.1.patch b/kernel-5.1.patch
new file mode 100644
index 0000000..d33a95b
--- /dev/null
+++ b/kernel-5.1.patch
@@ -0,0 +1,154 @@
+diff -uNrp a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c 2019-03-15 17:56:25.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2019-04-07 11:43:30.533394595 +0100
+@@ -35,6 +35,8 @@
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
+
++#include <linux/version.h>
++
+ static void nv_drm_connector_destroy(struct drm_connector *connector)
+ {
+ struct nv_drm_connector *nv_connector = to_nv_connector(connector);
+@@ -201,6 +203,12 @@ nv_drm_connector_detect(struct drm_conne
+ return __nv_drm_connector_detect_internal(connector);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++int drm_helper_probe_single_connector_modes(struct drm_connector
++ *connector, uint32_t maxX,
++ uint32_t maxY);
++#endif
++
+ static struct drm_connector_funcs nv_connector_funcs = {
+ #if defined NV_DRM_ATOMIC_HELPER_CONNECTOR_DPMS_PRESENT
+ .dpms = drm_atomic_helper_connector_dpms,
+diff -uNrp a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c 2019-03-15 17:56:25.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c 2019-04-07 11:43:30.534394589 +0100
+@@ -35,6 +35,15 @@
+ #include "nvidia-drm-gem-nvkms-memory.h"
+ #include "nvidia-drm-gem-user-memory.h"
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++void drm_kms_helper_poll_init(struct drm_device *dev);
++void drm_kms_helper_poll_fini(struct drm_device *dev);
++bool drm_helper_hpd_irq_event(struct drm_device *dev);
++void drm_kms_helper_poll_disable(struct drm_device *dev);
++#endif
++
+ #if defined(NV_DRM_AVAILABLE)
+
+ #include "nvidia-drm-ioctl.h"
+diff -uNrp a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2019-03-15 17:56:25.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2019-04-07 11:43:30.534394589 +0100
+@@ -36,6 +36,12 @@
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++void drm_kms_helper_hotplug_event(struct drm_device *dev);
++#endif
++
+ static void nv_drm_encoder_destroy(struct drm_encoder *encoder)
+ {
+ struct nv_drm_encoder *nv_encoder = to_nv_encoder(encoder);
+@@ -152,6 +158,12 @@ nv_drm_encoder_new(struct drm_device *de
+ return &nv_encoder->base;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++int drm_helper_probe_single_connector_modes(struct drm_connector
++ *connector, uint32_t maxX,
++ uint32_t maxY);
++#endif
++
+ /*
+ * Add encoder for given NvKmsKapiDisplay
+ */
+diff -uNrp a/kernel/nvidia-uvm/uvm8.c b/kernel/nvidia-uvm/uvm8.c
+--- a/kernel/nvidia-uvm/uvm8.c 2019-03-15 17:56:25.000000000 +0000
++++ b/kernel/nvidia-uvm/uvm8.c 2019-04-07 11:42:24.584784717 +0100
+@@ -172,7 +172,11 @@ static int uvm_vm_fault_sigbus(struct vm
+ return VM_FAULT_SIGBUS;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+ static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
++#else
++static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
++#endif
+ {
+ #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
+ return uvm_vm_fault_sigbus(vmf->vma, vmf);
+@@ -507,7 +511,11 @@ convert_error:
+ }
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+ static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
++#else
++static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)
++#endif
+ {
+ #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
+ return uvm_vm_fault(vmf->vma, vmf);
+diff -uNrp a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
+--- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2019-03-15 17:56:25.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2019-04-07 11:57:27.781244232 +0100
+@@ -29,6 +29,8 @@
+
+ #include "nv-mm.h"
+
++#include <linux/version.h>
++
+ static void __nv_drm_gem_nvkms_memory_free(struct nv_drm_gem_object *nv_gem)
+ {
+ struct nv_drm_device *nv_dev = nv_gem->nv_dev;
+@@ -377,7 +379,11 @@ static int __nv_drm_vma_fault(struct vm_
+ */
+
+ #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+ static int nv_drm_vma_fault(struct vm_fault *vmf)
++#else
++static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf)
++#endif
+ {
+ return __nv_drm_vma_fault(vmf->vma, vmf);
+ }
+diff -uNrp kernel/nvidia-uvm/uvm8.c.rej kernel/nvidia-uvm/uvm8.c.rej
+--- kernel/nvidia-uvm/uvm8.c.rej 1970-01-01 01:00:00.000000000 +0100
++++ kernel/nvidia-uvm/uvm8.c.rej 2019-04-07 11:43:37.841351364 +0100
+@@ -0,0 +1,26 @@
++--- nvidia-uvm/uvm8.c
+++++ nvidia-uvm/uvm8.c
++@@ -172,7 +172,11 @@ static int uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf)
++ return VM_FAULT_SIGBUS;
++ }
++
+++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
++ static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
+++#else
+++static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
+++#endif
++ {
++ #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
++ return uvm_vm_fault_sigbus(vmf->vma, vmf);
++@@ -507,7 +511,11 @@ convert_error:
++ }
++ }
++
+++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
++ static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
+++#else
+++static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)
+++#endif
++ {
++ #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
++ return uvm_vm_fault(vmf->vma, vmf);
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 6636659..9b695d3 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,12 +10,13 @@ Name: nvidia-kmod
Epoch: 3
Version: 418.56
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: kernel-5.1.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: x86_64
@@ -39,6 +40,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
+%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -66,6 +68,9 @@ done
%changelog
+* Sun Apr 07 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:418.56-3
+- Patch for 5.1rc kernel
+
* Thu Mar 21 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:418.56-2
- Add release tag to akmod build requires and obsoletes
5 years, 7 months
[ndiswrapper-kmod] Patch for 5.0 kernel
by Leigh Scott
commit 3f662b4632c7cba414a39990c607ec4cb1113637
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Apr 7 10:57:56 2019 +0100
Patch for 5.0 kernel
ndiswrapper-5.0-kernel.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++
ndiswrapper-kmod.spec | 7 ++++++-
2 files changed, 54 insertions(+), 1 deletion(-)
---
diff --git a/ndiswrapper-5.0-kernel.patch b/ndiswrapper-5.0-kernel.patch
new file mode 100644
index 0000000..916210a
--- /dev/null
+++ b/ndiswrapper-5.0-kernel.patch
@@ -0,0 +1,48 @@
+From: Julian Andres Klode <jak(a)debian.org>
+Date: Fri, 25 Jan 2019 21:04:17 +0100
+Subject: kernel 5.0: Replace do_gettimeofday() with ktime_get_real()
+
+do_gettimeofday() was removed in kernel 5.0, a direct replacement
+seems to be ktime_get_real() and friends. ktime_get_real() seems
+to be a nice replacement, and even makes the code easier.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1813063
+---
+ driver/ntoskernel.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/driver/ntoskernel.c b/driver/ntoskernel.c
+index 156c688..a99490b 100644
+--- a/driver/ntoskernel.c
++++ b/driver/ntoskernel.c
+@@ -2498,7 +2498,11 @@ struct worker_init_struct {
+
+ int ntoskernel_init(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)
+ struct timeval now;
++#else
++ ktime_t now;
++#endif
+
+ spin_lock_init(&dispatcher_lock);
+ spin_lock_init(&ntoskernel_lock);
+@@ -2518,11 +2522,18 @@ int ntoskernel_init(void)
+ INIT_WORK(&ntos_work, ntos_work_worker);
+ wrap_timer_slist.next = NULL;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)
+ do_gettimeofday(&now);
+ wrap_ticks_to_boot = TICKS_1601_TO_1970;
+ wrap_ticks_to_boot += (u64)now.tv_sec * TICKSPERSEC;
+ wrap_ticks_to_boot += now.tv_usec * 10;
+ wrap_ticks_to_boot -= jiffies * TICKSPERJIFFY;
++#else
++ now = ktime_get_real();
++ wrap_ticks_to_boot = TICKS_1601_TO_1970;
++ wrap_ticks_to_boot += ktime_to_us(now) * 10;
++ wrap_ticks_to_boot -= jiffies * TICKSPERJIFFY;
++#endif
+ TRACE2("%llu", wrap_ticks_to_boot);
+
+ cpu_count = num_online_cpus();
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index 7bdb3d3..9ac03ae 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -13,7 +13,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.61
-Release: 9%{?pre}%{?dist}
+Release: 10%{?pre}%{?dist}
License: GPLv2
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz
@@ -22,6 +22,7 @@ Patch0: ndiswrapper-kmod-nomodinfo.patch
Patch1: ndiswrapper-4.11-kernel.patch
Patch2: ndiswrapper-4.13-kernel.patch
Patch3: ndiswrapper-4.15-kernel.patch
+Patch4: ndiswrapper-5.0-kernel.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -55,6 +56,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi
%patch1 -p1 -b .orig
%patch2 -p2 -b .orig
%patch3 -p1 -b .orig
+%patch4 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -77,6 +79,9 @@ done
%changelog
+* Sun Apr 07 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.61-10
+- Patch for 5.0 kernel
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.61-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 7 months
[chromium-vaapi/f29] Update to 73.0.3683.103.
by Vasiliy Glazov
commit 32e2c667fe52db20d8d33057f137cf5b7e829d99
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Fri Apr 5 12:28:06 2019 +0300
Update to 73.0.3683.103.
chromium-vaapi.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 9e37c54..cfd599e 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -67,7 +67,7 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-vaapi
-Version: 73.0.3683.86
+Version: 73.0.3683.103
Release: 1%{?dist}
Summary: A Chromium web browser with video decoding acceleration
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -687,6 +687,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Fri Apr 05 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 73.0.3683.103-1
+- Update to 73.0.3683.103
+
* Fri Mar 22 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 73.0.3683.86-1
- Update to 73.0.3683.86
diff --git a/sources b/sources
index 50c63e7..784a21d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eac0227103881604469a52ff76c251a6 chromium-73.0.3683.86.tar.xz
+6614c55c213b9348ce7f4d072fe0a848 chromium-73.0.3683.103.tar.xz
5 years, 7 months