44-realsense-makefile-adaptation.patch

From aec56a0d10d09426f91c65e72aeb4cb3feed9d13 Mon Sep 17 00:00:00 2001
From: Evgeni Raikhel <evgeni.raikhel@intel.com>
Date: Mon, 19 Feb 2018 18:33:23 +0200
Subject: [PATCH] Adjust Makefiles for the kernel modules to be build as part of DKMS

Signed-off-by: Evgeni Raikhel <evgeni.raikhel@intel.com>
---
 drivers/media/usb/uvc/Makefile     | 4 ++++
 drivers/media/usb/uvc/uvcvideo.h   | 6 +++++-
 drivers/media/v4l2-core/Makefile   | 1 +
 drivers/media/v4l2-core/v4l2-dev.c | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/4.13.0/drivers/media/usb/uvc/Makefile b/4.13.0/drivers/media/usb/uvc/Makefile
index c26d12f..6bc4acb 100644
--- a/4.13.0/drivers/media/usb/uvc/Makefile
+++ b/4.13.0/drivers/media/usb/uvc/Makefile
@@ -1,3 +1,7 @@
+CONFIG_MODULE_SIG=n
+CC := ${CC} -I ${M}/../../../../include-overrides
+ccflags-y := -DDRIVER_VERSION_SUFFIX=\"${DRIVER_VERSION_SUFFIX}\"
+
 uvcvideo-objs  := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
 		  uvc_status.o uvc_isight.o uvc_debugfs.o
 ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
diff --git a/4.13.0/drivers/media/usb/uvc/uvcvideo.h b/4.13.0/drivers/media/usb/uvc/uvcvideo.h
index 15e415e..a8f36a9 100644
--- a/4.13.0/drivers/media/usb/uvc/uvcvideo.h
+++ b/4.13.0/drivers/media/usb/uvc/uvcvideo.h
@@ -157,7 +157,11 @@
  * Driver specific constants.
  */
 
-#define DRIVER_VERSION		"1.1.1"
+#ifndef DRIVER_VERSION_SUFFIX
+#define DRIVER_VERSION_SUFFIX
+#endif
+
+#define DRIVER_VERSION		"1.1.2" DRIVER_VERSION_SUFFIX
 
 /* Number of isochronous URBs. */
 #define UVC_URBS		5
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index 098ad5f..56e8ad0 100644
--- a/4.13.0/drivers/media/v4l2-core/Makefile
+++ b/4.13.0/drivers/media/v4l2-core/Makefile
@@ -1,6 +1,7 @@
 #
 # Makefile for the V4L2 core
 #
+CC := ${CC} -I ${M}/../../../include-overrides -I ${M}/../tuners -I ${M}/../dvb-core -I ${M}/../dvb-frontends
 
 tuner-objs	:=	tuner-core.o
 
diff --git a/4.13.0/drivers/media/v4l2-core/v4l2-dev.c b/4.13.0/drivers/media/v4l2-core/v4l2-dev.c
index c647ba6..756ec07 100644
--- a/4.13.0/drivers/media/v4l2-core/v4l2-dev.c
+++ b/4.13.0/drivers/media/v4l2-core/v4l2-dev.c
@@ -1070,3 +1070,4 @@ MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab <mchehab@infradead.org>");
 MODULE_DESCRIPTION("Device registrar for Video4Linux drivers v2");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(VIDEO_MAJOR);
+MODULE_VERSION("realsense2-dkms");
-- 
2.7.4