From bdd64127977e6643dcdfe7666f278bd74ea1326f Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Sun, 14 Dec 2014 10:27:10 +0100 Subject: [PATCH 1/3] Fix a "No such file or directory" error when $BOOTLOADER = "u-boot" and there are no arch/arm/boot/dts/*.dtb files in Linux kernel build directory --- packages/linux/package.mk | 2 +- packages/tools/u-boot/release | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 4442e7110a..3832237718 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -180,7 +180,7 @@ makeinstall_target() { if [ "$BOOTLOADER" = "u-boot" ]; then mkdir -p $INSTALL/usr/share/bootloader for dtb in arch/arm/boot/dts/*.dtb; do - cp $dtb $INSTALL/usr/share/bootloader + cp $dtb $INSTALL/usr/share/bootloader 2>/dev/null || : done fi diff --git a/packages/tools/u-boot/release b/packages/tools/u-boot/release index a4b53ed06a..eda86f4bc3 100755 --- a/packages/tools/u-boot/release +++ b/packages/tools/u-boot/release @@ -44,7 +44,7 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader fi for dtb in $BUILD/linux-*/arch/arm/boot/dts/*.dtb; do - cp -PR $dtb $RELEASE_DIR/3rdparty/bootloader + cp -PR $dtb $RELEASE_DIR/3rdparty/bootloader 2>/dev/null || : done if [ -f "$PROJECT_DIR/$PROJECT/bootloader/uEnv.txt" ]; then From 7421d90ad9c46b6c76267a4c2e15fdadfc01fb21 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 15 Dec 2014 23:17:14 +0200 Subject: [PATCH 2/3] kodi: update sigterm handler patch ... only handle first TERM --- .../kodi-999.03-0001-handle-SIGTERM.patch | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch b/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch index 418f67f4be..9c79dbe073 100644 --- a/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch @@ -1,6 +1,6 @@ -From eabb811c7f82695cb566b0aadf5d86cb7448368a Mon Sep 17 00:00:00 2001 +From 4ed7bee82ee9daa22e5675fd98ef97bf05c10d6b Mon Sep 17 00:00:00 2001 From: Stefan Saraev -Date: Thu, 5 Jun 2014 18:50:04 +0300 +Date: Mon, 15 Dec 2014 21:28:54 +0200 Subject: [PATCH] handle SIGTERM In some situations, due to deadlocks or crashes, xbmc fails to exit properly in @@ -27,11 +27,11 @@ is requested externaly (ssh, 3rdparty script). xbmc/ApplicationMessenger.cpp | 6 ++++-- xbmc/XBApplicationEx.cpp | 1 + xbmc/XBApplicationEx.h | 1 + - xbmc/main/main.cpp | 15 +++++++++++++++ - 6 files changed, 30 insertions(+), 4 deletions(-) + xbmc/main/main.cpp | 16 ++++++++++++++++ + 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 875ca39..9572b62 100644 +index da6a327..0570df9 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -3477,12 +3477,19 @@ bool CApplication::Cleanup() @@ -67,7 +67,7 @@ diff --git a/xbmc/Application.h b/xbmc/Application.h index 0a332ff..a4d6b58 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -153,6 +153,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs +@@ -153,6 +153,7 @@ public: bool StartPVRManager(); void StopPVRManager(); bool IsCurrentThread() const; @@ -128,7 +128,7 @@ diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h index c46cba1..ed3f35f 100644 --- a/xbmc/XBApplicationEx.h +++ b/xbmc/XBApplicationEx.h -@@ -40,6 +40,7 @@ class CXBApplicationEx : public IWindowManagerCallback +@@ -40,6 +40,7 @@ public: // Variables for timing bool m_bStop; int m_ExitCode; @@ -137,10 +137,10 @@ index c46cba1..ed3f35f 100644 bool m_renderGUI; diff --git a/xbmc/main/main.cpp b/xbmc/main/main.cpp -index ec86426..ad8fe6e 100644 +index ec86426..c20d793 100644 --- a/xbmc/main/main.cpp +++ b/xbmc/main/main.cpp -@@ -40,9 +40,24 @@ +@@ -40,9 +40,25 @@ #include "input/linux/LIRC.h" #endif #include "XbmcContext.h" @@ -148,10 +148,11 @@ index ec86426..ad8fe6e 100644 + +void xbmc_term_handler(int signum) +{ -+ CLog::Log(LOGINFO, "Received SIGTERM..."); -+ if (!g_application.m_ExitCodeSet) ++ if (!g_application.m_ExitCodeSet) { ++ CLog::Log(LOGINFO, "Received SIGTERM..."); + g_application.SetExitCode(EXITCODE_RESTARTAPP); -+ g_application.Stop(EXITCODE_RESTARTAPP); ++ g_application.Stop(EXITCODE_RESTARTAPP); ++ } +} int main(int argc, char* argv[]) @@ -165,3 +166,6 @@ index ec86426..ad8fe6e 100644 // set up some xbmc specific relationships XBMC::Context context; +-- +2.1.0 + From 6597a823841131f9eef63df37980a97001371d37 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 16 Dec 2014 14:15:44 +0200 Subject: [PATCH 3/3] Revert "kodi: update sigterm handler patch" This reverts commit 7421d90ad9c46b6c76267a4c2e15fdadfc01fb21. --- .../kodi-999.03-0001-handle-SIGTERM.patch | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch b/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch index 9c79dbe073..418f67f4be 100644 --- a/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch @@ -1,6 +1,6 @@ -From 4ed7bee82ee9daa22e5675fd98ef97bf05c10d6b Mon Sep 17 00:00:00 2001 +From eabb811c7f82695cb566b0aadf5d86cb7448368a Mon Sep 17 00:00:00 2001 From: Stefan Saraev -Date: Mon, 15 Dec 2014 21:28:54 +0200 +Date: Thu, 5 Jun 2014 18:50:04 +0300 Subject: [PATCH] handle SIGTERM In some situations, due to deadlocks or crashes, xbmc fails to exit properly in @@ -27,11 +27,11 @@ is requested externaly (ssh, 3rdparty script). xbmc/ApplicationMessenger.cpp | 6 ++++-- xbmc/XBApplicationEx.cpp | 1 + xbmc/XBApplicationEx.h | 1 + - xbmc/main/main.cpp | 16 ++++++++++++++++ - 6 files changed, 31 insertions(+), 4 deletions(-) + xbmc/main/main.cpp | 15 +++++++++++++++ + 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index da6a327..0570df9 100644 +index 875ca39..9572b62 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -3477,12 +3477,19 @@ bool CApplication::Cleanup() @@ -67,7 +67,7 @@ diff --git a/xbmc/Application.h b/xbmc/Application.h index 0a332ff..a4d6b58 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -153,6 +153,7 @@ public: +@@ -153,6 +153,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs bool StartPVRManager(); void StopPVRManager(); bool IsCurrentThread() const; @@ -128,7 +128,7 @@ diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h index c46cba1..ed3f35f 100644 --- a/xbmc/XBApplicationEx.h +++ b/xbmc/XBApplicationEx.h -@@ -40,6 +40,7 @@ public: +@@ -40,6 +40,7 @@ class CXBApplicationEx : public IWindowManagerCallback // Variables for timing bool m_bStop; int m_ExitCode; @@ -137,10 +137,10 @@ index c46cba1..ed3f35f 100644 bool m_renderGUI; diff --git a/xbmc/main/main.cpp b/xbmc/main/main.cpp -index ec86426..c20d793 100644 +index ec86426..ad8fe6e 100644 --- a/xbmc/main/main.cpp +++ b/xbmc/main/main.cpp -@@ -40,9 +40,25 @@ +@@ -40,9 +40,24 @@ #include "input/linux/LIRC.h" #endif #include "XbmcContext.h" @@ -148,11 +148,10 @@ index ec86426..c20d793 100644 + +void xbmc_term_handler(int signum) +{ -+ if (!g_application.m_ExitCodeSet) { -+ CLog::Log(LOGINFO, "Received SIGTERM..."); ++ CLog::Log(LOGINFO, "Received SIGTERM..."); ++ if (!g_application.m_ExitCodeSet) + g_application.SetExitCode(EXITCODE_RESTARTAPP); -+ g_application.Stop(EXITCODE_RESTARTAPP); -+ } ++ g_application.Stop(EXITCODE_RESTARTAPP); +} int main(int argc, char* argv[]) @@ -166,6 +165,3 @@ index ec86426..c20d793 100644 // set up some xbmc specific relationships XBMC::Context context; --- -2.1.0 -