[v5,09/34] package/kodi: add patch to disable online check

Submitted by Bernd Kuhls on April 17, 2017, 7:54 p.m.

Details

Message ID 20170417195433.26672-10-bernd.kuhls@t-online.de
State New
Headers show

Commit Message

Bernd Kuhls April 17, 2017, 7:54 p.m.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi/0004-disable-online-check.patch | 65 ++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 package/kodi/0004-disable-online-check.patch

Comments

Yann E. MORIN April 22, 2017, 8:45 p.m.
Bernd, All,

On 2017-04-17 21:54 +0200, Bernd Kuhls spake thusly:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

As I understand it, this patch disable the check that the system is
"online", for those systems that are not connected to the internet
(e.g not connected at all, or only to a LAN).

Again, I think this is a feature patch, and we usually try to avoid
feature patches.

Regards,
Yann E. MORIN.

> ---
>  package/kodi/0004-disable-online-check.patch | 65 ++++++++++++++++++++++++++++
>  1 file changed, 65 insertions(+)
>  create mode 100644 package/kodi/0004-disable-online-check.patch
> 
> diff --git a/package/kodi/0004-disable-online-check.patch b/package/kodi/0004-disable-online-check.patch
> new file mode 100644
> index 000000000..9c21064bf
> --- /dev/null
> +++ b/package/kodi/0004-disable-online-check.patch
> @@ -0,0 +1,65 @@
> +From 468f917d3c1ee6f84b1a075d327d7c7626f1e223 Mon Sep 17 00:00:00 2001
> +From: Stefan Saraev <stefan@saraev.ca>
> +Date: Sat, 18 Apr 2015 15:03:31 +0300
> +Subject: [PATCH 03/13] disable online check
> +
> +Ported from LibreELEC
> +https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +---
> + xbmc/GUIInfoManager.cpp              | 1 -
> + xbmc/utils/SystemInfo.cpp            | 5 +----
> + xbmc/windows/GUIWindowSystemInfo.cpp | 1 -
> + 3 files changed, 1 insertion(+), 6 deletions(-)
> +
> +diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
> +index cb09e75..a218e1d 100644
> +--- a/xbmc/GUIInfoManager.cpp
> ++++ b/xbmc/GUIInfoManager.cpp
> +@@ -278,7 +278,6 @@ const infomap system_labels[] =  {{ "hasnetwork",       SYSTEM_ETHERNET_LINK_ACT
> +                                   { "currentwindow",    SYSTEM_CURRENT_WINDOW },
> +                                   { "currentcontrol",   SYSTEM_CURRENT_CONTROL },
> +                                   { "dvdlabel",         SYSTEM_DVD_LABEL },
> +-                                  { "internetstate",    SYSTEM_INTERNET_STATE },
> +                                   { "osversioninfo",    SYSTEM_OS_VERSION_INFO },
> +                                   { "kernelversion",    SYSTEM_OS_VERSION_INFO }, // old, not correct name
> +                                   { "uptime",           SYSTEM_UPTIME },
> +diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
> +index f423cfe..d8483d0 100644
> +--- a/xbmc/utils/SystemInfo.cpp
> ++++ b/xbmc/utils/SystemInfo.cpp
> +@@ -247,7 +247,6 @@ bool CSysInfoJob::DoWork()
> + {
> +   m_info.systemUptime      = GetSystemUpTime(false);
> +   m_info.systemTotalUptime = GetSystemUpTime(true);
> +-  m_info.internetState     = GetInternetState();
> +   m_info.videoEncoder      = GetVideoEncoder();
> +   m_info.cpuFrequency      = GetCPUFreqInfo();
> +   m_info.osVersionInfo     = CSysInfo::GetOsPrettyNameWithVersion() + " (kernel: " + CSysInfo::GetKernelName() + " " + CSysInfo::GetKernelVersionFull() + ")";
> +@@ -1023,9 +1022,7 @@ int CSysInfo::GetXbmcBitness(void)
> + 
> + bool CSysInfo::HasInternet()
> + {
> +-  if (m_info.internetState != CSysData::UNKNOWN)
> +-    return m_info.internetState == CSysData::CONNECTED;
> +-  return (m_info.internetState = CSysInfoJob::GetInternetState()) == CSysData::CONNECTED;
> ++  return m_info.internetState == CSysData::UNKNOWN;
> + }
> + 
> + std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
> +diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
> +index 6ff2391..ee73c88 100644
> +--- a/xbmc/windows/GUIWindowSystemInfo.cpp
> ++++ b/xbmc/windows/GUIWindowSystemInfo.cpp
> +@@ -125,7 +125,6 @@ void CGUIWindowSystemInfo::FrameMove()
> +     SetControlLabel(i++, "%s: %s", 13160, NETWORK_GATEWAY_ADDRESS);
> +     SetControlLabel(i++, "%s: %s", 13161, NETWORK_DNS1_ADDRESS);
> +     SetControlLabel(i++, "%s: %s", 20307, NETWORK_DNS2_ADDRESS);
> +-    SetControlLabel(i++, "%s %s", 13295, SYSTEM_INTERNET_STATE);
> +   }
> + 
> +   else if (m_section == CONTROL_BT_VIDEO)
> +-- 
> +2.5.0
> +
> -- 
> 2.11.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Patch hide | download patch | download mbox

diff --git a/package/kodi/0004-disable-online-check.patch b/package/kodi/0004-disable-online-check.patch
new file mode 100644
index 000000000..9c21064bf
--- /dev/null
+++ b/package/kodi/0004-disable-online-check.patch
@@ -0,0 +1,65 @@ 
+From 468f917d3c1ee6f84b1a075d327d7c7626f1e223 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 18 Apr 2015 15:03:31 +0300
+Subject: [PATCH 03/13] disable online check
+
+Ported from LibreELEC
+https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ xbmc/GUIInfoManager.cpp              | 1 -
+ xbmc/utils/SystemInfo.cpp            | 5 +----
+ xbmc/windows/GUIWindowSystemInfo.cpp | 1 -
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
+index cb09e75..a218e1d 100644
+--- a/xbmc/GUIInfoManager.cpp
++++ b/xbmc/GUIInfoManager.cpp
+@@ -278,7 +278,6 @@ const infomap system_labels[] =  {{ "hasnetwork",       SYSTEM_ETHERNET_LINK_ACT
+                                   { "currentwindow",    SYSTEM_CURRENT_WINDOW },
+                                   { "currentcontrol",   SYSTEM_CURRENT_CONTROL },
+                                   { "dvdlabel",         SYSTEM_DVD_LABEL },
+-                                  { "internetstate",    SYSTEM_INTERNET_STATE },
+                                   { "osversioninfo",    SYSTEM_OS_VERSION_INFO },
+                                   { "kernelversion",    SYSTEM_OS_VERSION_INFO }, // old, not correct name
+                                   { "uptime",           SYSTEM_UPTIME },
+diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
+index f423cfe..d8483d0 100644
+--- a/xbmc/utils/SystemInfo.cpp
++++ b/xbmc/utils/SystemInfo.cpp
+@@ -247,7 +247,6 @@ bool CSysInfoJob::DoWork()
+ {
+   m_info.systemUptime      = GetSystemUpTime(false);
+   m_info.systemTotalUptime = GetSystemUpTime(true);
+-  m_info.internetState     = GetInternetState();
+   m_info.videoEncoder      = GetVideoEncoder();
+   m_info.cpuFrequency      = GetCPUFreqInfo();
+   m_info.osVersionInfo     = CSysInfo::GetOsPrettyNameWithVersion() + " (kernel: " + CSysInfo::GetKernelName() + " " + CSysInfo::GetKernelVersionFull() + ")";
+@@ -1023,9 +1022,7 @@ int CSysInfo::GetXbmcBitness(void)
+ 
+ bool CSysInfo::HasInternet()
+ {
+-  if (m_info.internetState != CSysData::UNKNOWN)
+-    return m_info.internetState == CSysData::CONNECTED;
+-  return (m_info.internetState = CSysInfoJob::GetInternetState()) == CSysData::CONNECTED;
++  return m_info.internetState == CSysData::UNKNOWN;
+ }
+ 
+ std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
+diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
+index 6ff2391..ee73c88 100644
+--- a/xbmc/windows/GUIWindowSystemInfo.cpp
++++ b/xbmc/windows/GUIWindowSystemInfo.cpp
+@@ -125,7 +125,6 @@ void CGUIWindowSystemInfo::FrameMove()
+     SetControlLabel(i++, "%s: %s", 13160, NETWORK_GATEWAY_ADDRESS);
+     SetControlLabel(i++, "%s: %s", 13161, NETWORK_DNS1_ADDRESS);
+     SetControlLabel(i++, "%s: %s", 20307, NETWORK_DNS2_ADDRESS);
+-    SetControlLabel(i++, "%s %s", 13295, SYSTEM_INTERNET_STATE);
+   }
+ 
+   else if (m_section == CONTROL_BT_VIDEO)
+-- 
+2.5.0
+