[nvidia-kmod/f24] Attempt to fix build on armhfp - disabled for now

commit 400130f29c847eb99f4cdeaf86b0428400b4ad9d Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed Jun 22 16:49:05 2016 +0200 Attempt to fix build on armhfp - disabled for now nv-linux-arm3.patch | 11 +++++++++++ nvidia-kmod.spec | 12 +++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) --- diff --git a/nv-linux-arm3.patch b/nv-linux-arm3.patch new file mode 100644 index 0000000..fd92199 --- /dev/null +++ b/nv-linux-arm3.patch @@ -0,0 +1,11 @@ +diff -up nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.orig nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h +--- nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.orig 2015-11-17 03:04:13.000000000 +0100 ++++ nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h 2016-06-22 16:15:28.975692646 +0200 +@@ -454,6 +454,7 @@ typedef spinlock_t nv_spi + #if defined(CONFIG_OUTER_CACHE) + #define OUTER_FLUSH_RANGE(start, end) outer_flush_range((start),(end)) + #endif ++#include <asm/barrier.h> + #define WRITE_COMBINE_FLUSH() { dsb(); outer_sync(); } + #elif defined(NVCPU_AARCH64) + static inline void nv_flush_cache_cpu(void *info) diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec index 5cd5830..1ecedc3 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: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -18,11 +18,13 @@ 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) -# needed for plague to make sure it builds for i586 and i686 -ExclusiveArch: i686 x86_64 armv7hl +#ExclusiveArch: i686 x86_64 armv7hl +# common/inc/nv-linux.h:459:43: error: implicit declaration of function 'outer_sync' +ExclusiveArch: i686 x86_64 # get the needed BuildRequires (in parts depending on what we build for) %global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version} @@ -45,6 +47,7 @@ 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 @@ -77,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 22 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:358.16-2 +- Attempt to fix build on armhfp - disabled for now + * Sat Nov 21 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:358.16-1 - Update to 358.16