diff -u nvidia-graphics-drivers-304-304.137/debian/changelog nvidia-graphics-drivers-304-304.137/debian/changelog --- nvidia-graphics-drivers-304-304.137/debian/changelog +++ nvidia-graphics-drivers-304-304.137/debian/changelog @@ -1,3 +1,10 @@ +nvidia-graphics-drivers-304 (304.137-0ubuntu2) bionic; urgency=medium + + * debian/dkms/patches/buildfix_kernel_4.14.patch: + - Fix dkms module build failures. (LP: #1727015) + + -- Seth Forshee Wed, 08 Nov 2017 13:55:06 -0600 + nvidia-graphics-drivers-304 (304.137-0ubuntu1) artful; urgency=medium * New upstream release: diff -u nvidia-graphics-drivers-304-304.137/debian/dkms.conf nvidia-graphics-drivers-304-304.137/debian/dkms.conf --- nvidia-graphics-drivers-304-304.137/debian/dkms.conf +++ nvidia-graphics-drivers-304-304.137/debian/dkms.conf @@ -7,6 +7,7 @@ DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm" AUTOINSTALL="yes" PATCH[0]="allow_sublevel_greater_than_5.patch" +PATCH[1]="buildfix_kernel_4.14.patch" #PATCH[1]="buildfix_kernel_4.9.patch" #PATCH[2]="buildfix_kernel_4.10.patch" #PATCH[3]="buildfix_kernel_4.11.patch" diff -u nvidia-graphics-drivers-304-304.137/debian/templates/dkms.conf.in nvidia-graphics-drivers-304-304.137/debian/templates/dkms.conf.in --- nvidia-graphics-drivers-304-304.137/debian/templates/dkms.conf.in +++ nvidia-graphics-drivers-304-304.137/debian/templates/dkms.conf.in @@ -7,6 +7,7 @@ DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm" AUTOINSTALL="yes" PATCH[0]="allow_sublevel_greater_than_5.patch" +PATCH[1]="buildfix_kernel_4.14.patch" #PATCH[1]="buildfix_kernel_4.9.patch" #PATCH[2]="buildfix_kernel_4.10.patch" #PATCH[3]="buildfix_kernel_4.11.patch" only in patch2: unchanged: --- nvidia-graphics-drivers-304-304.137.orig/debian/dkms/patches/buildfix_kernel_4.14.patch +++ nvidia-graphics-drivers-304-304.137/debian/dkms/patches/buildfix_kernel_4.14.patch @@ -0,0 +1,32 @@ +From fbab53d42d3f102a42d1677de40559d7df59bf59 Mon Sep 17 00:00:00 2001 +From: Seth Forshee +Date: Wed, 8 Nov 2017 13:30:28 -0600 +Subject: [PATCH] Build fixes for Linux 4.14 + +--- + nv-drm.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/nv-drm.c b/nv-drm.c +index 0d37447915c5..c93de108ebc3 100644 +--- a/nv-drm.c ++++ b/nv-drm.c +@@ -22,6 +22,15 @@ + #include + #endif + ++/* ++ * drm_pci_(init|exit) were renamed to drm_legacy_pci_(init|exit) ++ * in 4.14; map the new interface names to the old ones. ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++# define drm_pci_init drm_legacy_pci_init ++# define drm_pci_exit drm_legacy_pci_exit ++#endif ++ + extern nv_linux_state_t *nv_linux_devices; + + static int nv_drm_load( +-- +2.14.1 +