[nvidia-340xx-kmod] Update to 340.104
by Leigh Scott
commit 85a9b6d215577ee0d07a4add562f4953d5908c06
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Sep 20 00:20:22 2017 +0100
Update to 340.104
4.10.0_kernel.patch | 131 -------------------------------------------------
4.11_kernel.patch | 100 ++-----------------------------------
4.12_kernel.patch | 115 -------------------------------------------
4.9.0_kernel.patch | 28 -----------
nvidia-340xx-kmod.spec | 17 +++----
5 files changed, 13 insertions(+), 378 deletions(-)
---
diff --git a/4.11_kernel.patch b/4.11_kernel.patch
index 228c691..5fde165 100644
--- a/4.11_kernel.patch
+++ b/4.11_kernel.patch
@@ -1,94 +1,6 @@
-From 457a5db504405f2ce2afad82bdcc59a9349b5d77 Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux(a)googlemail.com>
-Date: Sun, 30 Jul 2017 12:17:39 +0100
-Subject: [PATCH 3/4] 4.11_kernel
-
----
- kernel/nv-drm.c | 14 ++++++++++++++
- kernel/uvm/nvidia_uvm_linux.h | 5 +++++
- kernel/uvm/nvidia_uvm_lite.c | 12 ++++++++++++
- 3 files changed, 31 insertions(+)
-
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index ea9f17e..bcb7cfe 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -22,6 +22,8 @@
- #include <drm/drm_gem.h>
- #endif
-
-+#include <linux/version.h>
-+
- extern nv_linux_state_t *nv_linux_devices;
-
- struct nv_gem_object {
-@@ -48,7 +50,11 @@ static int nv_drm_load(
- return -ENODEV;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- static int nv_drm_unload(
-+#else
-+static void nv_drm_unload(
-+#endif
- struct drm_device *dev
- )
- {
-@@ -60,11 +66,19 @@ static int nv_drm_unload(
- {
- BUG_ON(nvl->drm != dev);
- nvl->drm = NULL;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- return 0;
-+#else
-+ return;
-+#endif
- }
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- return -ENODEV;
-+#else
-+ return;
-+#endif
- }
-
- static void nv_gem_free(
-diff --git a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h
-index f69c107..0fb3b3b 100644
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -124,6 +124,9 @@
- #include <linux/delay.h> /* mdelay, udelay */
-
- #include <linux/sched.h> /* suser(), capable() replacement */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <linux/moduleparam.h> /* module_param() */
- #if !defined(NV_VMWARE)
- #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */
-@@ -362,6 +365,7 @@ typedef void irqreturn_t;
- void address_space_init_once(struct address_space *mapping);
- #endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- #if !defined(NV_FATAL_SIGNAL_PENDING_PRESENT)
- static inline int __fatal_signal_pending(struct task_struct *p)
- {
-@@ -373,6 +377,7 @@ typedef void irqreturn_t;
- return signal_pending(p) && __fatal_signal_pending(p);
- }
- #endif
-+#endif
-
- //
- // Before the current->cred structure was introduced, current->euid,
-diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
-index 2158b45..5150f3d 100644
--- a/kernel/uvm/nvidia_uvm_lite.c
+++ b/kernel/uvm/nvidia_uvm_lite.c
-@@ -818,7 +818,11 @@ done:
+@@ -818,7 +818,11 @@
}
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
@@ -98,9 +10,9 @@ index 2158b45..5150f3d 100644
int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+#endif
{
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
- unsigned long vaddr = (unsigned long)vmf->virtual_address;
-@@ -828,7 +832,11 @@ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
struct page *page = NULL;
int retval;
@@ -112,7 +24,7 @@ index 2158b45..5150f3d 100644
vmf->page = page;
-@@ -866,7 +874,11 @@ static struct vm_operations_struct uvmlite_vma_ops =
+@@ -866,7 +874,11 @@
// it's dealing with anonymous mapping (see handle_pte_fault).
//
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
@@ -124,6 +36,4 @@ index 2158b45..5150f3d 100644
{
vmf->page = NULL;
return VM_FAULT_SIGBUS;
---
-2.13.3
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index f3887e3..3ea231c 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-340xx-kmod
Epoch: 1
-Version: 340.102
+Version: 340.104
# Taken over by kmodtool
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,10 +18,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
-Patch1: 4.9.0_kernel.patch
-Patch2: 4.10.0_kernel.patch
-Patch3: 4.11_kernel.patch
-Patch4: 4.12_kernel.patch
+Patch1: 4.11_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,9 +48,6 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -101,6 +95,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.104-1
+- Update to 340.104
+- Drop obsolete kernel patches
+- Rebase 4.11_kernel patch to fix compile
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1:340.102-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
7 years, 2 months
[vdr-muggle] vdr-muggle was retired in Fedora 11
by Sérgio M. Basto
commit 52c503dab43b96ad7713df24fdfb0b660ba17ab5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 19 23:26:43 2017 +0100
vdr-muggle was retired in Fedora 11
.gitignore | 1 -
dead.package | 1 +
sources | 1 -
vdr-muggle-0.1.12-gcc43.patch | 140 -----------------------------
vdr-muggle.conf | 9 --
vdr-muggle.spec | 203 ------------------------------------------
6 files changed, 1 insertion(+), 354 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..bef0a94
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+vdr-muggle was retired in Fedora 11
7 years, 2 months
