- some build fixes, still fails on 4.14

diff --git a/kernel-5.6.patch b/kernel-5.6.patch
index bc1968d71e71b01f6b4ec8b5e0b0e0ca020378bf..0958acb9fe1a5a15c82737f3f224737d0531af33 100644 (file)
--- a/kernel-5.6.patch
+++ b/kernel-5.6.patch
@@ -83,15 +83,20 @@ diff --git a/kernel/common/inc/nv-time.h b/kernel/common/inc/nv-time.h
 index 2c799c9..0206062 100644
 --- a/kernel/common/inc/nv-time.h
 +++ b/kernel/common/inc/nv-time.h
 index 2c799c9..0206062 100644
 --- a/kernel/common/inc/nv-time.h
 +++ b/kernel/common/inc/nv-time.h

-@@ -30,7 +30,12 @@
+@@ -30,7 +30,17 @@

  #include <linux/ktime.h>
  #endif
  
 -static inline void nv_gettimeofday(struct timeval *tv)
  #include <linux/ktime.h>
  #endif
  
 -static inline void nv_gettimeofday(struct timeval *tv)

++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
++#define nv_timeval timeval
++#else

 +struct nv_timeval {
 +    __kernel_long_t      tv_sec;
 +    __kernel_suseconds_t tv_usec;
 +};
 +struct nv_timeval {
 +    __kernel_long_t      tv_sec;
 +    __kernel_suseconds_t tv_usec;
 +};

++#endif

 +
 +static inline void nv_gettimeofday(struct nv_timeval *tv)
  {
 +
 +static inline void nv_gettimeofday(struct nv_timeval *tv)
  {


@@ -156,10 +161,10 @@ index ec9e093..463a464 100755
 +            int conftest_ktime_get_raw_ts64(void) {
 +                struct timespec64 ts = {0};
 +
 +            int conftest_ktime_get_raw_ts64(void) {
 +                struct timespec64 ts = {0};
 +

-+                ktime_get_raw_ts64(&ts64);
++                ktime_get_raw_ts64(&ts);

 +            }"
 +
 +            }"
 +

-+            compile_check_conftest "$CODE" "NV_KTIME_GET_RAW_TS64_PRESENT" "" "functions"
++            compile_check_conftest "$CODE" "NV_KTIME_GET_RAW_TS64_PRESENT" "" "types"

 +        ;;
 +
          efi_enabled)
 +        ;;
 +
          efi_enabled)

diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index a62483ce6978e61de58c22e780de2298f02be513..3b8ec6bd859fa2337cd2bc44cd26954ca8753fe8 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -240,13 +240,6 @@ sterownik nVidii dla Xorg/XFree86.\
 
 %define build_kernel_pkg()\
 cd kernel\
 
 %define build_kernel_pkg()\
 cd kernel\

-#cat >> Makefile <<'EOF'\
-#\
-#$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin\
-#      cp $< $@\
-#EOF\
-#mv nv-kernel.o{,.bin}\
-#build_kernel_modules -m nvidia\

 %{__make} SYSSRC=%{_kernelsrcdir} clean\
 %{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\
 cd ..\
 %{__make} SYSSRC=%{_kernelsrcdir} clean\
 %{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\
 cd ..\