From 1426326e8f5a04f6af9c04991ba5bf8753bd993e Mon Sep 17 00:00:00 2001
From: cvh <namerp@googlemail.com>
Date: Fri, 14 Jul 2017 00:06:40 +0200
Subject: [PATCH] media_build: cleanup and add upstream fix

---
 .../media_build/config/usb.config             |  1 +
 .../media_build-02-add-to-backports.patch     | 13 ++++++-----
 ...1-fix-for-kernel-4.11-dibusb-license.patch | 23 +++++++++++++++++++
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 packages/linux-drivers/media_build/sources/backports/linux-261-fix-for-kernel-4.11-dibusb-license.patch

diff --git a/packages/linux-drivers/media_build/config/usb.config b/packages/linux-drivers/media_build/config/usb.config
index c485349ac8..6f8b65f225 100644
--- a/packages/linux-drivers/media_build/config/usb.config
+++ b/packages/linux-drivers/media_build/config/usb.config
@@ -585,6 +585,7 @@ CONFIG_MISC_DEVICES=y
 CONFIG_ALTERA_STAPL=m
 # CONFIG_STAGING is not set
 
+# RPi DVB Hat
 CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_CXD2841ER=m
 CONFIG_DVB_CXD2880=m
diff --git a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch
index 644d918c37..d65db5b7a0 100644
--- a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch
+++ b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch
@@ -1,17 +1,18 @@
 --- a/backports/backports.txt
 +++ b/backports/backports.txt
-@@ -25,6 +25,14 @@
+@@ -25,6 +25,15 @@ add api_version.patch
  add pr_fmt.patch
  add debug.patch
  add drx39xxj.patch
-+add linux-202-lnbp22_patch_for_more_power_if_rotor.patch
-+add linux-203-stb0899_enable_low_symbol_rate.patch
 +add linux-052-XBOX_remote_support.patch
 +add linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch
 +add linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
 +add linux-062-imon_pad_ignore_diagonal.patch
++add linux-202-lnbp22_patch_for_more_power_if_rotor.patch
++add linux-203-stb0899_enable_low_symbol_rate.patch
 +add linux-260-fix-for-kernel-4.11.patch
++add linux-261-fix-for-kernel-4.11-dibusb-license.patch
 +add cxd2880-support.patch
-
- [4.8.255]
- add v4.8_user_pages_flag.patch
+ 
+ [4.10.255]
+ add v4.10_sched_signal.patch
diff --git a/packages/linux-drivers/media_build/sources/backports/linux-261-fix-for-kernel-4.11-dibusb-license.patch b/packages/linux-drivers/media_build/sources/backports/linux-261-fix-for-kernel-4.11-dibusb-license.patch
new file mode 100644
index 0000000000..afe542c945
--- /dev/null
+++ b/packages/linux-drivers/media_build/sources/backports/linux-261-fix-for-kernel-4.11-dibusb-license.patch
@@ -0,0 +1,23 @@
+From 79312c5d61429a32761412be85ad7a84bfaa3b5c Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Fri, 17 Feb 2017 22:30:51 -0200
+Subject: dvb-usb-dibusb-mc-common: Add MODULE_LICENSE
+
+dvb-usb-dibusb-mc-common is licensed under GPLv2, and if we don't say
+so then it won't even load since it needs a GPL-only symbol.
+
+Fixes: e91455a1495a ("[media] dvb-usb: split out common parts of dibusb")
+
+diff --git a/drivers/media/usb/dvb-usb/dibusb-mc-common.c b/drivers/media/usb/dvb-usb/dibusb-mc-common.c
+index c989cac..0c2bc97 100644
+--- a/drivers/media/usb/dvb-usb/dibusb-mc-common.c
++++ b/drivers/media/usb/dvb-usb/dibusb-mc-common.c
+@@ -11,6 +11,8 @@
+ 
+ #include "dibusb.h"
+ 
++MODULE_LICENSE("GPL");
++
+ /* 3000MC/P stuff */
+ // Config Adjacent channels  Perf -cal22
+ static struct dibx000_agc_config dib3000p_mt2060_agc_config = {