[nvidia-kmod/f24: 2/3] Revert "Attempt to fix build on armhfp - disabled for now"

nchauvet nchauvet at rpmfusion.org
Fri Jul 1 18:58:04 CEST 2016


commit 2968532cb1dcd1e66a961139aec252304bb7d825
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Fri Jul 1 18:54:48 2016 +0200

    Revert "Attempt to fix build on armhfp - disabled for now"
    
    This reverts commit 400130f29c847eb99f4cdeaf86b0428400b4ad9d.

 nv-linux-arm3.patch | 11 -----------
 nvidia-kmod.spec    | 12 +++---------
 2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 1ecedc3..5cd5830 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -9,7 +9,7 @@ Name:          nvidia-kmod
 Epoch:         1
 Version:       358.16
 # Taken over by kmodtool
-Release:       2%{?dist}
+Release:       1%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -18,13 +18,11 @@ URL:           http://www.nvidia.com/
 Source11:      nvidia-kmodtool-excludekernel-filterfile
 Patch0:        nv-linux-arm.patch
 Patch1:        nv-linux-arm2.patch
-Patch2:        nv-linux-arm3.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#ExclusiveArch:  i686 x86_64 armv7hl
-# common/inc/nv-linux.h:459:43: error: implicit declaration of function 'outer_sync'
-ExclusiveArch:  i686 x86_64
+# needed for plague to make sure it builds for i586 and i686
+ExclusiveArch:  i686 x86_64 armv7hl
 
 # get the needed BuildRequires (in parts depending on what we build for)
 %global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version}
@@ -47,7 +45,6 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
 # patch loop
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -80,9 +77,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Jun 22 2016 Nicolas Chauvet <kwizart at gmail.com> - 1:358.16-2
-- Attempt to fix build on armhfp - disabled for now
-
 * Sat Nov 21 2015 Nicolas Chauvet <kwizart at gmail.com> - 1:358.16-1
 - Update to 358.16
 


More information about the rpmfusion-commits mailing list