From b1eaba3616c8d8a958e7162383865fb8337d1c93 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 May 2021 08:04:27 +0200 Subject: [PATCH 001/158] package/kodi-pvr-mediaportal-tvserver: bump version to 8.1.2 Removed all patches which were applied upstream: https://github.com/kodi-pvr/pvr.mediaportal.tvserver/commits/Matrix Changelog: https://github.com/kodi-pvr/pvr.mediaportal.tvserver/blob/Matrix/pvr.mediaportal.tvserver/changelog.txt Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...o-more-supported-C-17-declaration-ke.patch | 29 - .../0002-Remove-p8-os-includes.patch | 157 ---- .../0003-Use-kodi-StringUtils.patch | 124 ---- .../0004-Remove-SAFE_DELETE.patch | 289 -------- ...d-sleep_for-instead-of-p8-time-utils.patch | 308 -------- ...td-mutex-condition_variable-instead-.patch | 673 ------------------ ...-Remove-charset-converter-dependency.patch | 55 -- .../0008-Remove-p8-platform-dependency.patch | 74 -- .../0009-Travis-changes-for-cpp17.patch | 28 - ...-keyword-as-no-longer-valid-in-CPP17.patch | 23 - .../0011-changelog-and-version-v8.1.1.patch | 42 -- .../kodi-pvr-mediaportal-tvserver.hash | 2 +- .../kodi-pvr-mediaportal-tvserver.mk | 2 +- 13 files changed, 2 insertions(+), 1804 deletions(-) delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch diff --git a/package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch b/package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch deleted file mode 100644 index c09bbc14de..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8696d5408d6ec14b1ff4395ed538b7a48528fe68 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Thu, 8 Oct 2020 16:12:18 +0100 -Subject: [PATCH] Revert "Removed no more supported (C++17) declaration keyword - (register)" - -This reverts commit a8edcafe6cc7a424615319995f4f7bdfab3856b1. - -Signed-off-by: Bernd Kuhls ---- - src/lib/tsreader/DvbUtil.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/tsreader/DvbUtil.cpp b/src/lib/tsreader/DvbUtil.cpp -index c973062..8c4798a 100644 ---- a/src/lib/tsreader/DvbUtil.cpp -+++ b/src/lib/tsreader/DvbUtil.cpp -@@ -77,7 +77,7 @@ namespace MPTV - //******************************************************************* - uint32_t crc32(char *data, int len) - { -- int i; -+ register int i; - uint32_t crc = 0xffffffff; - - for (i = 0; i < len; i++) --- -2.29.2 - diff --git a/package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch b/package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch deleted file mode 100644 index b18d1ff82c..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch +++ /dev/null @@ -1,157 +0,0 @@ -From be13de0679d1707eadaf5349ab904a07fa83bb13 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Wed, 7 Oct 2020 17:34:56 +0100 -Subject: [PATCH] Remove p8 os includes - -Signed-off-by: Bernd Kuhls ---- - src/Socket.cpp | 1 - - src/lib/tsreader/FileReader.h | 1 - - src/lib/tsreader/MemorySink.cpp | 1 - - src/lib/tsreader/Section.cpp | 2 ++ - src/os-dependent.h | 40 ++++++++++++++++++--------------- - src/timers.cpp | 1 - - src/windows/FileUtils.cpp | 6 ++++- - 7 files changed, 29 insertions(+), 23 deletions(-) - -diff --git a/src/Socket.cpp b/src/Socket.cpp -index 12f7e80..b7dd250 100644 ---- a/src/Socket.cpp -+++ b/src/Socket.cpp -@@ -7,7 +7,6 @@ - - #include "utils.h" - #include --#include "p8-platform/os.h" - #include "Socket.h" - - #include -diff --git a/src/lib/tsreader/FileReader.h b/src/lib/tsreader/FileReader.h -index 986bbc4..edb01f2 100644 ---- a/src/lib/tsreader/FileReader.h -+++ b/src/lib/tsreader/FileReader.h -@@ -33,7 +33,6 @@ - * http://forums.dvbowners.com/ - */ - --#include "p8-platform/os.h" // for __stat - #include - #include - -diff --git a/src/lib/tsreader/MemorySink.cpp b/src/lib/tsreader/MemorySink.cpp -index 2d60696..dafef56 100644 ---- a/src/lib/tsreader/MemorySink.cpp -+++ b/src/lib/tsreader/MemorySink.cpp -@@ -29,7 +29,6 @@ - - #if defined LIVE555 - --#include "p8-platform/os.h" - #include "MemorySink.h" - #include "GroupsockHelper.hh" - #include //for kodi::Log -diff --git a/src/lib/tsreader/Section.cpp b/src/lib/tsreader/Section.cpp -index 258c6a9..aac6b53 100644 ---- a/src/lib/tsreader/Section.cpp -+++ b/src/lib/tsreader/Section.cpp -@@ -22,6 +22,8 @@ - #include "os-dependent.h" - #include "Section.h" - -+#include -+ - namespace MPTV - { - CSection::CSection(void) -diff --git a/src/os-dependent.h b/src/os-dependent.h -index 1f368ea..cdc6980 100644 ---- a/src/os-dependent.h -+++ b/src/os-dependent.h -@@ -7,29 +7,33 @@ - - #pragma once - --#include "p8-platform/os.h" -+#include - --#ifdef TARGET_LINUX --// Retrieve the number of milliseconds that have elapsed since the system was started --#include --inline unsigned long long GetTickCount64(void) --{ -- struct timespec ts; -- if(clock_gettime(CLOCK_MONOTONIC, &ts) != 0) -- { -- return 0; -- } -- return (unsigned long long)( (ts.tv_sec * 1000) + (ts.tv_nsec / 1000000) ); --}; --#elif defined(TARGET_DARWIN) --#include -+#if (defined(_WIN32) || defined(_WIN64)) -+ -+#ifndef _SSIZE_T_DEFINED -+#ifdef _WIN64 -+typedef __int64 ssize_t; -+#else -+typedef _W64 int ssize_t; -+#endif -+#define _SSIZE_T_DEFINED -+#endif -+ -+#else -+ -+#if (defined(TARGET_LINUX) || defined(TARGET_DARWIN)) -+#include -+#include -+#include - inline unsigned long long GetTickCount64(void) - { -- struct timeval tv; -- gettimeofday(&tv, NULL); -- return (unsigned long long)( (tv.tv_sec * 1000) + (tv.tv_usec / 1000) ); -+ auto now = std::chrono::steady_clock::now(); -+ return std::chrono::duration_cast(now.time_since_epoch()).count(); - }; - #endif /* TARGET_LINUX || TARGET_DARWIN */ - -+#endif -+ - // Additional typedefs - typedef uint8_t byte; -diff --git a/src/timers.cpp b/src/timers.cpp -index a8760e4..a60b4c2 100644 ---- a/src/timers.cpp -+++ b/src/timers.cpp -@@ -11,7 +11,6 @@ - - using namespace std; - --#include "p8-platform/os.h" //needed for snprintf - #include "timers.h" - #include "settings.h" - #include "utils.h" -diff --git a/src/windows/FileUtils.cpp b/src/windows/FileUtils.cpp -index 0d26bc6..0c8a03e 100644 ---- a/src/windows/FileUtils.cpp -+++ b/src/windows/FileUtils.cpp -@@ -6,7 +6,6 @@ - */ - - #include "../FileUtils.h" --#include "p8-platform/os.h" - #include "p8-platform/windows/CharsetConverter.h" - #include - #include "../utils.h" -@@ -14,6 +13,11 @@ - #include - #endif - -+#ifdef TARGET_WINDOWS -+#include -+#include -+#endif -+ - namespace OS - { - bool CFile::Exists(const std::string& strFileName, long* errCode) diff --git a/package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch b/package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch deleted file mode 100644 index 597e76af28..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 621a98436875f8b4ceea18218a23025e0b59aeb3 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Wed, 7 Oct 2020 17:46:14 +0100 -Subject: [PATCH] Use kodi StringUtils - -Signed-off-by: Bernd Kuhls ---- - src/GUIDialogRecordSettings.cpp | 6 +++--- - src/lib/tsreader/TSReader.cpp | 10 +++++----- - src/pvrclient-mediaportal.cpp | 3 ++- - src/utils.cpp | 3 ++- - 4 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/src/GUIDialogRecordSettings.cpp b/src/GUIDialogRecordSettings.cpp -index cf36d82..8e942d2 100644 ---- a/src/GUIDialogRecordSettings.cpp -+++ b/src/GUIDialogRecordSettings.cpp -@@ -9,9 +9,9 @@ - #include "timers.h" - #include "utils.h" - #include "DateTime.h" --#include "p8-platform/util/StringUtils.h" - - #include -+#include - - /* Dialog item identifiers */ - #define BUTTON_OK 1 -@@ -106,7 +106,7 @@ bool CGUIDialogRecordSettings::OnInit() - - // Populate PreRecord spin control - std::string marginStart; -- marginStart = StringUtils::Format("%d (%s)", m_timerinfo.GetMarginStart(), kodi::GetLocalizedString(30136).c_str()); -+ marginStart = kodi::tools::StringUtils::Format("%d (%s)", m_timerinfo.GetMarginStart(), kodi::GetLocalizedString(30136).c_str()); - m_spinPreRecord->SetType(kodi::gui::controls::ADDON_SPIN_CONTROL_TYPE_TEXT); - m_spinPreRecord->AddLabel(kodi::GetLocalizedString(30135), -1); - m_spinPreRecord->AddLabel(marginStart, m_timerinfo.GetMarginStart()); //value from XBMC -@@ -120,7 +120,7 @@ bool CGUIDialogRecordSettings::OnInit() - - // Populate PostRecord spin control - std::string marginEnd; -- marginEnd = StringUtils::Format("%d (%s)", m_timerinfo.GetMarginEnd(), kodi::GetLocalizedString(30136).c_str()); -+ marginEnd = kodi::tools::StringUtils::Format("%d (%s)", m_timerinfo.GetMarginEnd(), kodi::GetLocalizedString(30136).c_str()); - m_spinPostRecord->SetType(kodi::gui::controls::ADDON_SPIN_CONTROL_TYPE_TEXT); - m_spinPostRecord->AddLabel(kodi::GetLocalizedString(30135), -1); - m_spinPostRecord->AddLabel(marginEnd, m_timerinfo.GetMarginEnd()); //value from XBMC -diff --git a/src/lib/tsreader/TSReader.cpp b/src/lib/tsreader/TSReader.cpp -index 1129c8e..3f9725b 100644 ---- a/src/lib/tsreader/TSReader.cpp -+++ b/src/lib/tsreader/TSReader.cpp -@@ -34,7 +34,7 @@ - #include "utils.h" - #include "TSDebug.h" - #include "p8-platform/util/timeutils.h" --#include "p8-platform/util/StringUtils.h" -+#include - #ifdef LIVE555 - #include "MemoryReader.h" - #include "MepoRTSPClient.h" -@@ -104,7 +104,7 @@ namespace MPTV - { - if (!tscard.TimeshiftFolderUNC.empty()) - { -- StringUtils::Replace(sFileName, tscard.TimeshiftFolder.c_str(), tscard.TimeshiftFolderUNC.c_str()); -+ kodi::tools::StringUtils::Replace(sFileName, tscard.TimeshiftFolder.c_str(), tscard.TimeshiftFolderUNC.c_str()); - bFound = true; - } - else -@@ -129,7 +129,7 @@ namespace MPTV - if (!it->RecordingFolderUNC.empty()) - { - // Remove the original base path and replace it with the given path -- StringUtils::Replace(sFileName, it->RecordingFolder.c_str(), it->RecordingFolderUNC.c_str()); -+ kodi::tools::StringUtils::Replace(sFileName, it->RecordingFolder.c_str(), it->RecordingFolderUNC.c_str()); - bFound = true; - break; - } -@@ -412,8 +412,8 @@ namespace MPTV - if (tmp.find("smb://") != string::npos) - { - // Convert XBMC smb share name back to a real windows network share... -- StringUtils::Replace(tmp, "smb://", "\\\\"); -- StringUtils::Replace(tmp, "/", "\\"); -+ kodi::tools::StringUtils::Replace(tmp, "smb://", "\\\\"); -+ kodi::tools::StringUtils::Replace(tmp, "/", "\\"); - } - #else - //TODO: do something useful... -diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp -index 93ca1bc..fdb31e7 100644 ---- a/src/pvrclient-mediaportal.cpp -+++ b/src/pvrclient-mediaportal.cpp -@@ -11,7 +11,7 @@ - #include - - #include "p8-platform/util/timeutils.h" --#include "p8-platform/util/StringUtils.h" -+#include - - #include "timers.h" - #include "channels.h" -@@ -29,6 +29,7 @@ - #include - #include - -+using namespace kodi::tools; - using namespace std; - using namespace MPTV; - -diff --git a/src/utils.cpp b/src/utils.cpp -index 63c823a..9b8def8 100644 ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -13,8 +13,9 @@ - #include "settings.h" - #include - #include --#include "p8-platform/util/StringUtils.h" -+#include - -+using namespace kodi::tools; - using namespace std; - - void Tokenize(const string& str, vector& tokens, const string& delimiters = " ") diff --git a/package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch b/package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch deleted file mode 100644 index 98667913a8..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch +++ /dev/null @@ -1,289 +0,0 @@ -From 00d0d90fdac9257ed02e24677ba4f008f2486c94 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Wed, 7 Oct 2020 18:00:57 +0100 -Subject: [PATCH] Remove SAFE_DELETE - -Signed-off-by: Bernd Kuhls ---- - src/lib/tsreader/FileReader.cpp | 9 ++++++++- - src/lib/tsreader/MemoryBuffer.cpp | 22 +++++++++++++--------- - src/lib/tsreader/MultiFileReader.cpp | 11 ++++++++++- - src/lib/tsreader/TSReader.cpp | 25 +++++++++++++++++-------- - src/pvrclient-mediaportal.cpp | 27 ++++++++++++++++++--------- - src/utils.h | 2 -- - 6 files changed, 66 insertions(+), 30 deletions(-) - -diff --git a/src/lib/tsreader/FileReader.cpp b/src/lib/tsreader/FileReader.cpp -index ac8725c..3df22f2 100644 ---- a/src/lib/tsreader/FileReader.cpp -+++ b/src/lib/tsreader/FileReader.cpp -@@ -38,7 +38,6 @@ - #include "p8-platform/threads/threads.h" - #include //std::min, std::max - #include "p8-platform/util/timeutils.h" // for usleep --#include "p8-platform/util/util.h" - #include "utils.h" - #include - -@@ -58,6 +57,14 @@ - /* calcuate bitrate for file while reading */ - #define READ_BITRATE 0x10 - -+template void SafeDelete(T*& p) -+{ -+ if (p) -+ { -+ delete p; -+ p = nullptr; -+ } -+} - namespace MPTV - { - FileReader::FileReader() : -diff --git a/src/lib/tsreader/MemoryBuffer.cpp b/src/lib/tsreader/MemoryBuffer.cpp -index 6d411d7..609b575 100644 ---- a/src/lib/tsreader/MemoryBuffer.cpp -+++ b/src/lib/tsreader/MemoryBuffer.cpp -@@ -31,7 +31,6 @@ - - #include "p8-platform/util/timeutils.h" - #include "p8-platform/threads/mutex.h" --#include "p8-platform/util/util.h" - #include "MemoryBuffer.h" - #include //for kodi::Log - #include "TSDebug.h" -@@ -59,11 +58,14 @@ void CMemoryBuffer::Clear() - P8PLATFORM::CLockObject BufferLock(m_BufferLock); - std::vector::iterator it = m_Array.begin(); - -- for ( ; it != m_Array.end(); ++it ) -+ for (auto& item : m_Array) - { -- BufferItem *item = *it; -- SAFE_DELETE_ARRAY(item->data); -- SAFE_DELETE(item); -+ if (item) -+ { -+ if (item->data) -+ delete[] item->data; -+ delete item; -+ } - } - - m_Array.clear(); -@@ -150,8 +152,9 @@ size_t CMemoryBuffer::ReadFromBuffer(unsigned char *pbData, size_t lDataLength) - if (item->nOffset >= item->nDataLength) - { - m_Array.erase(m_Array.begin()); -- SAFE_DELETE_ARRAY(item->data); -- SAFE_DELETE(item); -+ if (item->data) -+ delete[] item->data; -+ delete item; - } - } - return bytesWritten; -@@ -182,8 +185,9 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) - - m_BytesInBuffer -= copyLength; - m_Array.erase(m_Array.begin()); -- SAFE_DELETE_ARRAY(item2->data); -- SAFE_DELETE(item2); -+ if (item2->data) -+ delete[] item2->data; -+ delete item2; - } - if (m_BytesInBuffer > 0) - { -diff --git a/src/lib/tsreader/MultiFileReader.cpp b/src/lib/tsreader/MultiFileReader.cpp -index b8005b3..3828e06 100644 ---- a/src/lib/tsreader/MultiFileReader.cpp -+++ b/src/lib/tsreader/MultiFileReader.cpp -@@ -48,6 +48,15 @@ using namespace P8PLATFORM; - //Maximum time in msec to wait for the buffer file to become available - Needed for DVB radio (this sometimes takes some time) - #define MAX_BUFFER_TIMEOUT 1500 - -+template void SafeDelete(T*& p) -+{ -+ if (p) -+ { -+ delete p; -+ p = nullptr; -+ } -+} -+ - namespace MPTV - { - MultiFileReader::MultiFileReader() : -@@ -484,7 +493,7 @@ namespace MPTV - - TSDEBUG(ADDON_LOG_DEBUG, "MultiFileReader: Removing file %s\n", file->filename.c_str()); - -- SAFE_DELETE(file); -+ SafeDelete(file); - m_tsFiles.erase(m_tsFiles.begin()); - - filesToRemove--; -diff --git a/src/lib/tsreader/TSReader.cpp b/src/lib/tsreader/TSReader.cpp -index 3f9725b..4a72f4f 100644 ---- a/src/lib/tsreader/TSReader.cpp -+++ b/src/lib/tsreader/TSReader.cpp -@@ -44,6 +44,15 @@ - - using namespace std; - -+template void SafeDelete(T*& p) -+{ -+ if (p) -+ { -+ delete p; -+ p = nullptr; -+ } -+} -+ - namespace MPTV - { - CTsReader::CTsReader() : m_demultiplexer(*this), -@@ -69,10 +78,10 @@ namespace MPTV - - CTsReader::~CTsReader(void) - { -- SAFE_DELETE(m_fileReader); -+ SafeDelete(m_fileReader); - #ifdef LIVE555 -- SAFE_DELETE(m_buffer); -- SAFE_DELETE(m_rtspClient); -+ SafeDelete(m_buffer); -+ SafeDelete(m_rtspClient); - #endif - } - -@@ -225,8 +234,8 @@ namespace MPTV - - if ( !m_rtspClient->OpenStream(m_fileName.c_str()) ) - { -- SAFE_DELETE(m_rtspClient); -- SAFE_DELETE(m_buffer); -+ SafeDelete(m_rtspClient); -+ SafeDelete(m_buffer); - return E_FAIL; - } - -@@ -318,8 +327,8 @@ namespace MPTV - #ifdef LIVE555 - kodi::Log(ADDON_LOG_INFO, "TsReader: closing RTSP client"); - m_rtspClient->Stop(); -- SAFE_DELETE(m_rtspClient); -- SAFE_DELETE(m_buffer); -+ SafeDelete(m_rtspClient); -+ SafeDelete(m_buffer); - #endif - } - else -@@ -327,7 +336,7 @@ namespace MPTV - kodi::Log(ADDON_LOG_INFO, "TsReader: closing file"); - m_fileReader->CloseFile(); - } -- SAFE_DELETE(m_fileReader); -+ SafeDelete(m_fileReader); - m_State = State_Stopped; - } - } -diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp -index fdb31e7..5479950 100644 ---- a/src/pvrclient-mediaportal.cpp -+++ b/src/pvrclient-mediaportal.cpp -@@ -42,6 +42,15 @@ int g_iTVServerKodiBuild = 0; - #define TVSERVERKODI_RECOMMENDED_VERSION_STRING "1.2.3.122 till 1.20.0.140" - #define TVSERVERKODI_RECOMMENDED_VERSION_BUILD 140 - -+template void SafeDelete(T*& p) -+{ -+ if (p) -+ { -+ delete p; -+ p = nullptr; -+ } -+} -+ - /************************************************************/ - /** Class interface */ - -@@ -75,10 +84,10 @@ cPVRClientMediaPortal::~cPVRClientMediaPortal() - kodi::Log(ADDON_LOG_DEBUG, "->~cPVRClientMediaPortal()"); - Disconnect(); - -- SAFE_DELETE(Timer::lifetimeValues); -- SAFE_DELETE(m_tcpclient); -- SAFE_DELETE(m_genretable); -- SAFE_DELETE(m_lastSelectedRecording); -+ SafeDelete(Timer::lifetimeValues); -+ SafeDelete(m_tcpclient); -+ SafeDelete(m_genretable); -+ SafeDelete(m_lastSelectedRecording); - } - - string cPVRClientMediaPortal::SendCommand(const char* command) -@@ -321,7 +330,7 @@ void cPVRClientMediaPortal::Disconnect() - if ((CSettings::Get().GetStreamingMethod()==TSReader) && (m_tsreader != NULL)) - { - m_tsreader->Close(); -- SAFE_DELETE(m_tsreader); -+ SafeDelete(m_tsreader); - } - SendCommand("StopTimeshift:\n"); - } -@@ -1748,7 +1757,7 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe - m_iCurrentChannel = -1; - if (m_tsreader != nullptr) - { -- SAFE_DELETE(m_tsreader); -+ SafeDelete(m_tsreader); - } - return false; - } -@@ -1959,7 +1968,7 @@ void cPVRClientMediaPortal::CloseLiveStream(void) - if (CSettings::Get().GetStreamingMethod() == TSReader && m_tsreader) - { - m_tsreader->Close(); -- SAFE_DELETE(m_tsreader); -+ SafeDelete(m_tsreader); - } - result = SendCommand("StopTimeshift:\n"); - kodi::Log(ADDON_LOG_INFO, "CloseLiveStream: %s", result.c_str()); -@@ -2141,7 +2150,7 @@ void cPVRClientMediaPortal::CloseRecordedStream(void) - { - kodi::Log(ADDON_LOG_INFO, "CloseRecordedStream: Stop TSReader..."); - m_tsreader->Close(); -- SAFE_DELETE(m_tsreader); -+ SafeDelete(m_tsreader); - } - else - { -@@ -2409,7 +2418,7 @@ cRecording* cPVRClientMediaPortal::GetRecordingInfo(const kodi::addon::PVRRecord - { - return m_lastSelectedRecording; - } -- SAFE_DELETE(m_lastSelectedRecording); -+ SafeDelete(m_lastSelectedRecording); - } - - if (!IsUp()) -diff --git a/src/utils.h b/src/utils.h -index 823b46e..d03569a 100644 ---- a/src/utils.h -+++ b/src/utils.h -@@ -11,13 +11,11 @@ - #include - #include - #include "uri.h" --#include "p8-platform/util/util.h" - - #ifdef TARGET_WINDOWS - #include "windows/WindowsUtils.h" - #endif - -- - /** - * String tokenize - * Split string using the given delimiter into a vector of substrings diff --git a/package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch b/package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch deleted file mode 100644 index 4d61d15b2d..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch +++ /dev/null @@ -1,308 +0,0 @@ -From 4b4a16157870d5816339700616f1efdb60fb59e3 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Wed, 7 Oct 2020 18:12:10 +0100 -Subject: [PATCH] Use thread sleep_for instead of p8 time utils - -Signed-off-by: Bernd Kuhls ---- - src/lib/tsreader/DeMultiplexer.cpp | 6 ++++-- - src/lib/tsreader/FileReader.cpp | 5 +++-- - src/lib/tsreader/MemoryBuffer.cpp | 5 +++-- - src/lib/tsreader/MepoRTSPClient.cpp | 5 +++-- - src/lib/tsreader/MultiFileReader.cpp | 9 +++++---- - src/lib/tsreader/TSReader.cpp | 5 +++-- - src/pvrclient-mediaportal.cpp | 23 +++++++++++++---------- - 7 files changed, 34 insertions(+), 24 deletions(-) - -diff --git a/src/lib/tsreader/DeMultiplexer.cpp b/src/lib/tsreader/DeMultiplexer.cpp -index 63bf20e..436e452 100644 ---- a/src/lib/tsreader/DeMultiplexer.cpp -+++ b/src/lib/tsreader/DeMultiplexer.cpp -@@ -37,6 +37,8 @@ - #include //for kodi::Log - #include "TSReader.h" - -+#include -+ - #define MAX_BUF_SIZE 8000 - #define BUFFER_LENGTH 0x1000 - #define READ_SIZE (1316*30) -@@ -83,7 +85,7 @@ namespace MPTV - { - size_t BytesRead = ReadFromFile(); - if (0 == BytesRead) -- usleep(10000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - m_bStarting = false; - } -@@ -248,7 +250,7 @@ namespace MPTV - { - size_t BytesRead = ReadFromFile(); - if (0 == BytesRead) -- usleep(10000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(10)); - dwBytesProcessed += BytesRead; - } - -diff --git a/src/lib/tsreader/FileReader.cpp b/src/lib/tsreader/FileReader.cpp -index 3df22f2..73b23af 100644 ---- a/src/lib/tsreader/FileReader.cpp -+++ b/src/lib/tsreader/FileReader.cpp -@@ -37,10 +37,10 @@ - #include "TSDebug.h" - #include "p8-platform/threads/threads.h" - #include //std::min, std::max --#include "p8-platform/util/timeutils.h" // for usleep - #include "utils.h" - #include - -+#include - - /* indicate that caller can handle truncated reads, where function returns before entire buffer has been filled */ - #define READ_TRUNCATED 0x01 -@@ -145,7 +145,8 @@ namespace MPTV - } - } - } -- usleep(20000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(20)); -+ - } while (--Tmo); - - if (Tmo) -diff --git a/src/lib/tsreader/MemoryBuffer.cpp b/src/lib/tsreader/MemoryBuffer.cpp -index 609b575..0e736f2 100644 ---- a/src/lib/tsreader/MemoryBuffer.cpp -+++ b/src/lib/tsreader/MemoryBuffer.cpp -@@ -29,12 +29,13 @@ - - #ifdef LIVE555 - --#include "p8-platform/util/timeutils.h" - #include "p8-platform/threads/mutex.h" - #include "MemoryBuffer.h" - #include //for kodi::Log - #include "TSDebug.h" - -+#include -+ - #define MAX_MEMORY_BUFFER_SIZE (1024L*1024L*12L) - - CMemoryBuffer::CMemoryBuffer(void) -@@ -197,7 +198,7 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) - - if (sleep) - { -- usleep(10000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - return S_OK; - } -diff --git a/src/lib/tsreader/MepoRTSPClient.cpp b/src/lib/tsreader/MepoRTSPClient.cpp -index 4971986..ccd6761 100644 ---- a/src/lib/tsreader/MepoRTSPClient.cpp -+++ b/src/lib/tsreader/MepoRTSPClient.cpp -@@ -18,13 +18,14 @@ - - #if defined LIVE555 - --#include "p8-platform/util/timeutils.h" - #include "MepoRTSPClient.h" - #include "MemorySink.h" - #include //for kodi::Log - #include "utils.h" - #include "os-dependent.h" - -+#include -+ - CRTSPClient::CRTSPClient() - { - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::CRTSPClient()"); -@@ -531,7 +532,7 @@ void CRTSPClient::FillBuffer(unsigned long byteCount) - - while ( IsRunning() && m_buffer->Size() < byteCount) - { -- usleep(5000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(5)); - if (GetTickCount64() - tickCount > 3000) - break; - } -diff --git a/src/lib/tsreader/MultiFileReader.cpp b/src/lib/tsreader/MultiFileReader.cpp -index 3828e06..21fd7b2 100644 ---- a/src/lib/tsreader/MultiFileReader.cpp -+++ b/src/lib/tsreader/MultiFileReader.cpp -@@ -39,10 +39,11 @@ - #include - #include "utils.h" - #include --#include "p8-platform/util/timeutils.h" - #include "p8-platform/threads/threads.h" - #include - -+#include -+ - using namespace P8PLATFORM; - - //Maximum time in msec to wait for the buffer file to become available - Needed for DVB radio (this sometimes takes some time) -@@ -112,7 +113,7 @@ namespace MPTV - retryCount++; - kodi::Log(ADDON_LOG_DEBUG, "MultiFileReader: buffer file has zero length, closing, waiting 100 ms and re-opening. Attempt: %d.", retryCount); - m_TSBufferFile.CloseFile(); -- usleep(100000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(100)); - hResult = m_TSBufferFile.OpenFile(); - kodi::Log(ADDON_LOG_DEBUG, "MultiFileReader: buffer file opened return code %d.", hResult); - } -@@ -124,7 +125,7 @@ namespace MPTV - - do - { -- usleep(100000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(100)); - if (timeout.TimeLeft() == 0) - { - kodi::Log(ADDON_LOG_ERROR, "MultiFileReader: timed out while waiting for buffer file to become available"); -@@ -457,7 +458,7 @@ namespace MPTV - // try to clear local / remote SMB file cache. This should happen when we close the filehandle - m_TSBufferFile.CloseFile(); - m_TSBufferFile.OpenFile(); -- usleep(5000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(5)); - } - - if (Error) -diff --git a/src/lib/tsreader/TSReader.cpp b/src/lib/tsreader/TSReader.cpp -index 4a72f4f..40a4faf 100644 ---- a/src/lib/tsreader/TSReader.cpp -+++ b/src/lib/tsreader/TSReader.cpp -@@ -33,7 +33,6 @@ - #include "MultiFileReader.h" - #include "utils.h" - #include "TSDebug.h" --#include "p8-platform/util/timeutils.h" - #include - #ifdef LIVE555 - #include "MemoryReader.h" -@@ -42,6 +41,8 @@ - #endif - #include "FileUtils.h" - -+#include -+ - using namespace std; - - template void SafeDelete(T*& p) -@@ -396,7 +397,7 @@ namespace MPTV - fileReader->OnChannelChange(); - - kodi::Log(ADDON_LOG_DEBUG, "%s:: move from %I64d to %I64d tsbufpos %I64d", __FUNCTION__, pos_before, pos_after, timeShiftBufferPos); -- usleep(100000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(100)); - - // Set the stream start times to this new channel - time(&m_startTime); -diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp -index 5479950..851b940 100644 ---- a/src/pvrclient-mediaportal.cpp -+++ b/src/pvrclient-mediaportal.cpp -@@ -10,7 +10,6 @@ - #include - #include - --#include "p8-platform/util/timeutils.h" - #include - - #include "timers.h" -@@ -29,6 +28,8 @@ - #include - #include - -+#include -+ - using namespace kodi::tools; - using namespace std; - using namespace MPTV; -@@ -389,7 +390,7 @@ void* cPVRClientMediaPortal::Process(void) - if (keepWaiting) - { - // Wait for 1 minute before re-trying -- usleep(60000000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(60000)); - } - } - SetConnectionState(state); -@@ -1571,7 +1572,8 @@ PVR_ERROR cPVRClientMediaPortal::AddTimer(const kodi::addon::PVRTimer& timerinfo - if (timerinfo.GetStartTime() <= 0) - { - // Refresh the recordings list to see the newly created recording -- usleep(100000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(100)); -+ - kodi::addon::CInstancePVRClient::TriggerRecordingUpdate(); - } - -@@ -1785,7 +1787,8 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe - kodi::Log(ADDON_LOG_INFO, "Channel timeshift buffer: %s", timeshiftfields[2].c_str()); - if (channelinfo.GetIsRadio()) - { -- usleep(100000); // 100 ms sleep to allow the buffer to fill -+ // 100 ms sleep to allow the buffer to fill -+ std::this_thread::sleep_for(std::chrono::milliseconds(100)); - } - } - else -@@ -1796,7 +1799,7 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe - if (CSettings::Get().GetSleepOnRTSPurl() > 0) - { - kodi::Log(ADDON_LOG_INFO, "Sleeping %i ms before opening stream: %s", CSettings::Get().GetSleepOnRTSPurl(), timeshiftfields[0].c_str()); -- usleep(CSettings::Get().GetSleepOnRTSPurl() * 1000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(CSettings::Get().GetSleepOnRTSPurl())); - } - - // Check the returned stream URL. When the URL is an rtsp stream, we need -@@ -1878,7 +1881,7 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe - CloseLiveStream(); - return false; - } -- usleep(400000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(400)); - } - } - -@@ -1924,7 +1927,7 @@ int cPVRClientMediaPortal::ReadLiveStream(unsigned char *pBuffer, unsigned int i - - if (m_tsreader->Read(bufptr, read_wanted, &read_wanted) > 0) - { -- usleep(20000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(20)); - read_timeouts++; - return static_cast(read_wanted); - } -@@ -1948,7 +1951,7 @@ int cPVRClientMediaPortal::ReadLiveStream(unsigned char *pBuffer, unsigned int i - } - bufptr += read_wanted; - read_timeouts++; -- usleep(10000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - } - read_timeouts = 0; -@@ -2175,7 +2178,7 @@ int cPVRClientMediaPortal::ReadRecordedStream(unsigned char *pBuffer, unsigned i - - if (m_tsreader->Read(bufptr, read_wanted, &read_wanted) > 0) - { -- usleep(20000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(20)); - return static_cast(read_wanted); - } - read_done += read_wanted; -@@ -2183,7 +2186,7 @@ int cPVRClientMediaPortal::ReadRecordedStream(unsigned char *pBuffer, unsigned i - if ( read_done < static_cast(iBufferSize) ) - { - bufptr += read_wanted; -- usleep(20000); -+ std::this_thread::sleep_for(std::chrono::milliseconds(20)); - } - } - diff --git a/package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch b/package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch deleted file mode 100644 index 7d6e14115f..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch +++ /dev/null @@ -1,673 +0,0 @@ -From 482d898333facf53bd3208cf5e44a0cf3e1f4f3b Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Thu, 8 Oct 2020 14:59:55 +0100 -Subject: [PATCH] Use std::thread, std::mutex, condition_variable instead of - event - -Signed-off-by: Bernd Kuhls ---- - src/lib/tsreader/DeMultiplexer.cpp | 2 +- - src/lib/tsreader/DeMultiplexer.h | 4 +- - src/lib/tsreader/FileReader.cpp | 2 +- - src/lib/tsreader/MemoryBuffer.cpp | 15 +++-- - src/lib/tsreader/MemoryBuffer.h | 7 +- - src/lib/tsreader/MemoryReader.h | 1 + - src/lib/tsreader/MemorySink.cpp | 2 +- - src/lib/tsreader/MemorySink.h | 4 +- - src/lib/tsreader/MepoRTSPClient.cpp | 28 ++++---- - src/lib/tsreader/MepoRTSPClient.h | 10 ++- - src/lib/tsreader/MultiFileReader.cpp | 9 ++- - src/os-dependent.h | 95 ++++++++++++++++++++++++++++ - src/pvrclient-mediaportal.cpp | 29 ++++----- - src/pvrclient-mediaportal.h | 21 +++--- - 14 files changed, 168 insertions(+), 61 deletions(-) - -diff --git a/src/lib/tsreader/DeMultiplexer.cpp b/src/lib/tsreader/DeMultiplexer.cpp -index 436e452..3d0d9a2 100644 ---- a/src/lib/tsreader/DeMultiplexer.cpp -+++ b/src/lib/tsreader/DeMultiplexer.cpp -@@ -104,7 +104,7 @@ namespace MPTV - if (m_filter.IsSeeking()) - return 0; // Ambass : to check - -- P8PLATFORM::CLockObject lock(m_sectionRead); -+ std::lock_guard lock(m_sectionRead); - if (NULL == m_reader) - return 0; - -diff --git a/src/lib/tsreader/DeMultiplexer.h b/src/lib/tsreader/DeMultiplexer.h -index c7cd577..72ed87d 100644 ---- a/src/lib/tsreader/DeMultiplexer.h -+++ b/src/lib/tsreader/DeMultiplexer.h -@@ -37,7 +37,7 @@ - #include "PacketSync.h" - #include "TSHeader.h" - #include "PatParser.h" --#include "p8-platform/threads/mutex.h" -+#include - - namespace MPTV - { -@@ -60,7 +60,7 @@ namespace MPTV - private: - unsigned long long m_LastDataFromRtsp; - bool m_bEndOfFile; -- P8PLATFORM::CMutex m_sectionRead; -+ std::mutex m_sectionRead; - FileReader* m_reader; - CPatParser m_patParser; - CTsReader& m_filter; -diff --git a/src/lib/tsreader/FileReader.cpp b/src/lib/tsreader/FileReader.cpp -index 73b23af..358b05f 100644 ---- a/src/lib/tsreader/FileReader.cpp -+++ b/src/lib/tsreader/FileReader.cpp -@@ -35,7 +35,7 @@ - #include "FileReader.h" - #include //for kodi::Log - #include "TSDebug.h" --#include "p8-platform/threads/threads.h" -+#include "os-dependent.h" - #include //std::min, std::max - #include "utils.h" - #include -diff --git a/src/lib/tsreader/MemoryBuffer.cpp b/src/lib/tsreader/MemoryBuffer.cpp -index 0e736f2..b5400da 100644 ---- a/src/lib/tsreader/MemoryBuffer.cpp -+++ b/src/lib/tsreader/MemoryBuffer.cpp -@@ -29,7 +29,7 @@ - - #ifdef LIVE555 - --#include "p8-platform/threads/mutex.h" -+#include "os-dependent.h" - #include "MemoryBuffer.h" - #include //for kodi::Log - #include "TSDebug.h" -@@ -56,7 +56,7 @@ bool CMemoryBuffer::IsRunning() - - void CMemoryBuffer::Clear() - { -- P8PLATFORM::CLockObject BufferLock(m_BufferLock); -+ std::lock_guard BufferLock(m_BufferLock); - std::vector::iterator it = m_Array.begin(); - - for (auto& item : m_Array) -@@ -104,14 +104,17 @@ size_t CMemoryBuffer::ReadFromBuffer(unsigned char *pbData, size_t lDataLength) - { - if (!m_bRunning) - return 0; -- m_event.Wait(5000); -+ -+ std::unique_lock lock(m_BufferLock); -+ m_condition.wait_for(lock, std::chrono::milliseconds(5000)); -+ - if (!m_bRunning) - return 0; - } - - // kodi::Log(ADDON_LOG_DEBUG, "get..%d/%d", lDataLength, m_BytesInBuffer); - size_t bytesWritten = 0; -- P8PLATFORM::CLockObject BufferLock(m_BufferLock); -+ std::lock_guard BufferLock(m_BufferLock); - - while (bytesWritten < lDataLength) - { -@@ -172,7 +175,7 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) - memcpy(item->data, pbData, lDataLength); - bool sleep = false; - { -- P8PLATFORM::CLockObject BufferLock(m_BufferLock); -+ std::lock_guard BufferLock(m_BufferLock); - m_Array.push_back(item); - m_BytesInBuffer += lDataLength; - -@@ -192,7 +195,7 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) - } - if (m_BytesInBuffer > 0) - { -- m_event.Broadcast(); -+ m_condition.notify_one(); - } - } - -diff --git a/src/lib/tsreader/MemoryBuffer.h b/src/lib/tsreader/MemoryBuffer.h -index 080553b..4f8708f 100644 ---- a/src/lib/tsreader/MemoryBuffer.h -+++ b/src/lib/tsreader/MemoryBuffer.h -@@ -30,7 +30,8 @@ - - #ifdef LIVE555 - --#include "p8-platform/threads/mutex.h" -+#include -+#include - #include - - class CMemoryBuffer -@@ -55,9 +56,9 @@ class CMemoryBuffer - - protected: - std::vector m_Array; -- P8PLATFORM::CMutex m_BufferLock; -+ std::mutex m_BufferLock; - size_t m_BytesInBuffer; -- P8PLATFORM::CEvent m_event; -+ std::condition_variable m_condition; - bool m_bRunning; - }; - #endif //LIVE555 -diff --git a/src/lib/tsreader/MemoryReader.h b/src/lib/tsreader/MemoryReader.h -index fef4f98..288984b 100644 ---- a/src/lib/tsreader/MemoryReader.h -+++ b/src/lib/tsreader/MemoryReader.h -@@ -32,6 +32,7 @@ - - #include "FileReader.h" - #include "MemoryBuffer.h" -+#include "os-dependent.h" - - namespace MPTV - { -diff --git a/src/lib/tsreader/MemorySink.cpp b/src/lib/tsreader/MemorySink.cpp -index dafef56..af8b74c 100644 ---- a/src/lib/tsreader/MemorySink.cpp -+++ b/src/lib/tsreader/MemorySink.cpp -@@ -84,7 +84,7 @@ void CMemorySink::addData(unsigned char* data, size_t dataSize, struct timeval U - return; - } - -- P8PLATFORM::CLockObject BufferLock(m_BufferLock); -+ std::lock_guard BufferLock(m_BufferLock); - - m_bReEntrant = true; - m_buffer.PutBuffer(data, dataSize); -diff --git a/src/lib/tsreader/MemorySink.h b/src/lib/tsreader/MemorySink.h -index cc0f3c8..22d91c6 100644 ---- a/src/lib/tsreader/MemorySink.h -+++ b/src/lib/tsreader/MemorySink.h -@@ -35,7 +35,7 @@ - #endif - - #include "MemoryBuffer.h" --#include "p8-platform/threads/mutex.h" -+#include - - class CMemorySink: public MediaSink - { -@@ -57,7 +57,7 @@ class CMemorySink: public MediaSink - private: // redefined virtual functions: - virtual Boolean continuePlaying(); - -- P8PLATFORM::CMutex m_BufferLock; -+ std::mutex m_BufferLock; - unsigned char* m_pSubmitBuffer; - int m_iSubmitBufferPos; - bool m_bReEntrant; -diff --git a/src/lib/tsreader/MepoRTSPClient.cpp b/src/lib/tsreader/MepoRTSPClient.cpp -index ccd6761..688ae84 100644 ---- a/src/lib/tsreader/MepoRTSPClient.cpp -+++ b/src/lib/tsreader/MepoRTSPClient.cpp -@@ -54,7 +54,7 @@ CRTSPClient::CRTSPClient() - m_env = NULL; - m_fDuration = 0.0f; - m_url[0] = '\0'; -- m_bRunning = false; -+ m_running = false; - } - - CRTSPClient::~CRTSPClient() -@@ -496,7 +496,9 @@ void CRTSPClient::StartBufferThread() - - if (!m_BufferThreadActive) - { -- CreateThread(); -+ m_running = true; -+ m_thread = std::thread([&] { Process(); }); -+ - m_BufferThreadActive = true; - } - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::StartBufferThread done"); -@@ -505,11 +507,12 @@ void CRTSPClient::StartBufferThread() - void CRTSPClient::StopBufferThread() - { - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::StopBufferThread"); -- m_bRunning = false; -+ m_running = false; - if (!m_BufferThreadActive) - return; - -- StopThread(); -+ if (m_thread.joinable()) -+ m_thread.join(); - - m_BufferThreadActive = false; - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::StopBufferThread done"); -@@ -539,25 +542,22 @@ void CRTSPClient::FillBuffer(unsigned long byteCount) - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::Fillbuffer...%d/%d\n", byteCount, m_buffer->Size() ); - } - --void *CRTSPClient::Process() -+void CRTSPClient::Process() - { - m_BufferThreadActive = true; -- m_bRunning = true; - - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient:: thread started"); - -- while (m_env != NULL && !IsStopped()) -+ while (m_env != NULL && m_running) - { - m_env->taskScheduler().doEventLoop(); -- if (m_bRunning == false) -+ if (m_running == false) - break; - } - - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient:: thread stopped"); - - m_BufferThreadActive = false; -- -- return NULL; - } - - void CRTSPClient::Continue() -@@ -582,8 +582,12 @@ bool CRTSPClient::Pause() - if (m_ourClient != NULL && m_session != NULL) - { - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::Pause() stopthread"); -- StopThread(10000); // Ambass : sometimes 100mS ( prev value ) is not enough and thread is not stopped. -- // now stopping takes around 5 secs ?!?! why ???? -+ // Ambass : sometimes 100mS ( prev value ) is not enough and thread is not stopped. -+ // now stopping takes around 5 secs ?!?! why ???? -+ m_running = false; -+ if (m_thread.joinable()) -+ m_thread.join(); -+ - kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::Pause() thread stopped"); - RTSPClient* rtspClient=(RTSPClient*)m_ourClient; - rtspClient->pauseMediaSession(*m_session); -diff --git a/src/lib/tsreader/MepoRTSPClient.h b/src/lib/tsreader/MepoRTSPClient.h -index bd6e578..9bb0421 100644 ---- a/src/lib/tsreader/MepoRTSPClient.h -+++ b/src/lib/tsreader/MepoRTSPClient.h -@@ -31,7 +31,8 @@ - - #ifdef LIVE555 - --#include "p8-platform/threads/threads.h" -+#include -+#include - #include "lib/tsreader/MemoryBuffer.h" - - #include "liveMedia.hh" -@@ -41,7 +42,7 @@ - - #define RTSP_URL_BUFFERSIZE 2048 - --class CRTSPClient: public P8PLATFORM::CThread -+class CRTSPClient - { - public: - CRTSPClient(); -@@ -101,7 +102,7 @@ class CRTSPClient: public P8PLATFORM::CThread - - // Thread - private: -- virtual void *Process(void); -+ void Process(); - void StartBufferThread(); - void StopBufferThread(); - bool m_BufferThreadActive; -@@ -113,5 +114,8 @@ class CRTSPClient: public P8PLATFORM::CThread - bool m_bRunning; - bool m_bPaused; - char m_outFileName[1000]; -+ -+ std::atomic m_running = {false}; -+ std::thread m_thread; - }; - #endif //LIVE555 -diff --git a/src/lib/tsreader/MultiFileReader.cpp b/src/lib/tsreader/MultiFileReader.cpp -index 21fd7b2..5106418 100644 ---- a/src/lib/tsreader/MultiFileReader.cpp -+++ b/src/lib/tsreader/MultiFileReader.cpp -@@ -35,17 +35,16 @@ - #include "MultiFileReader.h" - #include //for kodi::Log - #include -+#include - #include "TSDebug.h" - #include - #include "utils.h" - #include --#include "p8-platform/threads/threads.h" - #include -+#include "os-dependent.h" - - #include - --using namespace P8PLATFORM; -- - //Maximum time in msec to wait for the buffer file to become available - Needed for DVB radio (this sometimes takes some time) - #define MAX_BUFFER_TIMEOUT 1500 - -@@ -121,12 +120,12 @@ namespace MPTV - if (RefreshTSBufferFile() == S_FALSE) - { - // For radio the buffer sometimes needs some time to become available, so wait and try it more than once -- P8PLATFORM::CTimeout timeout(MAX_BUFFER_TIMEOUT); -+ kodi::tools::CEndTime timeout(MAX_BUFFER_TIMEOUT); - - do - { - std::this_thread::sleep_for(std::chrono::milliseconds(100)); -- if (timeout.TimeLeft() == 0) -+ if (timeout.MillisLeft() == 0) - { - kodi::Log(ADDON_LOG_ERROR, "MultiFileReader: timed out while waiting for buffer file to become available"); - kodi::QueueNotification(QUEUE_ERROR, "", "Time out while waiting for buffer file"); -diff --git a/src/os-dependent.h b/src/os-dependent.h -index cdc6980..28c162c 100644 ---- a/src/os-dependent.h -+++ b/src/os-dependent.h -@@ -11,6 +11,13 @@ - - #if (defined(_WIN32) || defined(_WIN64)) - -+#include -+ -+/* Handling of 2-byte Windows wchar strings */ -+#define WcsLen wcslen -+#define WcsToMbs wcstombs -+typedef wchar_t Wchar_t; /* sizeof(wchar_t) = 2 bytes on Windows */ -+ - #ifndef _SSIZE_T_DEFINED - #ifdef _WIN64 - typedef __int64 ssize_t; -@@ -20,20 +27,108 @@ typedef _W64 int ssize_t; - #define _SSIZE_T_DEFINED - #endif - -+/* Prevent deprecation warnings */ -+#define strnicmp _strnicmp -+ -+#define PATH_SEPARATOR_CHAR '\\' -+ - #else - - #if (defined(TARGET_LINUX) || defined(TARGET_DARWIN)) - #include - #include - #include -+ -+#define strnicmp(X,Y,N) strncasecmp(X,Y,N) -+ - inline unsigned long long GetTickCount64(void) - { - auto now = std::chrono::steady_clock::now(); - return std::chrono::duration_cast(now.time_since_epoch()).count(); - }; -+ -+#define PATH_SEPARATOR_CHAR '/' -+ -+#if defined(__APPLE__) -+// for HRESULT -+#include -+#endif -+ -+/* Handling of 2-byte Windows wchar strings on non-Windows targets -+ * Used by The MediaPortal and ForTheRecord pvr addons -+ */ -+typedef uint16_t Wchar_t; /* sizeof(wchar_t) = 4 bytes on Linux, but the MediaPortal buffer files have 2-byte wchars */ -+ -+/* This is a replacement of the Windows wcslen() function which assumes that -+ * wchar_t is a 2-byte character. -+ * It is used for processing Windows wchar strings -+ */ -+inline size_t WcsLen(const Wchar_t *str) -+{ -+ const unsigned short *eos = (const unsigned short*)str; -+ while( *eos++ ) ; -+ return( (size_t)(eos - (const unsigned short*)str) -1); -+}; -+ -+/* This is a replacement of the Windows wcstombs() function which assumes that -+ * wchar_t is a 2-byte character. -+ * It is used for processing Windows wchar strings -+ */ -+inline size_t WcsToMbs(char *s, const Wchar_t *w, size_t n) -+{ -+ size_t i = 0; -+ const unsigned short *wc = (const unsigned short*) w; -+ while(wc[i] && (i < n)) -+ { -+ s[i] = wc[i]; -+ ++i; -+ } -+ if (i < n) s[i] = '\0'; -+ -+ return (i); -+}; -+ - #endif /* TARGET_LINUX || TARGET_DARWIN */ - - #endif - -+typedef long LONG; -+#if !defined(__APPLE__) -+typedef LONG HRESULT; -+#endif -+ -+#ifndef FAILED -+#define FAILED(Status) ((HRESULT)(Status)<0) -+#endif -+ -+#ifndef SUCCEEDED -+#define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) -+#endif -+ -+#define _FILE_OFFSET_BITS 64 -+#define FILE_BEGIN 0 -+#define FILE_CURRENT 1 -+#define FILE_END 2 -+ -+#ifndef S_OK -+#define S_OK 0L -+#endif -+ -+#ifndef S_FALSE -+#define S_FALSE 1L -+#endif -+ -+// Error codes -+#define ERROR_FILENAME_EXCED_RANGE 206L -+#define ERROR_INVALID_NAME 123L -+ -+#ifndef E_OUTOFMEMORY -+#define E_OUTOFMEMORY 0x8007000EL -+#endif -+ -+#ifndef E_FAIL -+#define E_FAIL 0x8004005EL -+#endif -+ - // Additional typedefs - typedef uint8_t byte; -diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp -index 851b940..c1052e3 100644 ---- a/src/pvrclient-mediaportal.cpp -+++ b/src/pvrclient-mediaportal.cpp -@@ -28,8 +28,6 @@ - #include - #include - --#include -- - using namespace kodi::tools; - using namespace std; - using namespace MPTV; -@@ -70,7 +68,6 @@ cPVRClientMediaPortal::cPVRClientMediaPortal(KODI_HANDLE instance, const std::st - m_BackendTime = 0; - m_tsreader = NULL; - m_genretable = NULL; -- m_iLastRecordingUpdate = 0; - m_signalStateCounter = 0; - m_iSignal = 0; - m_iSNR = 0; -@@ -99,7 +96,7 @@ string cPVRClientMediaPortal::SendCommand(const char* command) - - string cPVRClientMediaPortal::SendCommand(const string& command) - { -- P8PLATFORM::CLockObject critsec(m_mutex); -+ std::lock_guard critsec(m_mutex); - - if ( !m_tcpclient->send(command) ) - { -@@ -174,10 +171,10 @@ ADDON_STATUS cPVRClientMediaPortal::TryConnect() - case PVR_CONNECTION_STATE_SERVER_UNREACHABLE: - kodi::Log(ADDON_LOG_ERROR, "Could not connect to MediaPortal TV Server backend."); - // Start background thread for connecting to the backend -- if (!IsRunning()) -+ if (!m_running) - { -- kodi::Log(ADDON_LOG_INFO, "Waiting for a connection in the background."); -- CreateThread(); -+ m_running = true; -+ m_thread = std::thread([&] { Process(); }); - } - return ADDON_STATUS_LOST_CONNECTION; - case PVR_CONNECTION_STATE_CONNECTING: -@@ -190,7 +187,7 @@ ADDON_STATUS cPVRClientMediaPortal::TryConnect() - - PVR_CONNECTION_STATE cPVRClientMediaPortal::Connect(bool updateConnectionState) - { -- P8PLATFORM::CLockObject critsec(m_connectionMutex); -+ std::lock_guard critsec(m_connectionMutex); - - string result; - -@@ -317,9 +314,11 @@ void cPVRClientMediaPortal::Disconnect() - - kodi::Log(ADDON_LOG_INFO, "Disconnect"); - -- if (IsRunning()) -+ if (m_running) - { -- StopThread(1000); -+ m_running = false; -+ if (m_thread.joinable()) -+ m_thread.join(); - } - - if (m_tcpclient->is_valid() && m_bTimeShiftStarted) -@@ -361,14 +360,14 @@ bool cPVRClientMediaPortal::IsUp() - } - } - --void* cPVRClientMediaPortal::Process(void) -+void cPVRClientMediaPortal::Process() - { - kodi::Log(ADDON_LOG_DEBUG, "Background thread started."); - - bool keepWaiting = true; - PVR_CONNECTION_STATE state; - -- while (!IsStopped() && keepWaiting) -+ while (m_running && keepWaiting) - { - state = Connect(false); - -@@ -396,8 +395,6 @@ void* cPVRClientMediaPortal::Process(void) - SetConnectionState(state); - - kodi::Log(ADDON_LOG_DEBUG, "Background thread finished."); -- -- return NULL; - } - - -@@ -1188,7 +1185,7 @@ PVR_ERROR cPVRClientMediaPortal::GetRecordings(bool deleted, kodi::addon::PVRRec - } - } - -- m_iLastRecordingUpdate = P8PLATFORM::GetTimeMs(); -+ m_iLastRecordingUpdate = std::chrono::system_clock::now(); - - return PVR_ERROR_NO_ERROR; - } -@@ -1383,7 +1380,7 @@ PVR_ERROR cPVRClientMediaPortal::GetTimers(kodi::addon::PVRTimersResultSet& resu - } - } - -- if ( P8PLATFORM::GetTimeMs() > m_iLastRecordingUpdate + 15000) -+ if ( std::chrono::system_clock::now() > m_iLastRecordingUpdate + std::chrono::milliseconds(15000)) - { - kodi::addon::CInstancePVRClient::TriggerRecordingUpdate(); - } -diff --git a/src/pvrclient-mediaportal.h b/src/pvrclient-mediaportal.h -index 3087634..e5da832 100644 ---- a/src/pvrclient-mediaportal.h -+++ b/src/pvrclient-mediaportal.h -@@ -7,6 +7,10 @@ - - #pragma once - -+#include -+#include -+#include -+#include - #include - - /* Master defines for client control */ -@@ -17,8 +21,6 @@ - #include "Cards.h" - #include "epg.h" - #include "channels.h" --#include "p8-platform/threads/mutex.h" --#include "p8-platform/threads/threads.h" - - /* Use a forward declaration here. Including RTSPClient.h via TSReader.h at this point gives compile errors */ - namespace MPTV -@@ -28,9 +30,7 @@ namespace MPTV - class cRecording; - - class ATTRIBUTE_HIDDEN cPVRClientMediaPortal -- : public kodi::addon::CInstancePVRClient, -- public P8PLATFORM::PreventCopy, -- public P8PLATFORM::CThread -+ : public kodi::addon::CInstancePVRClient - { - public: - /* Class interface */ -@@ -110,7 +110,7 @@ class ATTRIBUTE_HIDDEN cPVRClientMediaPortal - - private: - /* TVServerKodi Listening Thread */ -- void* Process(void); -+ void Process(); - PVR_CONNECTION_STATE Connect(bool updateConnectionState = true); - - void LoadGenreTable(void); -@@ -134,9 +134,9 @@ class ATTRIBUTE_HIDDEN cPVRClientMediaPortal - time_t m_BackendTime; - CCards m_cCards; - CGenreTable* m_genretable; -- P8PLATFORM::CMutex m_mutex; -- P8PLATFORM::CMutex m_connectionMutex; -- int64_t m_iLastRecordingUpdate; -+ std::mutex m_mutex; -+ std::mutex m_connectionMutex; -+ std::chrono::system_clock::time_point m_iLastRecordingUpdate; - MPTV::CTsReader* m_tsreader; - std::map m_channels; - int m_signalStateCounter; -@@ -145,6 +145,9 @@ class ATTRIBUTE_HIDDEN cPVRClientMediaPortal - - cRecording* m_lastSelectedRecording; - -+ std::atomic m_running = {false}; -+ std::thread m_thread; -+ - //Used for TV Server communication: - std::string SendCommand(const char* command); - std::string SendCommand(const std::string& command); diff --git a/package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch b/package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch deleted file mode 100644 index 81f583c7f6..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bb752566a31029df4ca2c8a2d7fca6680570bfe6 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Thu, 8 Oct 2020 16:10:44 +0100 -Subject: [PATCH] Remove charset converter dependency - -Signed-off-by: Bernd Kuhls ---- - src/windows/FileUtils.cpp | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/src/windows/FileUtils.cpp b/src/windows/FileUtils.cpp -index 0c8a03e..f829b2a 100644 ---- a/src/windows/FileUtils.cpp -+++ b/src/windows/FileUtils.cpp -@@ -6,24 +6,36 @@ - */ - - #include "../FileUtils.h" --#include "p8-platform/windows/CharsetConverter.h" - #include - #include "../utils.h" - #ifdef TARGET_WINDOWS_DESKTOP - #include - #endif - --#ifdef TARGET_WINDOWS - #include - #include --#endif -+ -+std::wstring ToW(const char* str, size_t length) -+{ -+ int result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, length, nullptr, 0); -+ if (result == 0) -+ return std::wstring(); -+ -+ auto newStr = std::make_unique(result); -+ result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, length, newStr.get(), result); -+ -+ if (result == 0) -+ return std::wstring(); -+ -+ return std::wstring(newStr.get(), result); -+} - - namespace OS - { - bool CFile::Exists(const std::string& strFileName, long* errCode) - { - std::string strWinFile = ToWindowsPath(strFileName); -- std::wstring strWFile = p8::windows::ToW(strWinFile.c_str()); -+ std::wstring strWFile = ToW(strWinFile.c_str(), 0); - DWORD dwAttr = GetFileAttributesW(strWFile.c_str()); - - if(dwAttr != 0xffffffff) diff --git a/package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch b/package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch deleted file mode 100644 index b38138df9d..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch +++ /dev/null @@ -1,74 +0,0 @@ -From e78eb2db7c42e302713d5e7129603e56d0e9b43b Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Thu, 8 Oct 2020 16:11:19 +0100 -Subject: [PATCH] Remove p8-platform dependency - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 7 ++----- - debian/control | 2 +- - depends/common/p8-platform/p8-platform.txt | 1 - - depends/windowsstore/p8-platform/p8-platform.txt | 1 - - 4 files changed, 3 insertions(+), 8 deletions(-) - delete mode 100644 depends/common/p8-platform/p8-platform.txt - delete mode 100644 depends/windowsstore/p8-platform/p8-platform.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1226685..f612570 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,7 +4,6 @@ project(pvr.mediaportal.tvserver) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) - - find_package(Kodi REQUIRED) --find_package(p8-platform REQUIRED) - find_package(TinyXML REQUIRED) - - set(LIVE555_INCLUDE_DIR -@@ -17,8 +16,7 @@ set(LIVE555_INCLUDE_DIR - - set(LIVE555_DEFINES -DLIVE555 -D_WINSOCK_DEPRECATED_NO_WARNINGS -DSOCKLEN_T=socklen_t -DBSD=1) - --include_directories(${p8-platform_INCLUDE_DIRS} -- ${TINYXML_INCLUDE_DIR} -+include_directories(${TINYXML_INCLUDE_DIR} - ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways - ${PROJECT_SOURCE_DIR}/src - ${PROJECT_BINARY_DIR} -@@ -229,8 +227,7 @@ source_group("Header Files\\lib\\live555" FILES ${LIVE555_HEADERS}) - # Make sure that CMake adds all files to the MSVC project - list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS} ${LIVE555_SOURCES} ${LIVE555_HEADERS}) - --set(DEPLIBS ${p8-platform_LIBRARIES} -- ${TINYXML_LIBRARIES}) -+set(DEPLIBS ${TINYXML_LIBRARIES}) - - if(WIN32) - list(APPEND DEPLIBS ws2_32) -diff --git a/debian/control b/debian/control -index 667e47c..e81ff45 100644 ---- a/debian/control -+++ b/debian/control -@@ -2,7 +2,7 @@ Source: kodi-pvr-mediaportal-tvserver - Priority: extra - Maintainer: Nobody - Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev, -- libp8-platform-dev, kodi-addon-dev -+ kodi-addon-dev - Standards-Version: 4.1.2 - Section: libs - Homepage: http://kodi.tv -diff --git a/depends/common/p8-platform/p8-platform.txt b/depends/common/p8-platform/p8-platform.txt -deleted file mode 100644 -index 98ed58a..0000000 ---- a/depends/common/p8-platform/p8-platform.txt -+++ /dev/null -@@ -1 +0,0 @@ --p8-platform https://github.com/xbmc/platform.git cee64e9dc0b69e8d286dc170a78effaabfa09c44 -diff --git a/depends/windowsstore/p8-platform/p8-platform.txt b/depends/windowsstore/p8-platform/p8-platform.txt -deleted file mode 100644 -index db6f782..0000000 ---- a/depends/windowsstore/p8-platform/p8-platform.txt -+++ /dev/null -@@ -1 +0,0 @@ --p8-platform https://github.com/afedchin/platform.git win10 diff --git a/package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch b/package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch deleted file mode 100644 index 793d3ce43d..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e613bfbb4561173046451e9bb1ec64c7879de859 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Sat, 17 Oct 2020 14:06:04 +0100 -Subject: [PATCH] Travis changes for cpp17 - -Signed-off-by: Bernd Kuhls ---- - .travis.yml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 1f2b61f..285f827 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -10,11 +10,11 @@ env: - matrix: - include: - - os: linux -- dist: xenial -+ dist: bionic - sudo: required - compiler: gcc - - os: linux -- dist: xenial -+ dist: bionic - sudo: required - compiler: clang - - os: linux diff --git a/package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch b/package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch deleted file mode 100644 index 09f4c80b96..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5cf2d4e05673964e269e4b9a2e779d20f57c0d17 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Sat, 6 Feb 2021 12:56:50 +0000 -Subject: [PATCH] Remove register keyword as no longer valid in CPP17 - -Signed-off-by: Bernd Kuhls ---- - src/lib/tsreader/DvbUtil.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/tsreader/DvbUtil.cpp b/src/lib/tsreader/DvbUtil.cpp -index 8c4798a..c973062 100644 ---- a/src/lib/tsreader/DvbUtil.cpp -+++ b/src/lib/tsreader/DvbUtil.cpp -@@ -77,7 +77,7 @@ namespace MPTV - //******************************************************************* - uint32_t crc32(char *data, int len) - { -- register int i; -+ int i; - uint32_t crc = 0xffffffff; - - for (i = 0; i < len; i++) diff --git a/package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch b/package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch deleted file mode 100644 index 7fded54e7e..0000000000 --- a/package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 79e33e1799976e2196132f90bd7f322f213c1a99 Mon Sep 17 00:00:00 2001 -From: phunkyfish -Date: Sat, 6 Feb 2021 00:16:19 +0000 -Subject: [PATCH] changelog and version v8.1.1 - -Signed-off-by: Bernd Kuhls ---- - pvr.mediaportal.tvserver/addon.xml.in | 2 +- - pvr.mediaportal.tvserver/changelog.txt | 10 ++++++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/pvr.mediaportal.tvserver/addon.xml.in b/pvr.mediaportal.tvserver/addon.xml.in -index de30c2a..1944bc0 100644 ---- a/pvr.mediaportal.tvserver/addon.xml.in -+++ b/pvr.mediaportal.tvserver/addon.xml.in -@@ -1,7 +1,7 @@ - - - @ADDON_DEPENDS@ -diff --git a/pvr.mediaportal.tvserver/changelog.txt b/pvr.mediaportal.tvserver/changelog.txt -index 7d1630e..8e06c48 100644 ---- a/pvr.mediaportal.tvserver/changelog.txt -+++ b/pvr.mediaportal.tvserver/changelog.txt -@@ -1,3 +1,13 @@ -+v8.1.1 -+- Remove p8-platform dependency -+- Remove charset converter dependency -+- Use std::thread, std::mutex, condition_variable instead of event and bool defines -+- Use thread sleep_for instead of p8 time utils -+- Remove SAFE_DELETE -+- Use kodi StringUtils -+- Remove p8 os includes -+- Revert "Removed no more supported (C++17) declaration keyword (register)" -+ - v8.1.0 - - Update PVR API 7.1.0 - diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 9f700ceef2..83ac680914 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 862b8b0c7c1cd49f0a304dd7caeb6a02dd2b6f767fff256875457040e5ca1177 kodi-pvr-mediaportal-tvserver-8.1.0-Matrix.tar.gz +sha256 cea87ccdceee834c96d6b6887b78213ccf79890fec97436cbef17c57b9cdac15 kodi-pvr-mediaportal-tvserver-8.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index d2cacae8a5..02b24ef271 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 8.1.0-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 8.1.2-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md From 4cb36ff7707d7b591b2896b089ce2f6c76a99275 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 12 May 2021 22:53:00 +0200 Subject: [PATCH 002/158] package/gnuchess: bump to version 6.2.8 https://lists.gnu.org/archive/html/info-gnu-chess/2021-05/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index 1641a7d8f9..b68eb6e0ee 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 e536675a61abe82e61b919f6b786755441d9fcd4c21e1c82fb9e5340dd229846 gnuchess-6.2.7.tar.gz +sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 60327dfe06..29d3590849 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.7 +GNUCHESS_VERSION = 6.2.8 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From f75975b995a004b188d215a7f4306e4ba4818479 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 13 May 2021 09:05:35 +0200 Subject: [PATCH 003/158] package/libudfread: bump version to 1.1.2 Changelog: https://code.videolan.org/videolan/libudfread/-/blob/master/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libudfread/libudfread.hash | 2 +- package/libudfread/libudfread.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libudfread/libudfread.hash b/package/libudfread/libudfread.hash index 14d24b5dbc..332b472d59 100644 --- a/package/libudfread/libudfread.hash +++ b/package/libudfread/libudfread.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 529ffa189a6b9fbe08c77430bd18201007b9b20b3153ad92ebd5e1cc515e7151 libudfread-1.1.1.tar.bz2 +sha256 cd062016d78902da53a34c4d536479dbb70b2a05116354d46ead4d0c498ed375 libudfread-1.1.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libudfread/libudfread.mk b/package/libudfread/libudfread.mk index 6803a918d0..55d4fb8e47 100644 --- a/package/libudfread/libudfread.mk +++ b/package/libudfread/libudfread.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUDFREAD_VERSION = 1.1.1 +LIBUDFREAD_VERSION = 1.1.2 LIBUDFREAD_SOURCE = libudfread-$(LIBUDFREAD_VERSION).tar.bz2 LIBUDFREAD_SITE = https://code.videolan.org/videolan/libudfread/-/archive/$(LIBUDFREAD_VERSION) LIBUDFREAD_AUTORECONF = YES From 1068ee78b8f42000055c1e7f980a7e5ab26bc902 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 13 May 2021 09:05:36 +0200 Subject: [PATCH 004/158] package/libbluray: bump version to 1.3.0 Removed backported patch. Changelog: https://code.videolan.org/videolan/libbluray/-/blob/master/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 430d477484..4ab8c85866 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.2.1/libbluray-1.2.1.tar.bz2.sha512 -sha512 e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4 libbluray-1.2.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 +sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 36f59190b1..5c5f603dd8 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.2.1 +LIBBLURAY_VERSION = 1.3.0 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES From 698ddd07b4a1cadc57b0f6b72a0bedcf957ef104 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 May 2021 09:01:41 +0200 Subject: [PATCH 005/158] package/libbluray: add optional support for libudfread Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libbluray/libbluray.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 5c5f603dd8..233797f38d 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -19,6 +19,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBBLURAY_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) +LIBBLURAY_DEPENDENCIES += libudfread +endif + ifeq ($(BR2_PACKAGE_FREETYPE),y) LIBBLURAY_DEPENDENCIES += freetype LIBBLURAY_CONF_OPTS += --with-freetype From fbde3a6c954ebf05e6a4a829823b65b90f8c06cb Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 13 May 2021 19:33:20 +0300 Subject: [PATCH 006/158] package/wayland: bump to version 1.19.0 Update wayland to version 1.19.0, which mostly includes bug fixes and is the minimum version required by wlroots 0.13.0 Patch "0001-build-add-option-to-disable-tests.patch" is updated as an actual backport from upstream. Since upstream has migrated to meson, and we've already switched too, drop the autostuff hunks. Patch "0002-meson-do-not-check-for-c.patch" is replaced by a newer one, "0002-meson-only-require-cpp-for-tests.patch" which was accepted by upstream as an improved version of it. Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: - do actual backports of upstream patches now they've been merged - consequently, drop the legacy autostuff hunks from first patch ] Signed-off-by: Yann E. MORIN --- ...01-build-add-option-to-disable-tests.patch | 74 ++++--------------- .../0002-meson-do-not-check-for-c.patch | 29 -------- ...002-meson-only-require-cpp-for-tests.patch | 59 +++++++++++++++ package/wayland/wayland.hash | 8 +- package/wayland/wayland.mk | 2 +- 5 files changed, 77 insertions(+), 95 deletions(-) delete mode 100644 package/wayland/0002-meson-do-not-check-for-c.patch create mode 100644 package/wayland/0002-meson-only-require-cpp-for-tests.patch diff --git a/package/wayland/0001-build-add-option-to-disable-tests.patch b/package/wayland/0001-build-add-option-to-disable-tests.patch index 6ab695e909..5ecf100d64 100644 --- a/package/wayland/0001-build-add-option-to-disable-tests.patch +++ b/package/wayland/0001-build-add-option-to-disable-tests.patch @@ -1,4 +1,4 @@ -From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001 +From 88f1605a826ca0c2ff02be6f4cf9ecabf68e8341 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 3 Mar 2020 15:27:51 -0700 Subject: [PATCH] build: add option to disable tests @@ -15,65 +15,19 @@ Signed-off-by: Alexey Brodkin Signed-off-by: James Hilliard [Upstream status: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66] +Signed-off-by: Adrian Perez de Castro +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN --- - Makefile.am | 2 ++ - configure.ac | 9 +++++++++ meson.build | 4 +++- meson_options.txt | 4 ++++ - 4 files changed, 18 insertions(+), 1 deletion(-) + 2 files changed, 7 insertions(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index cc87392..d5d43e3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc - include_HEADERS += egl/wayland-egl-backend.h - pkgconfig_DATA += egl/wayland-egl-backend.pc - -+if ENABLE_TESTS - built_test_programs = \ - array-test \ - client-test \ -@@ -295,6 +296,7 @@ os_wrappers_test_LDADD = libtest-runner.la - - exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c - exec_fd_leak_checker_LDADD = libtest-helpers.la -+endif - - EXTRA_DIST += tests/scanner-test.sh \ - protocol/tests.xml \ -diff --git a/configure.ac b/configure.ac -index dda5e48..99b7c96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries], - [], - [enable_libraries=yes]) - -+AC_ARG_ENABLE([tests], -+ [AC_HELP_STRING([--disable-tests], -+ [Disable compilation of test programs])], -+ [], -+ [enable_tests=yes]) -+ -+ - AC_ARG_WITH([host-scanner], - [AC_HELP_STRING([--with-host-scanner], - [Use installed wayland-scanner from host PATH during build])], -@@ -99,6 +106,8 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) - - AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes) - -+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes) -+ - AC_ARG_WITH(icondir, [ --with-icondir= Look for cursor icons here], - [ ICONDIR=$withval], - [ ICONDIR=${datadir}/icons]) diff --git a/meson.build b/meson.build -index 5632f4e..b37bb7a 100644 +index cdb66bc..714a86d 100644 --- a/meson.build +++ b/meson.build -@@ -83,7 +83,9 @@ subdir('src') +@@ -84,7 +84,9 @@ subdir('src') if get_option('libraries') subdir('cursor') subdir('egl') @@ -81,15 +35,15 @@ index 5632f4e..b37bb7a 100644 + if get_option('tests') + subdir('tests') + endif - endif - - if get_option('documentation') + if get_option('documentation') + subdir('doc') + endif diff --git a/meson_options.txt b/meson_options.txt -index 76314f7..ab4be92 100644 +index de588d1..4433fa0 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -2,6 +2,10 @@ option('libraries', - description: 'Compile Wayland libraries', +@@ -6,6 +6,10 @@ option('scanner', + description: 'Compile wayland-scanner binary', type: 'boolean', value: 'true') +option('tests', @@ -100,5 +54,5 @@ index 76314f7..ab4be92 100644 description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)', type: 'boolean', -- -2.20.1 +2.25.1 diff --git a/package/wayland/0002-meson-do-not-check-for-c.patch b/package/wayland/0002-meson-do-not-check-for-c.patch deleted file mode 100644 index c5819bf477..0000000000 --- a/package/wayland/0002-meson-do-not-check-for-c.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1df9b73db6541cbc483c6ee1b21dbe0cb6e5cbfa Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Wed, 29 Jul 2020 08:20:41 +0200 -Subject: [PATCH] meson: do not check for c++ - -Wayland does not need c++, fixes building with toolchains lacking c++. - -Backported from upstream PR: -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/88 - -Signed-off-by: Bernd Kuhls ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index b67b101..e47a52d 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project( -- 'wayland', 'c', 'cpp', -+ 'wayland', 'c', - version: '1.18.0', - license: 'MIT', - meson_version: '>= 0.47.0', --- -2.27.0 - diff --git a/package/wayland/0002-meson-only-require-cpp-for-tests.patch b/package/wayland/0002-meson-only-require-cpp-for-tests.patch new file mode 100644 index 0000000000..84d0e4cf6f --- /dev/null +++ b/package/wayland/0002-meson-only-require-cpp-for-tests.patch @@ -0,0 +1,59 @@ +From 4c2105312379b62dc84f6eaaf26e2ab293d51b92 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 16 Apr 2021 02:32:38 -0600 +Subject: [PATCH] meson: only require cpp for tests + +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130] +Signed-off-by: Adrian Perez de Castro +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + meson.build | 2 +- + tests/meson.build | 16 +++++++++------- + 2 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/meson.build b/meson.build +index 12b4641..cdb66bc 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project( +- 'wayland', 'c', 'cpp', ++ 'wayland', 'c', + version: '1.19.0', + license: 'MIT', + meson_version: '>= 0.52.1', +diff --git a/tests/meson.build b/tests/meson.build +index a32ac50..2e11af4 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -64,15 +64,17 @@ executable( + dependencies: test_runner_dep + ) + +-test( +- 'cpp-compile-test', +- executable( ++if add_languages('cpp') ++ test( + 'cpp-compile-test', +- 'cpp-compile-test.cpp', +- wayland_server_protocol_h, +- include_directories: src_inc ++ executable( ++ 'cpp-compile-test', ++ 'cpp-compile-test.cpp', ++ wayland_server_protocol_h, ++ include_directories: src_inc ++ ) + ) +-) ++endif + + sed_path = find_program('sed').path() + +-- +2.31.1 + diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index abd8bcdf29..e9dcb63a90 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html -md5 23317697b6e3ff2e1ac8c5ba3ed57b65 wayland-1.18.0.tar.xz -sha1 33e5292b32a115e829458ea627201ed1e4ad4f45 wayland-1.18.0.tar.xz -sha256 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d wayland-1.18.0.tar.xz -sha512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2021-January/041692.html +sha256 baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 wayland-1.19.0.tar.xz +sha512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef wayland-1.19.0.tar.xz # Locally calculated sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index 6cb4a50dbb..ecfe95d68a 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.18.0 +WAYLAND_VERSION = 1.19.0 WAYLAND_SITE = https://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT From b03f3696c49ab0df071f61d2a982d822661d07b1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 May 2021 15:19:49 +0200 Subject: [PATCH 007/158] package/kodi-pvr-iptvsimple: bump version to 7.6.5-Matrix Changelog: https://github.com/kodi-pvr/pvr.iptvsimple/blob/Matrix/pvr.iptvsimple/changelog.txt Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index f467c7d40b..495565ef46 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1310806ac4fd8c6e72020042e62bde8c9175e65015c4fddb82312cf32c53bf63 kodi-pvr-iptvsimple-7.6.4-Matrix.tar.gz +sha256 2b46ab509e26fb4a60759e78f9f13808f5bb2c67a03a62c58ebcadb31c26e6e1 kodi-pvr-iptvsimple-7.6.5-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 60e51a038b..03b96a1a7d 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 7.6.4-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 7.6.5-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From 4eadbfeb94806b6d9b69cbc5cbfa9d6468a2eee1 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 14 May 2021 23:40:35 +0200 Subject: [PATCH 008/158] package/libnss: bump version to 3.65 Release Notes (not yet available, but should eventually land): https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.65_release_notes Signed-off-by: Giulio Benetti [yann.morin.1998@free.fr: release notes not yet available] Signed-off-by: Yann E. MORIN --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 92e9936d0d..02fda14eec 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_64_RTM/src/SHA256SUMS -sha256 d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126 nss-3.64.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_65_RTM/src/SHA256SUMS +sha256 32170f6c188212a78bf9fdacffa2eeed0d564ef8faae63fd8ae971b208e8c637 nss-3.65.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 88cc13accf..41d3c04399 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.64 +LIBNSS_VERSION = 3.65 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From a83d41867c8d69a77d5cd0a665aa216af5340359 Mon Sep 17 00:00:00 2001 From: "GAUTRON, Erwan" Date: Mon, 11 May 2020 15:21:33 +0200 Subject: [PATCH 009/158] package/libopenssl: add option to enable some features Openssl implements lot of algorithms that are not required in some emdedded devices and cyphers known as weak. Secure embedded systems shall disable unused algorithms (and weak algo) in order to be certified. This patch allows to select weak algorithms and mecanims to enable such as md5. To ensure backward compatibility, all items are selected by default. Signed-off-by: Erwan GAUTRON [yann.morin.1998@free.fr: - drop help texts that just repeat the prompts - fix check-package ] Signed-off-by: Yann E. MORIN --- package/libopenssl/Config.in | 99 ++++++++++++++++++++++++++++++++ package/libopenssl/libopenssl.mk | 24 ++++++++ 2 files changed, 123 insertions(+) diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 723fd282a4..7ed799075f 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -40,4 +40,103 @@ config BR2_PACKAGE_LIBOPENSSL_ENGINES help Install additional encryption engine libraries. +config BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA + bool "enable CHACHA" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 + bool "enable RC5" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 + bool "enable RC2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 + bool "enable RC4" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2 + bool "enable MD2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 + bool "enable MD4" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD5 + bool "enable MD5" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 + bool "enable MDC2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 + bool "enable BLAKE2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_IDEA + bool "enable IDEA" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SEED + bool "enable SEED" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_DES + bool "enable DES" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 + bool "enable RMD160" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_WHIRLPOOL + bool "enable WHIRLPOOL" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH + bool "enable BLOWFISH" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL + bool "enable SSL" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL2 + bool "enable SSL2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL3 + bool "enable SSL3" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_WEAK_SSL + bool "enable WEAK_SSL" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK + bool "enable mode PSK" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST + bool "enable mode CAST" + default y + +config BR2_PACKAGE_LIBOPENSSL_UNSECURE + bool "enable unit test, debug, backtrace" + default y + help + Enable unit-test crypto-mdebug-backtrace + crypto-mdebug autoerrinit mode. + +config BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE + bool "enable dynamic engine" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP + bool "enable compression" + default y + endif # BR2_PACKAGE_LIBOPENSSL diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 487fe554c1..c7f8ae714e 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -84,6 +84,30 @@ define LIBOPENSSL_CONFIGURE_CMDS no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2),,no-md2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4),,no-md4) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD5),,no-md5) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2),,no-mdc2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2),,no-blake2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_IDEA),,no-idea) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SEED),,no-seed) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_DES),,no-des) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160),,no-rmd160) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_WHIRLPOOL),,no-whirlpool) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH),,no-bf) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL),,no-ssl) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL2),,no-ssl2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL3),,no-ssl3) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_WEAK_SSL),,no-weak-ssl-ciphers) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK),,no-psk) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST),,no-cast) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_UNSECURE),,no-unit-test no-crypto-mdebug-backtrace no-crypto-mdebug no-autoerrinit) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE),,no-dynamic-engine ) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP),,no-comp) \ $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ $(if $(BR2_STATIC_LIBS),no-dso) \ ) From 0f334a95ec9dc65be0c10c6bb686002e3f475035 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 2 May 2021 23:49:15 +0200 Subject: [PATCH 010/158] package/bdwgc: Fix 'undefined reference to __data_start' linker error on RISC-V Backport an upstream patch fixing a link issue with libgc.so on RISC-V riscv64-buildroot-linux-musl/sysroot/usr/lib/libgc.so: undefined reference to `__data_start' https://gitlab.com/kubu93/buildroot/-/jobs/1229888983 Signed-off-by: Romain Naour Reviewed-by: Alistair Francis Signed-off-by: Yann E. MORIN --- ...ference-to-__data_start-linker-error.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch diff --git a/package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch b/package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch new file mode 100644 index 0000000000..81221c9f66 --- /dev/null +++ b/package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch @@ -0,0 +1,33 @@ +From 301ef15aefa6764466c374d07efb511b1c3862cc Mon Sep 17 00:00:00 2001 +From: Nikita Ermakov +Date: Wed, 20 May 2020 17:57:17 +0300 +Subject: [PATCH] Fix 'undefined reference to __data_start' linker error on + RISC-V + +Issue #294 (bdwgc). + +* include/private/gcconfig.h [RISCV && LINUX] (__data_start): Add +attribute(weak). + +(cherry picked from commit 538562ad01b181f4cc3913da1ac06a77945cd9b9) +Signed-off-by: Romain Naour +--- + include/private/gcconfig.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h +index d9d45da1..d6cefa6f 100644 +--- a/include/private/gcconfig.h ++++ b/include/private/gcconfig.h +@@ -2943,7 +2943,7 @@ EXTERN_C_BEGIN + # define ALIGNMENT (CPP_WORDSZ/8) + # ifdef LINUX + # define OS_TYPE "LINUX" +- extern int __data_start[]; ++ extern int __data_start[] __attribute__((__weak__)); + # define DATASTART ((ptr_t)__data_start) + # define LINUX_STACKBOTTOM + # define DYNAMIC_LOADING +-- +2.30.2 + From 626a98a4492440a10e9374b9ce77b8b4ca02f310 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 2 May 2021 23:49:16 +0200 Subject: [PATCH 011/158] package/libatomic_ops: enable for riscv32 and riscv64 The riscv support has been added since v7.6.4 release. https://github.com/ivmai/libatomic_ops/commit/137643f1417ded071c56e05401ca6a3c16492d96 Signed-off-by: Romain Naour Reviewed-by: Alistair Francis [yann.morin.1998@free.fr: - split the long line - reorder the archs alphabetically, and group related ones ] Signed-off-by: Yann E. MORIN --- package/libatomic_ops/Config.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libatomic_ops/Config.in b/package/libatomic_ops/Config.in index e9206f3395..8287c6522d 100644 --- a/package/libatomic_ops/Config.in +++ b/package/libatomic_ops/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_sparc || BR2_sparc64 || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_aarch64 || BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_riscv + default y if BR2_sparc || BR2_sparc64 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 From 33aa59e7b500e60f2d736a17183c7d49b7baf5bd Mon Sep 17 00:00:00 2001 From: Dick Olsson Date: Wed, 12 May 2021 18:36:08 +0000 Subject: [PATCH 012/158] package/edk2-platforms: new package EDK2 firmware is usually built from two sources; the core EDK2 environment, and additional platform description files maintained separately. This package adds the latter set of description files to staging so that the core EDK2 package can build with these for certain platforms during the building process. Signed-off-by: Dick Olsson Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/edk2-platforms/Config.in | 8 ++++++++ package/edk2-platforms/edk2-platforms.hash | 3 +++ package/edk2-platforms/edk2-platforms.mk | 22 ++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/edk2-platforms/Config.in create mode 100644 package/edk2-platforms/edk2-platforms.hash create mode 100644 package/edk2-platforms/edk2-platforms.mk diff --git a/package/Config.in b/package/Config.in index 82b28d2835..45d75c71d0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -460,6 +460,7 @@ endmenu source "package/dvb-apps/Config.in" source "package/dvbsnoop/Config.in" source "package/edid-decode/Config.in" + source "package/edk2-platforms/Config.in" source "package/eudev/Config.in" source "package/ev3dev-linux-drivers/Config.in" source "package/evemu/Config.in" diff --git a/package/edk2-platforms/Config.in b/package/edk2-platforms/Config.in new file mode 100644 index 0000000000..17633c0fdd --- /dev/null +++ b/package/edk2-platforms/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_EDK2_PLATFORMS + bool + help + EDK2 description files for all supported platforms. + The main EDK2 bootloader package will depend on these + description files while building firmware for some platforms. + + https://github.com/tianocore/edk2-platforms diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash new file mode 100644 index 0000000000..30ae235078 --- /dev/null +++ b/package/edk2-platforms/edk2-platforms.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 dfdc34fea86e5037a3a6cbd2a83b1f655f16b4c9ab4f5ff9da91e45a358c9a14 edk2-platforms-db922e1253cb6f1fc456805bc42fb7d401eed5c2.tar.gz +sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk new file mode 100644 index 0000000000..47e6b1c51d --- /dev/null +++ b/package/edk2-platforms/edk2-platforms.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# edk2-platforms +# +################################################################################ + +# Keep in sync with latest commit as of the release date for boot/edk2 +EDK2_PLATFORMS_VERSION = db922e1253cb6f1fc456805bc42fb7d401eed5c2 +EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) +EDK2_PLATFORMS_LICENSE = BSD-2-Clause +EDK2_PLATFORMS_LICENSE_FILE = License.txt +EDK2_PLATFORMS_INSTALL_TARGET = NO +EDK2_PLATFORMS_INSTALL_STAGING = YES + +# There is nothing to build for edk2-platforms. All we need to do is to copy +# all description files to staging, for other packages to build with. +define EDK2_PLATFORMS_INSTALL_STAGING_CMDS + rm -rf $(STAGING_DIR)/usr/share/edk2-platforms + cp -rf $(@D) $(STAGING_DIR)/usr/share/edk2-platforms +endef + +$(eval $(generic-package)) From 1074a37e783b023bd0491ba4f4f7acab7f289e1d Mon Sep 17 00:00:00 2001 From: Dick Olsson Date: Wed, 12 May 2021 18:36:15 +0000 Subject: [PATCH 013/158] boot/edk2: new package EDK2 is a modern, feature-rich, cross-platform firmware development environment for the UEFI and PI specifications. The initial version of this bootloader package makes it possible to build firmware for the following seven configurations: * QEMU x86-64 pc machine * QEMU aarch64 virt machine, booting directly from flash * QEMU aarch64 virt machine, booting via the kernel protocol * QEMU aarch64 sbsa-ref machine * ARM FVP vexpress machine * Socionext SynQuacer Developerbox * SolidRun MacchiatoBin Support the use of EDK2 UEFI payloads as BL33 in ARM Trusted Firmware. Signed-off-by: Dick Olsson [yann.morin.1998@free.fr: - duplicate defaults in Config.in ] Signed-off-by: Yann E. MORIN --- boot/Config.in | 1 + boot/arm-trusted-firmware/Config.in | 15 +- .../arm-trusted-firmware.mk | 9 ++ boot/edk2/Config.in | 108 +++++++++++++ boot/edk2/edk2.hash | 3 + boot/edk2/edk2.mk | 150 ++++++++++++++++++ 6 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 boot/edk2/Config.in create mode 100644 boot/edk2/edk2.hash create mode 100644 boot/edk2/edk2.mk diff --git a/boot/Config.in b/boot/Config.in index 08d9ac06b2..ff98a49796 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -10,6 +10,7 @@ source "boot/beaglev-ddrinit/Config.in" source "boot/beaglev-secondboot/Config.in" source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" +source "boot/edk2/Config.in" source "boot/grub2/Config.in" source "boot/gummiboot/Config.in" source "boot/lpc32xxcdl/Config.in" diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index c06294040e..9d347550a4 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -1,7 +1,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \ - BR2_TARGET_UBOOT + (BR2_TARGET_UBOOT || BR2_TARGET_EDK2) help Enable this option if you want to build the ATF for your ARM based embedded device. @@ -135,6 +135,19 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE endif +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + bool "Use EDK2 as BL33" + depends on BR2_TARGET_EDK2 + help + This option allows to embed EDK2 as the BL33 part of + the ARM Trusted Firmware. It ensures that the EDK2 package + gets built before ATF, and that the appropriate BL33 + variable pointing to the EDK2 is passed when building ATF. + + Do not choose this option if you intend to build ATF and EDK2 + for the 'qemu_sbsa' platform. In this case, due to the EDK2 + build system, the dependency between ATF and EDK is reversed. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS string "Additional ATF make targets" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 0597cecf71..279658712b 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -79,6 +79,15 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee endif endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 +# Since the flash device name vary between platforms, we use the variable +# provided by the EDK2 package for this. Using this variable here is OK +# as it will expand after all dependencies are resolved, inside _BUILD_CMDS. +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + BL33=$(BINARIES_DIR)/$(call qstrip,$(BR2_TARGET_EDK2_FD_NAME).fd) +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y) ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE)) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN) diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in new file mode 100644 index 0000000000..150806899f --- /dev/null +++ b/boot/edk2/Config.in @@ -0,0 +1,108 @@ +config BR2_TARGET_EDK2 + bool "EDK2" + depends on BR2_x86_64 || BR2_aarch64 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_PACKAGE_EDK2_PLATFORMS + help + EDK II is a modern, feature-rich, cross-platform firmware + development environment for the UEFI and PI specifications. + + https://github.com/tianocore/tianocore.github.io/wiki/EDK-II + +if BR2_TARGET_EDK2 + +choice + prompt "Platform" + default BR2_TARGET_EDK2_PLATFORM_OVMF_X64 if BR2_x86_64 + default BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU if BR2_aarch64 + +config BR2_TARGET_EDK2_PLATFORM_OVMF_X64 + bool "x86-64" + depends on BR2_x86_64 + help + Platform configuration for a generic x86-64 target. + This platform will boot from flash address 0x0. + It should therefore be used as the first bootloader. + +config BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU + bool "ARM Virt Qemu (flash)" + depends on BR2_aarch64 + help + Platform configuration for QEMU targeting the Virt machine. + This platform will only boot from flash address 0x0. + It should therefore be used as the first bootloader. + +config BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL + bool "ARM Virt Qemu (kernel)" + depends on BR2_aarch64 + help + Platform configuration for QEMU targeting the Virt machine. + This platform can boot from either flash address 0x0 or via + the Linux boot protocol. It can therefore be loaded by a + previous bootloader like ARM Trusted Firmware or OP-TEE. + +config BR2_TARGET_EDK2_PLATFORM_ARM_SGI575 + bool "ARM SGI-575" + depends on BR2_aarch64 + help + Platform configuration for ARM SGI-575 on ARM's + Fixed Virtual Platform (FVP). + +config BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64 + bool "ARM VExpress FVP Aarch64" + depends on BR2_aarch64 + help + Platform configuration for ARM Versatile Express targeting + the Aarch64 Fixed Virtual Platform (FVP). + +config BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX + bool "Socionext DeveloperBox" + depends on BR2_aarch64 + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE + depends on !BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + select BR2_PACKAGE_HOST_DTC + select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP + help + Platform configuration for Socionext SynQuacer DeveloperBox + (SC2A11). + +comment "Socionext DeveloperBox depends on ATF not using EDK2 as BL33" + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + +config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN + bool "SolidRun MacchiatoBin" + depends on BR2_aarch64 + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE + select BR2_PACKAGE_HOST_DTC + select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP + help + Platform configuration for the SolidRun MacchiatoBin. + +config BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA + bool "QEMU SBSA" + depends on BR2_aarch64 + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE + depends on !BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + help + Platform configuration for QEMU targeting the SBSA reference + machine. + +comment "QEMU SBSA depends on ATF not using EDK2 as BL33" + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + +endchoice + +config BR2_TARGET_EDK2_FD_NAME + string + default "OVMF" if BR2_TARGET_EDK2_PLATFORM_OVMF_X64 + default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU + default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL + default "BL33_AP_UEFI" if BR2_TARGET_EDK2_PLATFORM_ARM_SGI575 + default "FVP_AARCH64_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64 + default "FVP_AARCH64_EFI" if BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX + default "ARMADA_EFI" if BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN + +endif + +comment "EDK2 needs a toolchain w/ gcc >= 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash new file mode 100644 index 0000000000..f28e9ce841 --- /dev/null +++ b/boot/edk2/edk2.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d edk2-edk2-stable202102-br1.tar.gz +sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk new file mode 100644 index 0000000000..903fdfb89e --- /dev/null +++ b/boot/edk2/edk2.mk @@ -0,0 +1,150 @@ +################################################################################ +# +# edk2 +# +################################################################################ + +EDK2_VERSION = edk2-stable202102 +EDK2_SITE = https://github.com/tianocore/edk2 +EDK2_SITE_METHOD = git +EDK2_LICENSE = BSD-2-Clause +EDK2_LICENSE_FILE = License.txt +EDK2_DEPENDENCIES = edk2-platforms host-python3 host-acpica host-util-linux +EDK2_INSTALL_TARGET = NO +EDK2_INSTALL_IMAGES = YES + +ifeq ($(BR2_x86_64),y) +EDK2_ARCH = X64 +else ifeq ($(BR2_aarch64),y) +EDK2_ARCH = AARCH64 +endif + +ifeq ($(BR2_ENABLE_DEBUG),y) +EDK2_BUILD_TYPE = DEBUG +else +EDK2_BUILD_TYPE = RELEASE +endif + +# Build system notes. +# +# The EDK2 build system is rather unique, so here are a few useful notes. +# +# First, builds rely heavily on Git submodules to fetch various dependencies +# into specific directory structures. It might be possible to work around this +# and rely on Buildroot's infrastructure, but using Git submodules greatly +# simplifies this already complicated build system. +# +# Second, the build system is spread across various commands and stages. +# Therefore, all build variables needs to be exported to be available +# accordingly. The first stage will build $(@D)/BaseTools which contains +# various tools and scripts for the host. +# +# Third, where applicable, the dependency direction between EDK2 and +# ARM Trusted Firmware (ATF) will go in different direction for different +# platforms. Most commonly, ATF will depend on EDK2 via the BL33 payload. +# But for some platforms (e.g. QEMU SBSA or DeveloperBox) EDK2 will package +# the ATF images within its own build system. In such cases, intermediary +# "EDK2 packages" will be built in $(EDK2_BUILD_PACKAGES) in order for EDK2 +# to be able to use them in subsequent build stages. +# +# For more information about the build setup: +# https://edk2-docs.gitbook.io/edk-ii-build-specification/4_edk_ii_build_process_overview + +EDK2_GIT_SUBMODULES = YES +EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot +EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms + +ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_X64),y) +EDK2_DEPENDENCIES += host-nasm +EDK2_PACKAGE_NAME = OvmfPkg +EDK2_PLATFORM_NAME = OvmfPkgX64 +EDK2_BUILD_DIR = OvmfX64 + +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU),y) +EDK2_PACKAGE_NAME = ArmVirtPkg +EDK2_PLATFORM_NAME = ArmVirtQemu +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) + +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL),y) +EDK2_PACKAGE_NAME = ArmVirtPkg +EDK2_PLATFORM_NAME = ArmVirtQemuKernel +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) + +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64),y) +EDK2_PACKAGE_NAME = Platform/ARM/VExpressPkg +EDK2_PLATFORM_NAME = ArmVExpress-FVP-AArch64 +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX),y) +EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware +EDK2_PACKAGE_NAME = Platform/Socionext/DeveloperBox +EDK2_PLATFORM_NAME = DeveloperBox +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) +EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/ +EDK2_BUILD_OPTS += -D DO_X86EMU=TRUE +EDK2_PRE_BUILD_HOOKS += EDK2_PRE_BUILD_SOCIONEXT_DEVELOPERBOX + +define EDK2_PRE_BUILD_SOCIONEXT_DEVELOPERBOX + mkdir -p $(EDK2_BUILD_PACKAGES)/Platform/Socionext/DeveloperBox + $(ARM_TRUSTED_FIRMWARE_DIR)/tools/fiptool/fiptool create \ + --tb-fw $(BINARIES_DIR)/bl31.bin \ + --soc-fw $(BINARIES_DIR)/bl31.bin \ + --scp-fw $(BINARIES_DIR)/bl31.bin \ + $(EDK2_BUILD_PACKAGES)/Platform/Socionext/DeveloperBox/fip_all_arm_tf.bin +endef + +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y) +EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware +EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin +EDK2_PLATFORM_NAME = Armada80x0McBin +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) +EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/ +EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND + +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y) +EDK2_DEPENDENCIES += arm-trusted-firmware +EDK2_PACKAGE_NAME = Platform/Qemu/SbsaQemu +EDK2_PLATFORM_NAME = SbsaQemu +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) +EDK2_PRE_BUILD_HOOKS += EDK2_PRE_BUILD_QEMU_SBSA + +define EDK2_PRE_BUILD_QEMU_SBSA + mkdir -p $(EDK2_BUILD_PACKAGES)/Platform/Qemu/Sbsa + ln -srf $(BINARIES_DIR)/{bl1.bin,fip.bin} $(EDK2_BUILD_PACKAGES)/Platform/Qemu/Sbsa/ +endef + +endif + +EDK2_BASETOOLS_OPTS = \ + EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \ + EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)" + +EDK2_BUILD_ENV += \ + WORKSPACE=$(@D) \ + PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \ + PYTHON_COMMAND=$(HOST_DIR)/bin/python3 \ + IASL_PREFIX=$(HOST_DIR)/bin/ \ + NASM_PREFIX=$(HOST_DIR)/bin/ \ + GCC5_$(EDK2_ARCH)_PREFIX=$(TARGET_CROSS) + +EDK2_BUILD_OPTS += \ + -t GCC5 \ + -n $(BR2_JLEVEL) \ + -a $(EDK2_ARCH) \ + -b $(EDK2_BUILD_TYPE) \ + -p $(EDK2_PACKAGE_NAME)/$(EDK2_PLATFORM_NAME).dsc + +define EDK2_BUILD_CMDS + mkdir -p $(EDK2_BUILD_PACKAGES) + export $(EDK2_BUILD_ENV) && \ + unset ARCH && \ + source $(@D)/edksetup.sh && \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/BaseTools $(EDK2_BASETOOLS_OPTS) && \ + build $(EDK2_BUILD_OPTS) all +endef + +define EDK2_INSTALL_IMAGES_CMDS + cp -f $(@D)/Build/$(EDK2_BUILD_DIR)/$(EDK2_BUILD_TYPE)_GCC5/FV/*.fd $(BINARIES_DIR) +endef + +$(eval $(generic-package)) From a8466cc5acd29711e534b48764e0db12e5472cf8 Mon Sep 17 00:00:00 2001 From: Dick Olsson Date: Wed, 12 May 2021 18:36:44 +0000 Subject: [PATCH 014/158] configs/qemu_aarch64_sbsa_defconfig: new config for QEMU sbsa-ref This introduces a configuration for the SBSA reference machine under QEMU that is intended for developing and testing firmware. It consists of ATF that load EDK2 as BL33 which in turn will load GRUB2. Included with the board files is a minimal kernel configuration, almost identical to that of board/qemu/aarch64-virt/linux.config. The main difference is the addition of ACPI which is preferred over DTB for booting an UEFI system. Signed-off-by: Dick Olsson Signed-off-by: Yann E. MORIN --- board/qemu/aarch64-sbsa/assemble-flash-images | 11 +++ board/qemu/aarch64-sbsa/genimage.cfg | 30 ++++++++ board/qemu/aarch64-sbsa/grub.cfg | 6 ++ board/qemu/aarch64-sbsa/linux.config | 68 +++++++++++++++++++ board/qemu/aarch64-sbsa/readme.txt | 32 +++++++++ configs/qemu_aarch64_sbsa_defconfig | 49 +++++++++++++ 6 files changed, 196 insertions(+) create mode 100755 board/qemu/aarch64-sbsa/assemble-flash-images create mode 100644 board/qemu/aarch64-sbsa/genimage.cfg create mode 100644 board/qemu/aarch64-sbsa/grub.cfg create mode 100644 board/qemu/aarch64-sbsa/linux.config create mode 100644 board/qemu/aarch64-sbsa/readme.txt create mode 100644 configs/qemu_aarch64_sbsa_defconfig diff --git a/board/qemu/aarch64-sbsa/assemble-flash-images b/board/qemu/aarch64-sbsa/assemble-flash-images new file mode 100755 index 0000000000..abcc276b0b --- /dev/null +++ b/board/qemu/aarch64-sbsa/assemble-flash-images @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +BOARD_DIR="$(dirname $0)" + +cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg + +# The QEMU sbsa machine expects flash devices to be 256M. +truncate -s 256M ${BINARIES_DIR}/SBSA_FLASH0.fd +truncate -s 256M ${BINARIES_DIR}/SBSA_FLASH1.fd diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg new file mode 100644 index 0000000000..285b308d90 --- /dev/null +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -0,0 +1,30 @@ +image efi-part.vfat { + vfat { + file startup.nsh { + image = "efi-part/startup.nsh" + } + file EFI { + image = "efi-part/EFI" + } + file Image { + image = "Image" + } + } + size = 32M +} + +image disk.img { + hdimage { + gpt = true + } + + partition boot { + partition-type = 0xEF + image = "efi-part.vfat" + } + + partition root { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg new file mode 100644 index 0000000000..cd486caf4c --- /dev/null +++ b/board/qemu/aarch64-sbsa/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=/dev/sda2 rootwait console=ttyAMA0 +} diff --git a/board/qemu/aarch64-sbsa/linux.config b/board/qemu/aarch64-sbsa/linux.config new file mode 100644 index 0000000000..a60cce02ec --- /dev/null +++ b/board/qemu/aarch64-sbsa/linux.config @@ -0,0 +1,68 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_TASKSTATS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_PROFILING=y +CONFIG_ARCH_VEXPRESS=y +CONFIG_COMPAT=y +CONFIG_FW_CFG_SYSFS=y +CONFIG_FW_CFG_SYSFS_CMDLINE=y +CONFIG_ACPI=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BINFMT_MISC=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=y +CONFIG_UNIX=y +CONFIG_NET_KEY=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_BRIDGE=m +CONFIG_NET_SCHED=y +CONFIG_VSOCKETS=y +CONFIG_PCI=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_SATA_AHCI_PLATFORM=y +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +CONFIG_MACVLAN=y +CONFIG_VIRTIO_NET=y +CONFIG_NLMON=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_MAILBOX=y +CONFIG_PL320_MBOX=y +CONFIG_ARM_SMMU_V3=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VIRTIO_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y diff --git a/board/qemu/aarch64-sbsa/readme.txt b/board/qemu/aarch64-sbsa/readme.txt new file mode 100644 index 0000000000..7935108ef1 --- /dev/null +++ b/board/qemu/aarch64-sbsa/readme.txt @@ -0,0 +1,32 @@ +Intro +===== + +The QEMU sbsa-ref machine is primarily meant for firmware development +and testing according to ARM's SBSA and SBBR standards. + +Build +===== + + $ make qemu_aarch64_sbsa_defconfig + $ make + +Emulation +========= + +Run the emulation with: + + qemu-system-aarch64 \ + -M sbsa-ref \ + -cpu cortex-a53 \ + -smp 4 \ + -m 1024 \ + -nographic \ + -pflash output/images/SBSA_FLASH0.fd \ + -pflash output/images/SBSA_FLASH1.fd \ + -hda output/images/disk.img + +Note that if you want to run sbsa-ref emulation with QEMU provided by +your distro (i.e., not host-qemu by Buildroot) then you may need to +install the SeaBIOS package for some required drivers. On Debian: + + # apt install seabios diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig new file mode 100644 index 0000000000..20ae393cd7 --- /dev/null +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -0,0 +1,49 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y + +# Toolchain +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y + +# System +BR2_SYSTEM_DHCP="eth0" +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# UEFI firmware +BR2_TARGET_EDK2=y +BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_ARM64_EFI=y + +# ARM Trusted Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y + +# Host tools for genimage +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From 6131efc62c4543e9a998305cc62f4ef3b200ad1a Mon Sep 17 00:00:00 2001 From: Dick Olsson Date: Wed, 12 May 2021 18:37:05 +0000 Subject: [PATCH 015/158] support/testing: new boot test for EDK2 Boot a QEMU sbsa-ref machine with ATF, EDK2, GRUB2 and a minimal kernel. This is a simple but effective test of a compliant setup. Signed-off-by: Dick Olsson Signed-off-by: Yann E. MORIN --- support/testing/tests/boot/test_edk2.py | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 support/testing/tests/boot/test_edk2.py diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py new file mode 100644 index 0000000000..c1be8fad95 --- /dev/null +++ b/support/testing/tests/boot/test_edk2.py @@ -0,0 +1,45 @@ +import os + +import infra.basetest + + +class TestEdk2(infra.basetest.BRTest): + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" + BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-sbsa/linux.config" + BR2_TARGET_EDK2=y + BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y + BR2_TARGET_GRUB2=y + BR2_TARGET_GRUB2_ARM64_EFI=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_MTOOLS=y + """ + + def test_run(self): + hda = os.path.join(self.builddir, "images", "disk.img") + flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") + flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") + self.emulator.boot(arch="aarch64", + options=["-M", "sbsa-ref", + "-cpu", "cortex-a57", + "-m", "512M", + "-pflash", flash0, + "-pflash", flash1, + "-hda", hda]) + self.emulator.login() From 823c173639971b491440b9ec7cf93e3c166e43da Mon Sep 17 00:00:00 2001 From: Dick Olsson Date: Wed, 12 May 2021 18:37:11 +0000 Subject: [PATCH 016/158] DEVELOPERS: add files related to EDK2 for Dick Olsson Signed-off-by: Dick Olsson [yann.morin.1998@free.fr: drop files from patches not applied] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b688c8a8c1..2d5c692062 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -675,7 +675,14 @@ N: Derrick Lyndon Pallas F: package/ipcalc/ N: Dick Olsson +F: board/aarch64-efi/ +F: board/pc/ +F: board/qemu/aarch64-sbsa/ +F: boot/arm-trusted-firmware/ +F: boot/edk2/ +F: configs/qemu_aarch64_sbsa_defconfig F: package/bearssl/ +F: package/edk2-platforms/ F: package/execline/ F: package/mdevd/ F: package/s6-dns/ @@ -686,6 +693,7 @@ F: package/s6-portable-utils/ F: package/s6-rc/ F: package/s6/ F: package/skalibs/ +F: support/testing/tests/boot/test_edk2.py N: Dimitrios Siganos F: package/wireless-regdb/ From 00715018284d8f69537c150b5d43cb5278ca4c39 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 17 May 2021 19:53:57 +0200 Subject: [PATCH 017/158] package/iproute2: bump version to 5.12.0 Backport from upstream mailing list patch from Heiko Thiery which fixes missing {name_to,open_by}_handle_at() on uclibc-ng < 1.0.35. Drop patch from v5.8.0. Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- .../0001-devlink-update-include-files.patch | 55 --------- ...-when-name-open-_to_handle_at-is-not.patch | 114 ++++++++++++++++++ package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 4 files changed, 116 insertions(+), 57 deletions(-) delete mode 100644 package/iproute2/0001-devlink-update-include-files.patch create mode 100644 package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch diff --git a/package/iproute2/0001-devlink-update-include-files.patch b/package/iproute2/0001-devlink-update-include-files.patch deleted file mode 100644 index 8cc6e4ec60..0000000000 --- a/package/iproute2/0001-devlink-update-include-files.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 12fafa27c7b306e6c397e858f4d5a8159500f659 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger -Date: Thu, 11 Jun 2020 09:46:46 -0700 -Subject: devlink: update include files - -Use the tool iwyu to get more complete list of includes for -all the bits used by devlink. - -This should also fix build with musl libc. - -Fixes: c4dfddccef4e ("fix JSON output of mon command") -Reported-off-by: Dan Robertson -Signed-off-by: Stephen Hemminger - -[Retrieved from: -https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=12fafa27c7b306e6c397e858f4d5a8159500f659] -Signed-off-by: Fabrice Fontaine ---- - devlink/devlink.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 507972c3..ce2e4676 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -19,18 +19,25 @@ - #include - #include - #include -+#include -+#include -+#include -+#include - #include - #define _LINUX_SYSINFO_H /* avoid collision with musl header */ - #include - #include -+#include - #include - #include -+#include -+#include - #include - - #include "SNAPSHOT.h" - #include "list.h" - #include "mnlg.h" --#include "json_writer.h" -+#include "json_print.h" - #include "utils.h" - #include "namespace.h" - --- -cgit 1.2.3-1.el7 - diff --git a/package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch b/package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch new file mode 100644 index 0000000000..b4e6374874 --- /dev/null +++ b/package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch @@ -0,0 +1,114 @@ +From c5b72cc56bf88160bbf477ec8565fed865e7a1c9 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Sat, 8 May 2021 08:49:26 +0200 +Subject: [PATCH] lib/fs: fix issue when {name,open}_to_handle_at() is not + implemented + +With commit d5e6ee0dac64 the usage of functions name_to_handle_at() and +open_by_handle_at() are introduced. But these function are not available +e.g. in uclibc-ng < 1.0.35. To have a backward compatibility check for the +availability in the configure script and in case of absence do a direct +syscall. + +Fixes: d5e6ee0dac64 ("ss: introduce cgroup2 cache and helper functions") +Cc: Dmitry Yakunin +Cc: Petr Vorel +Signed-off-by: Heiko Thiery +Reviewed-by: Petr Vorel +Signed-off-by: David Ahern +[ upstream-status: https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=c5b72cc56bf88160bbf477ec8565fed865e7a1c9 ] +--- + configure | 28 ++++++++++++++++++++++++++++ + lib/fs.c | 25 +++++++++++++++++++++++++ + 2 files changed, 53 insertions(+) + +diff --git a/configure b/configure +index 2c363d3b..179eae08 100755 +--- a/configure ++++ b/configure +@@ -202,6 +202,31 @@ EOF + rm -f $TMPDIR/setnstest.c $TMPDIR/setnstest + } + ++check_name_to_handle_at() ++{ ++ cat >$TMPDIR/name_to_handle_at_test.c < ++#include ++#include ++int main(int argc, char **argv) ++{ ++ struct file_handle *fhp; ++ int mount_id, flags, dirfd; ++ char *pathname; ++ name_to_handle_at(dirfd, pathname, fhp, &mount_id, flags); ++ return 0; ++} ++EOF ++ if $CC -I$INCLUDE -o $TMPDIR/name_to_handle_at_test $TMPDIR/name_to_handle_at_test.c >/dev/null 2>&1; then ++ echo "yes" ++ echo "CFLAGS += -DHAVE_HANDLE_AT" >>$CONFIG ++ else ++ echo "no" ++ fi ++ rm -f $TMPDIR/name_to_handle_at_test.c $TMPDIR/name_to_handle_at_test ++} ++ + check_ipset() + { + cat >$TMPDIR/ipsettest.c < ++#endif ++ + #define CGROUP2_FS_NAME "cgroup2" + + /* if not already mounted cgroup2 is mounted here for iproute2's use */ + #define MNT_CGRP2_PATH "/var/run/cgroup2" + ++ ++#ifndef HAVE_HANDLE_AT ++struct file_handle { ++ unsigned handle_bytes; ++ int handle_type; ++ unsigned char f_handle[]; ++}; ++ ++static int name_to_handle_at(int dirfd, const char *pathname, ++ struct file_handle *handle, int *mount_id, int flags) ++{ ++ return syscall(__NR_name_to_handle_at, dirfd, pathname, handle, ++ mount_id, flags); ++} ++ ++static int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags) ++{ ++ return syscall(__NR_open_by_handle_at, mount_fd, handle, flags); ++} ++#endif ++ + /* return mount path of first occurrence of given fstype */ + static char *find_fs_mount(const char *fs_to_find) + { +-- +2.31.1 + diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index b2a9e21e11..a5d6bf022c 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21 iproute2-5.7.0.tar.xz +sha256 9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f iproute2-5.12.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 3460c5c3b3..6cc0dd5210 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 5.7.0 +IPROUTE2_VERSION = 5.12.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 0173c06e5db4aa3d708e27872da05f272cfea83d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 17 May 2021 12:39:59 +0200 Subject: [PATCH 018/158] package/libubootenv: bump to version 0.3.2 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- ...eLists.txt-do-not-force-the-build-of-a-share.patch | 11 ++++++----- package/libubootenv/libubootenv.hash | 2 +- package/libubootenv/libubootenv.mk | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch b/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch index 2a234af78c..9040e1267e 100644 --- a/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch +++ b/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch @@ -26,10 +26,10 @@ Signed-off-by: Pierre-Jean Texier 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a04dd11..3a2115d 100644 +index 4b71bc5..0b515f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -12,17 +12,15 @@ SET(include_HEADERS +@@ -12,18 +12,16 @@ SET(include_HEADERS include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable @@ -41,8 +41,9 @@ index a04dd11..3a2115d 100644 -SET_TARGET_PROPERTIES(ubootenv_static PROPERTIES OUTPUT_NAME ubootenv) add_executable(fw_printenv fw_printenv.c) add_executable(fw_setenv fw_setenv.c) - target_link_libraries(fw_printenv ubootenv z) - target_link_libraries(fw_setenv ubootenv z) + target_link_libraries(ubootenv z) + target_link_libraries(fw_printenv ubootenv) + target_link_libraries(fw_setenv ubootenv) -install (TARGETS ubootenv ubootenv_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install (TARGETS ubootenv DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -50,5 +51,5 @@ index a04dd11..3a2115d 100644 install (TARGETS fw_printenv DESTINATION ${CMAKE_INSTALL_BINDIR}) install (TARGETS fw_setenv DESTINATION ${CMAKE_INSTALL_BINDIR}) -- -2.25.1 +2.30.2 diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash index 0b5320b36f..d6de614612 100644 --- a/package/libubootenv/libubootenv.hash +++ b/package/libubootenv/libubootenv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e25adf81dd2d4a083cb2cf032843a1ee2bb1fab54aa7a0202bd2295186bfe1b7 libubootenv-e663439e3d39a4cdbddb7e818245a99c485fa965.tar.gz +sha256 662ef1efe058e2d5a07498f7b63aff7b2a521c0f6f199c499fb3ae84b54121bd libubootenv-0.3.2.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk index 7a98f5324b..295226b9aa 100644 --- a/package/libubootenv/libubootenv.mk +++ b/package/libubootenv/libubootenv.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUBOOTENV_VERSION = e663439e3d39a4cdbddb7e818245a99c485fa965 -LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION)) +LIBUBOOTENV_VERSION = 0.3.2 +LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,v$(LIBUBOOTENV_VERSION)) LIBUBOOTENV_LICENSE = LGPL-2.1 LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt LIBUBOOTENV_INSTALL_STAGING = YES From 815d7f2617d03b9d9718dd0263fe32bd3b1b312e Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Tue, 18 May 2021 14:17:38 +0800 Subject: [PATCH 019/158] package/libuhttpd: bump version to 3.11.0 Signed-off-by: Jianhui Zhao Signed-off-by: Yann E. MORIN --- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 4b0b5027c6..19a02e5be0 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz +sha256 dcd95fac7b29d43f57e942db6e9fb4c8745d4284684cd627d60c8a7f8c76cd32 libuhttpd-3.11.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 326c78face..61afec701e 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.10.1 +LIBUHTTPD_VERSION = 3.11.0 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE From 6b5907bf65d27ed98532e9783f92f5575f38b3d2 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Tue, 18 May 2021 13:30:08 +0800 Subject: [PATCH 020/158] package/rtty: bump version to 7.4.0 Signed-off-by: Jianhui Zhao Signed-off-by: Yann E. MORIN --- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index 283a5d1da5..b2e9db2436 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 4c60eacd7a653988a1907284de2ecf360c74f55ef9e21c40b9ebd87af6570908 rtty-7.3.2.tar.gz +sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index dc91445287..4ec220394c 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.3.2 +RTTY_VERSION = 7.4.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE From d13b292cec8166c4712cf4a0defbeee827ffaf78 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 17 May 2021 19:41:24 +0200 Subject: [PATCH 021/158] package/rpcbind: bump version to 1.3.2 Rebased yellow pages patch. Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- .../0001-Remove-yellow-pages-support.patch | 22 ++++++------------- package/rpcbind/rpcbind.mk | 2 +- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/package/rpcbind/0001-Remove-yellow-pages-support.patch b/package/rpcbind/0001-Remove-yellow-pages-support.patch index 314e32e9c8..9303d71c96 100644 --- a/package/rpcbind/0001-Remove-yellow-pages-support.patch +++ b/package/rpcbind/0001-Remove-yellow-pages-support.patch @@ -8,25 +8,17 @@ available. As most Buildroot users are most likely never going to need such feature, get rid of it. Signed-off-by: Thomas Petazzoni +[ rebased for 1.3.2 ] +Signed-off-by: Petr Vorel --- - src/security.c | 18 ------------------ - 1 file changed, 18 deletions(-) + src/security.c | 15 --------------- + 1 file changed, 15 deletions(-) diff --git a/src/security.c b/src/security.c -index 0c9453f..abc81bb 100644 +index 38967dd..0a70635 100644 --- a/src/security.c +++ b/src/security.c -@@ -24,9 +24,6 @@ - #include - #include - #include --#include --#include --#include - #else - # define MOUNTPROC_MNT 1 - # define MOUNTPROC_UMNT 3 -@@ -325,24 +322,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused* +@@ -318,24 +318,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused* args->rmt_proc != MOUNTPROC_UMNT) break; goto deny; @@ -52,5 +44,5 @@ index 0c9453f..abc81bb 100644 break; } -- -2.4.5 +2.31.1 diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index 25916f0b56..fea2103794 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPCBIND_VERSION = 1.2.5 +RPCBIND_VERSION = 1.3.2 RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION) RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause From 118cf25a5ca012bd32031820250d0e5196be751a Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 17 May 2021 19:38:44 +0200 Subject: [PATCH 022/158] package/libqmi: bump version to 1.28.4 Drop patch backported from this release. Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- ...-when-ARPHRD_RAWIP-isn-t-defined-in-.patch | 39 ------------------- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/libqmi/0001-libqmi-fix-build-when-ARPHRD_RAWIP-isn-t-defined-in-.patch diff --git a/package/libqmi/0001-libqmi-fix-build-when-ARPHRD_RAWIP-isn-t-defined-in-.patch b/package/libqmi/0001-libqmi-fix-build-when-ARPHRD_RAWIP-isn-t-defined-in-.patch deleted file mode 100644 index 1212878af4..0000000000 --- a/package/libqmi/0001-libqmi-fix-build-when-ARPHRD_RAWIP-isn-t-defined-in-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cdec8660427d2895415f1d84426e39d1ed145136 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Tue, 30 Mar 2021 00:13:45 +0200 -Subject: [PATCH] libqmi: fix build when ARPHRD_RAWIP isn't defined in libc - -The kernel may be new enough to have rmnet support, but it could be -that libc doesn't have ARPHRD_RAWIP defined yet; if so, just define it -ourselves. - -Fixes http://autobuild.buildroot.org/results/c8853b7161bd85d46c1282c6c097e7ef4042ae68 - -Signed-off-by: Aleksander Morgado ---- - src/libqmi-glib/qmi-net-port-manager-rmnet.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/libqmi-glib/qmi-net-port-manager-rmnet.c b/src/libqmi-glib/qmi-net-port-manager-rmnet.c -index eb26129..571d4c4 100644 ---- a/src/libqmi-glib/qmi-net-port-manager-rmnet.c -+++ b/src/libqmi-glib/qmi-net-port-manager-rmnet.c -@@ -24,8 +24,15 @@ - #include - #include - #include -+ - #include - #include -+ -+/* The if_arp.h from libc may not have this symbol yet */ -+#if !defined ARPHRD_RAWIP -+#define ARPHRD_RAWIP 519 -+#endif -+ - #include - #include - #include --- -2.30.1 - diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 8cf25f486a..2720a8236d 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 8c8c3ee719874d2529bce9b35b028fe435b36f003979a360d3ad0938449db783 libqmi-1.28.2.tar.xz +sha256 3b14cd2ab5221a7adbb39fed16ef697538ea1c79308821ad2d19b505e1daaea0 libqmi-1.28.4.tar.xz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 6fc6d4a50d..278c0116be 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.28.2 +LIBQMI_VERSION = 1.28.4 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) From b93930ab12b8fbd2d90e01f99ddf2aa2ce50f66e Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 17 May 2021 19:33:59 +0200 Subject: [PATCH 023/158] package/links: bump version to 2.22 Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/links/links.hash | 2 +- package/links/links.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/links/links.hash b/package/links/links.hash index f941c2cd1b..156b73fb63 100644 --- a/package/links/links.hash +++ b/package/links/links.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63 links-2.21.tar.bz2 +sha256 0364986b3a7f1e8e3171bea362b53f71e1dd3360a8842d66fdc65580ebc2084d links-2.22.tar.bz2 sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING diff --git a/package/links/links.mk b/package/links/links.mk index 5213e02bd5..015878f892 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.21 +LINKS_VERSION = 2.22 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf From 845acb9c31fd0f8f547f6cc84ea5007ae23ace8a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 17 May 2021 12:39:42 +0200 Subject: [PATCH 024/158] package/nano: bump to version 5.7 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index cbb4977223..532a68e0c9 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v5/nano-5.6.1.tar.xz.asc +# https://www.nano-editor.org/dist/v5/nano-5.7.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 760d7059e0881ca0ee7e2a33b09d999ec456ff7204df86bee58eb6f523ee8b09 nano-5.6.1.tar.xz +sha256 d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa nano-5.7.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 77126fd4b0..39d9be12ba 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 5 -NANO_VERSION = $(NANO_VERSION_MAJOR).6.1 +NANO_VERSION = $(NANO_VERSION_MAJOR).7 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From c337990dce7c9a84f845d1498e1c90284ca4a2cd Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 17 May 2021 12:39:29 +0200 Subject: [PATCH 025/158] package/libcap: bump to version 2.49 Release notes: https://sites.google.com/site/fullycapable/release-notes-for-libcap Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libcap/libcap.hash | 4 ++-- package/libcap/libcap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 7499f2468c..de9de3514a 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2 libcap-2.48.tar.xz +sha256 e98bc4d93645082ec787730b0fd1a712b38882465c505777de17c338831ee181 libcap-2.49.tar.xz # Hash for license file: -sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License +sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 79a130b453..34636a3a81 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.48 +LIBCAP_VERSION = 2.49 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause From 0b4cb8faeb0c4247d5d8589e7500d23f576d19bd Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 18 May 2021 12:53:50 +0200 Subject: [PATCH 026/158] package/python-pytest-asyncio: bump version to 0.15.1 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- package/python-pytest-asyncio/python-pytest-asyncio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index 40541f54ba..4949919ecb 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 b63593bc08f445f6e3f14c34128a68ed pytest-asyncio-0.14.0.tar.gz -sha256 9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700 pytest-asyncio-0.14.0.tar.gz +md5 8940c41c342b5bafe2ebb0d6e5c320ec pytest-asyncio-0.15.1.tar.gz +sha256 2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f pytest-asyncio-0.15.1.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index 0645db3eb7..bd2e0083a9 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.14.0 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.15.1 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/65/09/9472d4db0625cf56d40f4e405f955faf6469be00858a273b71332f3fcd1f +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/de/c1/b2b0119e30f61f7ec8b44f129f6fde46a1a7329de17110f124639aa8896b PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE From 578de6edbfe95ee8e56c4f81df24f6bd8115d35d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 17 May 2021 22:13:27 +0200 Subject: [PATCH 027/158] package/gcc: enable secureplt for powerpc64 GCC support enabling secureplt for powerpc64. From [1] "PowerPC has two PLT models: BSS-PLT and Secure-PLT. BSS-PLT uses runtime code generation to generate the PLT stubs. Secure-PLT was introduced with GCC 4.1 and Binutils 2.17 (base has GCC 4.2.1 and Binutils 2.17), and is a more secure PLT format, using a read-only linkage table, with the dynamic linker populating a non-executable index table." This option is always enabled by glibc testing script called build-many-glibcs.py [1]. This script exist since glibc 2.25. Runtime tested with qemu_ppc64_e5500_defconfig. [1] https://reviews.freebsd.org/D20598 [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=scripts/build-many-glibcs.py;h=9c08ab7b326e6385abb835eb32dd143952a71942;hb=9826b03b747b841f5fc6de2054bf1ef3f5c4bdf3#l345 Signed-off-by: Romain Naour Cc: Matt Weber Signed-off-by: Yann E. MORIN --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 5e419f7ede..ed9b93e50f 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -231,7 +231,7 @@ endif # Set default to Secure-PLT to prevent run-time # generation of PLT stubs (supports RELRO and # SELinux non-exemem capabilities) -ifeq ($(BR2_powerpc),y) +ifeq ($(BR2_powerpc)$(BR2_powerpc64),y) HOST_GCC_COMMON_CONF_OPTS += --enable-secureplt endif From 04cd621a4532601328157aacf2c78c171f25eb52 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 17 May 2021 11:04:49 +0200 Subject: [PATCH 028/158] configs: add espressobin ultra dts and bump kernel to 5.11.21 This patch adds support for the Globalscale EspressoBin Ultra, which is an evolution of the EspressoBin family. Same SoC and switchcore, more Ethernet ports, including one PoE PD port. Tested-by: Atallah Amine Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- configs/globalscale_espressobin_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/globalscale_espressobin_defconfig b/configs/globalscale_espressobin_defconfig index 50cfc6b530..37d9c1859c 100644 --- a/configs/globalscale_espressobin_defconfig +++ b/configs/globalscale_espressobin_defconfig @@ -2,17 +2,17 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11.21" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/globalscale/espressobin/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From da50baa7c9337ffa83d4f910e3dd2032331857bf Mon Sep 17 00:00:00 2001 From: Mircea GLIGA Date: Mon, 17 May 2021 09:32:13 +0300 Subject: [PATCH 029/158] package/mbuffer: bump to version 20210328 Signed-off-by: Mircea GLIGA Signed-off-by: Yann E. MORIN --- package/mbuffer/mbuffer.hash | 4 ++-- package/mbuffer/mbuffer.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbuffer/mbuffer.hash b/package/mbuffer/mbuffer.hash index 73a8d3cf44..7c200d543e 100644 --- a/package/mbuffer/mbuffer.hash +++ b/package/mbuffer/mbuffer.hash @@ -1,8 +1,8 @@ # From http://www.maier-komor.de/mbuffer.html -md5 e2b4f3b0d0944c08d52c167841bde3c0 mbuffer-20200929.tgz +md5 4e4712db5fbd4e71bfbfa2c145c6c646 mbuffer-20210328.tgz # Locally computed after checking signature upstream -sha256 53a6e3c14e9a049f18a09840653dd84f18e7ec7560f2dcf2b61c0ab5f0ead4e8 mbuffer-20200929.tgz +sha256 51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d mbuffer-20210328.tgz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/mbuffer/mbuffer.mk b/package/mbuffer/mbuffer.mk index 90a72ce657..c7c4456651 100644 --- a/package/mbuffer/mbuffer.mk +++ b/package/mbuffer/mbuffer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBUFFER_VERSION = 20200929 +MBUFFER_VERSION = 20210328 MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer MBUFFER_LICENSE = GPL-3.0+ From ebf7eb7fff301b354b04c5dba96fc6accd6969f8 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 17 May 2021 10:22:53 +0200 Subject: [PATCH 030/158] package/ethtool: bump to version 5.12 Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 334ff8d503..536579670f 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf ethtool-5.10.tar.xz +sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index c9765eccff..f3e950f212 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.10 +ETHTOOL_VERSION = 5.12 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From 0dda1a44a0859fc15b318e493c151ca1d807ba24 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 May 2021 22:42:50 +0200 Subject: [PATCH 031/158] package/pipewire: bump version to 0.3.27 - remove 0001-meson-prefer-libintl-on-FreeBSD.patch (from upstream [1]) [1] https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4d064a37183a0bf8198914dd68b063b2c9def17e Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...0001-meson-prefer-libintl-on-FreeBSD.patch | 46 ------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 2 +- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 package/pipewire/0001-meson-prefer-libintl-on-FreeBSD.patch diff --git a/package/pipewire/0001-meson-prefer-libintl-on-FreeBSD.patch b/package/pipewire/0001-meson-prefer-libintl-on-FreeBSD.patch deleted file mode 100644 index b19715b2e8..0000000000 --- a/package/pipewire/0001-meson-prefer-libintl-on-FreeBSD.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4d064a37183a0bf8198914dd68b063b2c9def17e Mon Sep 17 00:00:00 2001 -From: Evgeniy Khramtsov -Date: Fri, 23 Apr 2021 22:57:51 +0300 -Subject: [PATCH] meson: prefer libintl on FreeBSD - -FreeBSD does not have gettext in libc. -It is implemented in the third-party library. - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4d064a37183a0bf8198914dd68b063b2c9def17e] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 3 +++ - src/pipewire/meson.build | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 99a4b2d1c..0a9963fbb 100644 ---- a/meson.build -+++ b/meson.build -@@ -351,6 +351,9 @@ libinotify_dep = (build_machine.system() == 'freebsd' - ? dependency('libinotify', required: true) - : dependency('', required: false)) - -+# On FreeBSD, libintl library is required for gettext -+libintl_dep = cc.find_library('intl', required: false) -+ - alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) - - installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name -diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build -index 7f2d42a7a..d4c271373 100644 ---- a/src/pipewire/meson.build -+++ b/src/pipewire/meson.build -@@ -101,7 +101,7 @@ libpipewire = shared_library(pipewire_name, pipewire_sources, - c_args : libpipewire_c_args, - include_directories : [pipewire_inc, configinc, spa_inc], - install : true, -- dependencies : [dl_lib, mathlib, pthread_lib, ], -+ dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, ], - ) - - pipewire_dep = declare_dependency(link_with : libpipewire, --- -GitLab - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 4d2548e3ab..7c26e2ab29 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 05cc9d25de45290c025da5da1b94fc705bddacd93cf3690d0b2988c1ac501ee1 pipewire-0.3.26.tar.gz +sha256 657db1b9a29ae17a9f1d9782a45bda2ba5a893fef55e1ca26453e8f7f2d4e64e pipewire-0.3.27.tar.gz sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 7db6138b0385e260ae8f09f050ea66c4e4fe775a11060d7f6ca2beb47f192d6f LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index e5185aeb8c..8abbfc35be 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.26 +PIPEWIRE_VERSION = 0.3.27 PIPEWIRE_SITE = $(call github,PipeWire,pipewire,$(PIPEWIRE_VERSION)) PIPEWIRE_LICENSE = MIT PIPEWIRE_LICENSE_FILES = COPYING LICENSE From b003cb5d16de9c92baba7dea7a6626c71cefc4fb Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 May 2021 22:42:51 +0200 Subject: [PATCH 032/158] package/pipewire: fix uclibc compile (getrandom related) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The getrandom() detection from meson.build failes with the following error message: .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name 'size_t' 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) | ^~~~~~ .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? Fix it by adding stddef.h include to the meson getrandom() detection. Fixes: - http://autobuild.buildroot.net/results/7e131bec458bf5c263ee1858d38ed5dc3cf704a6 ../src/pipewire/impl-core.c:54:9: error: conflicting types for ‘getrandom’ 54 | ssize_t getrandom(void *buf, size_t buflen, unsigned int flags) { | ^~~~~~~~~ In file included from ../src/pipewire/impl-core.c:34: .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:12: note: previous declaration of ‘getrandom’ was here 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) | ^~~~~~~~~ Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...n-fix-getrandom-detection-for-uclibc.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch diff --git a/package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch b/package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch new file mode 100644 index 0000000000..e902869ce9 --- /dev/null +++ b/package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch @@ -0,0 +1,49 @@ +From a36bc959768e100d2d72e027746e3a9d95cf29af Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 12 May 2021 22:08:39 +0200 +Subject: [PATCH] meson: fix getrandom detection for uclibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The getrandom() detection from meson.build failes with the following error +message: + + .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name 'size_t' + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~ + .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? + +Fix it by adding stddef.h include to the meson getrandom() detection. + +Fixes: + + ../src/pipewire/impl-core.c:54:9: error: conflicting types for ‘getrandom’ + 54 | ssize_t getrandom(void *buf, size_t buflen, unsigned int flags) { + | ^~~~~~~~~ + In file included from ../src/pipewire/impl-core.c:34: + .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:12: note: previous declaration of ‘getrandom’ was here + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~~~~ + +Signed-off-by: Peter Seiderer +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 03a9d174..01b4c7c8 100644 +--- a/meson.build ++++ b/meson.build +@@ -274,7 +274,7 @@ if cc.has_function('memfd_create', prefix : '#include ', args : [ '- + cdata.set('HAVE_MEMFD_CREATE', 1) + endif + +-if cc.has_function('getrandom', prefix : '#include ', args : [ '-D_GNU_SOURCE' ]) ++if cc.has_function('getrandom', prefix : '#include \n#include ', args : [ '-D_GNU_SOURCE' ]) + cdata.set('HAVE_GETRANDOM', 1) + endif + +-- +2.31.1 + From 08c48454e2df167aa8bf8234c0d0b248dd351c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Sun, 16 May 2021 20:09:52 +0200 Subject: [PATCH 033/158] configs/beaglebone: bump kernel and U-Boot versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump kernel to version 5.10.30-ti-r3. - Bump U-Boot to version 2021.04. Add mdev to the beaglebone_defconfig. This gives us automatic USB support, as the omap2plus kernel has most drivers as modules. While at it, enable VFPv3 with 32 registers (instead of 16) and add a few comments to the defconfig. Signed-off-by: Vincent Stehlé Cc: Yegor Yefremov Cc: Lothar Felten Signed-off-by: Yann E. MORIN --- configs/beaglebone_defconfig | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 9a4be13ec5..763696d1dd 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -1,31 +1,52 @@ +# Architecture BR2_arm=y BR2_cortex_a8=y +BR2_ARM_FPU_VFPV3=y + +# Patches BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" + +# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y + +# Supporting host tools to build FIT image BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From ef02a1193931083c622a33182ae2a2741b31b4c9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 17 May 2021 17:56:26 +0200 Subject: [PATCH 034/158] package/poke: new package Backport a patch to disable tcl/tk dependencies when gui support is disabled. Backport and rebase a patch to avoid host poisoning while cross-compiling. Add another local patch when HELP2MAN is missing. Disable uClibc-ng toolchain for now due to issues with bundled gnulib. The license of gnulib is not easy to describe because it bundle several sources files with different license [1][2]. Even if not SPDX compliant, use "gnulib license". [1] https://git.savannah.gnu.org/cgit/gnulib.git/tree/COPYING [2] https://src.fedoraproject.org/rpms/gnulib/blob/rawhide/f/gnulib.spec#_53 See: http://www.jemarch.net/poke-1.0-relnotes.html http://www.jemarch.net/poke-1.1-relnotes.html http://www.jemarch.net/poke-1.2-relnotes.html Signed-off-by: Romain Naour Cc: Jose E. Marchesi Cc: Luca Saiu Cc: Yann E. MORIN [yann.morin.1998@free.fr: - propagate BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS dependency to comment - select busybos-show-others ] Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + ...ck-for-Tcl-Tk-if-disable-gui-is-spec.patch | 43 ++++++++++++ ...ge-cppflags-to-omit-I-prefix-on-cros.patch | 67 +++++++++++++++++++ ...P2MAN-replace-by-true-when-cross-com.patch | 34 ++++++++++ package/poke/Config.in | 30 +++++++++ package/poke/poke.hash | 4 ++ package/poke/poke.mk | 25 +++++++ 7 files changed, 204 insertions(+) create mode 100644 package/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch create mode 100644 package/poke/0002-tentatively-change-cppflags-to-omit-I-prefix-on-cros.patch create mode 100644 package/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch create mode 100644 package/poke/Config.in create mode 100644 package/poke/poke.hash create mode 100644 package/poke/poke.mk diff --git a/package/Config.in b/package/Config.in index 45d75c71d0..e4a6dc292d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -126,6 +126,7 @@ menu "Debugging, profiling and benchmark" source "package/pcm-tools/Config.in" source "package/piglit/Config.in" source "package/ply/Config.in" + source "package/poke/Config.in" source "package/ptm2human/Config.in" source "package/pv/Config.in" source "package/racehound/Config.in" diff --git a/package/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch b/package/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch new file mode 100644 index 0000000000..3bd041a0e7 --- /dev/null +++ b/package/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch @@ -0,0 +1,43 @@ +From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001 +From: "Jose E. Marchesi" +Date: Fri, 30 Apr 2021 13:17:05 +0200 +Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified + +2021-04-30 Jose E. Marchesi + + * configure.ac: Do not check for tcl/tk if --disable-gui is + specified at configure time. + +(cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c) +[Romain: remove Changelog entry] +Signed-off-by: Romain Naour +--- + configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c7205513..c2f0760a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -214,12 +214,15 @@ fi + dnl The GUI is optional, and depends on the availability of Tcl and + dnl Tk. + +-POKE_TCLTK +- + AC_ARG_ENABLE([gui], + AS_HELP_STRING([--enable-gui], + [Enable the GUI (default is YES)]), +- [gui_enabled=$enableval], [gui_enabled=$has_tcltk]) ++ [gui_enabled=$enableval], [gui_enabled=yes]) ++ ++if test "x$gui_enabled" = "xyes"; then ++ POKE_TCLTK ++ gui_enabled=$has_tcltk ++fi + + AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"]) + +-- +2.30.2 + diff --git a/package/poke/0002-tentatively-change-cppflags-to-omit-I-prefix-on-cros.patch b/package/poke/0002-tentatively-change-cppflags-to-omit-I-prefix-on-cros.patch new file mode 100644 index 0000000000..8fae85eb20 --- /dev/null +++ b/package/poke/0002-tentatively-change-cppflags-to-omit-I-prefix-on-cros.patch @@ -0,0 +1,67 @@ +From ac9d057895f1e61f63cbecafcc3e3820fdb10f84 Mon Sep 17 00:00:00 2001 +From: Luca Saiu +Date: Fri, 30 Apr 2021 22:42:57 +0200 +Subject: [PATCH] tentatively change --cppflags to omit -I prefix on + cross-compilation + +The autoconf macros defined from jitter --cppflags get automatically changed, of +course. + +* configure.ac (JITTER_CROSS_COMPILING): New substitution. + +* bin/jitter-config.in.m4sh (main loop) <--cppflags>: Introduce conditional on +the new substitution. + +Suggested by Romain Naour, after his difficulties with building GNU poke with +buildroot. + +(cherry picked from commit 428406c7b8d4c20f3472d41ed57c12c1a88ad37e) +[Romain: + patch jitter-config.in instead of jitter-config.in.m4sh since + there is an issue while converting the M4sh m4sh script ( .in.m4sh ) + into a portable shell script ( .in ) ready to be processed by aclocal + for @-substitutions.] + +Signed-off-by: Romain Naour +--- + jitter/bin/jitter-config.in | 10 +++++++--- + jitter/configure.ac | 1 + + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in +index 5e124f0..4bc508d 100644 +--- a/jitter/bin/jitter-config.in ++++ b/jitter/bin/jitter-config.in +@@ -999,10 +999,14 @@ while test "$#" != "0"; do + --cppflags) + no_option_argument + append_to_output cppflags +- # Append a -I argument. This is defined separately from the rest, +- # as the installation prefix can be decided very late, at Jitter ++ # Unless cross-compiling, append a -I argument referring the ++ # installation path. This is defined separately from the rest, as ++ # the installation prefix can be decided very late, at Jitter + # installation time. +- output="$output -I $includedir";; ++ # (When cross-compiling this would be difficult to do correctly.) ++ if test "x@JITTER_CROSS_COMPILING@" != 'xyes'; then ++ output="$output -I $includedir" ++ fi;; + --ldadd) + no_option_argument + append_to_output ldadd;; +diff --git a/jitter/configure.ac b/jitter/configure.ac +index 21d6937..fb12349 100644 +--- a/jitter/configure.ac ++++ b/jitter/configure.ac +@@ -308,6 +308,7 @@ else + AC_MSG_RESULT([yes, cross-compiling from $build to $host .]) + jitter_cross_compiling=yes + fi ++AC_SUBST([JITTER_CROSS_COMPILING], [$jitter_cross_compiling]) + + # I never test on weird systems not supporting shebangs. + AC_SYS_INTERPRETER +-- +2.31.1 + diff --git a/package/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch new file mode 100644 index 0000000000..f217c917f1 --- /dev/null +++ b/package/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -0,0 +1,34 @@ +From 8ba76a5a7ce311f67890199c5595bc1f626495ad Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 30 Apr 2021 15:43:59 +0200 +Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when + cross-compiling + +Avoid: +/usr/bin/make ./../poke/poke +../run \ + : -p poke --name="The GNU extensible binary editor" \ + ./../poke/poke -o ./poke.1 +../run: line 51: exec: :: not found + +Signed-off-by: Romain Naour +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c2f0760a..93769ef9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) + if test $cross_compiling = no; then + AM_MISSING_PROG(HELP2MAN, help2man) + else +- HELP2MAN=: ++ HELP2MAN=true + fi + + dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to +-- +2.30.2 + diff --git a/package/poke/Config.in b/package/poke/Config.in new file mode 100644 index 0000000000..eb2e33d5af --- /dev/null +++ b/package/poke/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_POKE + bool "poke" + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc + depends on BR2_USE_WCHAR # needs wctomb + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # gnulib + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # less + select BR2_PACKAGE_BDWGC + select BR2_PACKAGE_LESS # runtime + select BR2_PACKAGE_READLINE + help + GNU poke is a new interactive editor for binary data. Not + limited to editing basic entities such as bits and bytes, + it provides a full-fledged procedural, interactive + programming language designed to describe data structures + and to operate on them. Once a user has defined a structure + for binary data (usually matching some file format) she can + search, inspect, create, shuffle and modify abstract entities + such as ELF relocations, MP3 tags, DWARF expressions, + partition table entries, and so on, with primitives + resembling simple editing of bits and bytes. The program + comes with a library of already written descriptions (or + "pickles" in poke parlance) for many binary formats. + + https://www.gnu.org/software/poke/ + +comment "poke needs a glibc or musl toolchain w/ NPTL, wchar" + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) \ + ||!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/poke/poke.hash b/package/poke/poke.hash new file mode 100644 index 0000000000..b3a79d90dc --- /dev/null +++ b/package/poke/poke.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62 poke-1.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk new file mode 100644 index 0000000000..c0217b6fad --- /dev/null +++ b/package/poke/poke.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# poke +# +################################################################################ + +POKE_VERSION = 1.2 +POKE_SITE = $(BR2_GNU_MIRROR)/poke +# gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. +POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) +POKE_LICENSE_FILES = COPYING jitter/COPYING + +# 0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch +# 0003-configure.ac-HELP2MAN-replace-by-false-when-cross-co.patch +POKE_AUTORECONF = YES + +POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline + +POKE_CONF_OPTS = \ + --disable-gui \ + --disable-libnbd \ + --disable-mi \ + --with-libreadline-prefix=$(STAGING_DIR) + +$(eval $(autotools-package)) From 5ee77341114fec8d0e35bf9069898713822449e9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 17 May 2021 17:56:27 +0200 Subject: [PATCH 035/158] package/poke: add optional json-c dependency From [1]: "The poke machine-interface uses a protocol to communicate with clients, which is based on JSON. poke uses the json-c library to parse and build JSON strings. If this library is not found, poke will build without machine-interface support." [1] https://git.savannah.nongnu.org/cgit/poke.git/tree/DEPENDENCIES?h=releases/poke-1.2#n55 Signed-off-by: Romain Naour Cc: Jose E. Marchesi Cc: Luca Saiu Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/poke/poke.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/poke/poke.mk b/package/poke/poke.mk index c0217b6fad..7c3c81d93c 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -19,7 +19,13 @@ POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline POKE_CONF_OPTS = \ --disable-gui \ --disable-libnbd \ - --disable-mi \ --with-libreadline-prefix=$(STAGING_DIR) +ifeq ($(BR2_PACKAGE_JSON_C),y) +POKE_DEPENDENCIES += json-c +POKE_CONF_OPTS += --enable-mi +else +POKE_CONF_OPTS += --disable-mi +endif + $(eval $(autotools-package)) From a4dc754178b7c24ed129e7e6f8effd555249c941 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 17 May 2021 17:56:28 +0200 Subject: [PATCH 036/158] package/poke: enable uClibc-ng support poke bundle gnulib that doesn't support the case where host_os='linux-uclibc'. When cross-compiling, the guessed answers are mostly wrong and gnulib will try to replace snprintf with rpl_snprintf. This lead to "undefined reference to `rpl_snprintf'" errors. Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/poke/Config.in | 6 ++---- package/poke/poke.mk | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/package/poke/Config.in b/package/poke/Config.in index eb2e33d5af..40e7a31bab 100644 --- a/package/poke/Config.in +++ b/package/poke/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_POKE depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc depends on BR2_USE_WCHAR # needs wctomb depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # gnulib select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # less select BR2_PACKAGE_BDWGC select BR2_PACKAGE_LESS # runtime @@ -24,7 +23,6 @@ config BR2_PACKAGE_POKE https://www.gnu.org/software/poke/ -comment "poke needs a glibc or musl toolchain w/ NPTL, wchar" +comment "poke needs a toolchain w/ NPTL, wchar" depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) \ - ||!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/poke/poke.mk b/package/poke/poke.mk index 7c3c81d93c..406acf15e0 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -16,6 +16,31 @@ POKE_AUTORECONF = YES POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline +# poke bundle gnulib that doesn't support the case where +# host_os='linux-uclibc'. When cross-compiling, the guessed +# answers are mostly wrong and gnulib will try to replace +# snprintf with rpl_snprintf. This lead to "undefined reference +# to `rpl_snprintf'" errors. +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +POKE_CONF_ENV = gl_cv_func_printf_positions=yes \ + gl_cv_func_snprintf_retval_c99=yes \ + gl_cv_func_printf_sizes_c99=yes \ + gl_cv_func_printf_infinite_long_double=yes \ + gl_cv_func_snprintf_retval_c99=yes \ + gl_cv_func_snprintf_truncation_c99=yes \ + gl_cv_func_snprintf_usable=yes \ + gl_cv_func_strerror_0_works=yes \ + gl_cv_header_working_stdint_h=yes \ + gl_cv_func_printf_infinite=yes \ + gl_cv_func_printf_flag_zero=yes \ + gl_cv_func_printf_enomem=yes \ + gl_cv_func_printf_directive_f=yes \ + gl_cv_func_printf_directive_a=yes \ + gl_cv_func_snprintf_directive_n=yes \ + gl_cv_func_vsnprintf_posix=yes \ + gl_cv_func_vsnprintf_zerosize_c99=yes +endif + POKE_CONF_OPTS = \ --disable-gui \ --disable-libnbd \ From 782d5632831c0af4b796f01e9e83ce2ea1b01629 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 18:14:04 +0300 Subject: [PATCH 037/158] package/libwpe: bump to version 1.10.0 Release notes: https://wpewebkit.org/release/libwpe-1.10.0.html The patch is removed, as it has been included upstream. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...ial-dependency-to-pass-EGL-module-fl.patch | 45 ------------------- package/libwpe/libwpe.hash | 8 ++-- package/libwpe/libwpe.mk | 2 +- 3 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch diff --git a/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch b/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch deleted file mode 100644 index e74ebe125e..0000000000 --- a/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 81bfedfa02fd864f3e4b295091d49c3eb20bb372 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Wed, 16 Sep 2020 00:01:37 +0300 -Subject: [PATCH] meson: Use a partial dependency to pass EGL module flags - -Make Meson try to always find an "egl" dependency, if found extract -the include directories and compiler flags from ir using a partial -dependency, otherwise check that at least EGL/eglplatform.h is -available when the pkg-config module is not found. - -Fixes #70 - -Signed-off-by: Adrian Perez de Castro -[Upstrem status: https://github.com/WebPlatformForEmbedded/libwpe/pull/71] - ---- - meson.build | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 5c88aed..a05f4ab 100644 ---- a/meson.build -+++ b/meson.build -@@ -57,8 +57,16 @@ dependencies = [ - ] - - cc = meson.get_compiler('c') --if not cc.has_header('EGL/eglplatform.h') -- dependencies += dependency('egl') -+egl_dep = dependency('egl', required: false) -+if egl_dep.found() -+ dependencies += egl_dep.partial_dependency( -+ compile_args: true, -+ includes: true, -+ ) -+else -+ assert(cc.has_header('EGL/eglplatform.h'), -+ 'Required heaer not found' -+ ) - endif - - if not cc.has_function('dlopen') --- -2.28.0 - diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 36cdf56664..66fd168dc3 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.8.0.tar.xz.sums -md5 328ea59dd8dee9107a49353536d00844 libwpe-1.8.0.tar.xz -sha1 3c893b1e8118a06f082d98373e279a8f8e33750d libwpe-1.8.0.tar.xz -sha256 a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2 libwpe-1.8.0.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.10.0.tar.xz.sums +md5 269ecb60d4ef80a0877d25a5828c8b82 libwpe-1.10.0.tar.xz +sha1 b3f48a48b0401da19deb60cb8f15f193dff799c1 libwpe-1.10.0.tar.xz +sha256 2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d libwpe-1.10.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index 5843e84d39..43dc201f54 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.8.0 +LIBWPE_VERSION = 1.10.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES From 994633108c62a11409c724b3c2b3f84f979fa9da Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 18:14:05 +0300 Subject: [PATCH 038/158] package/wpebackend-fdo: bump to version 1.9.92 Update to version 1.9.92 which, while even being a release candidate, is more stable than the 1.8.1 present in Buildroot. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.9.90.html https://wpewebkit.org/release/wpebackend-fdo-1.9.91.html https://wpewebkit.org/release/wpebackend-fdo-1.9.92.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 27e827ae2e..28d6c36938 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.8.3.tar.xz.sums -md5 980cbda207bf8f6263799c5062425737 wpebackend-fdo-1.8.3.tar.xz -sha1 c849043039d805448715be90cb5b3491f0a90c5f wpebackend-fdo-1.8.3.tar.xz -sha256 3d0b4282a1bd9e0664d7a20abe14e982f3285296ac62de56cae2a404b9d28b9e wpebackend-fdo-1.8.3.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.9.92.tar.xz.sums +md5 5c2f7fab6623e0964bc0d1b4a01719f0 wpebackend-fdo-1.9.92.tar.xz +sha1 d07fdfec0df53c57e3ed36a1efffecf30d1b418c wpebackend-fdo-1.9.92.tar.xz +sha256 fc5b388a91d6f2c22803e1a21a6759a314b4539e5169c6e272bfc953a05fbb85 wpebackend-fdo-1.9.92.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index 5f7e7acf30..4979dad8f9 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.8.3 +WPEBACKEND_FDO_VERSION = 1.9.92 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From d35e4a9744bf42f9549ad5b3bc2c24c0410ec99b Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 18:14:06 +0300 Subject: [PATCH 039/158] package/wpewebkit: bump to version 2.32.1 Update to a new major release which brings in improvements and a few new features. Release notes: https://wpewebkit.org/release/wpewebkit-2.32.0.html https://wpewebkit.org/release/wpewebkit-2.32.1.html None of the new features in WPE WebKit 2.32.x need additional dependencies. The existing patch for Musl compatibility is not needed anymore because a better solution has been accepted upstream and backported to be included in the 2.32.1 release. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- .../wpewebkit/0001-Fix-build-with-musl.patch | 79 ------------------- package/wpewebkit/wpewebkit.hash | 8 +- package/wpewebkit/wpewebkit.mk | 2 +- 3 files changed, 5 insertions(+), 84 deletions(-) delete mode 100644 package/wpewebkit/0001-Fix-build-with-musl.patch diff --git a/package/wpewebkit/0001-Fix-build-with-musl.patch b/package/wpewebkit/0001-Fix-build-with-musl.patch deleted file mode 100644 index 705c67c7f6..0000000000 --- a/package/wpewebkit/0001-Fix-build-with-musl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From cc3c27a7e997ef157ed469127f185a7bb6eb1feb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 27 May 2019 23:51:32 +0200 -Subject: [PATCH] Fix build with musl - -Signed-off-by: Khem Raj -[Retrieved (and slightly updated) from: -https://github.com/WebPlatformForEmbedded/meta-wpe/blob/master/recipes-wpe/wpewebkit/wpewebkit/0001-Fix-build-with-musl.patch] -Signed-off-by: Fabrice Fontaine ---- - Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- - Source/WTF/wtf/PlatformHave.h | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h -index bf0bdc7a51a..78d2ec81838 100644 ---- a/Source/JavaScriptCore/runtime/MachineContext.h -+++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) - - #if CPU(X86) - return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index e2a3388993f..95fe7c593cf 100644 ---- a/Source/WTF/wtf/PlatformHave.h -+++ b/Source/WTF/wtf/PlatformHave.h -@@ -683,7 +683,7 @@ - #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 - #endif - --#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) - #define HAVE_MACHINE_CONTEXT 1 - #endif - --- -2.20.1 - diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index c3aa8d4164..0c8c6dba6f 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.30.6.tar.xz.sums -md5 e35b31932ad3da6c06736d8f2d347072 wpewebkit-2.30.6.tar.xz -sha1 25a481e97e463df08fb2c0b0fa5d4299938670ac wpewebkit-2.30.6.tar.xz -sha256 893a3098226f116bbb38a665a3053c7d30e3c5dca786b954f9aa38f8c8581468 wpewebkit-2.30.6.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.32.1.tar.xz.sums +md5 1dd3f56b8eba16266166d757acb979fc wpewebkit-2.32.1.tar.xz +sha1 c5b3a48d886375a6982dd2dc5c9cc2f92f5a9690 wpewebkit-2.32.1.tar.xz +sha256 7b6b39a12ccf3f84da4cc6ac59e02fbe328f7476eaeb9c23de9b9288c2c2f39c wpewebkit-2.32.1.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b18ee2a37d..39424a26fa 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.30.6 +WPEWEBKIT_VERSION = 2.32.1 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From 61fb1a40e52183d0be0c14ccc77e613f7414f077 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 18:14:07 +0300 Subject: [PATCH 040/158] package/cog: bump to version 0.10.0 Release notes: https://wpewebkit.org/release/cog-0.10.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 2cafe8ca6e..566d30fa2a 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.8.1.tar.xz.sums -md5 21664fb04c9149dea6d68e13e6074276 cog-0.8.1.tar.xz -sha1 baabba7f0f6009c64ef0c4f7c5f807382cffef5d cog-0.8.1.tar.xz -sha256 b82e917eb764943b9859c631974f8f0e748b79ae87bb7a944f46c818740e0208 cog-0.8.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.10.0.tar.xz.sums +md5 1b0407b6163a3a01afdfc0fb454a7570 cog-0.10.0.tar.xz +sha1 911816c00a2b08f4cfd388b1d2e176835c9b4e9e cog-0.10.0.tar.xz +sha256 2c72369c636ca4684370adad1344071b23c9ee2c851eb7d738fa2e1d7092031f cog-0.10.0.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 86bdf935d2..d373e6e1b6 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.8.1 +COG_VERSION = 0.10.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From 7750fe1ee7f0d232847daeb04c99f59675dbdf20 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 18 May 2021 17:36:28 +0200 Subject: [PATCH 041/158] package/kodi-pvr-mediaportal-tvserver: bump version to 8.2.0-Matrix Changelog: https://github.com/kodi-pvr/pvr.mediaportal.tvserver/blob/Matrix/pvr.mediaportal.tvserver/changelog.txt Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-pvr-mediaportal-tvserver.hash | 2 +- .../kodi-pvr-mediaportal-tvserver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 83ac680914..ca526f40a0 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cea87ccdceee834c96d6b6887b78213ccf79890fec97436cbef17c57b9cdac15 kodi-pvr-mediaportal-tvserver-8.1.2-Matrix.tar.gz +sha256 0109daa45d7b6450954b40d0b09dbef28818c551e9f0fea9943cfd06f0a7ec40 kodi-pvr-mediaportal-tvserver-8.2.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 02b24ef271..50a9147a9d 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 8.1.2-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 8.2.0-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md From d0cb51333c47690f7a6a3bda015e99ff0646bcdd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 18 May 2021 17:38:32 +0200 Subject: [PATCH 042/158] package/kodi-inputstream-adaptive: bump version to 2.6.15-Matrix Changelog: https://github.com/xbmc/inputstream.adaptive/blob/Matrix/inputstream.adaptive/addon.xml.in#L22 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 2626968f1b..12e9f20904 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f1756932e8cc602ce66c5db3bc1d44a442c01197c193561ca9248a405bd8bd86 kodi-inputstream-adaptive-2.6.14-Matrix.tar.gz +sha256 179b337c397ff484f25a936f8c50114a112d5107f6d3cf41b4e9fb92507525fd kodi-inputstream-adaptive-2.6.15-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index b72241ab39..6176d7bff0 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.14-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.15-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL From 7657250808d8169af2ef3c585213645bec1c70ed Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 16:54:19 +0300 Subject: [PATCH 043/158] package/wlroots: bump to version 0.13.0 Update wlroots to version 0.13.0. This is a release which changes API/ABI, applications which use wlroots need to be rebuilt. Currently in Buildroot there is only cage, to be updated by a follow-up patch of the series. Additionally, remove usage of the xcb-icccm build option, which is no longer available and update the dependencies needed by the X11 support. Note that the dependencies neded by the X11 backend are a superset of the ones needed for XWayland support, so we can make toggle both Meson options at once. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wlroots/Config.in | 3 +++ package/wlroots/wlroots.hash | 4 ++-- package/wlroots/wlroots.mk | 22 ++++------------------ 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 694aa79de4..41f8986772 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -33,6 +33,9 @@ if BR2_PACKAGE_WLROOTS config BR2_PACKAGE_WLROOTS_X11 bool "X11 backend" depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_XLIB_LIBX11 help Support Wayland sessions nested inside a X11 window diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index 2fab9b30b4..024ea93cae 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,5 @@ -# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.12.0/wlroots-0.12.0.tar.gz.sig -sha256 c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb wlroots-0.12.0.tar.gz +# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.13.0/wlroots-0.13.0.tar.gz.sig +sha256 f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3 wlroots-0.13.0.tar.gz # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 0160b1aedb..a20f6683a9 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.12.0 +WLROOTS_VERSION = 0.13.0 WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE @@ -40,24 +40,10 @@ WLROOTS_CONF_OPTS += -Dlogind=disabled endif ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) -WLROOTS_CONF_OPTS += -Dx11-backend=enabled -WLROOTS_DEPENDENCIES += xlib_libX11 +WLROOTS_CONF_OPTS += -Dx11-backend=enabled -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 else -WLROOTS_CONF_OPTS += -Dx11-backend=disabled -endif - -ifeq ($(BR2_PACKAGE_LIBXCB),y) -WLROOTS_CONF_OPTS += -Dxwayland=enabled -WLROOTS_DEPENDENCIES += libxcb -else -WLROOTS_CONF_OPTS += -Dxwayland=disabled -endif - -ifeq ($(BR2_PACKAGE_XCB_UTIL_WM),y) -WLROOTS_CONF_OPTS += -Dxcb-icccm=enabled -WLROOTS_DEPENDENCIES += xcb-util-wm -else -WLROOTS_CONF_OPTS += -Dxcb-icccm=disabled +WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled endif $(eval $(meson-package)) From daae31149017cbf8b03634cfc56da132f7e1ad83 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 16:54:20 +0300 Subject: [PATCH 044/158] package/seatd: new package Introduce a seatd package, which can be used by wlroots 0.12.0 and newer. The package includes both a library (always built) and an optional seat management daemon. The library can use systemd-logind, the seatd daemon, or a simple builtin in-process mode. Build options are introduced for the daemon and the built-in mode, as to allow selecting the built-in mode as default when both the daemon and systemd-logind are not being built. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + ...pport-building-builtin-without-seatd.patch | 37 +++++++++++++++++++ package/seatd/Config.in | 22 +++++++++++ package/seatd/seatd.hash | 5 +++ package/seatd/seatd.mk | 37 +++++++++++++++++++ 5 files changed, 102 insertions(+) create mode 100644 package/seatd/0001-meson-Support-building-builtin-without-seatd.patch create mode 100644 package/seatd/Config.in create mode 100644 package/seatd/seatd.hash create mode 100644 package/seatd/seatd.mk diff --git a/package/Config.in b/package/Config.in index e4a6dc292d..6e10988e51 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2491,6 +2491,7 @@ menu "System tools" source "package/scrub/Config.in" source "package/scrypt/Config.in" source "package/sdbusplus/Config.in" + source "package/seatd/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" diff --git a/package/seatd/0001-meson-Support-building-builtin-without-seatd.patch b/package/seatd/0001-meson-Support-building-builtin-without-seatd.patch new file mode 100644 index 0000000000..fcaa355dc4 --- /dev/null +++ b/package/seatd/0001-meson-Support-building-builtin-without-seatd.patch @@ -0,0 +1,37 @@ +From 11bf7d5d11424749d549239540e5db06b8754bb5 Mon Sep 17 00:00:00 2001 +From: Kenny Levinsen +Date: Sun, 25 Apr 2021 20:16:19 +0200 +Subject: [PATCH] meson: Support building builtin without seatd + +The builtin backend relies on the seatd backend implementation. When +builtin was enabled without seatd, compilation would fail due to the +implementation not being included. + +Include the implementation if either seatd or builtin is enabled. + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: backport [with adaptations] +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index ff56845..8cb4fc6 100644 +--- a/meson.build ++++ b/meson.build +@@ -105,8 +105,11 @@ server_files = [ + 'seatd/server.c', + ] + +-if get_option('seatd').enabled() ++if get_option('seatd').enabled() or get_option('builtin').enabled() + private_files += 'libseat/backend/seatd.c' ++endif ++ ++if get_option('seatd').enabled() + add_project_arguments('-DSEATD_ENABLED=1', language: 'c') + endif + +-- +2.31.1 + diff --git a/package/seatd/Config.in b/package/seatd/Config.in new file mode 100644 index 0000000000..2c2efcb04e --- /dev/null +++ b/package/seatd/Config.in @@ -0,0 +1,22 @@ +menuconfig BR2_PACKAGE_SEATD + bool "seatd" + select BR2_PACKAGE_SEATD_BUILTIN \ + if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON + help + Seat management daemon and support library. + + https://git.sr.ht/~kennylevinsen/seatd + +if BR2_PACKAGE_SEATD + +config BR2_PACKAGE_SEATD_BUILTIN + bool "builtin backend" + help + Builtin in-process seatd implementation inside libseat. + +config BR2_PACKAGE_SEATD_DAEMON + bool "seatd daemon" + help + Build the seatd daemon and support for it inside libseat. + +endif diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash new file mode 100644 index 0000000000..342079e958 --- /dev/null +++ b/package/seatd/seatd.hash @@ -0,0 +1,5 @@ +# Calculated locally +sha256 274b56324fc81ca6002bc1cdd387668dee34a6e1063e5f3896805c3770948988 0.5.0.tar.gz + +# License files +sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk new file mode 100644 index 0000000000..2e90270555 --- /dev/null +++ b/package/seatd/seatd.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# seatd +# +################################################################################ + +SEATD_VERSION = 0.5.0 +SEATD_SOURCE = $(SEATD_VERSION).tar.gz +SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive +SEATD_LICENSE = MIT +SEATD_LICENSE_FILES = LICENSE +SEATD_INSTALL_STAGING = YES + +SEATD_CONF_OPTS += \ + -Dman-pages=disabled \ + -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) +SEATD_CONF_OPTS += -Dlogind=enabled +SEATD_DEPENDENCIES += systemd +else +SEATD_CONF_OPTS += -Dlogind=disabled +endif + +ifeq ($(BR2_PACKAGE_SEATD_BUILTIN),y) +SEATD_CONF_OPTS += -Dbuiltin=enabled +else +SEATD_CONF_OPTS += -Dbuiltin=disabled +endif + +ifeq ($(BR2_PACKAGE_SEATD_DAEMON),y) +SEATD_CONF_OPTS += -Dseatd=enabled -Dserver=enabled +else +SEATD_CONF_OPTS += -Dseatd=disabled -Dserver=disabled +endif + +$(eval $(meson-package)) From 60cee128c7282353d11c538a26abad709f3d3701 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 16:54:21 +0300 Subject: [PATCH 045/158] package/seatd: install init scripts Add commands to the seatd package to install the systemd unit included in the source tarball and a SysV init script, and ensure that the "video" group gets created. Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: - model the init script after package/busybox/S01syslogd ] Signed-off-by: Yann E. MORIN --- package/seatd/S70seatd | 46 ++++++++++++++++++++++++++++++++++++++++++ package/seatd/seatd.mk | 15 ++++++++++++++ 2 files changed, 61 insertions(+) create mode 100755 package/seatd/S70seatd diff --git a/package/seatd/S70seatd b/package/seatd/S70seatd new file mode 100755 index 0000000000..32bdc40fbb --- /dev/null +++ b/package/seatd/S70seatd @@ -0,0 +1,46 @@ +#! /bin/sh + +DAEMON="seatd" +DAEMON_EXE="/usr/bin/${DAEMON}" +PIDFILE="/run/${DAEMON}.pid" + +start() { + printf 'Starting %s: ' "${DAEMON}" + start-stop-daemon -S -x "${DAEMON_EXE}" -p "${PIDFILE}" -m -b -- -g video + status=$? + if [ "$status" -eq 0 ]; then + echo OK + else + echo FAIL + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "${DAEMON}" + start-stop-daemon -K -x "${DAEMON_EXE}" -p "${PIDFILE}" + status=$? + if [ "$status" -eq 0 ]; then + echo OK + else + echo FAIL + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "${1}" in + start|stop|restart) + "${1}";; + reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 2e90270555..2abcefbfaa 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -30,6 +30,21 @@ endif ifeq ($(BR2_PACKAGE_SEATD_DAEMON),y) SEATD_CONF_OPTS += -Dseatd=enabled -Dserver=enabled + +define SEATD_USERS + - - video -1 - - - - - +endef + +define SEATD_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D $(SEATD_PKGDIR)/S70seatd \ + $(TARGET_DIR)/etc/init.d/S70seatd +endef + +define SEATD_INSTALL_INIT_SYSTEMD + $(INSTALL) -m 0644 -D $(@D)/contrib/systemd/seatd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/seatd.service +endef + else SEATD_CONF_OPTS += -Dseatd=disabled -Dserver=disabled endif From 22eebe4cde772754048aeabc629d676c9fd0099a Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 16:54:22 +0300 Subject: [PATCH 046/158] package/wlroots: use libseat when available Enable using libseat for seat management when possible. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wlroots/wlroots.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index a20f6683a9..38ddba743d 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -22,7 +22,7 @@ WLROOTS_DEPENDENCIES = \ wayland \ wayland-protocols -WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Dlibseat=disabled +WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled ifeq ($(BR2_PACKAGE_FFMPEG),y) WLROOTS_DEPENDENCIES += ffmpeg @@ -46,4 +46,11 @@ else WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled endif +ifeq ($(BR2_PACKAGE_SEATD_LIBSEAT),y) +WLROOTS_CONF_OPTS += -Dlibseat=enabled +WLROOTS_DEPENDENCIES += seatd +else +WLROOTS_CONF_OPTS += -Dlibseat=disabled +endif + $(eval $(meson-package)) From 4dc6bcd180c892442221cc330b365da6e0efa399 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 16:54:23 +0300 Subject: [PATCH 047/158] package/cage: bump to version 0.1.3 Update to version 0.1.3, which is a matenance release which does not add any new features but can be built against wlroots 0.13.0. A new build option to toggle man pages is set to always disabled. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/cage/cage.hash | 2 +- package/cage/cage.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/cage/cage.hash b/package/cage/cage.hash index 5cae952d72..6e312bbf5f 100644 --- a/package/cage/cage.hash +++ b/package/cage/cage.hash @@ -1,5 +1,5 @@ # Generated locally -sha256 38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac cage-0.1.2.1.tar.gz +sha256 c28aa8230f937c89b564967748451c1eb15d8633a71a1ed6e22d532afa15462e cage-0.1.3.tar.gz # Hashes for license files: sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE diff --git a/package/cage/cage.mk b/package/cage/cage.mk index 9fc01d36c1..0950c70474 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -4,16 +4,17 @@ # ################################################################################ -CAGE_VERSION = 0.1.2.1 +CAGE_VERSION = 0.1.3 CAGE_SITE = https://github.com/Hjdskes/cage/releases/download/v$(CAGE_VERSION) CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots +CAGE_CONF_OPTS = -Dman-pages=disabled ifeq ($(BR2_PACKAGE_XORG7),y) -CAGE_CONF_OPTS = -Dxwayland=true +CAGE_CONF_OPTS += -Dxwayland=true else -CAGE_CONF_OPTS = -Dxwayland=false +CAGE_CONF_OPTS += -Dxwayland=false endif $(eval $(meson-package)) From 4cf6c02fb0b8b216e446c1230cb8f1eb61763211 Mon Sep 17 00:00:00 2001 From: Urja Rannikko Date: Tue, 27 Apr 2021 12:13:25 +0300 Subject: [PATCH 048/158] package/links: enable building graphics mode with only fb driver The "fb" framebuffer driver needs GPM (mouse support) to compile, but not DirectFB or Xorg. The .mk file already has an optional dependency on GPM, so it doesn't need to be added there. Also added a Kconfig comment for easier discovery of the GPM requirement. Signed-off-by: Urja Rannikko Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/links/Config.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/links/Config.in b/package/links/Config.in index 713f53da4e..cc2389c9f1 100644 --- a/package/links/Config.in +++ b/package/links/Config.in @@ -10,11 +10,15 @@ if BR2_PACKAGE_LINKS config BR2_PACKAGE_LINKS_GRAPHICS bool "use graphics" - depends on BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_GPM || BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBPNG help - Enable graphics output for DirectFB or X11. + Enable graphics output for framebuffer, DirectFB or X11. + Framebuffer output requires GPM (console mouse). Otherwise links will be text-mode only. +comment "links graphics needs GPM, DirectFB or X11" + depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_DIRECTFB && !BR2_PACKAGE_XORG7 + endif From 8dd9bbda3541043f64f02256fbd43624b0b3d278 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 18 May 2021 10:05:19 +0200 Subject: [PATCH 049/158] package/openblas: install static library even if BR2_STATIC_LIBS is not set openblas has options 'NO_STATIC' and 'NO_SHARED' to steer the installation of libopenblas.a and libopenblas.so. But this does not impact anything in the build process, other than copying the respective file to the output directory. As openblas is very large (e.g. 3MB on ARM) but applications may only use a small part of it, such applications may want to link statically with openblas, even though the global BR2_STATIC_LIBS is not set and not desired. One approach would have been to introduce options BR2_PACKAGE_OPENBLAS_BUILD_SHARED_LIB and BR2_PACKAGE_OPENBLAS_BUILD_STATIC_LIB which could be freely selected regardless of BR2_STATIC_LIBS / BR2_SHARED_LIBS. But since the installation of a static library does not have any negative impact except for some disk space on the host system (.a files are removed from the target in target-finalize anyway), change the installation rules to install the static library unconditionally. NO_SHARED is still passed for static-libs-only systems, because the dynamic library would unnecessarily take up target disk space for such systems. Users that only need the static library would still need to remove the shared library from a post-build script to actually save space. Signed-off-by: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/openblas/openblas.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 21d05cf30d..60b9d9b15b 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -42,10 +42,10 @@ endif OPENBLAS_MAKE_OPTS += USE_OPENMP=0 # Static-only/Shared-only toggle +# Note: static library is always generated so that applications can link +# statically for size reduction, even if BR2_STATIC_LIBS is not set. ifeq ($(BR2_STATIC_LIBS),y) OPENBLAS_MAKE_OPTS += NO_SHARED=1 -else ifeq ($(BR2_SHARED_LIBS),y) -OPENBLAS_MAKE_OPTS += NO_STATIC=1 endif # binutils version <= 2.23.2 has a bug From d51736f47296e3681cdb610765c73424272d42db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 May 2021 20:04:42 +0200 Subject: [PATCH 050/158] package/mesa3d: bump version to 21.1.0 Removed kmsro-related options, these are now handled by the build system: https://cgit.freedesktop.org/mesa/mesa/commit/?id=70813c1c13b99cb029c8fa3537163650bdd17b6d Updated license hash due to typo fix in upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/?id=2f42c21221cf89f738225e3ac2aa2e85953c1dc1 Rebased patch 0003 due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/?id=a9618e7c4214e29c97009870ad8904623746ffe9 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...tion-to-disable-optional-neon-suppor.patch | 6 ++--- package/mesa3d/Config.in | 23 +------------------ package/mesa3d/mesa3d.hash | 8 +++---- package/mesa3d/mesa3d.mk | 3 +-- 5 files changed, 10 insertions(+), 32 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 9c0079c3f9..308c6701ab 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.0.3 +MESA3D_HEADERS_VERSION = 21.1.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index 39e402361f..bb5ef00a9f 100644 --- a/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -10,7 +10,7 @@ to force disabling it at compile time. [Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114] Signed-off-by: Peter Seiderer Signed-off-by: Bernd Kuhls -[rebased for 20.2.0 & 20.3.0] +[rebased for 20.2.0, 20.3.0 & 21.1.0] --- meson_options.txt | 7 +++++++ src/gallium/drivers/vc4/meson.build | 4 ++-- @@ -67,7 +67,7 @@ index 66767e7f1f8..7446f1c3d0c 100644 { -#ifdef USE_ARM_ASM +#ifdef VC4_TILING_LT_NEON - if (util_cpu_caps.has_neon) { + if (util_get_cpu_caps()->has_neon) { vc4_load_lt_image_neon(dst, dst_stride, src, src_stride, cpp, box); @@ -105,7 +105,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride, @@ -76,7 +76,7 @@ index 66767e7f1f8..7446f1c3d0c 100644 { -#ifdef USE_ARM_ASM +#ifdef VC4_TILING_LT_NEON - if (util_cpu_caps.has_neon) { + if (util_get_cpu_caps()->has_neon) { vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, cpp, box); -- diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 0a9e95a799..d1b3af2054 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -81,11 +81,6 @@ config BR2_PACKAGE_MESA3D_DRIVER config BR2_PACKAGE_MESA3D_NEEDS_XA bool -# Quote from mesa3d meson.build: "kmsro driver requires one or more -# renderonly drivers (vc4, etnaviv, freedreno)". -config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - bool - # OpenGL GLX and Gallium VDPAU both needs X11 config BR2_PACKAGE_MESA3D_NEEDS_X11 bool @@ -105,7 +100,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help Mesa driver for Vivante GPUs. @@ -119,7 +113,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO # for arm/aarch64. select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_FREEDRENO - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help Mesa driver for Freedreno GPUs. @@ -143,20 +136,9 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS help Mesa driver for iris-based Intel GPUs. -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO - bool "Gallium KMSRO driver" - depends on BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - help - Support various sorts of KMS displays with the - renderonly layer used to attach a GPU. - -comment "Gallium KMSRO needs one or more renderonly drivers" - depends on !BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help Mesa driver for ARM Mali Utgard GPUs. @@ -172,7 +154,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help Mesa driver for ARM Mali Midgard and Bifrost GPUs. @@ -260,11 +241,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D bool "Gallium v3d driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL help - Driver for Broadcom VC6 (rpi4) GPUs (needs kmsro and vc4). + Driver for Broadcom VC6 (rpi4) GPUs (needs vc4). It requires a kernel 4.18+ with DRM V3D support enabled: @@ -275,7 +255,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on BR2_arm || BR2_aarch64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL help diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 6a70e8a1b2..b9eace0b42 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-April/000627.html -sha256 565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b mesa-21.0.3.tar.xz -sha512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f mesa-21.0.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-May/000630.html +sha256 0128f10e22970d3aed3d1034003731f94623015cd9797c07151417649c1b1ff8 mesa-21.1.0.tar.xz +sha512 9d7617a6d5dd8ec1d93fdda8fe8b2f745695c02bc381d685f1257f7e7f08d5c06f3c57ae71c5f2dfaabb1742b8a88f47294a369bd3ac553f29835f24ce5dd350 mesa-21.1.0.tar.xz # License -sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst +sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b18faeb2ce..1425cb7217 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.0.3 +MESA3D_VERSION = 21.1.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos @@ -87,7 +87,6 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedreno MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO) += kmsro MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost From daf7104a41d05146932efa4b6d81f4e3e4eb3277 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 18 May 2021 17:24:52 +0200 Subject: [PATCH 051/158] package/x11r7/xlib_libXfixes: bump version to 6.0.0 Release notes: https://lists.x.org/archives/xorg-announce/2021-May/003086.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xlib_libXfixes/xlib_libXfixes.hash | 5 +++-- package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index d655be4f71..f40c522903 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,5 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002722.html -sha256 de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6 libXfixes-5.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-May/003086.html +sha256 a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c libXfixes-6.0.0.tar.bz2 +sha512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d libXfixes-6.0.0.tar.bz2 # Locally calculated sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index f563ba34ec..a149ba9fab 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFIXES_VERSION = 5.0.3 +XLIB_LIBXFIXES_VERSION = 6.0.0 XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFIXES_LICENSE = MIT From 6b86c9335fc3ff381878156c6243454d4b688df9 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 7 May 2021 10:01:01 -0700 Subject: [PATCH 052/158] package/qemu: bump version to 6.0.0 Other changes: - Drop patch 0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch as it is part of 6.0.0. - Rename 0004-meson-add-tests-option.patch to 0003-meson-add-tests-option.patch and refresh it for 6.0.0 Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...age-of-mcontext-structure-on-ARM-uCl.patch | 2 +- .../0002-Fix-build-with-64-bits-time_t.patch | 4 +- ...t-libusb.c-fix-build-with-kernel-5.0.patch | 43 --------------- ...atch => 0003-meson-add-tests-option.patch} | 54 ++++++++++--------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 6 files changed, 33 insertions(+), 74 deletions(-) delete mode 100644 package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch rename package/qemu/{0004-meson-add-tests-option.patch => 0003-meson-add-tests-option.patch} (59%) diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch index 841708995e..6db4e8bc92 100644 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch @@ -21,7 +21,7 @@ diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 4ebe25461a..0496674fbd 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c -@@ -536,7 +536,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, +@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, #if defined(__NetBSD__) pc = uc->uc_mcontext.__gregs[_REG_R15]; diff --git a/package/qemu/0002-Fix-build-with-64-bits-time_t.patch b/package/qemu/0002-Fix-build-with-64-bits-time_t.patch index 7a72047136..934c0e28fd 100644 --- a/package/qemu/0002-Fix-build-with-64-bits-time_t.patch +++ b/package/qemu/0002-Fix-build-with-64-bits-time_t.patch @@ -29,7 +29,7 @@ diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c index 6020c6f33a..e688c3e0a9 100644 --- a/contrib/vhost-user-input/main.c +++ b/contrib/vhost-user-input/main.c -@@ -17,6 +17,11 @@ +@@ -15,6 +15,11 @@ #include "standard-headers/linux/virtio_input.h" #include "qapi/error.h" @@ -41,7 +41,7 @@ index 6020c6f33a..e688c3e0a9 100644 enum { VHOST_USER_INPUT_MAX_QUEUES = 2, }; -@@ -115,13 +120,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data) +@@ -113,13 +118,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data) static void vi_handle_status(VuInput *vi, virtio_input_event *event) { struct input_event evdev; diff --git a/package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch b/package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch deleted file mode 100644 index 2510dc9cd4..0000000000 --- a/package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ecd615dfe328e3ab551cea3ba243d908936ed382 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 13 Dec 2020 21:27:31 +0100 -Subject: [PATCH] hw/usb/host-libusb.c: fix build with kernel < 5.0 - -USBDEVFS_GET_SPEED is used since version 5.2.0 and -https://gitlab.com/qemu-project/qemu/-/commit/202d69a715a4b1824dcd7ec1683d027ed2bae6d3 -resulting in the following build failure with kernel < 5.0: - -../hw/usb/host-libusb.c: In function 'usb_host_open': -../hw/usb/host-libusb.c:953:32: error: 'USBDEVFS_GET_SPEED' undeclared (first use in this function); did you mean 'USBDEVFS_GETDRIVER'? - int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL); - ^~~~~~~~~~~~~~~~~~ - USBDEVFS_GETDRIVER - -A tentative was made to fix this build failure with -https://gitlab.com/qemu-project/qemu/-/commit/4969e697c15ac536d5c0700381d5d026ef7f0588 - -However, the assumtion that distros with old kernels also have old -libusb is just wrong so also add a check for defined(USBDEVFS_GET_SPEED) - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to qemu-devel@nongnu.org] ---- - hw/usb/host-libusb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c -index b950501d10..0343300d3e 100644 ---- a/hw/usb/host-libusb.c -+++ b/hw/usb/host-libusb.c -@@ -941,7 +941,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) - usb_host_ep_update(s); - - libusb_speed = libusb_get_device_speed(dev); --#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) -+#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) && defined(USBDEVFS_GET_SPEED) - if (hostfd && libusb_speed == 0) { - /* - * Workaround libusb bug: libusb_get_device_speed() does not --- -2.29.2 - diff --git a/package/qemu/0004-meson-add-tests-option.patch b/package/qemu/0003-meson-add-tests-option.patch similarity index 59% rename from package/qemu/0004-meson-add-tests-option.patch rename to package/qemu/0003-meson-add-tests-option.patch index aff8a0f9fc..b52a7aaf2f 100644 --- a/package/qemu/0004-meson-add-tests-option.patch +++ b/package/qemu/0003-meson-add-tests-option.patch @@ -13,6 +13,8 @@ Fixes: http://autobuild.buildroot.net/results/53f5d8baa994d599b9da013ee643b82353366ec3/build-end.log Signed-off-by: Romain Naour +Signed-off-by: Adam Duskett +Refresh for 6.0.0 --- configure | 7 +++++++ meson.build | 5 ++++- @@ -23,15 +25,15 @@ diff --git a/configure b/configure index 18c26e0389..7cceae4418 100755 --- a/configure +++ b/configure -@@ -449,6 +449,7 @@ meson="" +@@ -460,6 +460,7 @@ meson="" ninja="" skip_meson=no - gettext="" + gettext="auto" +tests="auto" - - bogus_os="no" - malloc_trim="auto" -@@ -1525,6 +1526,10 @@ for opt do + fuse="auto" + fuse_lseek="auto" + multiprocess="auto" +@@ -1549,6 +1550,10 @@ for opt do ;; --disable-libdaxctl) libdaxctl=no ;; @@ -39,30 +41,30 @@ index 18c26e0389..7cceae4418 100755 + ;; + --enable-tests) tests="enabled" + ;; - *) - echo "ERROR: unknown option $opt" - echo "Try '$0 --help' for more information" -@@ -1850,6 +1855,7 @@ disabled with --disable-FEATURE, default is enabled if available: + --enable-fuse) fuse="enabled" + ;; + --disable-fuse) fuse="disabled" +@@ -1915,6 +1920,7 @@ disabled with --disable-FEATURE, default is enabled if available xkbcommon xkbcommon support rng-none dummy RNG, avoid using /dev/(u)random and getrandom() libdaxctl libdaxctl support + tests build tests - - NOTE: The object files are built at the place where configure is launched - EOF -@@ -7014,6 +7020,7 @@ NINJA=$ninja $meson setup \ - -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ + fuse FUSE block device export + fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports + multiprocess Out of process device emulation support +@@ -6422,6 +6428,7 @@ NINJA=$ninja $meson setup \ + -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ + -Dattr=$attr -Ddefault_devices=$default_devices \ -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \ - -Dvhost_user_blk_server=$vhost_user_blk_server \ + -Dtests=$tests \ - $cross_arg \ - "$PWD" "$source_path" - + -Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \ + -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \ + $(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \ diff --git a/meson.build b/meson.build index e3386196ba..7f4efdc347 100644 --- a/meson.build +++ b/meson.build -@@ -1944,7 +1944,10 @@ subdir('scripts') +@@ -2381,7 +2381,10 @@ subdir('scripts') subdir('tools') subdir('pc-bios') subdir('docs') @@ -71,22 +73,22 @@ index e3386196ba..7f4efdc347 100644 + subdir('tests') +endif + - if 'CONFIG_GTK' in config_host + if gtk.found() subdir('po') endif diff --git a/meson_options.txt b/meson_options.txt index f6f64785fe..81bffbfe87 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -66,6 +66,8 @@ option('virtiofsd', type: 'feature', value: 'auto', - description: 'build virtiofs daemon (virtiofsd)') +@@ -111,6 +111,8 @@ option('fuse_lseek', type : 'feature', value : 'auto', + option('vhost_user_blk_server', type: 'feature', value: 'auto', description: 'build vhost-user-blk server') +option('tests', type : 'feature', value : 'auto', + description: 'Tests build support') - - option('capstone', type: 'combo', value: 'auto', - choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], + option('virtfs', type: 'feature', value: 'auto', + description: 'virtio-9p support') + option('virtiofsd', type: 'feature', value: 'auto', -- 2.29.2 diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 7d9936adb4..5e873791b8 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc qemu-5.2.0.tar.xz +sha256 87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9 qemu-6.0.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index b552ea139e..e0f722cf42 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 5.2.0 +QEMU_VERSION = 6.0.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c From 330bbd68923269f0adacec3cfa39ae30a78ca705 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 7 May 2021 10:01:02 -0700 Subject: [PATCH 053/158] package/gobject-introspection/Config.in: Allow RISCV_32 builds Qemu 6.0.0 no longer segfaults when running qemu-riscv32. As such, it's now possible to allow riscv32 to compile gobject-introspection. This partially reverts commit c94a212390e33c122cf9db4c772caf8bf3804565. The symbol BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS is kept, even though it is now equivalent to BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS, because it's likely that architecture dependencies will pop up again in the future. The configuration of a previously failing autobuilder [1] now passes. [1] http://autobuild.buildroot.org/results/668397b1df42297505e6fc8353c4752290a5628d Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gobject-introspection/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in index 57c569704e..bacf44363c 100644 --- a/package/gobject-introspection/Config.in +++ b/package/gobject-introspection/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS - depends on !BR2_RISCV_32 # qemu-riscv32 segfaults in qemu-5.0.0 config BR2_PACKAGE_GOBJECT_INTROSPECTION bool "gobject-introspection" From a699a667bd64a52ad3c30210c4756953232cc9cc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 7 May 2021 19:07:01 +0200 Subject: [PATCH 054/158] package/numactl: add -latomic to numa.pc Instead of passing -latomic through LDFLAGS as done in commit 4ed540ddf59bec4b389be44d7f42820d2466904f, properly check for it in configure.ac and add it to numa.pc or numactl users won't be able to get it Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-link-with-latomic-if-needed.patch | 52 +++++++++++++++++++ package/numactl/numactl.mk | 4 -- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 package/numactl/0002-link-with-latomic-if-needed.patch diff --git a/package/numactl/0002-link-with-latomic-if-needed.patch b/package/numactl/0002-link-with-latomic-if-needed.patch new file mode 100644 index 0000000000..6dff0cb233 --- /dev/null +++ b/package/numactl/0002-link-with-latomic-if-needed.patch @@ -0,0 +1,52 @@ +From e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 6 May 2021 23:08:36 +0200 +Subject: [PATCH] link with -latomic if needed + +numactl unconditionally uses __atomic_fetch_and but some architectures +(e.g. sparc) needs to link with -latomic to be able to use it. So check +if -latomic is needed and update numa.pc accordingly + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/numactl/numactl/commit/e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9] +--- + Makefile.am | 1 + + configure.ac | 2 ++ + numa.pc.in | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 44d0d76..34f6815 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -151,6 +151,7 @@ SED_PROCESS = \ + -e 's,@exec_prefix\@,$(exec_prefix),g' \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@includedir\@,$(includedir),g' \ ++ -e 's,@LIBS\@,$(LIBS),g' \ + < $< > $@ || rm $@ + + %.pc: %.pc.in Makefile +diff --git a/configure.ac b/configure.ac +index 659a765..e3b0eb3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,6 +24,8 @@ AM_CONDITIONAL([HAVE_TREE_VECTORIZE], [test x"${tree_vectorize}" = x"true"]) + + AC_CONFIG_FILES([Makefile]) + ++AC_SEARCH_LIBS([__atomic_fetch_and_1], [atomic]) ++ + # GCC tries to be "helpful" and only issue a warning for unrecognized + # attributes. So we compile the test with Werror, so that if the + # attribute is not recognized the compilation fails +diff --git a/numa.pc.in b/numa.pc.in +index 8a0f202..cc04d50 100644 +--- a/numa.pc.in ++++ b/numa.pc.in +@@ -8,3 +8,4 @@ Description: NUMA policy library + Version: @VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lnuma ++Libs.Private: @LIBS@ diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index 3364f6c5c3..cf9c759693 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -12,8 +12,4 @@ NUMACTL_INSTALL_STAGING = YES NUMACTL_AUTORECONF = YES NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -NUMACTL_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" -endif - $(eval $(autotools-package)) From bf149cd90351d9e4357830c994daf7f72f6cf7ee Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 29 Apr 2021 21:07:09 +0200 Subject: [PATCH 055/158] package/imlib2: bump version to 1.7.1 Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/imlib2/imlib2.hash | 8 ++++---- package/imlib2/imlib2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/imlib2/imlib2.hash b/package/imlib2/imlib2.hash index 68f6c91db7..3df3deffec 100644 --- a/package/imlib2/imlib2.hash +++ b/package/imlib2/imlib2.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.6.1/ -md5 7b3fbcb974b48822b32b326c6a47764b imlib2-1.6.1.tar.bz2 -sha1 3b5f850e83cbb7481e33061348fb9c7a555c8c60 imlib2-1.6.1.tar.bz2 +# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.7.1/ +md5 98569de9b10bcb6fd5d13e4d331ddd81 imlib2-1.7.1.tar.bz2 +sha1 092c66ae0180798a4036e68c68d7f316de192e36 imlib2-1.7.1.tar.bz2 # Locally computed -sha256 4d393a77e13da883c8ee2da3b029da3570210fe37d000c9ac33d9fce751b166d imlib2-1.6.1.tar.bz2 +sha256 033a6a639dcbc8e03f65ff05e57068e7346d50ee2f2fff304bb9095a1b2bc407 imlib2-1.7.1.tar.bz2 sha256 fb70339dd33a77b6213c7ae067fccf93d04af44ff3f937c61f8863f7970e73f6 COPYING sha256 8c9a2e92ed4937e2d30c2ea95439c36ed3002fc47e34efee43455a460fee8ef5 COPYING-PLAIN diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk index a88558575d..6d973827dc 100644 --- a/package/imlib2/imlib2.mk +++ b/package/imlib2/imlib2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMLIB2_VERSION = 1.6.1 +IMLIB2_VERSION = 1.7.1 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) IMLIB2_LICENSE = Imlib2 From e18ebde613d297e470f9a219a32bf535dccc2013 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 29 Apr 2021 21:21:03 +0200 Subject: [PATCH 056/158] package/ltp-testsuite: enable ebizzy ebizzy has been fixed in 20200930 (commit 967612c45). Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/ltp-testsuite/ltp-testsuite.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 43ee134d1c..978d01b7a6 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -76,8 +76,7 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_MUSL) += \ testcases/kernel/syscalls/getcontext/getcontext01.c \ testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ testcases/kernel/syscalls/timer_create/timer_create01.c \ - testcases/kernel/syscalls/timer_create/timer_create03.c \ - utils/benchmark/ebizzy-0.3 + testcases/kernel/syscalls/timer_create/timer_create03.c # ldd command build system tries to build a shared library unconditionally. LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_STATIC_LIBS) += \ From d770ad74b16fc2ef5f57e75d2c42b33030f46f58 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 25 Mar 2021 20:19:11 +0100 Subject: [PATCH 057/158] package/abootimg: Update to 1ebeb39, switch to ajs124 ajs124 [1] has 2 fixes over than original [2]. [1] https://gitlab.com/ajs124/abootimg [2] https://github.com/ggrandou/abootimg. Signed-off-by: Petr Vorel [yann.morin.1998@free.fr: also change homepage in Config.in] Signed-off-by: Yann E. MORIN --- package/abootimg/Config.in | 2 +- package/abootimg/abootimg.hash | 2 +- package/abootimg/abootimg.mk | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/abootimg/Config.in b/package/abootimg/Config.in index 30e5bd1fb0..bcd2a082c9 100644 --- a/package/abootimg/Config.in +++ b/package/abootimg/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ABOOTIMG Tool to manipulate Android Boot Images, either on files or directly on /dev block devices. - https://github.com/ggrandou/abootimg + https://gitlab.com/ajs124/abootimg diff --git a/package/abootimg/abootimg.hash b/package/abootimg/abootimg.hash index fa5282c6c3..141db26860 100644 --- a/package/abootimg/abootimg.hash +++ b/package/abootimg/abootimg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb8d912bc7b5454c2afd3385fd86f4917d3587c48a6f5ae45df7856d88502cab abootimg-7e127fee6a3981f6b0a50ce9910267cd501e09d4.tar.gz +sha256 f377da42a57d982cfc22fa75c5a69febdc3e4c1ef43cd0ceaec42e14067e2f37 abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e-br1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/abootimg/abootimg.mk b/package/abootimg/abootimg.mk index ab6c709318..a07100df5a 100644 --- a/package/abootimg/abootimg.mk +++ b/package/abootimg/abootimg.mk @@ -4,8 +4,9 @@ # ################################################################################ -ABOOTIMG_VERSION = 7e127fee6a3981f6b0a50ce9910267cd501e09d4 -ABOOTIMG_SITE = $(call github,ggrandou,abootimg,$(ABOOTIMG_VERSION)) +ABOOTIMG_VERSION = 1ebeb393252ab5aeed62e34bc439b6728444f06e +ABOOTIMG_SITE = https://gitlab.com/ajs124/abootimg.git +ABOOTIMG_SITE_METHOD = git ABOOTIMG_LICENSE = GPL-2.0+ ABOOTIMG_LICENSE_FILES = LICENSE From cf30776057ef137365a3b4701ab89ed29df578db Mon Sep 17 00:00:00 2001 From: Nathaniel Husted Date: Tue, 18 May 2021 22:54:30 +0200 Subject: [PATCH 058/158] package/rustc: prepare for musl-based platforms support The current rustc package only supports configurations based on glibc and hardcodes this requirement. This patch prepares the addition of support for musl-based platforms by using $(LIBC) instead of hardcoding "gnu" as the C library specifier when defining RUSTC_TARGET_NAME. Signed-off-by: Nathaniel Husted Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/rustc/rustc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 35ffc36106..52860b7eff 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -8,7 +8,7 @@ RUSTC_ARCH = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ARCH)) RUSTC_ABI = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ABI)) ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) -RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI) +RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-$(LIBC)$(RUSTC_ABI) endif ifeq ($(HOSTARCH),x86) From d69d40c029dc7d8199b745eaee759d92b66c5d17 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 18 May 2021 22:54:31 +0200 Subject: [PATCH 059/158] package/rustc: add support for Tier 1 and Tier 2 platforms This commit reworks how BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS is defined to more clearly map with the list of platforms supported by Rust as listed at https://doc.rust-lang.org/nightly/rustc/platform-support.html. Indeed, the situation is not as simple as a list of architectures, all supported for both glibc and musl. So instead, we take the approach of directly mapping with what's described at https://doc.rust-lang.org/nightly/rustc/platform-support.html, which means: * A list of Tier 1 platforms (in fact just 3 platforms) * A list of Tier 2 platforms with host tools (i.e where rustc and cargo themselves are available for the target, something that isn't relevant for Buildroot) * A list of Tier 2 platforms with no host tools support. For each platform, we add as a comment its Rust tuple name, as listed at https://doc.rust-lang.org/nightly/rustc/platform-support.html, and then the corresponding Buildroot architecture/libc dependency. This is obviously more verbose than it was, but it is also a lot easier to maintain. With this, a total of 16 new platforms are supported, 13 of which are musl-based. The additional non-musl platforms are ARMv5TE, RISC-V 64-bit and Sparc64. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/rust-bin/rust-bin.hash | 48 +++++++++++++++ package/rustc/Config.in.host | 104 +++++++++++++++++++++++++++++---- 2 files changed, 140 insertions(+), 12 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 0800dcca97..f7fb983813 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -7,33 +7,72 @@ sha256 d440cb932bbaaf43b600bd47b2dd4a05bc669a74d88addeeb943d694638d8e6e rust-1 # From https://static.rust-lang.org/dist/rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz.asc sha256 3720d98988302bc1f676cef2ea3b2a641404cbbe2d47d0f28f8954658586aa12 rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 153d4a56264b3c38187c566ebdc3dee2e7573cad87b7c68b7e5c52d0c5ad056a rust-std-1.52.0-aarch64-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabi.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabi.tar.xz.asc sha256 593ec073c273028f60cf49d6084ee1809e075682f3e65f9cc86067f84f71d5f7 rust-std-1.52.0-arm-unknown-linux-gnueabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.asc sha256 c251bf48962ff8f96e3572cecee12b1b3286477e66cb9c42c1fbe0118d6bdaf5 rust-std-1.52.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 236944c4ce5dfdc16471b2bc7dc45dfc04f97528a403851ef210fffa55d36434 rust-std-1.52.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 73d99f322c9a86219205aa6bb871a0f3e52c605c2d16a6821188ff90423073ec rust-std-1.52.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 fbe790020b1178aeb0be213ceabff9aa4542448685b3bc7a70f87edae200d1ae rust-std-1.52.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 7c3f989962ab7d0cf841f1d5c597db3cb14d9f09427ab9ff35a26248cd3b3e01 rust-std-1.52.0-armv5te-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.asc sha256 c28c6870b9717c6c2e2015a6a5581ccb130f9d393db8166da4513680fe03d4ea rust-std-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 d483aad358c480d1593ebf6d9605bf012125670823fa7d895f528a2b4e0f5092 rust-std-1.52.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 0a51992109c837a93d77a57edbbd3d25badca68b354a9fe4a77c354baff1559a rust-std-1.52.0-armv7-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-i586-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-i586-unknown-linux-gnu.tar.xz.asc sha256 f4d094e1cd73372f1565473b072e22278afeb2b728a178e6e9f1c813a9b76c23 rust-std-1.52.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-i586-unknown-linux-musl.tar.xz.asc +sha256 f364545baba647ce8b5e50b362303885bf5df47a9a285360d8c10a5948a36617 rust-std-1.52.0-i586-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-i686-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-i686-unknown-linux-gnu.tar.xz.asc sha256 54749b579a8426dd46afe67feb3c206b0b129e59873a443dcd93ed51232a37d6 rust-std-1.52.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-i686-unknown-linux-musl.tar.xz.asc +sha256 517a5a714b696313dc2713b41482ff17034bf1755df859a8c99943932e903079 rust-std-1.52.0-i686-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-mips-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips-unknown-linux-gnu.tar.xz.asc sha256 51492598343e5490c620fd04a16c3f41e2fe9f52232dc67fc1bc937233a2e85d rust-std-1.52.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips-unknown-linux-musl.tar.xz.asc +sha256 bec4d58999205aae3224d01e29b8cf74c7899e034444684620d6e7613916de0d rust-std-1.52.0-mips-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.asc sha256 8db8fac92466389629055d590ca06b7ef1c82621f05cba709413f2ce2c3c5407 rust-std-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 43daa71ac3f7b86f98d8e5a4ee81bf0f4979ad33fc5a8e3f9f8604cacaa0ae14 rust-std-1.52.0-mips64-unknown-linux-muslabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc sha256 824391b79c9b28be7a18feab1adb0eed1a9459667e93572fc8b343985ca965ba rust-std-1.52.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 84e9948c8d850dc1c76e146de0f577be7a4d2a8e9b42fee43b05d88237e37c82 rust-std-1.52.0-mips64el-unknown-linux-muslabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-mipsel-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mipsel-unknown-linux-gnu.tar.xz.asc sha256 a6de773dfcdc8cac832ac6c356e2c0ecfd94fd7f7242aac82f8922f5bd1639e9 rust-std-1.52.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 724df483aaf0797e30844715c537be9257074355201e92c992d12b2376d1b0ce rust-std-1.52.0-mipsel-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc-unknown-linux-gnu.tar.xz.asc sha256 2ad7e17bcb8f632eb4206294ab977bbe1b7562009a3ca84a8d753ff454b1ee07 rust-std-1.52.0-powerpc-unknown-linux-gnu.tar.xz @@ -43,9 +82,18 @@ sha256 a792384afe034322b4b430049f57ed5e5fe9efbcf74c13c3edaf04062392727a rust-s # From https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.asc sha256 af5256a5f1cb189415b0d6b3e349312bbe8a78331a817c8da79ccfe9a07c0aed rust-std-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 573d8681cfc0ce71e735254ac33bfca7644fd4251699781b16dd18633a8e92ad rust-std-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 0320e71a4c010295968b7ba05e68550b97c6b42520e72f1a534b0135c966cc99 rust-std-1.52.0-sparc64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc sha256 dcdc0083facd6484527494ee5b8f72e040a095ab346bb658ce176be573d5c9b4 rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 d5809f3f1345a3c524f00cfa2ac1631b494a6de3143b1a3d081476f2c4f78905 rust-std-1.52.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 1df25ae326..c5f64fd3c6 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -3,21 +3,101 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS bool default y if BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" +# The pre-built Rust standard library is only available for a number +# of architectures/C libraries combinations, with different levels of +# support: Tier 1 platforms, Tier 2 platforms with host tools, Tier 2 +# platforms, Tier 3 platforms. Below, we support Tier 1, Tier 2 with +# host tools and Tier 2 platforms. + +# The below entries match Tier 1 platforms as described at +# https://doc.rust-lang.org/nightly/rustc/platform-support.html. +config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS + bool + # aarch64-unknown-linux-gnu + default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC + # i686-unknown-linux-gnu + default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC + # x86_64-unknown-linux-gnu + default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC + +# The below entries match Tier 2 platforms with host tools as +# described at +# https://doc.rust-lang.org/nightly/rustc/platform-support.html. +config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS + bool + # aarch64-unknown-linux-musl + default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_MUSL + # arm-unknown-linux-gnueabi + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_GLIBC + # arm-unknown-linux-gnueabihf + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC + # armv7-unknown-linux-gnueabihf + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC + # mips-unknown-linux-gnu + default y if BR2_mips && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 + # mips64-unknown-linux-gnuabi64 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + # mipsel-unknown-linux-gnu + default y if BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 + # mips64el-unknown-linux-gnuabi64 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + # powerpc-unknown-linux-gnu + default y if BR2_powerpc && BR2_TOOLCHAIN_USES_GLIBC + # powerpc64-unknown-linux-gnu + default y if BR2_powerpc64 && BR2_TOOLCHAIN_USES_GLIBC + # powerpc64le-unknown-linux-gnu + default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC + # riscv64gc-unknown-linux-gnu + # "g" stands for imafd, and we also need "c". + default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ + BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ + BR2_TOOLCHAIN_USES_GLIBC + # x86_64-unknown-linux-musl + default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_MUSL + +# The below entries match Tier 2 platforms without host tools as +# described at +# https://doc.rust-lang.org/nightly/rustc/platform-support.html. +config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS + bool + # arm-unknown-linux-musleabi + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_MUSL + # arm-unknown-linux-musleabihf + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL + # armv5te-unknown-linux-gnueabi + default y if BR2_ARM_CPU_ARMV5 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_GLIBC + # armv5te-unknown-linux-musleabi + default y if BR2_ARM_CPU_ARMV5 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_MUSL + # armv7-unknown-linux-gnueabi + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_GLIBC + # armv7-unknown-linux-musleabi + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_MUSL + # armv7-unknown-linux-musleabihf + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL + # i586-unknown-linux-gnu + default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC + # i586-unknown-linux-musl + default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL + # i686-unknown-linux-musl + default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL + # mips-unknown-linux-musl + default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 + # mips64-unknown-linux-muslabi64 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + # mips64el-unknown-linux-muslabi64 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + # mipsel-unknown-linux-musl + default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 + # sparc64-unknown-linux-gnu + default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC + # All target rust packages should depend on this option config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS bool - # The pre-built Rust standard library is only available for the - # following architectures/ABIs, and is built against glibc. - default y if BR2_i386 - default y if BR2_x86_64 - default y if BR2_aarch64 - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 \ - && !(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI) - default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_CPU_MIPS32R6 - default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \ - && BR2_MIPS_NABI64 - depends on BR2_TOOLCHAIN_USES_GLIBC + default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS + default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS + default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH From f46e13f05fa04a180a416876cf1dd4252dd841ad Mon Sep 17 00:00:00 2001 From: Ryota Kinukawa Date: Wed, 19 May 2021 12:28:48 +0900 Subject: [PATCH 060/158] support/dependencies, scripts: accept patches with renames Currently, patches with renames are refused, as they reqire patch 2.7 or newer. So far, we did not require that version because it was too recent to be widely available. But patch 2.7 has been released in 2012, almost 9 years ago now; it is old enough that we can start relying on it. Add a check that patch is GNU patch 2.7 or newer, and so drop the common check for patch, and drop the check about renames in apply-patches.sh. Signed-off-by: Ryota Kinukawa [yann.morin.1998@free.fr: - drop common check - shorten variable names - drop now-incorrect comment about busybox w/desktop ] Signed-off-by: Yann E. MORIN --- support/dependencies/dependencies.sh | 16 ++++++++++++---- support/scripts/apply-patches.sh | 5 ----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 1954f038be..c604a9efcc 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -163,7 +163,7 @@ fi # Check that a few mandatory programs are installed missing_progs="no" -for prog in patch perl tar wget cpio unzip rsync bc ${DL_TOOLS} ; do +for prog in perl tar wget cpio unzip rsync bc ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then echo "You must install '$prog' on your build machine"; missing_progs="yes" @@ -183,11 +183,19 @@ if test "${missing_progs}" = "yes" ; then exit 1 fi -# apply-patches.sh needs patch with --no-backup-if-mismatch support (GNU, busybox w/DESKTOP) -if ! patch --no-backup-if-mismatch /dev/null; then - echo "Your patch program does not support the --no-backup-if-mismatch option. Install GNU patch" +PATCH_VERSION="$(patch -v 2>/dev/null | sed -n 's/^GNU patch \(.*\)/\1/p')" +if [ -z "${PATCH_VERSION}" ] ; then + echo + echo "You must install GNU patch" exit 1 fi +PATCH_MAJOR="$(echo "${PATCH_VERSION}" | cut -d . -f 1)" +PATCH_MINOR="$(echo "${PATCH_VERSION}" | cut -d . -f 2)" +if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -lt 7 ] ; then + echo + echo "You have GNU patch '${PATCH_VERSION}' installed. GNU patch >= 2.7 is required" + exit 1; +fi if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then if ! which locale > /dev/null ; then diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 9fb488c570..e5a2fdd09e 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -113,11 +113,6 @@ function apply_patch { echo " to be applied : ${path}/${patch}" exit 1 fi - if ${uncomp} "${path}/$patch" | grep -q "^rename from" && \ - ${uncomp} "${path}/$patch" | grep -q "^rename to" ; then - echo "Error: patch contains some renames, not supported by old patch versions" - exit 1 - fi echo "${path}/${patch}" >> ${builddir}/.applied_patches_list ${uncomp} "${path}/$patch" | patch -g0 -p1 -E --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then From dce02289b55cc139546406b4f1b4fb4808081a7b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 19 May 2021 06:52:02 +0200 Subject: [PATCH 061/158] package/kodi-peripheral-joystick: bump version to 1.7.2-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 650cab0f2d..e85cd19a65 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb kodi-peripheral-joystick-1.7.1-Matrix.tar.gz +sha256 405acfbcc510f96a48244168362213955357f95cd8b1b92fe1ce483213045bfb kodi-peripheral-joystick-1.7.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 0fdd4851cf..b70f12ce12 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 1.7.1-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 1.7.2-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From f7735a8f3e7231254928b0ce67c25280739443c9 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 19 May 2021 09:59:38 +0200 Subject: [PATCH 062/158] package/grpc: bump to version 1.37.1 Fixes from Changelog [0]: - Fix #25897 to avoid crashes when certificates are not yet updated - [Backport] Fix use-after-unref bug in fault_injection_filter. [0] https://github.com/grpc/grpc/releases/tag/v1.37.1 Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 8189f738b5..925761f37a 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c2dc8e876ea12052d6dd16704492fd8921df8c6d38c70c4708da332cf116df22 grpc-1.37.0.tar.gz +sha256 acf247ec3a52edaee5dee28644a4e485c5e5badf46bdb24a80ca1d76cb8f1174 grpc-1.37.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 320c287bd1..f3ce3de34f 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.37.0 +GRPC_VERSION = 1.37.1 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE From e009816c67fc1335a9b2da8687b55c5ff6aa27cf Mon Sep 17 00:00:00 2001 From: Eugen Hristev Date: Tue, 18 May 2021 23:37:46 +0200 Subject: [PATCH 063/158] boot/at91bootstrap3: add support for at91bootstrap 4.x series The project at https://github.com/linux4sam/at91bootstrap was until now releasing 3.x versions, which were packaged using boot/at91bootstrap3/ in Buildroot. Microchip has now started a new branch of at91bootstrap, called 4.x, which will only support the following devices: sam9x60, sama5d2, sama5d3, sama5d4, sama7g5. A number of older devices from Microchip will only be supported by the existing 3.x series. Therefore, we cannot simply remove support for the 3.x series, and allow using only the 4.x series. So what this commit does is extend the boot/at91bootstrap3 package to support building both 3.x and 4.x versions. In detail, this implies: * Having the BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION symbol point to the latest 4.x version. Indeed, we want BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION to really point to the latest upstream version, even if that means potential breakage for users. Users who want to use a fixed version of at91bootstrap should anyway not be using BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION. * Introduce BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X for users who would like to use the latest 3.x series. * Adjust the installation logic, as images to install are now in build/binaries/*.bin instead of binaries/*.bin. In order to not have to differentiate 3.x and 4.x, we simply use $(wildcard ...) to expand the list of files to install. * To make it clear that boot/at91bootstrap3 supports both 3.x and 4.x, we also update the prompt of the package. at911bootstrap does not carry a license file; so far we were using main.c as the license file, as it carries the license blurb. Now that we have a known alternate version, we would need a per-version hash for that file. However, this is a bit too cumbersome to handle, so just drop using main.c as the license file. When upstream introduces a proper license file, we can revisit the situation. Update the two defconfigs that were using the upstream 3.9.3 version; all other defconfigs are using custom tarballs or custom git trees. Signed-off-by: Eugen Hristev [Thomas: while this patch is based on previous work by Eugen, it was reworked quite significantly.] Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: - drop main.c as license file, explain why - update the two defconfigs ] Signed-off-by: Yann E. MORIN --- boot/at91bootstrap3/Config.in | 10 +++++++--- boot/at91bootstrap3/at91bootstrap3.hash | 2 +- boot/at91bootstrap3/at91bootstrap3.mk | 5 +---- configs/acmesystems_acqua_a5_256mb_defconfig | 1 + configs/acmesystems_acqua_a5_512mb_defconfig | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 25ab30489f..ebc912e46c 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -1,5 +1,5 @@ config BR2_TARGET_AT91BOOTSTRAP3 - bool "AT91 Bootstrap 3" + bool "AT91 Bootstrap 3+" depends on BR2_arm926t || BR2_cortex_a5 || BR2_cortex_a7 help AT91Bootstrap is a first level bootloader for the Atmel AT91 @@ -16,9 +16,12 @@ if BR2_TARGET_AT91BOOTSTRAP3 choice - prompt "AT91 Bootstrap 3 version" + prompt "AT91 Bootstrap 3+ version" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + bool "4.0.0-rc2" + +config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X bool "3.9.3" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT @@ -51,7 +54,8 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string - default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v4.0.0-rc2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index 6b6257b0ab..e4d402ee47 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz -sha256 fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a main.c +sha256 b5d5f042297cad0d091f7d8734e61eb9ec7b6020898e086503fb5f8bc71fb9fc at91bootstrap3-v4.0.0-rc2.tar.gz diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index a942afcdc9..c4d7bd6106 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -20,9 +20,6 @@ AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VER endif AT91BOOTSTRAP3_LICENSE = Atmel License -ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y) -AT91BOOTSTRAP3_LICENSE_FILES = main.c -endif AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap @@ -48,7 +45,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS endef define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS - cp $(@D)/binaries/*.bin $(BINARIES_DIR) + cp $(wildcard $(@D)/build/binaries/*.bin $(@D)/binaries/*.bin) $(BINARIES_DIR) endef ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y) diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 810c3c9782..f62b000654 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -17,6 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X=y BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-256m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 11a7e795e0..9d2f009a5a 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -17,6 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X=y BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-512m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From 7abfdeea120825e9818b96457b5e3c595f00c0d1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 18 May 2021 23:37:47 +0200 Subject: [PATCH 064/158] boot/at91bootstrap3: bump 3.x series to 3.10.2 Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- boot/at91bootstrap3/Config.in | 4 ++-- boot/at91bootstrap3/at91bootstrap3.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index ebc912e46c..18301a0dc0 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -22,7 +22,7 @@ config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION bool "4.0.0-rc2" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X - bool "3.9.3" + bool "3.10.2" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" @@ -55,7 +55,7 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string default "v4.0.0-rc2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X + default "v3.10.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index e4d402ee47..8b7453bbd4 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz +sha256 33e4ba431af93a4fc2e81c1458cd31901b9f69c583ebe4c74ca78c0846479bfd at91bootstrap3-v3.10.2.tar.gz sha256 b5d5f042297cad0d091f7d8734e61eb9ec7b6020898e086503fb5f8bc71fb9fc at91bootstrap3-v4.0.0-rc2.tar.gz From d98b5df418d6ba428205a37f5e4beb95f6f3dc01 Mon Sep 17 00:00:00 2001 From: Eugen Hristev Date: Tue, 18 May 2021 23:37:48 +0200 Subject: [PATCH 065/158] boot/at91bootstrap3: add BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 Some at91bootstrap3 configurations now use Python scripts on the host for NAND/PMEC related utilities. In order to be able to use those scripts, this commit adds a new BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 which allows to express the need for host-python3 as a dependency to build at91bootstrap3. Signed-off-by: Eugen Hristev [Thomas: this was extracted from a patch from Eugen adding at91bootstrap 4.x support.] Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- boot/at91bootstrap3/Config.in | 8 ++++++++ boot/at91bootstrap3/at91bootstrap3.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 18301a0dc0..966e393db5 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -101,3 +101,11 @@ config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE Path to the at91bootstrap3 configuration file endif # BR2_TARGET_AT91BOOTSTRAP3 + +config BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 + bool "needs host-python3" + help + Enable this option if the at91bootstrap build process needs + Python 3.x to be available on the host. This is needed in + some at91bootstrap configurations to use NAND/PMECC Python + scripts. diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index c4d7bd6106..b253129dfb 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -27,6 +27,10 @@ AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap AT91BOOTSTRAP3_INSTALL_IMAGES = YES AT91BOOTSTRAP3_INSTALL_TARGET = NO +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3),y) +AT91BOOTSTRAP3_DEPENDENCIES += host-python3 +endif + AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \ $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR)) From deac34e1d3e40fb1533ca1b674b39f09358af69b Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 18 May 2021 22:05:14 +0300 Subject: [PATCH 066/158] package/webkitgtk: bump to version 2.32.1 Update to a new major release which bring in improvements and a few new features. Release notes: https://webkitgtk.org/2021/03/26/webkitgtk2.32.0-released.html https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.html None of the new features in WebKitGTK 2.32.x need additional dependencies. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index d85a7f46f2..d8bfa60fb8 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.30.6.tar.xz.sums -md5 11148c4ed400c58fe330ac94208cbc4d webkitgtk-2.30.6.tar.xz -sha1 aaaf9b0f1780f3eae104ae0d3ad15b3e19cf6e8d webkitgtk-2.30.6.tar.xz -sha256 50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e webkitgtk-2.30.6.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.32.1.tar.xz.sums +md5 b12790ae1209e1d5848aeb4fb70994db webkitgtk-2.32.1.tar.xz +sha1 c8c507d3c98c891ea5bfcfb6407320959dc77a2b webkitgtk-2.32.1.tar.xz +sha256 136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917 webkitgtk-2.32.1.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 1720ffc7d6..42132ca5fc 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.30.6 +WEBKITGTK_VERSION = 2.32.1 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From bb6b32f1a6ca2afd1ec97ac2049f529d89f69938 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Mon, 10 May 2021 11:28:52 +0200 Subject: [PATCH 067/158] package/dt-utils: bump version to 2021.03.0 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/dt-utils/dt-utils.hash | 2 +- package/dt-utils/dt-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index e42e82578d..74819158bb 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 737313719d7c04d7b9576fdc572d838c81ea22ea41a44c7646467018e67a0b97 dt-utils-v2019.01.0-br1.tar.gz +sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index 25c287d434..bc7fd90631 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DT_UTILS_VERSION = v2019.01.0 +DT_UTILS_VERSION = v2021.03.0 DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils DT_UTILS_SITE_METHOD = git DT_UTILS_LICENSE = GPL-2.0 From 1505d406fb4ab6539bebae512d6ef9cf196699b7 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Sun, 9 May 2021 22:56:50 +0300 Subject: [PATCH 068/158] package/libmdbx: bump version to 0.10.0 Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.10.0 Signed-off-by: Leonid Yuriev Signed-off-by: Yann E. MORIN --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index fcfb4a673f..8ff8e99810 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://github.com/erthink/libmdbx/releases/ -sha256 d12bc7189b746beaa85514fcd1fcf26b957bb8feadb11662a0e20c4e79410d3f libmdbx-amalgamated-0.9.3.tar.gz +sha256 767776d961fadeb51ee895fb70ed82a03051bae855a19396f0067b03076103bb libmdbx-amalgamated-0.10.0.tar.gz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index baf5193eb6..8e2eff0c7f 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.9.3 +LIBMDBX_VERSION = 0.10.0 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From 10cd7fca4becdebec12af611a954d074fc341821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Sat, 8 May 2021 19:12:32 +0200 Subject: [PATCH 069/158] configs/uevm5432: new defconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The OMAP5432 uEVM[1] is a development board from Texas Instruments. It is similar to the OMAP4 Panda boards, from which this configuration is inspired. [1]: https://svtronics.com/5432 Signed-off-by: Vincent Stehlé Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + board/uevm5432/genimage.cfg | 26 +++++++++++++++++++++ board/uevm5432/readme.txt | 40 ++++++++++++++++++++++++++++++++ configs/uevm5432_defconfig | 46 +++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 board/uevm5432/genimage.cfg create mode 100644 board/uevm5432/readme.txt create mode 100644 configs/uevm5432_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 2d5c692062..a12d9d98b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2717,6 +2717,7 @@ F: package/utp_com/ N: Vincent Stehlé F: board/bananapi/bananapi-m2-zero/ F: configs/bananapi_m2_zero_defconfig +F: configs/uevm5432_defconfig F: package/i7z/ F: package/msr-tools/ F: package/pixz/ diff --git a/board/uevm5432/genimage.cfg b/board/uevm5432/genimage.cfg new file mode 100644 index 0000000000..f30033f023 --- /dev/null +++ b/board/uevm5432/genimage.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img" + } + } + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/uevm5432/readme.txt b/board/uevm5432/readme.txt new file mode 100644 index 0000000000..4569fbd84e --- /dev/null +++ b/board/uevm5432/readme.txt @@ -0,0 +1,40 @@ +OMAP5432 uEVM +============= + +This file documents the Buildroot support for the OMAP5432 uEVM[1], a +single-board computer development platform based on the Texas Instruments +OMAP5432 system on a chip (SoC). + +How to build +============ + + $ make uevm5432_defconfig + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Where /dev/sdX is the device node of your SD card (may be /dev/mmcblkX instead +depending on setup). + +To boot from SD card, set the SYSBOOT switches S1 of your OMAP5432 uEVM to the +following position: + + ON x x + x x + 1 2 3 4 + +Insert the micro SDcard in your OMAP5432 uEVM, and power it up with the POWER +ON push button switch S3. The console is on the micro USB Debug UART, with +serial settings 115200 8N1. Refer also to the quick start guide[2]. + +[1]: https://svtronics.com/5432 +[2]: https://www.ti.com/lit/ug/swcu131/swcu131.pdf diff --git a/configs/uevm5432_defconfig b/configs/uevm5432_defconfig new file mode 100644 index 0000000000..7b9a4309c6 --- /dev/null +++ b/configs/uevm5432_defconfig @@ -0,0 +1,46 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, a 5.12 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" +BR2_SYSTEM_DHCP="eth0" + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/uevm5432/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap5-uevm" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap5_uevm" +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="MLO" + +# Required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From a86318a79f405b5e601515e6c85d3ce7544bcb17 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 19 May 2021 14:34:58 +0200 Subject: [PATCH 070/158] boot/at91bootstrap3: move BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 As spotted by Eugen, BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 currently is outside the at91bootstrap section, because it was inccorectly added after the 'endif' statement rather than before, which makes the menuconfig layout weird. Move it around. Reported-by: Eugen Hristev Signed-off-by: Yann E. MORIN --- boot/at91bootstrap3/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 966e393db5..f44597bc00 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -100,8 +100,6 @@ config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE help Path to the at91bootstrap3 configuration file -endif # BR2_TARGET_AT91BOOTSTRAP3 - config BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 bool "needs host-python3" help @@ -109,3 +107,5 @@ config BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 Python 3.x to be available on the host. This is needed in some at91bootstrap configurations to use NAND/PMECC Python scripts. + +endif # BR2_TARGET_AT91BOOTSTRAP3 From 3f691b698f297290fa23de0ab2befe5e6bda34a8 Mon Sep 17 00:00:00 2001 From: Eugen Hristev Date: Wed, 19 May 2021 15:30:11 +0300 Subject: [PATCH 071/158] configs/microchip_sama5d2_icp: new defconfigs Add the new SAMA5D2 ICP (Industrial Connectivity Board) with linux4sam_2020.10 components. Update README file with new defconfigs. https://www.linux4sam.org/bin/view/Linux4SAM/Sama5d2IcpMainPage Signed-off-by: Eugen Hristev Signed-off-by: Yann E. MORIN --- board/atmel/readme.txt | 2 + board/microchip/sama5d2_icp/genimage.cfg | 31 ++++++++ configs/microchip_sama5d2_icp_mmc_defconfig | 31 ++++++++ .../microchip_sama5d2_icp_mmc_dev_defconfig | 74 +++++++++++++++++++ 4 files changed, 138 insertions(+) create mode 100644 board/microchip/sama5d2_icp/genimage.cfg create mode 100644 configs/microchip_sama5d2_icp_mmc_defconfig create mode 100644 configs/microchip_sama5d2_icp_mmc_dev_defconfig diff --git a/board/atmel/readme.txt b/board/atmel/readme.txt index 1f21dd15e4..a29d027214 100644 --- a/board/atmel/readme.txt +++ b/board/atmel/readme.txt @@ -23,6 +23,8 @@ This guide covers the following configurations: - microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig - microchip_sam9x60ek_mmc_defconfig - microchip_sam9x60ek_mmc_dev_defconfig + - microchip_sama5d2_icp_mmc_defconfig + - microchip_sama5d2_icp_mmc_dev_defconfig These configurations will use AT91Bootstrap, u-boot and a linux kernel from the git trees maintained by Atmel. diff --git a/board/microchip/sama5d2_icp/genimage.cfg b/board/microchip/sama5d2_icp/genimage.cfg new file mode 100644 index 0000000000..854751713f --- /dev/null +++ b/board/microchip/sama5d2_icp/genimage.cfg @@ -0,0 +1,31 @@ +# Image for SD card boot on Microchip SAMA5D2 ICP (Industrial Connectivity Platform) +# +image boot.vfat { + vfat { + files = { + "zImage", + "at91-sama5d2_icp.dtb", + "boot.bin", + "u-boot.bin" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 1M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/configs/microchip_sama5d2_icp_mmc_defconfig b/configs/microchip_sama5d2_icp_mmc_defconfig new file mode 100644 index 0000000000..2196555311 --- /dev/null +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -0,0 +1,31 @@ +BR2_arm=y +BR2_cortex_a5=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama5d2_icp/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam-2020.10)/linux-linux4sam-2020.10.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="sama5" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.0-rc2)/at91bootstrap-v4.0.0-rc2.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_icpsd_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam-2020.10)/u-boot-at91-linux4sam-2020.10.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_icp_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig new file mode 100644 index 0000000000..1966d4baf1 --- /dev/null +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -0,0 +1,74 @@ +BR2_arm=y +BR2_cortex_a5=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_PTHREAD_DEBUG=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sama5d2_icp/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam-2020.10)/linux-linux4sam-2020.10.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="sama5" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_icp" +BR2_PACKAGE_LINUX_TOOLS_IIO=y +BR2_PACKAGE_BZIP2=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_ZIP=y +BR2_PACKAGE_GDB=y +BR2_PACKAGE_LMBENCH=y +BR2_PACKAGE_STRACE=y +BR2_PACKAGE_TREE=y +BR2_PACKAGE_DOSFSTOOLS=y +BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y +BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y +BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y +BR2_PACKAGE_MMC_UTILS=y +BR2_PACKAGE_MTD=y +BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_EVTEST=y +BR2_PACKAGE_SETSERIAL=y +BR2_PACKAGE_SPI_TOOLS=y +BR2_PACKAGE_USBUTILS=y +BR2_PACKAGE_LIBSYSFS=y +BR2_PACKAGE_LIBDRM=y +BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y +BR2_PACKAGE_DTC=y +BR2_PACKAGE_DTC_PROGRAMS=y +BR2_PACKAGE_ARGP_STANDALONE=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BRIDGE_UTILS=y +BR2_PACKAGE_CAN_UTILS=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_IPERF=y +BR2_PACKAGE_IPROUTE2=y +BR2_PACKAGE_IPTABLES=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_LRZSZ=y +BR2_PACKAGE_MII_DIAG=y +BR2_PACKAGE_OPENSSH=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_HTOP=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.0-rc2)/at91bootstrap-v4.0.0-rc2.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_icpsd_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam-2020.10)/u-boot-at91-linux4sam-2020.10.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_icp_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From b27332636887bb99a2121c28551a36b46ee1cabe Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sun, 9 May 2021 10:09:50 +0200 Subject: [PATCH 072/158] package/python-dbus-next: new package Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-dbus-next/Config.in | 9 +++++++++ package/python-dbus-next/python-dbus-next.hash | 5 +++++ package/python-dbus-next/python-dbus-next.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/python-dbus-next/Config.in create mode 100644 package/python-dbus-next/python-dbus-next.hash create mode 100644 package/python-dbus-next/python-dbus-next.mk diff --git a/DEVELOPERS b/DEVELOPERS index a12d9d98b5..2a75d430af 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1649,6 +1649,7 @@ F: package/murata-cyw-fw/ F: package/netdata/ F: package/python-ansicolors/ F: package/python-bleak/ +F: package/python-dbus-next/ F: package/python-iniconfig/ F: package/python-intelhex/ F: package/python-packaging/ diff --git a/package/Config.in b/package/Config.in index 6e10988e51..761d687e03 100644 --- a/package/Config.in +++ b/package/Config.in @@ -962,6 +962,7 @@ menu "External python modules" source "package/python-daphne/Config.in" source "package/python-dataproperty/Config.in" source "package/python-dateutil/Config.in" + source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" source "package/python-defusedxml/Config.in" source "package/python-dialog/Config.in" diff --git a/package/python-dbus-next/Config.in b/package/python-dbus-next/Config.in new file mode 100644 index 0000000000..bafead8986 --- /dev/null +++ b/package/python-dbus-next/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_DBUS_NEXT + bool "python-dbus-next" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + help + A zero-dependency DBus library for Python with asyncio + support. + + https://github.com/altdesktop/python-dbus-next diff --git a/package/python-dbus-next/python-dbus-next.hash b/package/python-dbus-next/python-dbus-next.hash new file mode 100644 index 0000000000..fa1cbc9da7 --- /dev/null +++ b/package/python-dbus-next/python-dbus-next.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dbus-next/json +md5 fcf7443b379ef69f95727bec0221ebc9 dbus_next-0.2.2.tar.gz +sha256 f656a3d3450b670f228248ffb1c3a703a69c4a8cb10cce63b108f17c8bd6c3de dbus_next-0.2.2.tar.gz +# Locally computed sha256 checksums +sha256 c454ab6b8e0653a8eab828a8cbaaa368a1bbfba982178bb18b6177e311eae4cc LICENSE diff --git a/package/python-dbus-next/python-dbus-next.mk b/package/python-dbus-next/python-dbus-next.mk new file mode 100644 index 0000000000..9aab9ac92b --- /dev/null +++ b/package/python-dbus-next/python-dbus-next.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-dbus-next +# +################################################################################ + +PYTHON_DBUS_NEXT_VERSION = 0.2.2 +PYTHON_DBUS_NEXT_SOURCE = dbus_next-$(PYTHON_DBUS_NEXT_VERSION).tar.gz +PYTHON_DBUS_NEXT_SITE = https://files.pythonhosted.org/packages/cb/fb/5ab0485c6460e39be75e16af95c0e23c2531c1ac5a482fffb9ee7d576e6f +PYTHON_DBUS_NEXT_SETUP_TYPE = setuptools +PYTHON_DBUS_NEXT_LICENSE = MIT +PYTHON_DBUS_NEXT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From f40219ff69fbfa31dea7a5d57d0c5129f6d77b4f Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sun, 9 May 2021 10:09:51 +0200 Subject: [PATCH 073/158] support/testing: add python-dbus-next test Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 + .../tests/package/sample_python_dbus_next.py | 44 +++++++++++++++++++ .../tests/package/test_python_dbus_next.py | 40 +++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 support/testing/tests/package/sample_python_dbus_next.py create mode 100644 support/testing/tests/package/test_python_dbus_next.py diff --git a/DEVELOPERS b/DEVELOPERS index 2a75d430af..93687081c4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1660,9 +1660,11 @@ F: package/python-typing-extensions/ F: package/python-xmodem/ F: package/rs485conf/ F: package/turbolua/ +F: support/testing/tests/package/sample_python_dbus_next.py F: support/testing/tests/package/sample_python_pytest.py F: support/testing/tests/package/sample_python_pytest_asyncio.py F: support/testing/tests/package/test_netdata.py +F: support/testing/tests/package/test_python_dbus_next.py F: support/testing/tests/package/test_python_pytest.py F: support/testing/tests/package/test_python_pytest_asyncio.py diff --git a/support/testing/tests/package/sample_python_dbus_next.py b/support/testing/tests/package/sample_python_dbus_next.py new file mode 100644 index 0000000000..1fcb76f45a --- /dev/null +++ b/support/testing/tests/package/sample_python_dbus_next.py @@ -0,0 +1,44 @@ +import asyncio +from dbus_next.aio import MessageBus +from dbus_next.service import ServiceInterface, method +import dbus_next.introspection as intr +from dbus_next import BusType + + +class SampleInterface(ServiceInterface): + def __init__(self): + super().__init__('test.interface') + + @method() + def Ping(self): + pass + + @method() + def ConcatStrings(self, what1: 's', what2: 's') -> 's': + return what1 + what2 + + +async def main(): + bus_name = 'dbus.next.sample' + + bus = await MessageBus(bus_type=BusType.SYSTEM).connect() + bus2 = await MessageBus(bus_type=BusType.SYSTEM).connect() + + await bus.request_name(bus_name) + + service_interface = SampleInterface() + bus.export('/test/path', service_interface) + + introspection = await bus2.introspect(bus_name, '/test/path') + assert type(introspection) is intr.Node + obj = bus2.get_proxy_object(bus_name, '/test/path', introspection) + interface = obj.get_interface(service_interface.name) + + result = await interface.call_ping() + assert result is None + + result = await interface.call_concat_strings('hello ', 'world') + assert result == 'hello world' + + +asyncio.run(main()) diff --git a/support/testing/tests/package/test_python_dbus_next.py b/support/testing/tests/package/test_python_dbus_next.py new file mode 100644 index 0000000000..3c597ad198 --- /dev/null +++ b/support/testing/tests/package/test_python_dbus_next.py @@ -0,0 +1,40 @@ +import textwrap + + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3DBusNext(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_DBUS=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DBUS_NEXT=y + """ + sample_scripts = ["tests/package/sample_python_dbus_next.py"] + + def run_sample_scripts(self): + config = \ + """ + + + + + + + + """ + config = textwrap.dedent(config) + config_dir = "/etc/dbus-1/system.d" + config_fn = "dbus.next.sample.conf" + + # Setup and reload D-Bus configuration + self.emulator.run("mkdir -p " + config_dir) + self.emulator.run("cat > " + config_dir + "/" + config_fn + + " < Date: Wed, 19 May 2021 22:01:48 +0300 Subject: [PATCH 074/158] package/libcurl: make sure openssl supports DES DES support in openssl is optional since commit a83d41867c8d ("package/libopenssl: add option to enable some features"). curl uses DES support in openssl when enabled. Select DES support to avoid build failure. Fixes: http://autobuild.buildroot.net/results/8931fd2b71eb2490cdc041b47eff58377ac823da/ http://autobuild.buildroot.net/results/f159195adf05c375d7d314a270afd3a55d43ebdd/ http://autobuild.buildroot.net/results/e143c75bccd7bcd4216954b76099404a38cf9bc1/ Cc: Erwan GAUTRON Signed-off-by: Baruch Siach Reviewed-by: Matthew Weber Signed-off-by: Yann E. MORIN --- package/libcurl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index b89c46f5ef..466f9ee3a1 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -51,6 +51,7 @@ choice config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" depends on BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL config BR2_PACKAGE_LIBCURL_BEARSSL bool "BearSSL" From beada77a7355c07cae7865afec41d67af6db4485 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 19 May 2021 20:14:23 +0200 Subject: [PATCH 075/158] package/postgresql: select mandatory libopenssl features Select mandatory libopenssl features (which are selectable since commit a83d41867c8d69a77d5cd0a665aa216af5340359): - BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH - BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST - BR2_PACKAGE_LIBOPENSSL_ENABLE_DES Fixes: - http://autobuild.buildroot.net/results/7fdcaa337a7369673ac4580ff7a2bbccc895dca2 openssl.c:449:35: warning: implicit declaration of function 'EVP_bf_ecb'; did you mean 'EVP_sm4_ecb'? [-Wimplicit-function-declaration] 449 | if (!EVP_EncryptInit_ex(evp_ctx, EVP_bf_ecb(), NULL, NULL, NULL)) | ^~~~~~~~~~ | EVP_sm4_ecb openssl.c:449:35: warning: passing argument 2 of 'EVP_EncryptInit_ex' makes pointer from integer without a cast [-Wint-conversion] 449 | if (!EVP_EncryptInit_ex(evp_ctx, EVP_bf_ecb(), NULL, NULL, NULL)) | ^~~~~~~~~~~~ | | | int In file included from openssl.c:34: .../host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/openssl/evp.h:583:53: note: expected 'const EVP_CIPHER *' {aka 'const struct evp_cipher_st *'} but argument is of type 'int' 583 | const EVP_CIPHER *cipher, ENGINE *impl, | ~~~~~~~~~~~~~~~~~~^~~~~~ Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/postgresql/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index 2debdc24d7..b42b219558 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -6,6 +6,9 @@ config BR2_PACKAGE_POSTGRESQL # postgresql is unlikely to be used in a pure statically # linked environment. depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help PostgreSQL is a powerful, open source object-relational database system. From 04e3dc3e4bf057f99475971956528e4a0c91dc2b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 19 May 2021 22:49:35 +0200 Subject: [PATCH 076/158] package/libopenssl: md5 is not optional Commit a83d41867c8d (package/libopenssl: add option to enable some features) made md5 an optional feature. However, md5 has not been optional since 1.1.0, released in 2016. Drop that option. Fixes: - http://autobuild.buildroot.net/results/9d79c9f313ff989449e9b47c1ff0afd3a167fd2d/ Reported-by: "Weber, Matthew L Collins" Reviewed-by: "Matthew Weber" Signed-off-by: Yann E. MORIN --- package/libopenssl/Config.in | 4 ---- package/libopenssl/libopenssl.mk | 1 - 2 files changed, 5 deletions(-) diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 7ed799075f..fcead4c11a 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -64,10 +64,6 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 bool "enable MD4" default y -config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD5 - bool "enable MD5" - default y - config BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 bool "enable MDC2" default y diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index c7f8ae714e..389a0a8b32 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -90,7 +90,6 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2),,no-md2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4),,no-md4) \ - $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD5),,no-md5) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2),,no-mdc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2),,no-blake2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_IDEA),,no-idea) \ From 5594bb01768e851ec75787235ac1cfcf2c4807f8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 May 2021 07:00:24 +0200 Subject: [PATCH 077/158] package/{mesa3d, mesa3d-headers}: bump version to 21.1.1 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2021-May/000631.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 308c6701ab..143de09937 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.1.0 +MESA3D_HEADERS_VERSION = 21.1.1 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index b9eace0b42..9548f8d170 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-May/000630.html -sha256 0128f10e22970d3aed3d1034003731f94623015cd9797c07151417649c1b1ff8 mesa-21.1.0.tar.xz -sha512 9d7617a6d5dd8ec1d93fdda8fe8b2f745695c02bc381d685f1257f7e7f08d5c06f3c57ae71c5f2dfaabb1742b8a88f47294a369bd3ac553f29835f24ce5dd350 mesa-21.1.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-May/000631.html +sha256 eec25ea379054e8911bc5de816aeb50f581b5b708414725003d2f00386b38dd2 mesa-21.1.1.tar.xz +sha512 79d0e2b0e1e590e7f36a082df3584010a553af0b3060bd2d3a7ace700ac7a8d1b7734ba67f2e193dd441434eeec74a16e0dbcbf8c15061b5dd5d6a1feca73d62 mesa-21.1.1.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 1425cb7217..aa81cd10a8 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.1.0 +MESA3D_VERSION = 21.1.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From fce1488853273db6491c4015002fcbdbbbae7da0 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 19 May 2021 23:51:10 +0200 Subject: [PATCH 078/158] package/raspberrypi-usbboot: bump version to 9324fd7 - add license description/file/hash - rebased 0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch - removed 0002-Makefile-add-DESTDIR-support.patch (Makefile install target removed since [1]) - removed 0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch (bootcode.bin/bootcode4.bin and start.elf/start4.elf compiled in since [2]) - change host install command [1] https://github.com/raspberrypi/usbboot/commit/9e6ff777bbf271b75aa0b1aa24e6f12d7b768375 [2] https://github.com/raspberrypi/usbboot/commit/1bb4c2da4775329bcf5811616fc8f0ce78ee2121 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...akefile-allow-passing-CFLAGS-LDFLAGS.patch | 18 +-- .../0002-Makefile-add-DESTDIR-support.patch | 51 ------- ...gic-to-find-def1-def2-and-def3-files.patch | 127 ------------------ .../raspberrypi-usbboot.hash | 5 +- .../raspberrypi-usbboot.mk | 7 +- 5 files changed, 18 insertions(+), 190 deletions(-) delete mode 100644 package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch delete mode 100644 package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch index cdab6070c2..d482b0b9d4 100644 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -1,4 +1,4 @@ -From 5b015e67af27679f4ca8f7f5f2f71020ec054b0c Mon Sep 17 00:00:00 2001 +From 38b730c00f45abf324caf687b5b00662ff4252c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Dec 2016 23:09:44 +0100 Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS @@ -8,21 +8,23 @@ rpiboot. Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 Signed-off-by: Thomas Petazzoni +[Rebased on 9324fd7] +Signed-off-by: Peter Seiderer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 3e7d1e4..d9a7220 100755 +index 822e714..875e717 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ - rpiboot: main.c -- $(CC) -g -o $@ $< -lusb-1.0 -+ $(CC) -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) + rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h +- $(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0 ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) - install: rpiboot - cp rpiboot /usr/bin + %.h: %.bin ./bin2c + ./bin2c $< $@ -- -2.7.4 +2.31.1 diff --git a/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch b/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch deleted file mode 100644 index a757cb0e03..0000000000 --- a/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 905bc741b189d67160b27551b8ad01459c2707a0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:10:37 +0100 -Subject: [PATCH] Makefile: add DESTDIR support - -This allows installing rpiboot outside of /usr if needed. - -Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 -Signed-off-by: Thomas Petazzoni -[Arnout: remove /usr] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - Makefile | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Makefile b/Makefile -index d9a7220..7835b7f 100755 ---- a/Makefile -+++ b/Makefile -@@ -2,18 +2,18 @@ rpiboot: main.c - $(CC) -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) - - install: rpiboot -- cp rpiboot /usr/bin -- mkdir -p /usr/share/rpiboot -- cp usbbootcode.bin /usr/share/rpiboot -- cp msd.elf /usr/share/rpiboot -- cp buildroot.elf /usr/share/rpiboot -+ cp rpiboot $(DESTDIR)bin -+ mkdir -p $(DESTDIR)/share/rpiboot -+ cp usbbootcode.bin $(DESTDIR)/share/rpiboot -+ cp msd.elf $(DESTDIR)/share/rpiboot -+ cp buildroot.elf $(DESTDIR)/share/rpiboot - - uninstall: -- rm -f /usr/bin/rpiboot -- rm -f /usr/share/rpiboot/usbbootcode.bin -- rm -f /usr/share/rpiboot/msd.elf -- rm -f /usr/share/rpiboot/buildroot.elf -- rmdir --ignore-fail-on-non-empty /usr/share/rpiboot/ -+ rm -f $(DESTDIR)/bin/rpiboot -+ rm -f $(DESTDIR)/share/rpiboot/usbbootcode.bin -+ rm -f $(DESTDIR)/share/rpiboot/msd.elf -+ rm -f $(DESTDIR)/share/rpiboot/buildroot.elf -+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/share/rpiboot/ - - clean: - rm rpiboot --- -2.7.4 - diff --git a/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch b/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch deleted file mode 100644 index 30cde49f34..0000000000 --- a/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 935894908dc24acda0acea7d211a9d80e55ecadb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:43:23 +0100 -Subject: [PATCH] main.c: rework logic to find def1, def2 and def3 files - -The current logic to find def1, def2 and def3 first tries to find them -in the local directory, and if they are not available, find them in -/usr/share. - -However, this doesn't work if rpiboot and its related files are -installed, but not in /usr. In order to address this use-case, this -commit reworks the logic to find the file path. - -A new function, getfilepath() is created. If the requested file is -available in the current directory, it is used. If not, then the path to -the file is inferred from the location of the currently running -program. I.e if we run /home/foo/sys/bin/rpiboot, then we will search -def1 in usbbootcode.bin in -/home/foo/sys/bin/../share/rpiboot/usbbootcode.bin. - -This continues to address the case of an installation in /usr, while -allowing installation in other locations as well. - -Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 -Signed-off-by: Thomas Petazzoni ---- - main.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 48 insertions(+), 13 deletions(-) - -diff --git a/main.c b/main.c -index 1b4e042..7c571d6 100755 ---- a/main.c -+++ b/main.c -@@ -1,10 +1,12 @@ --#include "libusb-1.0/libusb.h" -+#define _GNU_SOURCE - #include - #include - #include -- -+#include - #include - -+#include "libusb-1.0/libusb.h" -+ - int verbose = 0; - int out_ep = 1; - int in_ep = 2; -@@ -146,6 +148,37 @@ int ep_read(unsigned char *buf, int len, libusb_device_handle * usb_device) - return len; - } - -+char *getfilepath(char *filename) -+{ -+ char *progpath, *filepath, *progdir; -+ ssize_t len; -+ -+ /* If file is available locally, use it */ -+ if (access(filename, F_OK) != -1) -+ return filename; -+ -+ /* Otherwise, use the installed version */ -+ progpath = malloc(PATH_MAX); -+ len = readlink("/proc/self/exe", progpath, PATH_MAX - 1); -+ if (len == -1) -+ { -+ free(progpath); -+ return NULL; -+ } -+ -+ progpath[len] = '\0'; -+ progdir = dirname(progpath); -+ if (asprintf(&filepath, "%s/../share/rpiboot/%s", progdir, filename) < 0) -+ { -+ free(progpath); -+ return NULL; -+ } -+ -+ free(progpath); -+ -+ return filepath; -+} -+ - int main(int argc, char *argv[]) - { - int result; -@@ -157,13 +190,9 @@ int main(int argc, char *argv[]) - int last_serial = -1; - FILE *fp1, *fp2, *fp; - -- char def1_inst[] = "/usr/share/rpiboot/usbbootcode.bin"; -- char def2_inst[] = "/usr/share/rpiboot/msd.elf"; -- char def3_inst[] = "/usr/share/rpiboot/buildroot.elf"; -- -- char def1_loc[] = "./usbbootcode.bin"; -- char def2_loc[] = "./msd.elf"; -- char def3_loc[] = "./buildroot.elf"; -+ char def1_name[] = "usbbootcode.bin"; -+ char def2_name[] = "msd.elf"; -+ char def3_name[] = "buildroot.elf"; - - char *def1, *def2, *def3; - -@@ -171,10 +200,16 @@ int main(int argc, char *argv[]) - char *fatimage = NULL, *executable = NULL; - int loop = 0; - --// if local file version exists use it else use installed -- if( access( def1_loc, F_OK ) != -1 ) { def1 = def1_loc; } else { def1 = def1_inst; } -- if( access( def2_loc, F_OK ) != -1 ) { def2 = def2_loc; } else { def2 = def2_inst; } -- if( access( def3_loc, F_OK ) != -1 ) { def3 = def3_loc; } else { def3 = def3_inst; } -+ def1 = getfilepath(def1_name); -+ def2 = getfilepath(def2_name); -+ def3 = getfilepath(def3_name); -+ -+ if (!def1 || !def2 || !def3) -+ { -+ fprintf(stderr, "One of %s, %s or %s cannot be found\n", -+ def1_name, def2_name, def3_name); -+ exit(1); -+ } - - stage1 = def1; - stage2 = def2; --- -2.7.4 - diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 94860a9dab..3f66b12ff1 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,2 +1,5 @@ # Locally calculated -sha256 a8893f8a10522bd58866eb34e7f0d7731c43200d585f122681f428cdef76e676 raspberrypi-usbboot-f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051.tar.gz +sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz + +# License files +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 7018617906..5d7b433c64 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,8 +4,10 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051 +RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) +RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 +RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE HOST_RASPBERRYPI_USBBOOT_DEPENDENCIES = host-libusb @@ -14,8 +16,7 @@ define HOST_RASPBERRYPI_USBBOOT_BUILD_CMDS endef define HOST_RASPBERRYPI_USBBOOT_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ - DESTDIR=$(HOST_DIR) install + $(INSTALL) -D -m 0755 $(@D)/rpiboot $(HOST_DIR)/bin/rpiboot endef $(eval $(host-generic-package)) From 53b4004d52594b4da24d771d33307ac9ef8d212e Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 19 May 2021 23:51:11 +0200 Subject: [PATCH 079/158] package/raspberrypi-usbboot: enable for BR2_aarch64 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/raspberrypi-usbboot/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/raspberrypi-usbboot/Config.in.host b/package/raspberrypi-usbboot/Config.in.host index b1a434f36e..e5772e3aa1 100644 --- a/package/raspberrypi-usbboot/Config.in.host +++ b/package/raspberrypi-usbboot/Config.in.host @@ -1,6 +1,6 @@ config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT bool "host raspberrypi-usbboot" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package builds and install the "rpiboot" tool for the @@ -13,5 +13,5 @@ config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT https://github.com/raspberrypi/usbboot comment "host raspberrypi-usbboot needs a toolchain w/ host gcc >= 4.9" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_HOST_GCC_AT_LEAST_4_9 From eb3c965c8816519e3c07ad6f9fa6d17146b1cdab Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 19 May 2021 23:51:12 +0200 Subject: [PATCH 080/158] board/raspberrypi: add rpi3 64 bit hint Signed-off-by: Yann E. MORIN --- board/raspberrypi/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 8b3de6d251..ac784e07fd 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -35,6 +35,10 @@ For model 3 B and B+: $ make raspberrypi3_defconfig +or for model 3 B and B+ (64 bit): + + $ make raspberrypi3_64_defconfig + For model 4 B: $ make raspberrypi4_defconfig From 24c0306feb0ab0b860060025ba89cc39d05a1e03 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 19 May 2021 23:51:13 +0200 Subject: [PATCH 081/158] board/raspberrypi: add rpi4 64 bit hint Signed-off-by: Yann E. MORIN --- board/raspberrypi/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index ac784e07fd..2a876f9ae4 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -43,6 +43,10 @@ For model 4 B: $ make raspberrypi4_defconfig +or for model 4 B (64 bit): + + $ make raspberrypi4_64_defconfig + Build the rootfs ---------------- From 2fb6962bf02c489142793122054b57a00cf556e8 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 19 May 2021 23:51:14 +0200 Subject: [PATCH 082/158] board/raspberrypi: add Compute Module 4/IO Board support Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- .../raspberrypi/genimage-raspberrypicm4io.cfg | 30 ++++++++++++++ board/raspberrypi/readme.txt | 34 +++++++++++++++ board/raspberrypicm4io | 1 + configs/raspberrypicm4io_defconfig | 41 +++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 board/raspberrypi/genimage-raspberrypicm4io.cfg create mode 120000 board/raspberrypicm4io create mode 100644 configs/raspberrypicm4io_defconfig diff --git a/board/raspberrypi/genimage-raspberrypicm4io.cfg b/board/raspberrypi/genimage-raspberrypicm4io.cfg new file mode 100644 index 0000000000..5a42bcfbb4 --- /dev/null +++ b/board/raspberrypi/genimage-raspberrypicm4io.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "bcm2711-rpi-cm4.dtb", + "rpi-firmware/cmdline.txt", + "rpi-firmware/config.txt", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", + "rpi-firmware/overlays", + "zImage" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 2a876f9ae4..2032bf80ed 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -9,6 +9,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B2 (aka Raspberry Pi 2) - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). + - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). How to build it =============== @@ -47,6 +48,10 @@ or for model 4 B (64 bit): $ make raspberrypi4_64_defconfig +For model CM4 (on IO Board): + + $ make raspberrypicm4io_defconfig + Build the rootfs ---------------- @@ -71,6 +76,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] + +-- bcm2711-rpi-cm4.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ @@ -105,3 +111,31 @@ Insert the SDcard into your Raspberry Pi, and power it up. Your new system should come up now and start two consoles: one on the serial port on the P1 header, one on the HDMI output where you can login using a USB keyboard. + +How to write to CM4 eMMC memory +=============================== + +For CM4 modules without eMMC memory see above for booting from SD card, +for CM4 moduels with eMMC memory proceed as following: + +- fit jumper on IO Board header J2 to disable eMMC boot +- connect IO Board micro USB port (J11 USB slave) to your host linux system +- power up CM4/IO Board (lsusb command should show a '0a5c:2711 Broadcom Corp. + BCM2711 Boot' device) +- run 'sudo ./host/bin/rpiboot', output should look like the following: + Waiting for BCM2835/6/7/2711... + Loading embedded: bootcode4.bin + Sending bootcode.bin + Successful read 4 bytes + Waiting for BCM2835/6/7/2711... + Loading embedded: bootcode4.bin + Second stage boot server + Loading embedded: start4.elf + File read: start4.elf + Second stage boot server done + +- a USB mass storage device should show up (the CM4 eMMC memory), proceed + as described above to copy sdcard.img to it +- power down CM4/IO Board +- remove jumper on IO Board header J2 to re-enable eMMC boot +- power up CM4/IO Board diff --git a/board/raspberrypicm4io b/board/raspberrypicm4io new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypicm4io @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig new file mode 100644 index 0000000000..cba07a9064 --- /dev/null +++ b/configs/raspberrypicm4io_defconfig @@ -0,0 +1,41 @@ +BR2_arm=y +BR2_cortex_a72=y +BR2_ARM_FPU_NEON_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,b657cd2f27d9171b75c846f21e7b4bb581b3ed29)/linux-b657cd2f27d9171b75c846f21e7b4bb581b3ed29.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-cm4" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Required tool to flash CM4 eMMC memory +BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" From 46f01da8a4a578f251b35d74388690a53b749f00 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 19 May 2021 23:51:15 +0200 Subject: [PATCH 083/158] board/raspberrypi: add Compute Module 4/IO Board support (64 Bit) Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- .../genimage-raspberrypicm4io-64.cfg | 30 ++++++++++++++ board/raspberrypi/readme.txt | 4 ++ board/raspberrypicm4io-64 | 1 + configs/raspberrypicm4io_64_defconfig | 41 +++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 board/raspberrypi/genimage-raspberrypicm4io-64.cfg create mode 120000 board/raspberrypicm4io-64 create mode 100644 configs/raspberrypicm4io_64_defconfig diff --git a/board/raspberrypi/genimage-raspberrypicm4io-64.cfg b/board/raspberrypi/genimage-raspberrypicm4io-64.cfg new file mode 100644 index 0000000000..32a7ca897d --- /dev/null +++ b/board/raspberrypi/genimage-raspberrypicm4io-64.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "bcm2711-rpi-cm4.dtb", + "rpi-firmware/cmdline.txt", + "rpi-firmware/config.txt", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", + "rpi-firmware/overlays", + "Image" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 2032bf80ed..62cb248633 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -52,6 +52,10 @@ For model CM4 (on IO Board): $ make raspberrypicm4io_defconfig +or for CM4 (on IO Board - 64 bit): + + $ make raspberrypicm4io_64_defconfig + Build the rootfs ---------------- diff --git a/board/raspberrypicm4io-64 b/board/raspberrypicm4io-64 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypicm4io-64 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig new file mode 100644 index 0000000000..66a9332fe5 --- /dev/null +++ b/configs/raspberrypicm4io_64_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,b657cd2f27d9171b75c846f21e7b4bb581b3ed29)/linux-b657cd2f27d9171b75c846f21e7b4bb581b3ed29.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Required tool to flash CM4 eMMC memory +BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" From 82e7aa945a6c961b69503dd181db00344e833bf1 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Wed, 19 May 2021 21:43:50 +0200 Subject: [PATCH 084/158] configs/acmesystems_acqua_a5_*: use tested bootloader version The new branch "4.x" of at91bootstrap has dropped the contrib directory, which holds the defconfigs used by the Acmesystems Acqua A5 boards. We then cannot use the latest at91bootstrap anymore. As commit e009816c67fc1335a9b2da8687b55c5ff6aa27cf introduced support for at91bootstrap 4.x in the "next" branch, it had to work around this by pinning these defconfigs to the "latest 3.x" version. Avoid this and any future incompatibility problems by explicitly requesting a tested version of at91bootstrap. Signed-off-by: Edgar Bonet [yann.morin.1998@free.fr: use a custom git, like other acme defconfigs] Signed-off-by: Yann E. MORIN --- configs/acmesystems_acqua_a5_256mb_defconfig | 4 +++- configs/acmesystems_acqua_a5_512mb_defconfig | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index f62b000654..618ef0e756 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -17,7 +17,9 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-256m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 9d2f009a5a..e9d74be7c8 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -17,7 +17,9 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-512m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From c72524fb1b1c6b7dd1b1f511eea0fdf5a39dd3a0 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 1 May 2021 12:56:18 -0700 Subject: [PATCH 085/158] package/libglib2: bump to version 2.68.1 Other changes: - Drop 0002-allow-explicit-disabling-of-tests.patch as this patch has been upstreamed and the option is now simply "tests." - Add -Dglib_debug=disabled and -Dlibelf=disabled as defaults to both HOST_LIBGLIB2_CONF_OPTS and LIBGLIB2_CONF_OPTS - Refactor existing patches to apply to 2.68.1 Tested with test-pkg -p libglib2 -a. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- ...01-fix-compile-time-atomic-detection.patch | 12 +++--- ...02-allow-explicit-disabling-of-tests.patch | 37 ------------------- ...atch => 0002-remove-cpp-requirement.patch} | 6 +-- ...at-nonliteral-to-compiler-arguments.patch} | 7 ++-- package/libglib2/libglib2.hash | 4 +- package/libglib2/libglib2.mk | 12 ++++-- 6 files changed, 24 insertions(+), 54 deletions(-) delete mode 100644 package/libglib2/0002-allow-explicit-disabling-of-tests.patch rename package/libglib2/{0003-remove-cpp-requirement.patch => 0002-remove-cpp-requirement.patch} (95%) rename package/libglib2/{0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch => 0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch} (84%) diff --git a/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/package/libglib2/0001-fix-compile-time-atomic-detection.patch index d84a1ab460..aae505f8e5 100644 --- a/package/libglib2/0001-fix-compile-time-atomic-detection.patch +++ b/package/libglib2/0001-fix-compile-time-atomic-detection.patch @@ -10,19 +10,21 @@ See : https://gitlab.gnome.org/GNOME/glib/issues/1063 Signed-off-by: Brendan Heading Signed-off-by: Adam Duskett +Refresh for 2.68.1 --- - glib/gthread-posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + glib/gthread-posix.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 71a6b7b..d09d029 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c -@@ -73,7 +73,7 @@ +@@ -72,8 +72,7 @@ + #include #endif - /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */ --#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && !defined(__clang__) +-#if defined(HAVE_FUTEX) && \ +- (defined(HAVE_STDATOMIC_H) || defined(__ATOMIC_SEQ_CST)) +#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__) #define USE_NATIVE_MUTEX #endif diff --git a/package/libglib2/0002-allow-explicit-disabling-of-tests.patch b/package/libglib2/0002-allow-explicit-disabling-of-tests.patch deleted file mode 100644 index c865c04e03..0000000000 --- a/package/libglib2/0002-allow-explicit-disabling-of-tests.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cdccbc6ec36243463613cb32d7058c26c3c51e16 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Wed, 18 Sep 2019 09:50:00 -0700 -Subject: [PATCH] allow explicit disabling of tests - -Upstream won't build tests when cross-compiling. However; this means still -building the tests during a host build. Building the tests causes build -failures on older distributions such as CentOS 6 and Debian 7 because the -command `objcopy --add-symbol` is used when building the test -"test_resources2," which is not available with the older version of objcopy -provided by the distributions. - -Instead, remove the conditional checks which set build_tests and only check if -installed_tests_enabled is passed. - -Signed-off-by: Adam Duskett -Refresh for 2.62.2 ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 99806d0..3206603 100644 ---- a/meson.build -+++ b/meson.build -@@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in') - installed_tests_template_tap = files('template-tap.test.in') - - # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use) --build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled -+build_tests = installed_tests_enabled - - add_project_arguments('-D_GNU_SOURCE', language: 'c') - --- -2.23.0 - diff --git a/package/libglib2/0003-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch similarity index 95% rename from package/libglib2/0003-remove-cpp-requirement.patch rename to package/libglib2/0002-remove-cpp-requirement.patch index 11978e9755..35d46e161b 100644 --- a/package/libglib2/0003-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.66.8', + version : '2.68.1', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1548,20 +1547,6 @@ if g_have_iso_c_varargs +@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2167,7 +2152,6 @@ subdir('gobject') +@@ -2330,7 +2315,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') diff --git a/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch similarity index 84% rename from package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch rename to package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index f792ceba3f..67aea7982e 100644 --- a/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -7,6 +7,7 @@ This warning is a false positive on older versions of gcc. See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details. Signed-off-by: Adam Duskett +Refresh for 2.68.1 --- meson.build | 1 + 1 file changed, 1 insertion(+) @@ -15,14 +16,14 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -372,6 +372,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' + # building with -Wbad-function-cast. + '-Wno-bad-function-cast', '-Wno-cast-function-type', + '-Wno-format-nonliteral', # Due to function casts through (void*) we cannot support -Wpedantic: # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions. '-Wno-pedantic', - '-Werror=declaration-after-statement', - '-Werror=format=2', -- 2.20.1 diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 4f69f1cc48..e3a3aa7561 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.66/glib-2.66.8.sha256sum -sha256 97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b glib-2.66.8.tar.xz +# https://download.gnome.org/sources/glib/2.68/glib-2.68.1.sha256sum +sha256 241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333 glib-2.68.1.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 9ce40d91ff..b5554d6b56 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.66 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).8 +LIBGLIB2_VERSION_MAJOR = 2.68 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -25,11 +25,13 @@ endif HOST_LIBGLIB2_CONF_OPTS = \ -Ddtrace=false \ -Dfam=false \ + -Dglib_debug=disabled \ + -Dlibelf=disabled \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ -Dinternal_pcre=false \ - -Dinstalled_tests=false \ + -Dtests=false \ -Doss_fuzz=disabled LIBGLIB2_DEPENDENCIES = \ @@ -49,9 +51,11 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # ${libdir} would be prefixed by the sysroot by pkg-config, causing a # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ + -Dglib_debug=disabled \ -Dinternal_pcre=false \ + -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ - -Dinstalled_tests=false \ + -Dtests=false \ -Doss_fuzz=disabled LIBGLIB2_MESON_EXTRA_PROPERTIES = \ From bdbd6ab4d031b03fe68c656ab91d82dba9e208c6 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 1 May 2021 12:56:19 -0700 Subject: [PATCH 086/158] package/libglib2: add -Dxattr=true when libselinux is selected Xattrs is required for SELinux. Explicitly enable the feature when the libselinux package is selected. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/libglib2/libglib2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index b5554d6b56..e3263ce9ce 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -77,10 +77,10 @@ LIBGLIB2_DEPENDENCIES += libiconv endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LIBGLIB2_CONF_OPTS += -Dselinux=enabled +LIBGLIB2_CONF_OPTS += -Dselinux=enabled -Dxattr=true LIBGLIB2_DEPENDENCIES += libselinux else -LIBGLIB2_CONF_OPTS += -Dselinux=disabled +LIBGLIB2_CONF_OPTS += -Dselinux=disabled -Dxattr=false endif # Purge gdb-related files From abc110e3624aa4e8a9bd8595b3fdc0aec60845e0 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 1 May 2021 12:56:20 -0700 Subject: [PATCH 087/158] package/gobject-introspection: bump to version 1.68.0 Other changes: - Change -Dgi_cross_use_host_gi=true to -Dgi_cross_use_prebuilt_gi=true as the option has changed. - Explicitly define python3 in both the host and target builds of g-ir-tool-template.in Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - add hash for giscanner/scannerlexer.l used as license file - two spaces in hash file ] Signed-off-by: Yann E. MORIN --- .../gobject-introspection/0001-disable-tests.patch | 2 +- .../0002-Add-rpath-links-to-ccompiler.patch | 2 +- .../gobject-introspection/gobject-introspection.hash | 9 +++++---- .../gobject-introspection/gobject-introspection.mk | 12 ++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index c75c7512d9..01b11998bd 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index eed4d6b..5058664 100644 --- a/meson.build +++ b/meson.build -@@ -214,12 +214,6 @@ if get_option('build_introspection_data') == true +@@ -222,12 +222,6 @@ if get_option('build_introspection_data') == true endif subdir('docs') diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch index 08835d3ecc..9b9ae99779 100644 --- a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +++ b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -15,7 +15,7 @@ diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py index a8bd5b1..51bb9bc 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py -@@ -229,6 +229,8 @@ class CCompiler(object): +@@ -231,6 +231,8 @@ class CCompiler(object): for envvar in runtime_path_envvar: if envvar in os.environ: diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index 68bf63e055..e859ba1d3b 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,4 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.sha256sum -sha256 80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7 gobject-introspection-1.64.1.tar.xz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.sha256sum +sha256 d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 gobject-introspection-1.68.0.tar.xz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad35e98ae9342a3539c36f2171e84d175394ddcff625887290c751302cb02983 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index eefb2c83f7..d8138b2e96 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,8 +4,8 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.64 -GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68 +GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz GOBJECT_INTROSPECTION_INSTALL_STAGING = YES @@ -43,7 +43,7 @@ HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \ # Use the host gi-scanner to prevent the scanner from generating incorrect # elf classes. GOBJECT_INTROSPECTION_CONF_OPTS = \ - -Dgi_cross_use_host_gi=true \ + -Dgi_cross_use_prebuilt_gi=true \ -Dgi_cross_binary_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \ -Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ -Dbuild_introspection_data=true \ @@ -64,8 +64,8 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ GI_SCANNER_DISABLE_CACHE=1 # Make sure g-ir-tool-template uses the host python. -define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH - $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in +define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH + $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in endef HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH @@ -75,7 +75,7 @@ HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOL # - Create a safe modules directory which does not exist so we don't load random things # which may then get deleted (or their dependencies) and potentially segfault define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS - $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in + $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \ $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper From ecb2ea34f3d20078bcc46f274374b4c0f7f072c1 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:25:08 -0700 Subject: [PATCH 088/158] package/libglib2: bump version to 2.68.2 Includes an important bugfix: #2387 json-glib does not build with glib 2.68.1 Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 35d46e161b..9393bd258a 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.1', + version : '2.68.2', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index e3a3aa7561..15e0085f78 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.1.sha256sum -sha256 241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333 glib-2.68.1.tar.xz +# https://download.gnome.org/sources/glib/2.68/glib-2.68.2.sha256sum +sha256 ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb glib-2.68.2.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index e3263ce9ce..4f13622e36 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ From 72e57b7b4bc0efa960dd9c569dd674b0c005fad7 Mon Sep 17 00:00:00 2001 From: Jugurtha BELKALEM Date: Sun, 20 Dec 2020 16:11:59 +0100 Subject: [PATCH 089/158] package/llvm: add BPF backend bcc is a front-end tool for eBPF : https://github.com/iovisor/bcc/blob/master/README.md. eBPF is the most powerful Linux tracer, and bcc allows to write eBPF scripts in C and PYTHON3. BCC requires enabling LLVM backend BPF support. Signed-off-by: Jugurtha BELKALEM Signed-off-by: Romain Naour Tested-by: Qais Yousef Reviewed-by: Qais Yousef Cc: Qais Yousef Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/llvm/Config.in | 6 ++++++ package/llvm/llvm.mk | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 1d21d879da..6ec2ffcfe6 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -47,6 +47,12 @@ config BR2_PACKAGE_LLVM_RTTI https://llvm.org/docs/HowToSetUpLLVMStyleRTTI.html +config BR2_PACKAGE_LLVM_BPF + bool "BPF backend" + help + Build BPF target. Select this option if you are going + to install bcc on the target. + endif comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 7d60fe7f8c..6c721c30b9 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -62,6 +62,11 @@ ifeq ($(BR2_PACKAGE_LLVM_AMDGPU),y) LLVM_TARGETS_TO_BUILD += AMDGPU endif +# Build BPF backend +ifeq ($(BR2_PACKAGE_LLVM_BPF),y) +LLVM_TARGETS_TO_BUILD += BPF +endif + # Use native llvm-tblgen from host-llvm (needed for cross-compilation) LLVM_CONF_OPTS += -DLLVM_TABLEGEN=$(HOST_DIR)/bin/llvm-tblgen From f7b8508e4fe9c96bf679cc5423cc1500b6523e83 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 20 Dec 2020 16:12:01 +0100 Subject: [PATCH 090/158] package/libbpf: new package A mirror of bpf-next linux tree bpf-next/tools/lib/bpf directory plus its supporting header files. The version of the package reflects the version of ABI. Signed-off-by: Jugurtha BELKALEM Signed-off-by: Romain Naour Cc: Qais Yousef Reviewed-by: Qais Yousef Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [Arnout: add hash file] --- DEVELOPERS | 1 + package/Config.in | 1 + package/libbpf/Config.in | 20 +++++++++++++++++++ package/libbpf/libbpf.hash | 5 +++++ package/libbpf/libbpf.mk | 40 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 package/libbpf/Config.in create mode 100644 package/libbpf/libbpf.hash create mode 100644 package/libbpf/libbpf.mk diff --git a/DEVELOPERS b/DEVELOPERS index 93687081c4..988612a944 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2314,6 +2314,7 @@ F: package/glibc/ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ +F: package/libbpf/ F: package/libclc/ F: package/libgta/ F: package/libiec61850/ diff --git a/package/Config.in b/package/Config.in index 761d687e03..8e017654d2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -109,6 +109,7 @@ menu "Debugging, profiling and benchmark" source "package/kvm-unit-tests/Config.in" source "package/kyua/Config.in" source "package/latencytop/Config.in" + source "package/libbpf/Config.in" source "package/lmbench/Config.in" source "package/lsof/Config.in" source "package/ltp-testsuite/Config.in" diff --git a/package/libbpf/Config.in b/package/libbpf/Config.in new file mode 100644 index 0000000000..c5b24c5eb5 --- /dev/null +++ b/package/libbpf/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_LIBBPF + bool "libbpf" + depends on BR2_USE_WCHAR # elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_ZLIB + help + libbpf library. + A mirror of bpf-next linux tree bpf-next/tools/lib/bpf + directory plus its supporting header files. The version + of the package reflects the version of ABI. + + https://github.com/libbpf/libbpf + +comment "libbpf needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash new file mode 100644 index 0000000000..1afda50c9c --- /dev/null +++ b/package/libbpf/libbpf.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 0f97295987c745eb07c48f8db992f7df307b5cd45c9a20eb352ee6d08cf7bd36 libbpf-0.2.tar.gz +sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LPGL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk new file mode 100644 index 0000000000..a1aeb7d894 --- /dev/null +++ b/package/libbpf/libbpf.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# libbpf +# +################################################################################ + +LIBBPF_VERSION = 0.2 +LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) +LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause +LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LPGL-2.1 +LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib +LIBBPF_INSTALL_STAGING = YES + +define LIBBPF_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +# bpf/bpf.h installed by libbpf uses bpf_iter_link_info that was added since +# kernel 5.9, so we need to update some uapi headers in STAGING_DIR if the +# toolchain is build with linux-headers < 5.9. +# Otherwise bpf/bpf.h is broken due to out of date linux/bpf.h installed by the +# toolchain. +# https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a5cbe05a6673b85bed2a63ffcfea6a96c6410cff +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9),) +LIBBPF_UPDATE_UAPI_HEADERS = install_uapi_headers +endif + +define LIBBPF_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install $(LIBBPF_UPDATE_UAPI_HEADERS) \ + DESTDIR=$(STAGING_DIR) +endef + +define LIBBPF_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR=$(TARGET_DIR) +endef + +$(eval $(generic-package)) From cb5d9fdf1ebf7002a29e6fa43c817611e2e4e8d1 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Fri, 21 May 2021 11:13:33 +0200 Subject: [PATCH 091/158] boot/arm-trusted-firmware: bump to version 2.5 Release notes: https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-5 The existing qemu_aarch64_sbsa_defconfig was using an unpinned version of ATF, so to avoid any regression, it is pinned to the previous version, 2.4. Signed-off-by: Heiko Thiery [yann.morin.1998@free.fr: pin ATF version in qemu_aarch64_sbsa_defconfig] Signed-off-by: Yann E. MORIN --- boot/arm-trusted-firmware/Config.in | 4 ++-- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- configs/qemu_aarch64_sbsa_defconfig | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 9d347550a4..a5a8c5bfc3 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -15,7 +15,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.4" + bool "v2.5" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -43,7 +43,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.4" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 970613f38d..1ab50a9e28 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d arm-trusted-firmware-v2.4.tar.gz +sha256 d12a824afcc5cb90d005f9820f3274f1319cef1bb282e40a6a190b75900206d3 arm-trusted-firmware-v2.5.tar.gz sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 20ae393cd7..d014140bf5 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -36,6 +36,9 @@ BR2_TARGET_GRUB2_ARM64_EFI=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y From e9b35ce3ea36a6326ff1b6f368cc3d140876659d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:39 -0700 Subject: [PATCH 092/158] package/libsepol: bump to version 3.2 Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/libsepol/libsepol.hash | 4 ++-- package/libsepol/libsepol.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 1759d3ba04..b273f982b6 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc libsepol-3.1.tar.gz +sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index a4398bdc42..55125f2203 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.1 -LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +LIBSEPOL_VERSION = 3.2 +LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING LIBSEPOL_CPE_ID_VENDOR = selinuxproject From 6fd41b6d46385ecf5ed2f3e2867213d060f207bb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:40 -0700 Subject: [PATCH 093/158] package/libsepol/Config.in: Add policy version 33 Policy version 33 was added starting with kernel 5.8. Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/libsepol/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 6c66809c9e..04af880e67 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -11,6 +11,7 @@ if BR2_PACKAGE_LIBSEPOL config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION int "Policy version" + default 33 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 default 32 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 @@ -29,7 +30,8 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION >= 3.14 < 4.3 29 >= 4.3 < 4.13 30 >= 4.13 < 5.5 31 - >= 5.5 32 + >= 5.5 < 5.8 32 + >= 5.8 33 endif From d04944b0c5f0003bd1b4df422c09a0b4653e7ed9 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:41 -0700 Subject: [PATCH 094/158] package/libsemanage: bump to version 3.2 Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index a977ddabc6..117fd40d6a 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 22d6c75526e40d1781c30bcf29abf97171bdfe6780923f11c8e1c76a75a21ff8 libsemanage-3.1.tar.gz +sha256 d722a55ca4fe2d4e2b30527720db657e6238b28079e69e2e4affeb8e733ee511 libsemanage-3.2.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index 48e2bbbc8b..bbe976a2c9 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.1 -LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +LIBSEMANAGE_VERSION = 3.2 +LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 From b7ff47516ea01436c53b4d1e2b7a5b595ef3ed80 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:42 -0700 Subject: [PATCH 095/158] package/libselinux: bump to version 3.2 Also drop upstream patch 0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- ...T-and-rely-on-the-installed-file-nam.patch | 2 +- ...d-to-something-which-never-conflicts.patch | 71 ------------------- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 4 +- 4 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch diff --git a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index cbd98a61ad..18c79b3b4d 100644 --- a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -36,7 +36,7 @@ index 190016e2af34..7ee22fd35da3 100644 RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -176,7 +175,7 @@ install: all +@@ -184,7 +183,7 @@ install: all install-pywrap: pywrap $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py diff --git a/package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch b/package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch deleted file mode 100644 index 2a23e98f9b..0000000000 --- a/package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 398d2ceef92cb1baac18e6b34a1a8e1bf41296cd Mon Sep 17 00:00:00 2001 -From: Nicolas Iooss -Date: Tue, 16 Feb 2021 22:13:28 +0100 -Subject: [PATCH] libselinux: rename gettid() to something which never - conflicts with the libc - -Musl recently added a wrapper for gettid() syscall. There is no way to -detect this new version in a reliable way, so rename our gettid() -wrapper to a non-conflicting name. - -Introduce a new function which, when using a libc known to provide a -wrapper for gettid(), calls it, and which, otherwise, performs the -syscall directly. - -Anyway this function is only used on systems where /proc/thread-self -does not exist, which are therefore running Linux<3.17. - -Fixes: https://github.com/SELinuxProject/selinux/issues/282 -Signed-off-by: Nicolas Iooss -Acked-by: Petr Lautrbach -[Retrieved from: -https://github.com/SELinuxProject/selinux/commit/398d2ceef92cb1baac18e6b34a1a8e1bf41296cd] -Signed-off-by: Fabrice Fontaine ---- - src/procattr.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/procattr.c b/src/procattr.c -index 1aa67ac53..840570525 100644 ---- a/src/procattr.c -+++ b/src/procattr.c -@@ -25,21 +25,23 @@ static __thread char destructor_initialized; - /* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and - * has a definition for it */ - #ifdef __BIONIC__ -- #define OVERRIDE_GETTID 0 -+ #define HAVE_GETTID 1 - #elif !defined(__GLIBC_PREREQ) -- #define OVERRIDE_GETTID 1 -+ #define HAVE_GETTID 0 - #elif !__GLIBC_PREREQ(2,30) -- #define OVERRIDE_GETTID 1 -+ #define HAVE_GETTID 0 - #else -- #define OVERRIDE_GETTID 0 -+ #define HAVE_GETTID 1 - #endif - --#if OVERRIDE_GETTID --static pid_t gettid(void) -+static pid_t selinux_gettid(void) - { -+#if HAVE_GETTID -+ return gettid(); -+#else - return syscall(__NR_gettid); --} - #endif -+} - - static void procattr_thread_destructor(void __attribute__((unused)) *unused) - { -@@ -94,7 +96,7 @@ static int openattr(pid_t pid, const char *attr, int flags) - if (fd >= 0 || errno != ENOENT) - goto out; - free(path); -- tid = gettid(); -+ tid = selinux_gettid(); - rc = asprintf(&path, "/proc/self/task/%d/attr/%s", tid, attr); - } else { - errno = EINVAL; diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 1101b40501..797b978ee1 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 ea5dcbb4d859e3f999c26a13c630da2f16dff9462e3cc8cb7b458ac157d112e7 libselinux-3.1.tar.gz +sha256 df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161 libselinux-3.2.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index fdd13aa942..0f36db1cfd 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.1 -LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +LIBSELINUX_VERSION = 3.2 +LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE LIBSELINUX_CPE_ID_VENDOR = selinuxproject From b5a51db2a83c68f7cd1ad91dd6b222625555d90a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:43 -0700 Subject: [PATCH 096/158] package/policycoreutils: bump to version 3.2 Also refactor patches to apply cleanly. Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- ...-all-paths-that-use-an-absolute-path.patch | 11 +++--- .../0002-Add-PREFIX-to-host-paths.patch | 36 +++++++++---------- package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 6 ++-- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch index 57833d8176..aa75ca63c0 100644 --- a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch +++ b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch @@ -12,26 +12,27 @@ accomodate version 2.5 Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett Signed-off-by: Fabrice Fontaine [Update for 2.8] +Signed-off-by: Adam Duskett +[Update for 3.2] --- setfiles/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setfiles/Makefile b/setfiles/Makefile -index c08e2dd..36c0638 100644 +index a3bbbe1..df675cf 100644 --- a/setfiles/Makefile +++ b/setfiles/Makefile -@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr +@@ -3,7 +3,7 @@ LINGUAS ?= ru PREFIX ?= /usr SBINDIR ?= /sbin MANDIR = $(PREFIX)/share/man -AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) +AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) - ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') - + CFLAGS ?= -g -Werror -Wall -W + override LDLIBS += -lselinux -lsepol -- 2.13.6 diff --git a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch index ffe5fcbd44..2daed57c97 100644 --- a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch +++ b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch @@ -6,41 +6,39 @@ Subject: [PATCH] Add PREFIX to host paths Updates the remaining hardcoded host paths used in the build to be prefixed with a PREFIX path to allow cross compilation. -Updated to work with version 2.5 +Updated to work with version 3.2 Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett Signed-off-by: Fabrice Fontaine [Update for 2.8] +Signed-off-by: Adam Duskett +[Update for 3.2] --- - load_policy/Makefile | 2 +- - newrole/Makefile | 6 +++--- - run_init/Makefile | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) + newrole/Makefile | 4 ++-- + run_init/Makefile | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newrole/Makefile b/newrole/Makefile -index 196af92..896708f 100644 +index 0e7ebce..3188cec 100644 --- a/newrole/Makefile +++ b/newrole/Makefile -@@ -3,9 +3,9 @@ PREFIX ?= $(DESTDIR)/usr +@@ -4,8 +4,8 @@ PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin MANDIR ?= $(PREFIX)/share/man ETCDIR ?= /etc - LOCALEDIR = $(DESTDIR)$(PREFIX)/share/locale --PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y) --AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) -+PAMH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/security/pam_appl.h && echo y) -+AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) +-LOCALEDIR = $(DESTDIR)$(PREFIX)/share/locale +-INCLUDEDIR ?= $(PREFIX)/include ++LOCALEDIR = $(DESTDIR)$(PREFIX) ++INCLUDEDIR ?= $(LOCALEDIR)/include + PAMH ?= $(shell test -f $(INCLUDEDIR)/security/pam_appl.h && echo y) + AUDITH ?= $(shell test -f $(INCLUDEDIR)/libaudit.h && echo y) # Enable capabilities to permit newrole to generate audit records. - # This will make newrole a setuid root program. - # The capabilities used are: CAP_AUDIT_WRITE. diff --git a/run_init/Makefile b/run_init/Makefile -index 921f0b0..e1566fc 100644 +index e86364a..20a64d4 100644 --- a/run_init/Makefile +++ b/run_init/Makefile -@@ -4,9 +4,9 @@ PREFIX ?= $(DESTDIR)/usr - SBINDIR ?= $(PREFIX)/sbin +@@ -6,8 +6,8 @@ SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man ETCDIR ?= /etc LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale @@ -52,5 +50,5 @@ index 921f0b0..e1566fc 100644 CFLAGS ?= -Werror -Wall -W override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -- -2.13.6 +2.31.1 diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index 5dae18f17d..7d08636370 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c889f62ee80f8b6a369469a9b8af51f5b797975aeaa291f5c5960cc12eed1934 policycoreutils-3.1.tar.gz +sha256 d1331c6fa766c547b071c491de90b9f343c8dbffdb119be8a5a7e491199b93a9 policycoreutils-3.2.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 0dfdc7af03..a486f8ddc3 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,8 +4,8 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 3.1 -POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +POLICYCOREUTILS_VERSION = 3.2 +POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(POLICYCOREUTILS_VERSION) POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_AUDIT),y) POLICYCOREUTILS_DEPENDENCIES += audit -POLICYCOREUTILS_MAKE_OPTS += AUDIT_LOG_PRIV=y +POLICYCOREUTILS_MAKE_OPTS += AUDIT_LOG_PRIV=y USE_AUDIT=y endif # Enable LSPP_PRIV if both audit and linux pam are enabled From 0128a89a7e3d61a32cd6498411c98a66ca5f2f1b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:44 -0700 Subject: [PATCH 097/158] package/checkpolicy: bump to version 3.2 Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index 55f4f09f76..c237913eaf 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 dfc7707070520c93b14fbbdfdbe081364d806bf28e3e79e10318c2594c77bbb2 checkpolicy-3.1.tar.gz +sha256 9b1c81fa86fe3867842164448d90c8e7ea94b2987497809c65d4caa87a5c5bc8 checkpolicy-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index 86eaffccb1..f8ce48c175 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,8 +4,8 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.1 -CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +CHECKPOLICY_VERSION = 3.2 +CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING From b2cc73b0064fa68e770b57bb6d0d80457a6f251d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:45 -0700 Subject: [PATCH 098/158] package/restorecond: bump to version 3.2 Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index e30e62a812..1869100188 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 82ca45099685a45d718f11f8859963c1ba83d98e510312cbf0b7dc5664c60ad0 restorecond-3.1.tar.gz +sha256 471c17e64aa6d7226e861d4d0125d15fdf9b38892c542be32bd83d999e5e75f5 restorecond-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 7ab7e978dd..d08e0a722e 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,8 +4,8 @@ # ################################################################################ -RESTORECOND_VERSION = 3.1 -RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +RESTORECOND_VERSION = 3.2 +RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING From dbadff7075497c02ded4beb5c6427e0fe8b63657 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:46 -0700 Subject: [PATCH 099/158] package/semodule-utils: bump to version 3.2 Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index d015205d53..595183924d 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 0cc37f9cec751d9c2abb5f2b228b060567e973cb47c19b53b8a4a7378baaa853 semodule-utils-3.1.tar.gz +sha256 be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757 semodule-utils-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index c89f28d60e..426dbdb7b6 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.1 -SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +SEMODULE_UTILS_VERSION = 3.2 +SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING SEMODULE_UTILS_DEPENDENCIES = libsepol From 8add215e9f590542c769c0f902c2c6a8921966d3 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:47 -0700 Subject: [PATCH 100/158] package/selinux-python: bump to version 3.2 Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index f896168f7a..00c28b722c 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 f4d0a1a030bc291a6af498b26e0676b745075dd289a8ba16cdec86c3ea8f2f02 selinux-python-3.1.tar.gz +sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 3b1e15bdf8..61ec7eb595 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,8 +4,8 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.1 -SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +SELINUX_PYTHON_VERSION = 3.2 +SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING SELINUX_PYTHON_DEPENDENCIES = python3 From 4934b732a62ca855b25e6652b1f8a495a79bf879 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:48 -0700 Subject: [PATCH 101/158] package/setools: bump to version 4.4.0 - Remove upstream patch 0001-remove-werror-flag-from-setup.patch - Refactor Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch to apply to 4.4.0 Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- ...-setools.InfoFlowAnalysis-and-setoo.patch} | 19 ++++++------ .../0001-remove-werror-flag-from-setup.patch | 31 ------------------- package/setools/setools.hash | 2 +- package/setools/setools.mk | 2 +- 4 files changed, 12 insertions(+), 42 deletions(-) rename package/setools/{0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch => 0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch} (88%) delete mode 100644 package/setools/0001-remove-werror-flag-from-setup.patch diff --git a/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch similarity index 88% rename from package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch rename to package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index f9519a0790..3c3ae97dff 100644 --- a/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -15,6 +15,7 @@ sedta and seinfoflow to require python3-networkx Signed-off-by: Antoine Tenart [Refreshed for 4.3.0] Signed-off-by: Adam Duskett +[Refreshed for 4.4.0] --- sedta | 3 ++- seinfoflow | 5 +++-- @@ -36,7 +37,7 @@ index 60861ca630a5..0056172a55e5 100755 +import setools.dta - def print_transition(trans): + def print_transition(trans: setools.DomainTransition) -> None: @@ -114,7 +115,7 @@ else: try: @@ -58,7 +59,7 @@ index f10c39de4d8e..fe733bbd0787 100755 import argparse import sys import logging -@@ -101,8 +102,8 @@ elif args.booleans is not None: +@@ -102,8 +103,8 @@ elif args.booleans is not None: try: p = setools.SELinuxPolicy(args.policy) m = setools.PermissionMap(args.map) @@ -70,20 +71,20 @@ index f10c39de4d8e..fe733bbd0787 100755 if args.shortest_path or args.all_paths: if args.shortest_path: diff --git a/setools/__init__.py b/setools/__init__.py -index 26fa5aa34a19..9e9058a6bf90 100644 +index d72d343..4d5aaaa 100644 --- a/setools/__init__.py +++ b/setools/__init__.py -@@ -75,11 +75,11 @@ from .pcideviceconquery import PcideviceconQuery +@@ -91,11 +91,11 @@ from .pcideviceconquery import PcideviceconQuery from .devicetreeconquery import DevicetreeconQuery # Information Flow Analysis -from .infoflow import InfoFlowAnalysis +# from .infoflow import InfoFlowAnalysis - from .permmap import PermissionMap + from .permmap import PermissionMap, RuleWeight, Mapping # Domain Transition Analysis --from .dta import DomainTransitionAnalysis -+# from .dta import DomainTransitionAnalysis +-from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition ++# from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition # Policy difference from .diff import PolicyDifference @@ -91,7 +92,7 @@ diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py index 4608b9dbf34e..2cde44c142e9 100644 --- a/setoolsgui/apol/dta.py +++ b/setoolsgui/apol/dta.py -@@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread +@@ -24,7 +24,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ QTreeWidgetItem @@ -99,7 +100,7 @@ index 4608b9dbf34e..2cde44c142e9 100644 +from setools.dta import DomainTransitionAnalysis from ..logtosignal import LogHandlerToSignal - from .analysistab import AnalysisTab + from .analysistab import AnalysisSection, AnalysisTab diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py index 7bca299d23fc..7fee2778f35f 100644 --- a/setoolsgui/apol/infoflow.py diff --git a/package/setools/0001-remove-werror-flag-from-setup.patch b/package/setools/0001-remove-werror-flag-from-setup.patch deleted file mode 100644 index 0ab4006661..0000000000 --- a/package/setools/0001-remove-werror-flag-from-setup.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8ab5a49247d870d92a8287db6134877ebf7a4379 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 12 Oct 2017 22:04:58 -0400 -Subject: [PATCH] remove werror flag from setup - -Compilers older than gcc6 will generate uninitialized variable warnings which -will cause compiling to fail. - -Signed-off-by: Antoine Tenart -[Refreshed for 4.3.0] -Signed-off-by: Adam Duskett ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 457c83049ca5..4dcb30196abf 100644 ---- a/setup.py -+++ b/setup.py -@@ -106,7 +106,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'], - libraries=['selinux', 'sepol'], - library_dirs=lib_dirs, - define_macros=macros, -- extra_compile_args=['-Werror', '-Wextra', -+ extra_compile_args=['-Wextra', - '-Waggregate-return', - '-Wfloat-equal', - '-Wformat', '-Wformat=2', --- -2.26.2 - diff --git a/package/setools/setools.hash b/package/setools/setools.hash index 689b20a357..74428a177c 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 da2c1d23edd24c4aa17d01d78e86c9e5fb5bf3aa38c71d5d63f41c750f6ef26c setools-4.3.0.tar.gz +sha256 202eac5f857475937bee8136cff278aa2b4a4b94a0dec63fbbbe18c9eb644a4e setools-4.4.0.tar.gz sha256 2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/setools/setools.mk b/package/setools/setools.mk index a07b1367a2..8e1c0d2cc6 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SETOOLS_VERSION = 4.3.0 +SETOOLS_VERSION = 4.4.0 SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES From aaca5fa97198fa1836a477f2fb2e3ba5872a0be2 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 20 May 2021 10:46:49 -0700 Subject: [PATCH 102/158] package/audit: bump to version 3.0.1 Drop all upstream patches as they no longer are applicable. Signed-off-by: Adam Duskett Tested-by: Matthew Weber Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- ...0001-Fix-audispd-path-in-auditd.conf.patch | 32 ----- ...tue-functions-for-strndupa-rawmemchr.patch | 133 ------------------ ...ns-need-to-be-external-when-building.patch | 28 ---- package/audit/audit.hash | 6 +- package/audit/audit.mk | 2 +- 5 files changed, 4 insertions(+), 197 deletions(-) delete mode 100644 package/audit/0001-Fix-audispd-path-in-auditd.conf.patch delete mode 100644 package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch delete mode 100644 package/audit/0003-Header-definitions-need-to-be-external-when-building.patch diff --git a/package/audit/0001-Fix-audispd-path-in-auditd.conf.patch b/package/audit/0001-Fix-audispd-path-in-auditd.conf.patch deleted file mode 100644 index ccf45db911..0000000000 --- a/package/audit/0001-Fix-audispd-path-in-auditd.conf.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e1fd09f7bc131c8f16d9cc43e2455ba4650c651 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sat, 3 Nov 2018 08:25:58 -0300 -Subject: [PATCH] Fix audispd path in auditd.conf - -audispd is installed at /usr/sbin but the configuration file pointed -to /sbin, causing auditd to fail on startup. - -This patch cannot be sent upstream because audispd does not exist -anymore on the master branch (it was merged to auditd). - -Signed-off-by: Carlos Santos ---- - init.d/auditd.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/init.d/auditd.conf b/init.d/auditd.conf -index 4dcda83..998904f 100644 ---- a/init.d/auditd.conf -+++ b/init.d/auditd.conf -@@ -13,7 +13,7 @@ max_log_file = 8 - num_logs = 5 - priority_boost = 4 - disp_qos = lossy --dispatcher = /sbin/audispd -+dispatcher = /usr/sbin/audispd - name_format = NONE - ##name = mydomain - max_log_file_action = ROTATE --- -2.17.1 - diff --git a/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch b/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch deleted file mode 100644 index ac292c57d1..0000000000 --- a/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch +++ /dev/null @@ -1,133 +0,0 @@ -From c39a071e7c021f6ff3554aca2758e97b47a9777c Mon Sep 17 00:00:00 2001 -From: Steve Grubb -Date: Tue, 26 Feb 2019 18:33:33 -0500 -Subject: [PATCH] Add substitue functions for strndupa & rawmemchr - -(cherry picked from commit d579a08bb1cde71f939c13ac6b2261052ae9f77e) -Signed-off-by: Thomas Petazzoni ---- - auparse/auparse.c | 12 +++++++++++- - auparse/interpret.c | 9 ++++++++- - configure.ac | 14 +++++++++++++- - src/ausearch-lol.c | 12 +++++++++++- - 4 files changed, 43 insertions(+), 4 deletions(-) - -diff --git a/auparse/auparse.c b/auparse/auparse.c -index 650db02..2e1c737 100644 ---- a/auparse/auparse.c -+++ b/auparse/auparse.c -@@ -1,5 +1,5 @@ - /* auparse.c -- -- * Copyright 2006-08,2012-17 Red Hat Inc., Durham, North Carolina. -+ * Copyright 2006-08,2012-19 Red Hat Inc., Durham, North Carolina. - * All Rights Reserved. - * - * This library is free software; you can redistribute it and/or -@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t *e) - return 0; - } - -+#ifndef HAVE_STRNDUPA -+static inline char *strndupa(const char *old, size_t n) -+{ -+ size_t len = strnlen(old, n); -+ char *tmp = alloca(len + 1); -+ tmp[len] = 0; -+ return memcpy(tmp, old, len); -+} -+#endif -+ - /* Returns 0 on success and 1 on error */ - static int extract_timestamp(const char *b, au_event_t *e) - { -diff --git a/auparse/interpret.c b/auparse/interpret.c -index 51c4a5e..67b7b77 100644 ---- a/auparse/interpret.c -+++ b/auparse/interpret.c -@@ -853,6 +853,13 @@ err_out: - return print_escaped(id->val); - } - -+// rawmemchr is faster. Let's use it if we have it. -+#ifdef HAVE_RAWMEMCHR -+#define STRCHR rawmemchr -+#else -+#define STRCHR strchr -+#endif -+ - static const char *print_proctitle(const char *val) - { - char *out = (char *)print_escaped(val); -@@ -863,7 +870,7 @@ static const char *print_proctitle(const char *val) - // Proctitle has arguments separated by NUL bytes - // We need to write over the NUL bytes with a space - // so that we can see the arguments -- while ((ptr = rawmemchr(ptr, '\0'))) { -+ while ((ptr = STRCHR(ptr, '\0'))) { - if (ptr >= end) - break; - *ptr = ' '; -diff --git a/configure.ac b/configure.ac -index 6e345f1..6f3007e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,7 +1,7 @@ - dnl - define([AC_INIT_NOTICE], - [### Generated automatically using autoconf version] AC_ACVERSION [ --### Copyright 2005-18 Steve Grubb -+### Copyright 2005-19 Steve Grubb - ### - ### Permission is hereby granted, free of charge, to any person obtaining a - ### copy of this software and associated documentation files (the "Software"), -@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote - AC_CHECK_FUNCS([posix_fallocate]) - dnl; signalfd is needed for libev - AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ]) -+dnl; check if rawmemchr is available -+AC_CHECK_FUNCS([rawmemchr]) -+dnl; check if strndupa is available -+AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [[ -+ #define _GNU_SOURCE -+ #include -+ int main() { (void) strndupa("test", 10); return 0; }]])], -+ [AC_DEFINE(HAVE_STRNDUPA, 1, [Let us know if we have it or not])], -+ [] -+) - - ALLWARNS="" - ALLDEBUG="-g" -diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c -index 5d17a72..758c33e 100644 ---- a/src/ausearch-lol.c -+++ b/src/ausearch-lol.c -@@ -1,6 +1,6 @@ - /* - * ausearch-lol.c - linked list of linked lists library --* Copyright (c) 2008,2010,2014,2016 Red Hat Inc., Durham, North Carolina. -+* Copyright (c) 2008,2010,2014,2016,2019 Red Hat Inc., Durham, North Carolina. - * All Rights Reserved. - * - * This software may be freely redistributed and/or modified under the -@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2) - return 0; - } - -+#ifndef HAVE_STRNDUPA -+static inline char *strndupa(const char *old, size_t n) -+{ -+ size_t len = strnlen(old, n); -+ char *tmp = alloca(len + 1); -+ tmp[len] = 0; -+ return memcpy(tmp, old, len); -+} -+#endif -+ - /* - * This function will look at the line and pick out pieces of it. - */ --- -2.21.0 - diff --git a/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch b/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch deleted file mode 100644 index 9a546261df..0000000000 --- a/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001 -From: Steve Grubb -Date: Fri, 10 Jan 2020 21:13:50 -0500 -Subject: [PATCH] Header definitions need to be external when building with - -fno-common (which is default in GCC 10) - Tony Jones - -Patch taken from upstream: https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f -Signed-off-by: Heiko Thiery ---- - src/ausearch-common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ausearch-common.h b/src/ausearch-common.h -index 6669203..3040547 100644 ---- a/src/ausearch-common.h -+++ b/src/ausearch-common.h -@@ -50,7 +50,7 @@ extern pid_t event_pid; - extern int event_exact_match; - extern uid_t event_uid, event_euid, event_loginuid; - extern const char *event_tuid, *event_teuid, *event_tauid; --slist *event_node_list; -+extern slist *event_node_list; - extern const char *event_comm; - extern const char *event_filename; - extern const char *event_hostname; --- -2.20.1 - diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 71e7df7dbc..4ef9a42b0d 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 0e5d4103646e00f8d1981e1cd2faea7a2ae28e854c31a803e907a383c5e2ecb7 audit-2.8.5.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB +sha256 994c4250d8fd43f3087a3c2ce73461832e30f1e9b278bf5bb03c3e07091155a5 audit-3.0.1.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 05a16e6e31..df6650593d 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 2.8.5 +AUDIT_VERSION = 3.0.1 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB From b9a5448aa05f90718768302a64d2f4a57f260be0 Mon Sep 17 00:00:00 2001 From: Mircea GLIGA Date: Fri, 21 May 2021 16:41:22 +0300 Subject: [PATCH 103/158] package/uclibc: enable linuxthreads for all supported architectures Synchronize the list of architectures that have LinuxThreads support with the ones from uClibc-ng. Signed-off-by: Mircea GLIGA Signed-off-by: Yann E. MORIN --- package/uclibc/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index e59fef3c69..2091166b62 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -53,7 +53,8 @@ config BR2_PTHREADS_NATIVE config BR2_PTHREADS bool "linuxthreads" - depends on BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa + depends on !BR2_aarch64 && !BR2_aarch64_be + depends on !BR2_RISCV_64 select BR2_TOOLCHAIN_HAS_THREADS config BR2_PTHREADS_NONE From ad9d1332dc2e610586da3bc1d4be44f927ef44c2 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 20 May 2021 00:32:37 +0300 Subject: [PATCH 104/158] package/wpewebkit: select gstreamer autoaudiosink Select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT when multimedia support is enabled. This is needed at runtime to automatically select a suitable audio output element, otherwise WebKit will crash at an assertion due to the missing "autoaudiosink" element. More here: https://wpewebkit.org/about/faq.html#why-does-the-browser%2Flauncher-(e.g.-cog)-crash-when-trying-to-play-audio%3F Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpewebkit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 640f7c7011..c8c66e8458 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -95,6 +95,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP From 7d47e5c284faf706cac9e94a48a0abb5e604854f Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 20 May 2021 00:38:27 +0300 Subject: [PATCH 105/158] package/webkitgtk: select missing multimedia deps Select a few missing multimedia related dependencies: - BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT is needed for "autoaudiosink"; not having this element can cause a crash as it is used unconditionally. - BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA and BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX are needed for WebM video playback. Note that BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX depends on THREADS (because of libvpx), but webktigtk already depend on libgtk3, which depends on THREADS. The probability that GTK3 drops the dependency on THREADS is sufficiently close to zero that we need not account for that. So we do not propagate the THREADS dependency for this option. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/webkitgtk/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 4ea931fde1..2ba8d47660 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -98,8 +98,11 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX select BR2_PACKAGE_GST1_LIBAV help This option pulls in all of the required dependencies From 2e53ee4f01f7a8ae0695b32cdd80d8dfdb5d3f9e Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 20 May 2021 00:42:00 +0300 Subject: [PATCH 106/158] package/wpewebkit: make gst-gl depend on _HAS_PLATFORM The GStreamer-GL usage in WPE WebKit is usable as long as GStreamer is configured with a valid platform API (GLX+OpenGL, EGL+OpenGL, EGL+GLES, etc.), which is exactly what the symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM represents. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpewebkit/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index c8c66e8458..04b2bf3beb 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -110,7 +110,7 @@ if BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA config BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL bool "use gstreamer-gl" default y - depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM help Use the GStreamer GL elements for handling video content. This is recommended as it improves performance of video From 4e6efb5884c9479703f8023415df8ba707e61664 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 20 May 2021 00:45:23 +0300 Subject: [PATCH 107/158] package/webkitgtk: make gst-gl depend on _HAS_PLATFORM The GStreamer-GL usage in WebKitGTK is usable as long as GStreamer is configured with a valid platform API (GLX+OpenGL, EGL+OpenGL, EGL+GLES, etc.), which is exactly what the symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM represents. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/webkitgtk/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 2ba8d47660..a05161d052 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -113,7 +113,7 @@ if BR2_PACKAGE_WEBKITGTK_MULTIMEDIA config BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL bool "use gstreamer-gl" default y - depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM help Use the GStreamer GL elements for handling video content. This is recommended as it improves performance of video From 62f71720ee848b7450a91c4e30f1e4c6bbc4b467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 21 May 2021 10:32:10 +0200 Subject: [PATCH 108/158] package/openocd: bump to 0.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove upstream patches. Signed-off-by: Sébastien Szymanski Signed-off-by: Yann E. MORIN --- ...event-some-forms-of-Cross-Protocol-S.patch | 50 ------------------- .../0003-bitbang-Fix-FTBFS-with-GCC-10.patch | 37 -------------- package/openocd/openocd.hash | 7 ++- package/openocd/openocd.mk | 2 +- 4 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch delete mode 100644 package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch diff --git a/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch b/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch deleted file mode 100644 index ba19bf5735..0000000000 --- a/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3a223ca3ebc7ac24d7726a0cd58e5695bc813657 Mon Sep 17 00:00:00 2001 -From: Andreas Fritiofson -Date: Sat, 13 Jan 2018 21:00:47 +0100 -Subject: [PATCH] CVE-2018-5704: Prevent some forms of Cross Protocol Scripting - attacks - -OpenOCD can be targeted by a Cross Protocol Scripting attack from -a web browser running malicious code, such as the following PoC: - -var x = new XMLHttpRequest(); -x.open("POST", "http://127.0.0.1:4444", true); -x.send("exec xcalc\r\n"); - -This mitigation should provide some protection from browser-based -attacks and is based on the corresponding fix in Redis: - -https://github.com/antirez/redis/blob/8075572207b5aebb1385c4f233f5302544439325/src/networking.c#L1758 - - -Upstream-status: Under review: http://openocd.zylin.com/#/c/4335/ -Change-Id: Ia96ebe19b74b5805dc228bf7364c7971a90a4581 -Signed-off-by: Andreas Fritiofson -Reported-by: Josef Gajdusek -Signed-off-by: Peter Korsgaard ---- - src/server/startup.tcl | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/server/startup.tcl b/src/server/startup.tcl -index 64ace407..dd1b31e4 100644 ---- a/src/server/startup.tcl -+++ b/src/server/startup.tcl -@@ -8,3 +8,14 @@ proc ocd_gdb_restart {target_id} { - # one target - reset halt - } -+ -+proc prevent_cps {} { -+ echo "Possible SECURITY ATTACK detected." -+ echo "It looks like somebody is sending POST or Host: commands to OpenOCD." -+ echo "This is likely due to an attacker attempting to use Cross Protocol Scripting" -+ echo "to compromise your OpenOCD instance. Connection aborted." -+ exit -+} -+ -+proc POST {args} { prevent_cps } -+proc Host: {args} { prevent_cps } --- -2.11.0 - diff --git a/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch b/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch deleted file mode 100644 index cf83515247..0000000000 --- a/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001 -From: Andreas Fritiofson -Date: Fri, 17 Apr 2020 13:49:28 +0200 -Subject: [PATCH] bitbang: Fix FTBFS with GCC 10 - -GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd -struct between bitbang drivers due to a missing extern. - -Change-Id: I2b4122f7939cec91a72284006748f99a23548324 -Signed-off-by: Andreas Fritiofson -Reviewed-on: http://openocd.zylin.com/5592 -Tested-by: jenkins -Reviewed-by: Antonio Borneo -Reviewed-by: Jonathan McDowell - -Patch taken from upstream: https://github.com/ntfreak/openocd/commit/c60252ac2b636c4d99b766a574b9df0966151696 -Signed-off-by: Heiko Thiery ---- - src/jtag/drivers/bitbang.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h -index edb779ca..bbbc693d 100644 ---- a/src/jtag/drivers/bitbang.h -+++ b/src/jtag/drivers/bitbang.h -@@ -56,7 +56,7 @@ struct bitbang_interface { - void (*swdio_drive)(bool on); - }; - --const struct swd_driver bitbang_swd; -+extern const struct swd_driver bitbang_swd; - - extern bool swd_mode; - --- -2.20.1 - diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash index 3fb817b4a2..91eb56d930 100644 --- a/package/openocd/openocd.hash +++ b/package/openocd/openocd.hash @@ -1,4 +1,3 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.10.0/ -sha1 3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a openocd-0.10.0.tar.bz2 -md5 b412bdef0481a3859c6585eb69f6f6ba openocd-0.10.0.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/ +sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 7887f3a6dc..1460495a88 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENOCD_VERSION = 0.10.0 +OPENOCD_VERSION = 0.11.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) OPENOCD_LICENSE = GPL-2.0+ From 636cd56e54672a6782367fa28ed2ac1f96a22166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 21 May 2021 10:32:11 +0200 Subject: [PATCH 109/158] package/openocd: add optional dependency on libgpiod MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To make the Linux GPIOD bitbang adapter driver through libgpiod available. Signed-off-by: Sébastien Szymanski Signed-off-by: Yann E. MORIN --- package/openocd/openocd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 1460495a88..b74426ff47 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -32,7 +32,8 @@ OPENOCD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ $(if $(BR2_PACKAGE_LIBHID),libhid) \ - $(if $(BR2_PACKAGE_HIDAPI),hidapi) + $(if $(BR2_PACKAGE_HIDAPI),hidapi) \ + $(if $(BR2_PACKAGE_LIBGPIOD),libgpiod) # Adapters OPENOCD_CONF_OPTS += \ From 2525b3be23f9f914db9b0a9fccd6fec747d9d121 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 7 May 2021 19:42:29 +0200 Subject: [PATCH 110/158] package/python-bleak: bump to version 0.11.0 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-bleak/Config.in | 2 +- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in index 6015361899..43ed65d752 100644 --- a/package/python-bleak/Config.in +++ b/package/python-bleak/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_BLEAK bool "python-bleak" depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_TXDBUS # runtime + select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime help Bluetooth Low Energy platform Agnostic Klient. diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 9506822c1b..9931bce202 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 e891b33804b69f0247eb770ca27fa0d5 bleak-0.10.0.tar.gz -sha256 5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee bleak-0.10.0.tar.gz +md5 f15b43e4a6380eadb96b4235385c2ba1 bleak-0.11.0.tar.gz +sha256 7796a6188547cf77f668406e6513d5d23316c508ca929882ed429d90c7a745ff bleak-0.11.0.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 040d64ed41..870bfce10f 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.10.0 +PYTHON_BLEAK_VERSION = 0.11.0 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/80/37/c8c88709e4f1ca4636bf11c96d1ec046d7426cd02670ae80a3542280558b +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/7c/f3/817132098d57f5717f7f7dc46357e4ca2647c9addaf8e571382d12a28546 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From bbf123d9ca6e9019618ace24abe9b21c1f074226 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 22 May 2021 22:48:45 +0300 Subject: [PATCH 111/158] package/hostapd: enable MD4 in openssl Hostapd assumes that openssl always provides MD4 support. However MD4 support in openssl has become optional since commit a83d41867c8d ("package/libopenssl: add option to enable some features"). Select openssl MD4 support in hostapd Kconfig to avoid build failures. Fixes: http://autobuild.buildroot.net/results/09ce1d8009da98cd2a3f2c8488abaa9f060a9d6b/ Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- package/hostapd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 54d2086c09..1ac7f6cd5a 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOSTAPD bool "hostapd" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help User space daemon for wireless access points. From 2889b5d1a22a20fde816fd807dc88a01adfb9675 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 22 May 2021 23:12:09 +0300 Subject: [PATCH 112/158] package/wpa_supplicant: enable MD4 in openssl Hostapd/wpa_supplicant crypto backend assumes that openssl always provides MD4 support. However MD4 support in openssl has become optional since commit a83d41867c8d ("package/libopenssl: add option to enable some features"). Select openssl MD4 support in wpa_supplicant Kconfig to avoid build failures. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- package/wpa_supplicant/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 27ad22430a..67117c141b 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -1,6 +1,7 @@ menuconfig BR2_PACKAGE_WPA_SUPPLICANT bool "wpa_supplicant" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help WPA supplicant for secure wireless networks From daa27958d472a118d38bdf31151879e9ffc17a51 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 23 May 2021 22:44:47 +0200 Subject: [PATCH 113/158] package/fluidsynth: bump to version 2.2.1 For change log since v2.2.0, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.1 ./utils/test-pkg --package fluidsynth 6 builds, 2 skipped, 0 build failed, 0 legal-info failed Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 12620f51c5..08a19e23f8 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 928fb16f307507485bd1d9b010dafba8c747bce5de2ba47ab1705944c87013b6 fluidsynth-2.2.0.tar.gz +sha256 1c56660f23f6c406b36646cc619fc2d2a5265d1d3290e79bcef4505bcd985fdd fluidsynth-2.2.1.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 4cce6d6448..88b4ba4eda 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.0 +FLUIDSYNTH_VERSION = 2.2.1 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From cb648d12fa733788cd2ea8e0fa8b00bb95983c4e Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sun, 23 May 2021 10:35:08 +0000 Subject: [PATCH 114/158] package/makedumpfile: bump to version 1.6.9 Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- ...-makedumpfile.h-fix-build-on-sparc64.patch | 35 ------------------- package/makedumpfile/makedumpfile.hash | 2 +- package/makedumpfile/makedumpfile.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch diff --git a/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch b/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch deleted file mode 100644 index defc101949..0000000000 --- a/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2c132ac5e6656723821acdb0ee57b34c42851fed Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 4 Feb 2021 20:15:56 +0100 -Subject: [PATCH] makedumpfile.h: fix build on sparc64 - -Fix the following build failure on sparc64: - -/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc64-buildroot-linux-gnu/9.3.0/../../../../sparc64-buildroot-linux-gnu/bin/ld: /tmp/ccylTux8.o: in function `find_kaslr_offsets': -/home/giuliobenetti/autobuild/run/instance-0/output-1/build/makedumpfile-1.6.8/makedumpfile.c:4017: undefined reference to `get_kaslr_offset' - -Fixes: - - http://autobuild.buildroot.org/results/1421f54f7599bba62c0a4bd5c65ce21c8cc7ee1a - -Signed-off-by: Fabrice Fontaine -[Upstream status: -http://lists.infradead.org/pipermail/kexec/2021-February/021996.html] ---- - makedumpfile.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/makedumpfile.h b/makedumpfile.h -index 97a5554..dfc1a77 100644 ---- a/makedumpfile.h -+++ b/makedumpfile.h -@@ -1139,6 +1139,7 @@ unsigned long long vaddr_to_paddr_sparc64(unsigned long vaddr); - #define get_machdep_info() TRUE - #define get_phys_base() get_phys_base_sparc64() - #define get_versiondep_info() get_versiondep_info_sparc64() -+#define get_kaslr_offset(X) stub_false() - #define vaddr_to_paddr(X) vaddr_to_paddr_sparc64(X) - #define paddr_to_vaddr(X) paddr_to_vaddr_general(X) - #define is_phys_addr(X) stub_true_ul(X) --- -2.29.2 - diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index 1b2df008d2..f85f334cbf 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 85d79b7090e9a8ce0d426795d3bc1de2858def7e12954d9bc6ae03de160b694c makedumpfile-1.6.8.tar.gz +sha256 393ea8f22393c059ad21de9b1c3f45d9d0d8dbeb0ccb1417815b835d03f7c350 makedumpfile-1.6.9.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 99fb3a71c8..16271e2246 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.6.8 +MAKEDUMPFILE_VERSION = 1.6.9 MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,$(MAKEDUMPFILE_VERSION)) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 From 1c833604aef36d381353c9b5541e22e9eaa277aa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 23 May 2021 12:11:21 +0200 Subject: [PATCH 115/158] package/pifmrds: use pkg-config Use pkg-config to retrieve libsndfile dependencies Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 888546e5273d77d49bec564a515e85d7acee6bdd) Signed-off-by: Yann E. MORIN --- package/pifmrds/0003-Makefile-fix-static-link.patch | 6 ++++-- package/pifmrds/pifmrds.mk | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/pifmrds/0003-Makefile-fix-static-link.patch b/package/pifmrds/0003-Makefile-fix-static-link.patch index ecd7c4fc4c..3bd91c981f 100644 --- a/package/pifmrds/0003-Makefile-fix-static-link.patch +++ b/package/pifmrds/0003-Makefile-fix-static-link.patch @@ -4,6 +4,8 @@ Since libsndfile uses funtions from libm, the -lm should be specified after libsndfile for static linking. Signed-off-by: "Eric Limpens" +[Fabrice: add $(SNDFILE_LIBS) to pass all dependencies from pkg-config] +Signed-off-by: Fabrice Fontaine diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile --- pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile 2016-02-26 08:06:43.102962592 +0100 @@ -13,11 +15,11 @@ diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pi app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o - $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm ++ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o $(SNDFILE_LIBS) rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o - $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lsndfile -lm ++ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o $(SNDFILE_LIBS) rds.o: rds.c waveforms.h $(CC) $(CFLAGS) rds.c diff --git a/package/pifmrds/pifmrds.mk b/package/pifmrds/pifmrds.mk index 509ec80876..33c13bae33 100644 --- a/package/pifmrds/pifmrds.mk +++ b/package/pifmrds/pifmrds.mk @@ -6,13 +6,14 @@ PIFMRDS_VERSION = 0bf57f9ce0d954365a38d8af8e7be6f28521c3f2 PIFMRDS_SITE = $(call github,ChristopheJacquet,PiFmRds,$(PIFMRDS_VERSION)) -PIFMRDS_DEPENDENCIES = libsndfile +PIFMRDS_DEPENDENCIES = host-pkgconf libsndfile PIFMRDS_LICENSE = GPL-3.0+ PIFMRDS_LICENSE_FILES = LICENSE define PIFMRDS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -ffast-math -c" \ + SNDFILE_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs sndfile`" \ app rds_wav endef From 8c600fda64f48c16d20588336dd7ac6a32241c6a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 23 May 2021 12:11:19 +0200 Subject: [PATCH 116/158] package/libsndfile: bump to version 1.0.31 - Switch site to github to get latest release - Drop all patches (already in version) - Update indentation in hash file (two spaces) https://github.com/libsndfile/libsndfile/releases/tag/1.0.31 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...eck-psf-sf.channels-against-upper-bo.patch | 39 -------- ...MAX_CHANNELS-in-sndfile-deinterleave.patch | 36 ------- ...aw-fix-multiple-buffer-overflows-432.patch | 96 ------------------- ...004-src-wav.c-Fix-heap-read-overflow.patch | 35 ------- ...header-don-t-read-past-the-array-end.patch | 33 ------- ...rc-aiff.c-Fix-a-buffer-read-overflow.patch | 29 ------ .../0007-FLAC-Fix-a-buffer-read-overrun.patch | 68 ------------- ...rc-flac.c-Fix-a-buffer-read-overflow.patch | 54 ----------- ...9-src-flac-c-Fix-another-memory-leak.patch | 32 ------- ...er-overflows-when-writing-strings-in.patch | 92 ------------------ package/libsndfile/libsndfile.hash | 4 +- package/libsndfile/libsndfile.mk | 27 +----- 12 files changed, 5 insertions(+), 540 deletions(-) delete mode 100644 package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch delete mode 100644 package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch delete mode 100644 package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch delete mode 100644 package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch delete mode 100644 package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch delete mode 100644 package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch delete mode 100644 package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch delete mode 100644 package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch delete mode 100644 package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch delete mode 100644 package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch diff --git a/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch b/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch deleted file mode 100644 index 59ba8f85f6..0000000000 --- a/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 85c877d5072866aadbe8ed0c3e0590fbb5e16788 Mon Sep 17 00:00:00 2001 -From: Fabian Greffrath -Date: Thu, 28 Sep 2017 12:15:04 +0200 -Subject: [PATCH] double64_init: Check psf->sf.channels against upper bound - -This prevents division by zero later in the code. - -While the trivial case to catch this (i.e. sf.channels < 1) has already -been covered, a crafted file may report a number of channels that is -so high (i.e. > INT_MAX/sizeof(double)) that it "somehow" gets -miscalculated to zero (if this makes sense) in the determination of the -blockwidth. Since we only support a limited number of channels anyway, -make sure to check here as well. - -CVE-2017-14634 - -Closes: https://github.com/erikd/libsndfile/issues/318 -Signed-off-by: Erik de Castro Lopo -Signed-off-by: Peter Korsgaard ---- - src/double64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/double64.c b/src/double64.c -index b318ea86..78dfef7f 100644 ---- a/src/double64.c -+++ b/src/double64.c -@@ -91,7 +91,7 @@ int - double64_init (SF_PRIVATE *psf) - { static int double64_caps ; - -- if (psf->sf.channels < 1) -+ if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS) - { psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ; - return SFE_INTERNAL ; - } ; --- -2.11.0 - diff --git a/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch b/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch deleted file mode 100644 index 3b828de6ac..0000000000 --- a/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aaea680337267bfb6d2544da878890ee7f1c5077 Mon Sep 17 00:00:00 2001 -From: "Brett T. Warden" -Date: Tue, 28 Aug 2018 12:01:17 -0700 -Subject: [PATCH] Check MAX_CHANNELS in sndfile-deinterleave - -Allocated buffer has space for only 16 channels. Verify that input file -meets this limit. - -Fixes #397 - -Signed-off-by: Peter Korsgaard ---- - programs/sndfile-deinterleave.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c -index 53660310..225b4d54 100644 ---- a/programs/sndfile-deinterleave.c -+++ b/programs/sndfile-deinterleave.c -@@ -89,6 +89,13 @@ main (int argc, char **argv) - exit (1) ; - } ; - -+ if (sfinfo.channels > MAX_CHANNELS) -+ { printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n", -+ argv [1], sfinfo.channels, MAX_CHANNELS) ; -+ exit (1) ; -+ } ; -+ -+ - state.channels = sfinfo.channels ; - sfinfo.channels = 1 ; - --- -2.11.0 - diff --git a/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch b/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch deleted file mode 100644 index 536bad2678..0000000000 --- a/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 8ddc442d539ca775d80cdbc7af17a718634a743f Mon Sep 17 00:00:00 2001 -From: Hugo Lefeuvre -Date: Mon, 24 Dec 2018 06:43:48 +0100 -Subject: [PATCH] a/ulaw: fix multiple buffer overflows (#432) - -i2ulaw_array() and i2alaw_array() fail to handle ptr [count] = INT_MIN -properly, leading to buffer underflow. INT_MIN is a special value -since - INT_MIN cannot be represented as int. - -In this case round - INT_MIN to INT_MAX and proceed as usual. - -f2ulaw_array() and f2alaw_array() fail to handle ptr [count] = NaN -properly, leading to null pointer dereference. - -In this case, arbitrarily set the buffer value to 0. - -This commit fixes #429 (CVE-2018-19661 and CVE-2018-19662) and -fixes #344 (CVE-2017-17456 and CVE-2017-17457). - -Signed-off-by: Peter Korsgaard ---- - src/alaw.c | 9 +++++++-- - src/ulaw.c | 9 +++++++-- - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/alaw.c b/src/alaw.c -index 063fd1a2..4220224c 100644 ---- a/src/alaw.c -+++ b/src/alaw.c -@@ -19,6 +19,7 @@ - #include "sfconfig.h" - - #include -+#include - - #include "sndfile.h" - #include "common.h" -@@ -326,7 +327,9 @@ s2alaw_array (const short *ptr, int count, unsigned char *buffer) - static inline void - i2alaw_array (const int *ptr, int count, unsigned char *buffer) - { while (--count >= 0) -- { if (ptr [count] >= 0) -+ { if (ptr [count] == INT_MIN) -+ buffer [count] = alaw_encode [INT_MAX >> (16 + 4)] ; -+ else if (ptr [count] >= 0) - buffer [count] = alaw_encode [ptr [count] >> (16 + 4)] ; - else - buffer [count] = 0x7F & alaw_encode [- ptr [count] >> (16 + 4)] ; -@@ -346,7 +349,9 @@ f2alaw_array (const float *ptr, int count, unsigned char *buffer, float normfact - static inline void - d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfact) - { while (--count >= 0) -- { if (ptr [count] >= 0) -+ { if (!isfinite (ptr [count])) -+ buffer [count] = 0 ; -+ else if (ptr [count] >= 0) - buffer [count] = alaw_encode [lrint (normfact * ptr [count])] ; - else - buffer [count] = 0x7F & alaw_encode [- lrint (normfact * ptr [count])] ; -diff --git a/src/ulaw.c b/src/ulaw.c -index e50b4cb5..b6070ade 100644 ---- a/src/ulaw.c -+++ b/src/ulaw.c -@@ -19,6 +19,7 @@ - #include "sfconfig.h" - - #include -+#include - - #include "sndfile.h" - #include "common.h" -@@ -827,7 +828,9 @@ s2ulaw_array (const short *ptr, int count, unsigned char *buffer) - static inline void - i2ulaw_array (const int *ptr, int count, unsigned char *buffer) - { while (--count >= 0) -- { if (ptr [count] >= 0) -+ { if (ptr [count] == INT_MIN) -+ buffer [count] = ulaw_encode [INT_MAX >> (16 + 2)] ; -+ else if (ptr [count] >= 0) - buffer [count] = ulaw_encode [ptr [count] >> (16 + 2)] ; - else - buffer [count] = 0x7F & ulaw_encode [-ptr [count] >> (16 + 2)] ; -@@ -847,7 +850,9 @@ f2ulaw_array (const float *ptr, int count, unsigned char *buffer, float normfact - static inline void - d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfact) - { while (--count >= 0) -- { if (ptr [count] >= 0) -+ { if (!isfinite (ptr [count])) -+ buffer [count] = 0 ; -+ else if (ptr [count] >= 0) - buffer [count] = ulaw_encode [lrint (normfact * ptr [count])] ; - else - buffer [count] = 0x7F & ulaw_encode [- lrint (normfact * ptr [count])] ; --- -2.11.0 - diff --git a/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch b/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch deleted file mode 100644 index 2e730ca3fa..0000000000 --- a/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 42132c543358cee9f7c3e9e9b15bb6c1063a608e Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Tue, 1 Jan 2019 20:11:46 +1100 -Subject: [PATCH] src/wav.c: Fix heap read overflow - -This is CVE-2018-19758. - -Closes: https://github.com/erikd/libsndfile/issues/435 -[Retrieved (and backported) from: -https://github.com/erikd/libsndfile/commit/42132c543358cee9f7c3e9e9b15bb6c1063a608e] -Signed-off-by: Fabrice Fontaine ---- - src/wav.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/wav.c b/src/wav.c -index 9d71aadb..5c825f2a 100644 ---- a/src/wav.c -+++ b/src/wav.c -@@ -1,5 +1,5 @@ - /* --** Copyright (C) 1999-2016 Erik de Castro Lopo -+** Copyright (C) 1999-2019 Erik de Castro Lopo - ** Copyright (C) 2004-2005 David Viens - ** - ** This program is free software; you can redistribute it and/or modify -@@ -1146,6 +1146,8 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) - psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* SMTPE format */ - psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loop_count), BHW4 (0)) ; - -+ /* Loop count is signed 16 bit number so we limit it range to something sensible. */ -+ psf->instrument->loop_count &= 0x7fff ; - for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++) - { int type ; - diff --git a/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch b/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch deleted file mode 100644 index e958517808..0000000000 --- a/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6d7ce94c020cc720a6b28719d1a7879181790008 Mon Sep 17 00:00:00 2001 -From: Emilio Pozuelo Monfort -Date: Tue, 5 Mar 2019 11:27:17 +0100 -Subject: [PATCH] wav_write_header: don't read past the array end - -If loop_count is bigger than the array, truncate it to the array -length (and not to 32k). - -CVE-2019-3832 -[Retrieved from: -https://github.com/erikd/libsndfile/commit/6d7ce94c020cc720a6b28719d1a7879181790008] -Signed-off-by: Fabrice Fontaine ---- - src/wav.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/wav.c b/src/wav.c -index 5c825f2a..104bd0a7 100644 ---- a/src/wav.c -+++ b/src/wav.c -@@ -1146,8 +1146,10 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) - psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* SMTPE format */ - psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loop_count), BHW4 (0)) ; - -- /* Loop count is signed 16 bit number so we limit it range to something sensible. */ -- psf->instrument->loop_count &= 0x7fff ; -+ /* Make sure we don't read past the loops array end. */ -+ if (psf->instrument->loop_count > ARRAY_LEN (psf->instrument->loops)) -+ psf->instrument->loop_count = ARRAY_LEN (psf->instrument->loops) ; -+ - for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++) - { int type ; - diff --git a/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch b/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch deleted file mode 100644 index 68b9e8ed67..0000000000 --- a/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f833c53cb596e9e1792949f762e0b33661822748 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Tue, 23 May 2017 20:15:24 +1000 -Subject: [PATCH] src/aiff.c: Fix a buffer read overflow - -Secunia Advisory SA76717. - -Found by: Laurent Delosieres, Secunia Research at Flexera Software - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748] ---- - src/aiff.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/aiff.c b/src/aiff.c -index 5b5f9f53..45864b76 100644 ---- a/src/aiff.c -+++ b/src/aiff.c -@@ -1759,7 +1759,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword) - psf_binheader_readf (psf, "j", dword - bytesread) ; - - if (map_info->channel_map != NULL) -- { size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ; -+ { size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xffff) * sizeof (psf->channel_map [0]) ; - - free (psf->channel_map) ; - diff --git a/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch b/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch deleted file mode 100644 index b000143b70..0000000000 --- a/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch +++ /dev/null @@ -1,68 +0,0 @@ -From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Wed, 12 Apr 2017 19:45:30 +1000 -Subject: [PATCH] FLAC: Fix a buffer read overrun - -Buffer read overrun occurs when reading a FLAC file that switches -from 2 channels to one channel mid-stream. Only option is to -abort the read. - -Closes: https://github.com/erikd/libsndfile/issues/230 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3] ---- - src/common.h | 1 + - src/flac.c | 13 +++++++++++++ - src/sndfile.c | 1 + - 3 files changed, 15 insertions(+) - -diff --git a/src/common.h b/src/common.h -index 0bd810c3..e2669b6a 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -725,6 +725,7 @@ enum - SFE_FLAC_INIT_DECODER, - SFE_FLAC_LOST_SYNC, - SFE_FLAC_BAD_SAMPLE_RATE, -+ SFE_FLAC_CHANNEL_COUNT_CHANGED, - SFE_FLAC_UNKOWN_ERROR, - - SFE_WVE_NOT_WVE, -diff --git a/src/flac.c b/src/flac.c -index 84de0e26..986a7b8f 100644 ---- a/src/flac.c -+++ b/src/flac.c -@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ - - switch (metadata->type) - { case FLAC__METADATA_TYPE_STREAMINFO : -+ if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) -+ { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" -+ "Nothing to be but to error out.\n" , -+ psf->sf.channels, metadata->data.stream_info.channels) ; -+ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; -+ return ; -+ } ; -+ -+ if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate) -+ { psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n" -+ "Carrying on as if nothing happened.", -+ psf->sf.samplerate, metadata->data.stream_info.sample_rate) ; -+ } ; - psf->sf.channels = metadata->data.stream_info.channels ; - psf->sf.samplerate = metadata->data.stream_info.sample_rate ; - psf->sf.frames = metadata->data.stream_info.total_samples ; -diff --git a/src/sndfile.c b/src/sndfile.c -index 41875610..e2a87be8 100644 ---- a/src/sndfile.c -+++ b/src/sndfile.c -@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] = - { SFE_FLAC_INIT_DECODER , "Error : problem with initialization of the flac decoder." }, - { SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." }, - { SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." }, -+ { SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." }, - { SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." }, - - { SFE_WVE_NOT_WVE , "Error : not a WVE file." }, diff --git a/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch b/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch deleted file mode 100644 index f716e26867..0000000000 --- a/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Fri, 14 Apr 2017 15:19:16 +1000 -Subject: [PATCH] src/flac.c: Fix a buffer read overflow - -A file (generated by a fuzzer) which increased the number of channels -from one frame to the next could cause a read beyond the end of the -buffer provided by libFLAC. Only option is to abort the read. - -Closes: https://github.com/erikd/libsndfile/issues/231 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808] ---- - src/flac.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/flac.c b/src/flac.c -index 5a4f8c21..e4f9aaa0 100644 ---- a/src/flac.c -+++ b/src/flac.c -@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf) - const int32_t* const *buffer = pflac->wbuffer ; - unsigned i = 0, j, offset, channels, len ; - -+ if (psf->sf.channels != (int) frame->header.channels) -+ { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n" -+ "Nothing to do but to error out.\n" , -+ psf->sf.channels, frame->header.channels) ; -+ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; -+ return 0 ; -+ } ; -+ - /* - ** frame->header.blocksize is variable and we're using a constant blocksize - ** of FLAC__MAX_BLOCK_SIZE. -@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf) - return 0 ; - } ; - -- - len = SF_MIN (pflac->len, frame->header.blocksize) ; - - if (pflac->remain % channels != 0) -@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ - { case FLAC__METADATA_TYPE_STREAMINFO : - if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) - { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" -- "Nothing to be but to error out.\n" , -+ "Nothing to do but to error out.\n" , - psf->sf.channels, metadata->data.stream_info.channels) ; - psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; - return ; diff --git a/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch b/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch deleted file mode 100644 index 788b9b5187..0000000000 --- a/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cd7da8dbf6ee4310d21d9e44b385d6797160d9e8 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Wed, 12 Apr 2017 20:19:34 +1000 -Subject: [PATCH] src/flac.c: Fix another memory leak - -When the FLAC decoder was passed a malformed file, the associated -`FLAC__StreamDecoder` object was not getting released. - -Closes: https://github.com/erikd/libsndfile/issues/233 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/erikd/libsndfile/commit/cd7da8dbf6ee4310d21d9e44b385d6797160d9e8] ---- - src/flac.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/flac.c b/src/flac.c -index 986a7b8f..5a4f8c21 100644 ---- a/src/flac.c -+++ b/src/flac.c -@@ -841,7 +841,9 @@ flac_read_header (SF_PRIVATE *psf) - - psf_log_printf (psf, "End\n") ; - -- if (psf->error == 0) -+ if (psf->error != 0) -+ FLAC__stream_decoder_delete (pflac->fsd) ; -+ else - { FLAC__uint64 position ; - - FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; diff --git a/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch b/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch deleted file mode 100644 index 91aa36c9d6..0000000000 --- a/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch +++ /dev/null @@ -1,92 +0,0 @@ -From cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= -Date: Wed, 14 Jun 2017 12:25:40 +0200 -Subject: [PATCH] src/common.c: Fix heap buffer overflows when writing strings - in binheader - -Fixes the following problems: - 1. Case 's' only enlarges the buffer by 16 bytes instead of size bytes. - 2. psf_binheader_writef() enlarges the header buffer (if needed) prior to the - big switch statement by an amount (16 bytes) which is enough for all cases - where only a single value gets added. Cases 's', 'S', 'p' however - additionally write an arbitrary length block of data and again enlarge the - buffer to the required amount. However, the required space calculation does - not take into account the size of the length field which gets output before - the data. - 3. Buffer size requirement calculation in case 'S' does not account for the - padding byte ("size += (size & 1) ;" happens after the calculation which - uses "size"). - 4. Case 'S' can overrun the header buffer by 1 byte when no padding is - involved - ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;" while - the buffer is only guaranteed to have "size" space available). - 5. "psf->header.ptr [psf->header.indx] = 0 ;" in case 'S' always writes 1 byte - beyond the space which is guaranteed to be allocated in the header buffer. - 6. Case 's' can overrun the provided source string by 1 byte if padding is - involved ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;" - where "size" is "strlen (strptr) + 1" (which includes the 0 terminator, - plus optionally another 1 which is padding and not guaranteed to be - readable via the source string pointer). - -Closes: https://github.com/erikd/libsndfile/issues/292 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8] ---- - src/common.c | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/src/common.c b/src/common.c -index 1a6204ca..6b2a2ee9 100644 ---- a/src/common.c -+++ b/src/common.c -@@ -681,16 +681,16 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) - /* Write a C string (guaranteed to have a zero terminator). */ - strptr = va_arg (argptr, char *) ; - size = strlen (strptr) + 1 ; -- size += (size & 1) ; - -- if (psf->header.indx + (sf_count_t) size >= psf->header.len && psf_bump_header_allocation (psf, 16)) -+ if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) - return count ; - - if (psf->rwf_endian == SF_ENDIAN_BIG) -- header_put_be_int (psf, size) ; -+ header_put_be_int (psf, size + (size & 1)) ; - else -- header_put_le_int (psf, size) ; -+ header_put_le_int (psf, size + (size & 1)) ; - memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ; -+ size += (size & 1) ; - psf->header.indx += size ; - psf->header.ptr [psf->header.indx - 1] = 0 ; - count += 4 + size ; -@@ -703,16 +703,15 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) - */ - strptr = va_arg (argptr, char *) ; - size = strlen (strptr) ; -- if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) -+ if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) - return count ; - if (psf->rwf_endian == SF_ENDIAN_BIG) - header_put_be_int (psf, size) ; - else - header_put_le_int (psf, size) ; -- memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ; -+ memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + (size & 1)) ; - size += (size & 1) ; - psf->header.indx += size ; -- psf->header.ptr [psf->header.indx] = 0 ; - count += 4 + size ; - break ; - -@@ -724,7 +723,7 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) - size = (size & 1) ? size : size + 1 ; - size = (size > 254) ? 254 : size ; - -- if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) -+ if (psf->header.indx + 1 + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, 1 + size)) - return count ; - - header_put_byte (psf, size) ; diff --git a/package/libsndfile/libsndfile.hash b/package/libsndfile/libsndfile.hash index c744a7675a..14dfe823f9 100644 --- a/package/libsndfile/libsndfile.hash +++ b/package/libsndfile/libsndfile.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 libsndfile-1.0.28.tar.gz +sha256 a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163 libsndfile-1.0.31.tar.bz2 # Locally calculated -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index eb15426146..2505e8d17f 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -4,37 +4,16 @@ # ################################################################################ -LIBSNDFILE_VERSION = 1.0.28 -LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files +LIBSNDFILE_VERSION = 1.0.31 +LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.bz2 +LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION) LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project -# 0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-14634 -# 0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch -LIBSNDFILE_IGNORE_CVES += CVE-2018-13139 CVE-2018-19432 -# 0003-a-ulaw-fix-multiple-buffer-overflows-432.patch -LIBSNDFILE_IGNORE_CVES += \ - CVE-2017-14245 CVE-2017-14246 CVE-2017-17456 CVE-2017-17457 \ - CVE-2018-19661 CVE-2018-19662 # disputed, https://github.com/erikd/libsndfile/issues/398 LIBSNDFILE_IGNORE_CVES += CVE-2018-13419 -# 0004-src-wav.c-Fix-heap-read-overflow.patch -LIBSNDFILE_IGNORE_CVES += CVE-2018-19758 -# 0005-wav_write_header-don-t-read-past-the-array-end.patch -LIBSNDFILE_IGNORE_CVES += CVE-2019-3832 -# 0006-src-aiff.c-Fix-a-buffer-read-overflow.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-6892 -# 0007-FLAC-Fix-a-buffer-read-overrun.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-8361 -# 0008-src-flac.c-Fix-a-buffer-read-overflow.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-8362 CVE-2017-8365 -# 0009-src-flac-c-Fix-another-memory-leak.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-8363 -# 0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-12562 LIBSNDFILE_CONF_OPTS = \ --disable-sqlite \ From dbc6e9e9f385995eb10bbfb0bb08e7674100ce66 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 23 May 2021 12:11:20 +0200 Subject: [PATCH 117/158] package/libsndfile: add external libs support Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: dependencies fit on a single line] Signed-off-by: Yann E. MORIN --- package/libsndfile/libsndfile.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 2505e8d17f..69530c98ed 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -18,7 +18,13 @@ LIBSNDFILE_IGNORE_CVES += CVE-2018-13419 LIBSNDFILE_CONF_OPTS = \ --disable-sqlite \ --disable-alsa \ - --disable-external-libs \ --disable-full-suite +ifeq ($(BR2_PACKAGE_FLAC)$(BR2_PACKAGE_LIBVORBIS)$(BR2_PACKAGE_OPUS),yyy) +LIBSNDFILE_DEPENDENCIES += flac host-pkgconf libvorbis opus +LIBSNDFILE_CONF_OPTS += --enable-external-libs +else +LIBSNDFILE_CONF_OPTS += --disable-external-libs +endif + $(eval $(autotools-package)) From 6f70990ccf6cb993fc31519337390e436d15493b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 24 May 2021 14:29:01 +0200 Subject: [PATCH 118/158] package/xmrig: new package Signed-off-by: Bernd Kuhls [me: - introduce XMRIG_SUFFIX - extend comment about installation commands ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/xmrig/Config.in | 22 ++++++++++++++++++++ package/xmrig/xmrig.hash | 3 +++ package/xmrig/xmrig.mk | 43 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 package/xmrig/Config.in create mode 100644 package/xmrig/xmrig.hash create mode 100644 package/xmrig/xmrig.mk diff --git a/DEVELOPERS b/DEVELOPERS index 988612a944..979813c1dd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -455,6 +455,7 @@ F: package/waylandpp/ F: package/x11r7/ F: package/x264/ F: package/x265/ +F: package/xmrig/ F: package/ytree/ F: package/znc/ F: support/testing/tests/package/test_perl_html_parser.py diff --git a/package/Config.in b/package/Config.in index 8e017654d2..3c99ba8030 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2061,6 +2061,7 @@ menu "Miscellaneous" source "package/sunwait/Config.in" source "package/taskd/Config.in" source "package/wine/Config.in" + source "package/xmrig/Config.in" source "package/xutil_util-macros/Config.in" endmenu diff --git a/package/xmrig/Config.in b/package/xmrig/Config.in new file mode 100644 index 0000000000..7024241017 --- /dev/null +++ b/package/xmrig/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_XMRIG + bool "xmrig" + # archs officially supported by upstream + depends on BR2_aarch64 || BR2_x86_64 || BR2_i386 + depends on BR2_USE_MMU # libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + # xmrig needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + help + RandomX, CryptoNight, AstroBWT and Argon2 CPU/GPU miner. + + https://xmrig.com + +comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library" + depends on BR2_aarch64 || BR2_x86_64 || BR2_i386 + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + BR2_TOOLCHAIN_USES_UCLIBC || BR2_STATIC_LIBS diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash new file mode 100644 index 0000000000..c80bdd6621 --- /dev/null +++ b/package/xmrig/xmrig.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7570030c4b3e257bda190a100dc59f78b74c823af7561222a99b296f5e7b1ac2 xmrig-6.12.1.tar.gz +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk new file mode 100644 index 0000000000..2202d875c5 --- /dev/null +++ b/package/xmrig/xmrig.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# xmrig +# +################################################################################ + +XMRIG_VERSION = 6.12.1 +XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) +XMRIG_LICENSE = GPL-3.0+ +XMRIG_LICENSE_FILES = LICENSE +XMRIG_DEPENDENCIES = libuv +XMRIG_CONF_OPTS = -DWITH_CUDA=OFF + +ifeq ($(BR2_PACKAGE_HAS_LIBOPENCL),y) +XMRIG_CONF_OPTS += -DWITH_OPENCL=ON +XMRIG_DEPENDENCIES += libopencl +else +XMRIG_CONF_OPTS += -DWITH_OPENCL=OFF +endif + +ifeq ($(BR2_PACKAGE_HWLOC),y) +XMRIG_CONF_OPTS += -DWITH_HWLOC=ON +XMRIG_DEPENDENCIES += hwloc +else +XMRIG_CONF_OPTS += -DWITH_HWLOC=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XMRIG_CONF_OPTS += -DWITH_TLS=ON +XMRIG_DEPENDENCIES += openssl +else +XMRIG_CONF_OPTS += -DWITH_TLS=OFF +XMRIG_SUFFIX = -notls +endif + +# Upstream provides no installation rule: +# *** No rule to make target 'install/fast'. Stop. +define XMRIG_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/xmrig$(XMRIG_SUFFIX) \ + $(TARGET_DIR)/usr/bin/xmrig$(XMRIG_SUFFIX) +endef + +$(eval $(cmake-package)) From d7c7c41734efbc5ab1a3a3bfc40c7f62ad779ef7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 May 2021 11:40:24 +0200 Subject: [PATCH 119/158] package/kodi-inputstream-adaptive: bump version to 2.6.16-Matrix Changelog: https://github.com/xbmc/inputstream.adaptive/blob/Matrix/inputstream.adaptive/addon.xml.in#L22 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 12e9f20904..f3a4bf9ec3 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 179b337c397ff484f25a936f8c50114a112d5107f6d3cf41b4e9fb92507525fd kodi-inputstream-adaptive-2.6.15-Matrix.tar.gz +sha256 49b9971973a8df16faa2a7a46d81156484a27c98930eae56dad12d466910db13 kodi-inputstream-adaptive-2.6.16-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 6176d7bff0..1ffc6bc25a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.15-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.16-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL From 03b50bfe5fc04b032add4574bba30166468c9dc4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 22 May 2021 21:14:26 +0200 Subject: [PATCH 120/158] package/sqlite: bump to version 3350500 Release notes: https://www.sqlite.org/releaselog/3_35_5.html Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/sqlite/Config.in | 2 +- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 87c0f6c073..0ae9878d7b 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_SQLITE self-contained, embeddable, zero-configuration SQL database engine. - http://www.sqlite.org/ + https://www.sqlite.org/ if BR2_PACKAGE_SQLITE diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 02b0e7132a..ec66543224 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a3bca581117b3b88e5361d0ef3803ba6d8da604b1c1a47d902ef785c1b53e89 sqlite-autoconf-3340100.tar.gz +sha256 f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0 sqlite-autoconf-3350500.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 2c2928f274..8e864ba2e5 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3340100 -SQLITE_CPE_ID_VERSION = 3.34.1 +SQLITE_VERSION = 3350500 +SQLITE_CPE_ID_VERSION = 3.35.5 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain From 47acda3a95bd4310f884e741f20785d374af7b22 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 21 May 2021 13:37:36 +0300 Subject: [PATCH 121/158] package/libpsl: new package Package libpsl is a new non-optional dependency of future libsoup versions. Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: reorder some variables] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/libpsl/Config.in | 8 ++++++++ package/libpsl/libpsl.hash | 6 ++++++ package/libpsl/libpsl.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/libpsl/Config.in create mode 100644 package/libpsl/libpsl.hash create mode 100644 package/libpsl/libpsl.mk diff --git a/DEVELOPERS b/DEVELOPERS index 979813c1dd..845089736b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,6 +35,7 @@ F: package/bubblewrap/ F: package/cage/ F: package/cog/ F: package/libepoxy/ +F: package/libpsl/ F: package/libwpe/ F: package/webkitgtk/ F: package/wlroots/ diff --git a/package/Config.in b/package/Config.in index 3c99ba8030..4dac63ab90 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1792,6 +1792,7 @@ menu "Networking" source "package/libpagekite/Config.in" source "package/libpcap/Config.in" source "package/libpjsip/Config.in" + source "package/libpsl/Config.in" source "package/librelp/Config.in" source "package/librsync/Config.in" source "package/libshairplay/Config.in" diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in new file mode 100644 index 0000000000..dd484799e7 --- /dev/null +++ b/package/libpsl/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBPSL + bool "libpsl" + select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN + select BR2_PACKAGE_LIBUNISTRING if !BR2_PACKAGE_ICU + help + C library to handle the Public Suffix List of TLDs. + + https://github.com/rockdaboot/libpsl diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash new file mode 100644 index 0000000000..552935e9ec --- /dev/null +++ b/package/libpsl/libpsl.hash @@ -0,0 +1,6 @@ +# Locally generated +sha256 ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c libpsl-0.21.1.tar.gz + +# Hashes for license files: +sha256 7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4 COPYING +sha256 1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3 src/LICENSE.chromium diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk new file mode 100644 index 0000000000..69e5da4ca4 --- /dev/null +++ b/package/libpsl/libpsl.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libpsl +# +################################################################################ + +LIBPSL_VERSION = 0.21.1 +LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION) +LIBPSL_LICENSE = MIT, BSD-3-Clause +LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium +LIBPSL_DEPENDENCIES = host-pkgconf +LIBPSL_INSTALL_STAGING = YES +LIBPSL_CONF_OPTS = -Ddocs=false + +# The order of checks is the same as done by libpsl when configured. +ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy) +LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2 +LIBPSL_DEPENDENCIES += libidn2 libunistring +else ifeq ($(BR2_PACKAGE_ICU),y) +LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu +LIBPSL_DEPENDENCIES += icu +else +LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn +LIBPSL_DEPENDENCIES += libidn libunistring +endif + +$(eval $(meson-package)) From 508cdd7b813825668752cc57024ae5f5342393b6 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 21 May 2021 13:37:37 +0300 Subject: [PATCH 122/158] package/libsoup: bump to version 2.66.5 Change libsoup to version 2.66.5, which introduces many fixes. This needs adding the libpsl dependency, and switching over to Meson as the autotools based build system is no more. The existing patch is not needed anymore. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- .../0001-Revert-tld-parser-use-Python-3.patch | 27 ------------------- package/libsoup/Config.in | 1 + package/libsoup/libsoup.hash | 4 +-- package/libsoup/libsoup.mk | 20 +++++++------- 4 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch diff --git a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch deleted file mode 100644 index c27ee986c6..0000000000 --- a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 015926c80fa3e9704f05cbc1ad17f0a877f8de09 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 1 Sep 2018 15:39:04 +0200 -Subject: [PATCH] Revert "tld-parser: use Python 3" - -This reverts commit 4b924e573da307436169d5ef7e04c0ab85b36ef9. The -script runs just fine with Python 2.x, there is no reason to enforce -using Python 3.x. - -Signed-off-by: Thomas Petazzoni ---- - libsoup/tld-parser.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py -index a743471a..5d9d2ba5 100755 ---- a/libsoup/tld-parser.py -+++ b/libsoup/tld-parser.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/env python - - # Generate tld rules - # Copyright (C) 2012 Red Hat, Inc. --- -2.14.4 - diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index f6f8fde968..47adfb33f2 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBSOUP depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBPSL select BR2_PACKAGE_SQLITE help libsoup is an HTTP client/server library. It uses GObject diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 666bbc278b..3b9009884d 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.62/libsoup-2.62.3.sha256sum -sha256 d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172 libsoup-2.62.3.tar.xz +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.66/libsoup-2.66.5.sha256sum +sha256 ee43be1485bd95b686236b1e0043ec6edb761a538616c9c63004d7d1979bb139 libsoup-2.66.5.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 44808225ea..1617940c8f 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.62 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3 +LIBSOUP_VERSION_MAJOR = 2.66 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).5 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ @@ -13,27 +13,27 @@ LIBSOUP_LICENSE_FILES = COPYING LIBSOUP_CPE_ID_VENDOR = gnome LIBSOUP_INSTALL_STAGING = YES LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) -LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no +LIBSOUP_CONF_OPTS = -Dtests=false -Dvapi=false -Dgssapi=false LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ - libglib2 libxml2 sqlite host-intltool + libglib2 libpsl libxml2 sqlite host-intltool ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSOUP_CONF_OPTS += --with-introspection +LIBSOUP_CONF_OPTS += -Dintrospection=true LIBSOUP_DEPENDENCIES += gobject-introspection else -LIBSOUP_CONF_OPTS += --without-introspection +LIBSOUP_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) -LIBSOUP_CONF_OPTS += --with-gnome +LIBSOUP_CONF_OPTS += -Dgnome=true else -LIBSOUP_CONF_OPTS += --without-gnome +LIBSOUP_CONF_OPTS += -Dgnome=false endif ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y) LIBSOUP_DEPENDENCIES += glib-networking else -LIBSOUP_CONF_OPTS += --disable-tls-check +LIBSOUP_CONF_OPTS += -Dtls_check=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From ea42a5670a87452db400479e9674c4b0cf25f65c Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 20 May 2021 15:28:40 +0200 Subject: [PATCH 123/158] package/{protobuf, python-protobuf}: bump to version 3.17 Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 79d3184f59..6818b6f83a 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 bbdfb7455431d7d58666e8a2996d14b236718ff238eecde10646581e4c87f168 protobuf-cpp-3.15.6.tar.gz +sha256 84d30a78cae000be164ac6b973ee1dc0664669d63685dfbcf96f058c50456f19 protobuf-cpp-3.17.0.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index ea75480038..7ba99d2c4b 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 3.15.6 +PROTOBUF_VERSION = 3.17.0 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index 0d3665b736..3ed9de739a 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e8c58a14950ac7a727864d5c521f48c81feb66ff7df325487fc930c9aa50d8b protobuf-python-3.15.6.tar.gz +sha256 3011bfbc18d1c695ee393cb0dc1042282cfa33ef6573fe82732aefc9f7286121 protobuf-python-3.17.0.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From 8e5f7f1cfc8fd7a9d5270f6a9707eb9eecfd21da Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 May 2021 18:01:12 +0300 Subject: [PATCH 124/158] package/libsoup: bump to version 2.72.0 Among other fixes, switching to the current stable version plugs a few memory leaks; solves many WebSocket bugs; makes NTLM authentication work; allows building gobject-introspection data when cross-building (to be enabled in a separate patch); fixes message cancellation; adds support for HTTP 308 permanent redirects, same-site cookies, secure cookies, HSTS, and Brotli compression. This also removes the unneeded LIBSOUP_CONF_ENV which defined an autoconf variable, and updates the Meson build configuration options to follow the changes done by upstream. Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: - reorder options and move them one per line - while at it, do the same for dependencies ] Signed-off-by: Yann E. MORIN --- package/libsoup/libsoup.hash | 4 ++-- package/libsoup/libsoup.mk | 35 +++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 3b9009884d..01bf419563 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.66/libsoup-2.66.5.sha256sum -sha256 ee43be1485bd95b686236b1e0043ec6edb761a538616c9c63004d7d1979bb139 libsoup-2.66.5.tar.xz +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.72/libsoup-2.72.0.sha256sum +sha256 170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387 libsoup-2.72.0.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 1617940c8f..6711326711 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,24 +4,43 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.66 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).5 +LIBSOUP_VERSION_MAJOR = 2.72 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ LIBSOUP_LICENSE_FILES = COPYING LIBSOUP_CPE_ID_VENDOR = gnome LIBSOUP_INSTALL_STAGING = YES -LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) -LIBSOUP_CONF_OPTS = -Dtests=false -Dvapi=false -Dgssapi=false -LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ - libglib2 libpsl libxml2 sqlite host-intltool +LIBSOUP_DEPENDENCIES = \ + host-intltool \ + host-libglib2 \ + host-pkgconf \ + libglib2 \ + libpsl \ + libxml2 \ + sqlite + +LIBSOUP_CONF_OPTS = \ + -Dgssapi=disabled \ + -Dgtk_doc=false \ + -Dntlm=disabled \ + -Dsysprof=disabled \ + -Dtests=false \ + -Dvapi=disabled + +ifeq ($(BR2_PACKAGE_BROTLI),y) +LIBSOUP_CONF_OPTS += -Dbrotli=enabled +LIBSOUP_DEPENDENCIES += brotli +else +LIBSOUP_CONF_OPTS += -Dbrotli=disabled +endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSOUP_CONF_OPTS += -Dintrospection=true +LIBSOUP_CONF_OPTS += -Dintrospection=enabled LIBSOUP_DEPENDENCIES += gobject-introspection else -LIBSOUP_CONF_OPTS += -Dintrospection=false +LIBSOUP_CONF_OPTS += -Dintrospection=disabled endif ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) From bd2b819faa4cde88ce7390fb238729df5205d7f8 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 20 May 2021 00:14:39 +0300 Subject: [PATCH 125/158] package/libepoxy: bump to version 1.5.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update includes a build fix for the RaspberryPi 4 (from 1.5.7) and a fix for the GL library loader when GLX is involved (from 1.5.6) Release notes: https://github.com/anholt/libepoxy/releases/tag/1.5.6 https://github.com/anholt/libepoxy/releases/tag/1.5.7 Signed-off-by: Adrian Perez de Castro [francois.perrad@gadz.org: fix indent in hash file] Signed-off-by: Francois Perrad [yann.morin.1998@free.fr: meld Adrian and François' patches together] Signed-off-by: Yann E. MORIN --- package/libepoxy/libepoxy.hash | 6 +++--- package/libepoxy/libepoxy.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash index 79876ad01d..35af7c076b 100644 --- a/package/libepoxy/libepoxy.hash +++ b/package/libepoxy/libepoxy.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.5.sha256sum -sha256 261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556 libepoxy-1.5.5.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.7.sha256sum +sha256 9479cc0146ffb395fdecf9bd2a5930834fd0bce490cbcc4681ffd716bb3a0763 libepoxy-1.5.7.tar.xz # Hashes for license files: -sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING +sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index bb578fb02c..729d1bff92 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -5,7 +5,7 @@ ################################################################################ LIBEPOXY_VERSION_MAJOR = 1.5 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).5 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).7 LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES From cb53b131f64adfb6bba86d1f466665721241b684 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Mon, 24 May 2021 19:33:10 +0200 Subject: [PATCH 126/158] package/libgit2: disable NTLM support unconditionally. NTLM is an old authentication protocol depending on DES and MD4 and its creator, Microsoft, discourage its use since 2010, because it is weak and vulnerable to many attacks. libgit2 has support for NTLM and it is enabled by default if openssl is used, however, since commit a83d41867c8d ("package/libopenssl: add option to enable some features"), support for DES and MD4 can be disabled in openssl. Since openssl is an optional dependency to libgit2 and getting rid of NTLM is a goal in itself for many windows administrators, disable NTLM by default. Fixes: http://autobuild.buildroot.net/results/efb4ce2174cb6944558e895ce852182ba2738a70 Signed-off-by: Nicolas Cavallari Signed-off-by: Yann E. MORIN --- package/libgit2/libgit2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index e5d17fa3dd..668fa758f8 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -17,6 +17,7 @@ LIBGIT2_CONF_OPTS = \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ + -DUSE_NTLMCLIENT=OFF \ -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser From 77a0167155c34379079662197874a5f38d49ade8 Mon Sep 17 00:00:00 2001 From: Xiaobing Luo Date: Mon, 24 May 2021 14:37:15 +0000 Subject: [PATCH 127/158] package/mtd: add BR2_PACKAGE_MTD_UBIHEALTHD option mtd-utils-2.1.2 add ubihealthd daemon Signed-off-by: Xiaobing Luo Reviewed-by: Matthew Weber Signed-off-by: Yann E. MORIN --- package/mtd/Config.in | 4 ++++ package/mtd/mtd.mk | 1 + 2 files changed, 5 insertions(+) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 590ca7f5ef..c7ad3b3cdc 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -137,6 +137,10 @@ config BR2_PACKAGE_MTD_UBIFORMAT bool "ubiformat" default y +config BR2_PACKAGE_MTD_UBIHEALTHD + bool "ubihealthd" + default y + config BR2_PACKAGE_MTD_UBIMKVOL bool "ubimkvol" default y diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index c4fa56d260..121dfa554b 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -96,6 +96,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach MTD_TARGETS_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32 MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat +MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIHEALTHD) += ubihealthd MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol MTD_TARGETS_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo MTD_TARGETS_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize From ebc1ded1913875869eb5cfb27c4100da737e225b Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 25 May 2021 14:27:36 +0200 Subject: [PATCH 128/158] package/Makefile.in: pass '-g0' explicitly if !BR2_ENABLE_DEBUG If BR2_ENABLE_DEBUG is not set, Buildroot did not pass any flag to control debug level. This means that the build system of the package itself would control it. Instead, provide an explicit '-g0' (no debugging symbols) to get consistent behavior across packages. Suggested-by: Arnout Vandecappelle Signed-off-by: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index f4028bc67c..86db62ba5b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -136,6 +136,9 @@ endif ifeq ($(BR2_OPTIMIZE_FAST),y) TARGET_OPTIMIZATION = -Ofast endif +ifeq ($(BR2_ENABLE_DEBUG),) +TARGET_DEBUGGING = -g0 +endif ifeq ($(BR2_DEBUG_1),y) TARGET_DEBUGGING = -g1 endif From 9806302851feea83fd41c60e8ffb0855a7b4e706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 7 Feb 2020 10:37:04 +0100 Subject: [PATCH 129/158] package/mupdf: new package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MuPDF is a lightweight PDF, XPS, and E-book viewer. Note: some packages, like PyMuPDF, depend on mupdf's libraries, hence the patch. Signed-off-by: Raphaël Mélotte Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [Arnout: - propagate harfbuzz dependencies; - correct version number in hash file; - patch on post-patch hook instead of post-extract; - nicer line splitting] --- DEVELOPERS | 1 + package/Config.in | 1 + ...-Makefile-add-an-install_libs-target.patch | 41 ++++++++++++ package/mupdf/Config.in | 23 +++++++ package/mupdf/mupdf.hash | 8 +++ package/mupdf/mupdf.mk | 64 +++++++++++++++++++ 6 files changed, 138 insertions(+) create mode 100644 package/mupdf/0001-Makefile-add-an-install_libs-target.patch create mode 100644 package/mupdf/Config.in create mode 100644 package/mupdf/mupdf.hash create mode 100644 package/mupdf/mupdf.mk diff --git a/DEVELOPERS b/DEVELOPERS index 845089736b..2a7a64ce15 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2250,6 +2250,7 @@ F: package/bitwise/ N: Raphaël Mélotte F: package/jbig2dec/ +F: package/mupdf/ F: package/python-boto3/ F: package/python-botocore/ F: package/python-jmespath/ diff --git a/package/Config.in b/package/Config.in index 4dac63ab90..c30ceb03b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -375,6 +375,7 @@ comment "X applications" source "package/gtkperf/Config.in" source "package/leafpad/Config.in" source "package/midori/Config.in" + source "package/mupdf/Config.in" source "package/nodm/Config.in" source "package/pcmanfm/Config.in" source "package/qt-webkit-kiosk/Config.in" diff --git a/package/mupdf/0001-Makefile-add-an-install_libs-target.patch b/package/mupdf/0001-Makefile-add-an-install_libs-target.patch new file mode 100644 index 0000000000..9cb5a2fec9 --- /dev/null +++ b/package/mupdf/0001-Makefile-add-an-install_libs-target.patch @@ -0,0 +1,41 @@ +From 0989f13ecbc2155b05da0cb091801d32d750d2d4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= + +Date: Thu, 29 Aug 2019 09:51:02 +0200 +Subject: [PATCH] Makefile: add an install_libs target. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This allows to install only the library files (if you need pymupdf but +not mupdf binaries for example). + +Signed-off-by: Raphaël Mélotte +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index c5bc541ac..e14f88526 100644 +--- a/Makefile ++++ b/Makefile +@@ -322,7 +322,7 @@ libs: $(INSTALL_LIBS) + tools: $(TOOL_APPS) + apps: $(TOOL_APPS) $(VIEW_APPS) + +-install: libs apps ++install_libs: + install -d $(DESTDIR)$(incdir)/mupdf + install -d $(DESTDIR)$(incdir)/mupdf/fitz + install -d $(DESTDIR)$(incdir)/mupdf/pdf +@@ -333,6 +333,7 @@ install: libs apps + install -d $(DESTDIR)$(libdir) + install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir) + ++install: libs apps install_libs + install -d $(DESTDIR)$(bindir) + install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir) + +-- +2.21.0 + diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in new file mode 100644 index 0000000000..dc296b3e8a --- /dev/null +++ b/package/mupdf/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_MUPDF + bool "mupdf" + depends on BR2_INSTALL_LIBSTDCPP # harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_HARFBUZZ + select BR2_PACKAGE_JBIG2DEC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LCMS2 + select BR2_PACKAGE_OPENJPEG + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_ZLIB + help + MuPDF is a lightweight PDF, XPS, and E-book viewer. + + https://www.mupdf.com/index.html + +comment "mupdf needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash new file mode 100644 index 0000000000..ec4893046d --- /dev/null +++ b/package/mupdf/mupdf.hash @@ -0,0 +1,8 @@ +# From https://mupdf.com/downloads/index.html: +sha1 18f069b7cc125e53f541163ac305c588c94dea97 mupdf-1.16.0-source.tar.gz + +# Locally computed: +sha256 64d537895641b711737cc58fe762481b07ea71d1506e8bd8a13434e093b0068d mupdf-1.16.0-source.tar.gz + +# Hash for license files: +sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk new file mode 100644 index 0000000000..6058b85792 --- /dev/null +++ b/package/mupdf/mupdf.mk @@ -0,0 +1,64 @@ +################################################################################ +# +# mudpf +# +################################################################################ + +MUPDF_VERSION = 1.16.0 +MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.gz +MUPDF_SITE = https://mupdf.com/downloads/archive +MUPDF_LICENSE = AGPL-3.0+ +MUPDF_LICENSE_FILES = COPYING +MUPDF_INSTALL_STAGING = YES +MUPDF_DEPENDENCIES = \ + freetype \ + harfbuzz \ + host-pkgconf \ + jbig2dec jpeg \ + lcms2 openjpeg \ + xlib_libX11 \ + zlib + +MUPDF_PKG_CONFIG_PACKAGES = \ + freetype2 \ + harfbuzz \ + libjpeg \ + zlib + +MUPDF_CFLAGS = \ + $(TARGET_CFLAGS) \ + `$(PKG_CONFIG_HOST_BINARY) --cflags $(MUPDF_PKG_CONFIG_PACKAGES)` \ + -fPIC # -fPIC is needed because the Makefile doesn't append it. + +MUPDF_LDFLAGS = \ + $(TARGET_LDFLAGS) \ + `$(PKG_CONFIG_HOST_BINARY) --libs $(MUPDF_PKG_CONFIG_PACKAGES)` + +# mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. +# with USE_SYSTEM_LIBS it will try to use system libraries instead of the bundled ones. +MUPDF_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + XCFLAGS="$(MUPDF_CFLAGS)" \ + XLIBS="$(MUPDF_LDFLAGS)" \ + USE_SYSTEM_LIBS=yes + +# Modern versions of mupdf depend on OpenGL, +# we disable it because it may not be available: +define MUPDF_DISABLE_OPENGL + sed -i 's/HAVE_GLUT := yes/HAVE_GLUT := no/g' $(@D)/Makerules +endef + +MUPDF_POST_PATCH_HOOKS = MUPDF_DISABLE_OPENGL + +define MUPDF_BUILD_CMDS + $(MUPDF_MAKE_ENV) $(MAKE) -C $(@D) all +endef + +define MUPDF_INSTALL_STAGING_CMDS + $(MUPDF_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" prefix="/usr" install_libs +endef + +define MUPDF_INSTALL_TARGET_CMDS + $(MUPDF_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" prefix="/usr" install +endef + +$(eval $(generic-package)) From 71f7fc8a27af383d3307945bf6e880491cb74bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 7 Feb 2020 10:37:05 +0100 Subject: [PATCH 130/158] package/python-pymupdf: new package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python bindings for the PDF rendering library MuPDF. Signed-off-by: Raphaël Mélotte Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [Arnout: - propagate harfbuzz dependencies; - add comment to mupdf to keep versions in sync; - clarify license situation + lack of license file] --- DEVELOPERS | 1 + package/Config.in | 1 + package/mupdf/mupdf.mk | 1 + package/python-pymupdf/Config.in | 21 +++++++++++++++++ package/python-pymupdf/python-pymupdf.hash | 3 +++ package/python-pymupdf/python-pymupdf.mk | 26 ++++++++++++++++++++++ 6 files changed, 53 insertions(+) create mode 100644 package/python-pymupdf/Config.in create mode 100644 package/python-pymupdf/python-pymupdf.hash create mode 100644 package/python-pymupdf/python-pymupdf.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2a7a64ce15..a0a9cebfe6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2254,6 +2254,7 @@ F: package/mupdf/ F: package/python-boto3/ F: package/python-botocore/ F: package/python-jmespath/ +F: package/python-pymupdf/ F: package/python-s3transfer/ N: Refik Tuzakli diff --git a/package/Config.in b/package/Config.in index c30ceb03b4..e42f579494 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1138,6 +1138,7 @@ menu "External python modules" source "package/python-pylibftdi/Config.in" source "package/python-pylru/Config.in" source "package/python-pymodbus/Config.in" + source "package/python-pymupdf/Config.in" source "package/python-pymysql/Config.in" source "package/python-pynacl/Config.in" source "package/python-pyopenssl/Config.in" diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 6058b85792..5a905f7903 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -4,6 +4,7 @@ # ################################################################################ +# python-pymupdf's version must match exactly mupdf's version MUPDF_VERSION = 1.16.0 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.gz MUPDF_SITE = https://mupdf.com/downloads/archive diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in new file mode 100644 index 0000000000..cd4c8cfcbb --- /dev/null +++ b/package/python-pymupdf/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_PYTHON_PYMUPDF + bool "python-pymupdf" + depends on BR2_INSTALL_LIBSTDCPP # mupdf -> harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # mupdf -> harfbuzz + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MUPDF + select BR2_PACKAGE_ZLIB + help + Python bindings for the PDF rendering library MuPDF. + + https://github.com/pymupdf/PyMuPDF + +comment "python-pymupdf needs Xorg" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_PACKAGE_XORG7 + +comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash new file mode 100644 index 0000000000..6729c6b91b --- /dev/null +++ b/package/python-pymupdf/python-pymupdf.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/pymupdf/json +md5 0e924bbb7364ba63df65d33fee9656f0 PyMuPDF-1.16.0.tar.gz +sha256 1a6cc5b8b0fb9aa16bfa453fdfed445398f00d2556e78d90ba54cdce8d900857 python-pymupdf-1.16.0.tar.gz diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk new file mode 100644 index 0000000000..9f8d1744b1 --- /dev/null +++ b/package/python-pymupdf/python-pymupdf.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# python-pymupdf +# +################################################################################ + +# python-pymupdf's version must match exactly mupdf's version +PYTHON_PYMUPDF_VERSION = 1.16.0 +PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/d2/da/692102b6e6868a57d1dc7f98d07413116a02493b3b49a798dcd6f676d368 +PYTHON_PYMUPDF_SETUP_TYPE = distutils +PYTHON_PYMUPDF_LICENSE = GPL-3.0, AGPL-3.0+ (code generated from mupdf) +# No license file included in pip, but it's present on github +PYTHON_PYMUPDF_DEPENDENCIES = mupdf zlib + +PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf" + +# We need to remove the original paths as we provide them in the CFLAGS: +define PYTHON_PYMUPDF_REMOVE_PATHS + sed -i "s:\/usr\/include\/mupdf::g" $(@D)/setup.py + sed -i "s:\/usr\/local\/include\/mupdf::g" $(@D)/setup.py +endef + +PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS + +$(eval $(python-package)) From a2baf1dbfa1ac8b1f9b22fecc123d3e660c723dd Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Wed, 26 May 2021 22:56:34 +0300 Subject: [PATCH 131/158] package/wpa_supplicant: enable DES in openssl Hostapd/wpa_supplicant crypto backend assumes that openssl always provides DES support. However DES support in openssl has become optional since commit a83d41867c8d ("package/libopenssl: add option to enable some features"). Select openssl DES support in wpa_supplicant Kconfig to avoid build failures. Fixes: http://autobuild.buildroot.net/results/00d46eb765f23a1f6e168338f2cc863ae348045d/ Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- package/wpa_supplicant/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 67117c141b..bc9847c99f 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -2,6 +2,7 @@ menuconfig BR2_PACKAGE_WPA_SUPPLICANT bool "wpa_supplicant" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help WPA supplicant for secure wireless networks From a92e4f992b0301baef45117055015829533ba113 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Wed, 26 May 2021 22:56:35 +0300 Subject: [PATCH 132/158] package/hostapd: enable DES in openssl Hostapd/wpa_supplicant crypto backend assumes that openssl always provides DES support. However DES support in openssl has become optional since commit a83d41867c8d ("package/libopenssl: add option to enable some features"). Select openssl DES support in hostapd Kconfig to avoid build failures. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- package/hostapd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 1ac7f6cd5a..9d5e8692a2 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_HOSTAPD bool "hostapd" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help User space daemon for wireless access points. From f1e65b0b963455bb8eb75ef23e051533c6398d6b Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 27 May 2021 16:37:52 +0300 Subject: [PATCH 133/158] package/wlroots: check for BR2_PACKAGE_SEATD Fix the wlroots packaging by checking for the correct variable to determine whether seatd is being built. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wlroots/wlroots.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 38ddba743d..0696d037df 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -46,7 +46,7 @@ else WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_SEATD_LIBSEAT),y) +ifeq ($(BR2_PACKAGE_SEATD),y) WLROOTS_CONF_OPTS += -Dlibseat=enabled WLROOTS_DEPENDENCIES += seatd else From 154b99d0a7fb15756b70736f381ec607d9b564a6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 27 May 2021 15:22:07 +0300 Subject: [PATCH 134/158] package/wget: enable MD4 and DES support in openssl NTLM support in wget requires MD4 and DES. Make sure that openssl supports these algorithms. Fixes: http://autobuild.buildroot.net/results/a342a4547dce1551e141c06c454f6e5f0830b671/ http://autobuild.buildroot.net/results/12b1f6f701b46a1dd2de5e32c86beecf590b6530/ Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- package/wget/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/wget/Config.in b/package/wget/Config.in index acb20f8f09..ba03a75e7a 100644 --- a/package/wget/Config.in +++ b/package/wget/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_WGET depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help Network utility to retrieve files from http, https and ftp. From c2a1f906d6adfda9b9ccd2a15ad06c4936d5ec57 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 27 May 2021 17:35:52 +0200 Subject: [PATCH 135/158] package/{hostapd,wpa_supplicant}: alphabetical order to select openssl features Signed-off-by: Yann E. MORIN --- package/hostapd/Config.in | 2 +- package/wpa_supplicant/Config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 9d5e8692a2..f4206ceea5 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_HOSTAPD bool "hostapd" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help User space daemon for wireless access points. diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index bc9847c99f..8f095cdf2d 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -1,8 +1,8 @@ menuconfig BR2_PACKAGE_WPA_SUPPLICANT bool "wpa_supplicant" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help WPA supplicant for secure wireless networks From b7939fe2a0b15ba46faa77552567a2852aea387f Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:06 +0200 Subject: [PATCH 136/158] core: introduce BR2_ENABLE_RUNTIME_DEBUG Some packages have optional runtime assertions, extra traces, or other elements that can help in debugging problems. However, such runtime elements can negatively influence performance. In a test program performing 100K gRPC calls from a client to a local server and receiving the returned response, we see following execution time: - runtime debug enabled: 1065 seconds - runtime debug disabled: 48 seconds This is more than a factor 20 (!) difference. Analysis shows that the problem mostly stems from libabseil-cpp (a dependency of gRPC) which enables mutex deadlock analysis when the preprocessor flag 'NDEBUG' is not set, which adds a 'backtrace()' call on every lock/unlock. Potentially worse, when libunwind is enabled and linked with the test program, 'backtrace()' is not provided by glibc but by libunwind itself. For production systems, users expect good performance out-of-the-box. In the example above, the difference is huge and unless explicitly tested and analyzed, users may not realize that the performance could be much better. Address this problem by introducing a new option BR2_ENABLE_RUNTIME_DEBUG, which can be used by packages or package infrastructures to set the necessary flags. Note that BR2_ENABLE_RUNTIME_DEBUG is orthogonal to BR2_ENABLE_DEBUG: the former changes runtime behavior, while the latter is only expected to add debug symbols to the build. Today, the cmake build system does introduce a runtime impact when BR2_ENABLE_DEBUG is set, but that will be rectified in a subsequent commit. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- Config.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Config.in b/Config.in index c65e34bd5e..a008425688 100644 --- a/Config.in +++ b/Config.in @@ -412,6 +412,19 @@ config BR2_DEBUG_3 endchoice endif +config BR2_ENABLE_RUNTIME_DEBUG + bool "build packages with runtime debugging info" + help + Some packages may have runtime assertions, extra traces, and + similar runtime elements that can help debugging. However, + these elements may negatively influence performance so should + normally not be enabled on production systems. + + Enable this option to enable such runtime debugging. + + Note: disabling this option is not a guarantee that all + packages effectively removed these runtime debugging elements. + config BR2_STRIP_strip bool "strip target binaries" default y From 5a8c50fe05afacc3cbe8e7347e238da9f242fab0 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:07 +0200 Subject: [PATCH 137/158] core: enable 'NDEBUG' unless BR2_ENABLE_RUNTIME_DEBUG is set The 'assert' statement in glibc honors the 'NDEBUG' preprocessor macro: if it is set, then the assert statement is compiled away. Define this 'NDEBUG' macro when BR2_ENABLE_RUNTIME_DEBUG is disabled (the default case). Signed-off-by: Thomas De Schampheleire Reviewed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index 86db62ba5b..955e6a8e8c 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -148,6 +148,9 @@ endif ifeq ($(BR2_DEBUG_3),y) TARGET_DEBUGGING = -g3 endif +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),) +TARGET_DEBUGGING += -DNDEBUG +endif TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) From 61c5e0319c5aefbe9ea101a53c6416b76d5d9e97 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:08 +0200 Subject: [PATCH 138/158] package/pkg-cmake.mk: determine CMAKE_BUILD_TYPE depending on BR2_ENABLE_RUNTIME_DEBUG The CMAKE_BUILD_TYPE is currently set as 'Debug' in case BR2_ENABLE_DEBUG is set, and as 'Release' in other cases. However, while the description of BR2_ENABLE_DEBUG is to enable debug symbols (no runtime impact), the 'Debug' build type in CMake can actually have runtime impact. For one, because it does not set -DNDEBUG like is done for 'Release', but also because packages may do custom things based on it. The question of which CMAKE_BUILD_TYPE Buildroot should set, be it 'Debug', 'Release', 'RelWithDebInfo' or others, has come up several times in the past. See some references below: - July 2016: switch from Debug to RelWithDebInfo: https://git.buildroot.org/buildroot/commit/?id=4b0120183404913f7f7788ef4f0f6b51498ef363 - October 2016: switch from RelWithDebInfo back to Debug: https://git.buildroot.org/buildroot/commit/?id=104bb29e0490bfb487e2e665448dd3ca07fcc2b5 and changes to make sure Buildroot's flags are respected: https://git.buildroot.org/buildroot/commit/?id=12494ef48f893684d0800e7f6fe39a2ceaed0451 - August 2017: bug #10246 - "BR2_ENABLE_DEBUG does not have the expected effect for cmake packages" https://bugs.busybox.net/show_bug.cgi?id=10246 - August 2017: mail thread following bug #10246: http://lists.busybox.net/pipermail/buildroot/2017-August/200778.html In the last mail thread, Samuel Martin confirmed that the 'Release' build type could be used in all cases, because Buildroot is actually making sure that the optimization flags are those determined by Buildroot, not the defaults of cmake, thanks to commit 12494ef48f. But Arnout Vandecappelle objected to using always 'Release', stating that users may actually want the extra assertions. With the introduction of BR2_ENABLE_RUNTIME_DEBUG, Buildroot can now cater for all cases: - use CMAKE_BUILD_TYPE=Release by default. This makes sure that there is no unexpected performance degradation triggered by enabling BR2_ENABLE_DEBUG. - users can optionally enable BR2_ENABLE_RUNTIME_DEBUG if they want runtime debug info like assertions, at the risk of introducing performance degradation. In this case, we switch to CMAKE_BUILD_TYPE=Debug. - orthogonally to the above, BR2_ENABLE_DEBUG still determines passing the '-g' flag to enable debug symbols, and BR2_OPTIMIZE_X still determines the used optimization flags. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-cmake.txt | 2 +- package/pkg-cmake.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt index 73f0943024..541d7422cf 100644 --- a/docs/manual/adding-packages-cmake.txt +++ b/docs/manual/adding-packages-cmake.txt @@ -100,7 +100,7 @@ typical packages will therefore only use a few of them. necessary to set them in the package's +*.mk+ file unless you want to override them: -** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_DEBUG+; +** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_RUNTIME_DEBUG+; ** +CMAKE_INSTALL_PREFIX+; ** +BUILD_SHARED_LIBS+ is driven by +BR2_STATIC_LIBS+; ** +BUILD_DOC+, +BUILD_DOCS+ are disabled; diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 37078f3c34..4ee100a0c6 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -266,7 +266,7 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ -e 's#@@TOOLCHAIN_HAS_CXX@@#$(if $(BR2_INSTALL_LIBSTDCPP),1,0)#' \ -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ - -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ + -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release)#' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > $(HOST_DIR)/share/buildroot/toolchainfile.cmake $(Q)$(INSTALL) -D -m 0644 support/misc/Buildroot.cmake \ From f2f318270e3fcffc502b45a4503ecdde7033bf1c Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:09 +0200 Subject: [PATCH 139/158] package/flare-engine: disable effect of CMAKE_BUILD_TYPE flare-engine enables profiling when CMAKE_BUILD_TYPE is 'Debug'. The Buildroot package explicitly avoided that by forcing CMAKE_BUILD_TYPE to 'RelWithDebInfo' when pkg-cmake.mk would normally set it to 'Debug'. Until recently, this was the case when BR2_ENABLE_DEBUG was enabled. A previous commit changed the condition under which CMAKE_BUILD_TYPE=Debug was set, from BR2_ENABLE_DEBUG=y to BR2_ENABLE_RUNTIME_DEBUG=y, so logically the flare-engine package would have to be updated accordingly. However, apart from the profiling flag, the flare-engine package only uses CMAKE_BUILD_TYPE to determine flags that Buildroot wants to control itself, like optimization and debugging flags. This means we can fake CMAKE_BUILD_TYPE to a value that has no meaning for flare-engine itself, without needing to check BR2_ENABLE_DEBUG nor BR2_ENABLE_RUNTIME_DEBUG. Incidentally, this trick was already done in case BR2_TOOLCHAIN_HAS_GCC_BUG_85180 was true, so move that line out of this condition. Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- package/flare-engine/flare-engine.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index e2f3eefa28..b91fc16af3 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -14,16 +14,12 @@ FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare -# Don't use the default Debug type as it adds -pg (gprof) -ifeq ($(BR2_ENABLE_DEBUG),y) -FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=RelWithDebInfo -endif +# CMAKE_BUILD_TYPE is only used to set optimization and debug flags, all of +# which we want Buildroot to steer explicitly. Explicitly set a fake build type +# to get this control. +FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -# CMakeLists.txt sets CMAKE_CXX_FLAGS_ depending on -# BUILD_TYPE, and this comes after the generic CMAKE_CXX_FLAGS. -# Override CMAKE_BUILD_TYPE so no overrides are applied. -FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot FLARE_ENGINE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -O0" endif From 9a7afc0bb68163d30c0a10640cebc7d77723626d Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:10 +0200 Subject: [PATCH 140/158] package/sysrepo: use default CMAKE_BUILD_TYPE for host package Use the default build type for host-sysrepo. In the current version of sysrepo, this happens to be 'Debug'. As 'Debug' also enables tests, explicitly disable them. Suggested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/sysrepo/sysrepo.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index dbc7b16b63..f5be29d2c9 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -26,8 +26,9 @@ define SYSREPO_INSTALL_INIT_SYSV endef HOST_SYSREPO_CONF_OPTS = \ - -DCMAKE_BUILD_TYPE=Release \ -DBUILD_EXAMPLES=OFF \ + -DENABLE_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF \ -DREPO_PATH=$(TARGET_DIR)/etc/sysrepo $(eval $(cmake-package)) From 77b9b0f8cf9bf520959701928b7c8a5425ce2987 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:11 +0200 Subject: [PATCH 141/158] package/sysrepo: remove explicit setting of CMAKE_BUILD_TYPE sysrepo explicitly sets CMAKE_BUILD_TYPE=Release, ignoring any possible value of BR2_ENABLE_DEBUG (previously) or BR2_ENABLE_RUNTIME_DEBUG (now). With the introduction of BR2_ENABLE_RUNTIME_DEBUG, this change should no longer be necessary. Users that do not wish to have additional runtime debugging just keep BR2_ENABLE_RUNTIME_DEBUG disabled (default value). As the 'Debug' build type enables tests, disable them explicitly. As the 'Debug' build type uses a custom REPO_PATH which does not exist on target, force /etc/sysrepo like in the 'Release' build type. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/sysrepo/sysrepo.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index f5be29d2c9..c0db05e52c 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -13,8 +13,10 @@ SYSREPO_DEPENDENCIES = libyang pcre host-sysrepo HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre SYSREPO_CONF_OPTS = \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) + -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ + -DENABLE_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DREPO_PATH=/etc/sysrepo ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) SYSREPO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From a5107b8740131aa92fddd61f8bef7535c9945bc0 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:12 +0200 Subject: [PATCH 142/158] package/boost: use BR2_ENABLE_RUNTIME_DEBUG iso BR2_ENABLE_DEBUG BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 8d745ecc72..e72ddf897c 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -95,7 +95,7 @@ BOOST_OPTS += --no-cmake-config \ toolset=gcc \ threading=multi \ abi=$(BOOST_ABI) \ - variant=$(if $(BR2_ENABLE_DEBUG),debug,release) + variant=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) ifeq ($(BR2_sparc64),y) BOOST_OPTS += architecture=sparc instruction-set=ultrasparc From dd14435d8182d2e891f0757e0bcfe6bfad4a27e5 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:13 +0200 Subject: [PATCH 143/158] package/oracle-mysql: use BR2_ENABLE_RUNTIME_DEBUG iso BR2_ENABLE_DEBUG BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- package/oracle-mysql/oracle-mysql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk index ccfa40cfb1..e7d6354ed8 100644 --- a/package/oracle-mysql/oracle-mysql.mk +++ b/package/oracle-mysql/oracle-mysql.mk @@ -95,7 +95,7 @@ ORACLE_MYSQL_CONF_OPTS += \ # Debugging is only available for the server, so no need for # this if-block outside of the server if-block -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) ORACLE_MYSQL_CONF_OPTS += --with-debug=full else ORACLE_MYSQL_CONF_OPTS += --without-debug From a93b467427a017f57dd4bc0823759c39c5365a35 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:14 +0200 Subject: [PATCH 144/158] package/qt5: use BR2_ENABLE_RUNTIME_DEBUG iso BR2_ENABLE_DEBUG BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- package/qt5/qt5base/qt5base.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 84e9fa4edb..8b55aa3098 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -86,7 +86,7 @@ else QT5BASE_CONFIGURE_OPTS += -no-gbm endif -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) QT5BASE_CONFIGURE_OPTS += -debug else QT5BASE_CONFIGURE_OPTS += -release From df35cd7976aa74489abff8b1bd3f3e05b5fe87be Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:15 +0200 Subject: [PATCH 145/158] package/ripgrep: use BR2_ENABLE_RUNTIME_DEBUG iso BR2_ENABLE_DEBUG BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- package/ripgrep/ripgrep.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 9dd8d58de1..c3c12fd185 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -18,7 +18,7 @@ RIPGREP_CARGO_OPTS = \ --target=$(RUSTC_TARGET_NAME) \ --manifest-path=$(@D)/Cargo.toml -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) RIPGREP_CARGO_BIN_SUBDIR = debug else RIPGREP_CARGO_OPTS += --release From fb12adbb7613a4c05643491453dbc09151b5bf48 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:16 +0200 Subject: [PATCH 146/158] package/sofia-sip: correct passing of '--enable-ndebug' The preprocessor option NDEBUG, triggered by the configure option '--enable-ndebug', should be read as 'no-debug'. When NDEBUG is set, asserts are _disabled_. The sofia-sip package had inverted logic, and set '--enable-ndebug' when BR2_ENABLE_DEBUG was enabled, while it should be the other way around. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- package/sofia-sip/sofia-sip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 5c383400ff..274c72fce8 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -30,7 +30,7 @@ SOFIA_SIP_CONF_OPTS += \ --without-openssl endif -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_DEBUG),) SOFIA_SIP_CONF_OPTS += --enable-ndebug endif From 0993954814e8f54c7fea5dcb6dff1cc2c3d3e780 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:17 +0200 Subject: [PATCH 147/158] package/sofia-sip: don't set 'NDEBUG' explicitly BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. The sofia-sip package was setting '--enable-ndebug' conditionally based on BR2_ENABLE_DEBUG, and this would have to be updated to be based on BR2_ENABLE_RUNTIME_DEBUG. However, the sofia-sip option '--enable-ndebug' only sets the 'NDEBUG' preprocessor macro, and the core package infrastructure already sets this macro correctly based on BR2_ENABLE_RUNTIME_DEBUG. This means that the explicit '--enable-ndebug' flag can be removed. Suggested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- package/sofia-sip/sofia-sip.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 274c72fce8..fb565637eb 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -30,8 +30,4 @@ SOFIA_SIP_CONF_OPTS += \ --without-openssl endif -ifeq ($(BR2_ENABLE_DEBUG),) -SOFIA_SIP_CONF_OPTS += --enable-ndebug -endif - $(eval $(autotools-package)) From 47c26b3e5fcda164ffdf6b9e4be8057367203af9 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:18 +0200 Subject: [PATCH 148/158] package/zmqpp: don't set CONFIG=debug Below are the flags set by zmqpp depending on the specified CONFIG variable: CONFIG_FLAGS = ifeq ($(CONFIG),debug) CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000 endif ifeq ($(CONFIG),valgrind) CONFIG_FLAGS = -g -O1 -DNO_DEBUG_LOG -DNO_TRACE_LOG endif ifeq ($(CONFIG),max) CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions \ -fomit-frame-pointer -DNDEBUG endif ifneq (,$(findstring $(CONFIG),release loadtest)) CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions \ -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG endif For the flags added with CONFIG=debug, '-g' is to be steered by the core infrastructure (could be '-g1', '-g2' etc.) The flag '-ftemplate-depth' is only a protection against incorrect code and not really needed in Buildroot context. Finally, the flag '-fno-inline' may be useful when really stepping through zmqpp code, but is a very specific use case. With the above in mind, not passing CONFIG=debug may actually be better. Use 'CONFIG=buildroot' instead. Note that we don't pass an empty 'CONFIG' to avoid confusion, as this variable is also passed through to the variable BUILD_ENV, even though it is currently unused. Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- package/zmqpp/zmqpp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index 3cd19d644a..c629f14920 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -19,7 +19,7 @@ ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread # -ffast-math -finline-functions -fomit-frame-pointer are disabled, # so only set CONFIG for the non-affected cases. ifneq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) -ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),debug,release) +ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),buildroot,release) endif ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From 2af0d35875783143b91d9b189943de74b8950bb5 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:19 +0200 Subject: [PATCH 149/158] package/zmqpp: use BR2_ENABLE_RUNTIME_DEBUG iso BR2_ENABLE_DEBUG BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- package/zmqpp/zmqpp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index c629f14920..32fabf26ef 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -19,7 +19,7 @@ ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread # -ffast-math -finline-functions -fomit-frame-pointer are disabled, # so only set CONFIG for the non-affected cases. ifneq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) -ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),buildroot,release) +ZMQPP_CONFIG = $(if $(BR2_ENABLE_RUNTIME_DEBUG),buildroot,release) endif ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From 603a949af081742990db32f3f656d0352c357acb Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:20 +0200 Subject: [PATCH 150/158] package/pkg-meson.mk: determine 'buildtype' based on BR2_ENABLE_RUNTIME_DEBUG iso BR2_ENABLE_DEBUG BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN --- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index a57820d4d2..dafad3b1eb 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -89,7 +89,7 @@ define $(2)_CONFIGURE_CMDS --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ - --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ + --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ From 7c9dfe4fd93639ebc621449217c0bbc2f7415e43 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 1 Jun 2021 16:34:21 +0200 Subject: [PATCH 151/158] utils/genrandconfig: also test BR2_ENABLE_RUNTIME_DEBUG ... similar to BR2_ENABLE_DEBUG. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 93dc6d898b..ca3e77e3e3 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -357,6 +357,8 @@ def gen_config(args): # Amend the configuration with a few things. if randint(0, 20) == 0: configlines.append("BR2_ENABLE_DEBUG=y\n") + if randint(0, 20) == 0: + configlines.append("BR2_ENABLE_RUNTIME_DEBUG=y\n") if randint(0, 1) == 0: configlines.append("BR2_INIT_BUSYBOX=y\n") elif randint(0, 15) == 0: From 0f1083bf21edc990c97db05ef5dd71ce453bceef Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 30 May 2021 20:24:39 +0300 Subject: [PATCH 152/158] package/libssh: openssl backend requires DES Make sure that openssl supports DES. The libssh openssl backend depends on DES support. Fixes: http://autobuild.buildroot.net/results/faf773b9997d6504f32fe660d0d9b9c15a198aa5/ http://autobuild.buildroot.net/results/c3ebcbb9b5ff502e7acefb8b2426bd544913d415/ Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libssh/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libssh/Config.in b/package/libssh/Config.in index cde73a0d87..1f271a692e 100644 --- a/package/libssh/Config.in +++ b/package/libssh/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBSSH depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_MBEDTLS || BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol on client and server side. With libssh, From 66ddec89e8867435e696dcd4e50473f62f3bc8d4 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 20 May 2021 02:09:05 +0200 Subject: [PATCH 153/158] package/udisks: bump to version 2.92 Bump version to 2.92 by: - removing local patches that have been upstreamed - adding BR2_TOOLCHAIN_HAS_SYNC_4 dependency - adding libblockdev dependencies - adding libmount(contained in util-linux package) dependency - moving download site to github since it's the new upstream address - disabling all useless udisks's build option to shrink its size and t use it as a daemon Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-fix-build-with-newer-glibc-versions.patch | 29 ------- .../0002-Fix-systemd-service-file.patch | 33 -------- ...issue-with-missing-sys-sysmacros.h-i.patch | 81 ------------------- package/udisks/Config.in | 17 +++- package/udisks/udisks.hash | 4 +- package/udisks/udisks.mk | 27 +++++-- 6 files changed, 35 insertions(+), 156 deletions(-) delete mode 100644 package/udisks/0001-fix-build-with-newer-glibc-versions.patch delete mode 100644 package/udisks/0002-Fix-systemd-service-file.patch delete mode 100644 package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch diff --git a/package/udisks/0001-fix-build-with-newer-glibc-versions.patch b/package/udisks/0001-fix-build-with-newer-glibc-versions.patch deleted file mode 100644 index 336fc440a6..0000000000 --- a/package/udisks/0001-fix-build-with-newer-glibc-versions.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix build with newer glibc versions - -This patch has been backported from upstream: - -http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0 - -Signed-off-by: Vicente Olivert Riera - -From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 29 May 2015 21:09:39 -0400 -Subject: fix build with newer glibc versions - -https://bugs.freedesktop.org/show_bug.cgi?id=90778 - -diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c -index eeafcab..d122a1f 100644 ---- a/src/helpers/job-drive-detach.c -+++ b/src/helpers/job-drive-detach.c -@@ -18,6 +18,7 @@ - * - */ - -+#include - #include - #include - #include --- -cgit v0.10.2 diff --git a/package/udisks/0002-Fix-systemd-service-file.patch b/package/udisks/0002-Fix-systemd-service-file.patch deleted file mode 100644 index ea347aef73..0000000000 --- a/package/udisks/0002-Fix-systemd-service-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bf8b4362cef24a6f747e4329305a4939c8f585d1 Mon Sep 17 00:00:00 2001 -From: David King -Date: Thu, 2 Jul 2015 13:49:22 +0100 -Subject: [PATCH] Fix systemd service file - -udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks. - -https://bugzilla.redhat.com/show_bug.cgi?id=1238664 -https://bugs.freedesktop.org/show_bug.cgi?id=91191 - -[This patch has been backported from upstream: -https://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=bf8b4362cef24a6f747e4329305a4939c8f585d1] -Signed-off-by: Pieterjan Camerlynck ---- - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..08af5f4 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir) - systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) - - $(systemdservice_DATA): $(systemdservice_in_files) Makefile -- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ -+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - endif - - udevrulesdir = $(slashlibdir)/udev/rules.d --- -2.7.4 - diff --git a/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch b/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch deleted file mode 100644 index 71152e5de3..0000000000 --- a/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d934b0fa5ce24a8fd1987b916e435ba991c2ef64 Mon Sep 17 00:00:00 2001 -From: Vadim Kochan -Date: Mon, 31 Dec 2018 11:00:46 +0200 -Subject: [PATCH] Fix compilation issue due to missing sys/sysmacros.h include - -glibc 2.28+ no longer include from , so - must now be explicitly included to use the major, -minor and makedev macros. - -Signed-off-by: Vadim Kochan ---- - src/daemon.c | 1 + - src/device.c | 1 + - src/mount-monitor.c | 1 + - tools/udisks.c | 1 + - tools/umount-udisks.c | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/src/daemon.c b/src/daemon.c -index fafcf9a..4303a6d 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/device.c b/src/device.c -index 2ae7f38..20920df 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/mount-monitor.c b/src/mount-monitor.c -index 573a69c..0cfa167 100644 ---- a/src/mount-monitor.c -+++ b/src/mount-monitor.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/tools/udisks.c b/tools/udisks.c -index 97e80d7..22a7d87 100644 ---- a/tools/udisks.c -+++ b/tools/udisks.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c -index 2813fe0..d915660 100644 ---- a/tools/umount-udisks.c -+++ b/tools/umount-udisks.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.14.1 - diff --git a/package/udisks/Config.in b/package/udisks/Config.in index efd3b619bf..e128a48ab5 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -7,18 +7,26 @@ config BR2_PACKAGE_UDISKS depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit - depends on BR2_USE_MMU # lvm2 depends on BR2_USE_WCHAR # dbus-glib -> glib2 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2 - depends on !BR2_STATIC_LIBS # lvm2, spidermonkey + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c + depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit + depends on !BR2_STATIC_LIBS # spidermonkey select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBATASMART + select BR2_PACKAGE_LIBBLOCKDEV + select BR2_PACKAGE_LIBBLOCKDEV_CRYPTO + select BR2_PACKAGE_LIBBLOCKDEV_FS + select BR2_PACKAGE_LIBBLOCKDEV_LOOP + select BR2_PACKAGE_LIBBLOCKDEV_MDRAID + select BR2_PACKAGE_LIBBLOCKDEV_PART + select BR2_PACKAGE_LIBBLOCKDEV_SWAP select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_LVM2 select BR2_PACKAGE_PARTED select BR2_PACKAGE_POLKIT select BR2_PACKAGE_SG3_UTILS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT help The udisks project provides @@ -53,6 +61,7 @@ comment "udisks needs udev /dev management" comment "udisks needs a glibc or musl toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_ENABLE_LOCALE || BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_INSTALL_LIBSTDCPP || \ BR2_STATIC_LIBS || \ diff --git a/package/udisks/udisks.hash b/package/udisks/udisks.hash index b40161e323..303a0aae01 100644 --- a/package/udisks/udisks.hash +++ b/package/udisks/udisks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz -sha256 7d30f41a79a9b453b4972a6d7e3425ff104b39232891bde8ba659f1adb21f771 COPYING +sha256 bda6f9d7edc632c57e55862731a8ffeff2413fa4346708a22bf31ed72b0fe058 udisks-2.9.2.tar.bz2 +sha256 98046e932dc6c739001e79d7079a3bd958fc55475dcd917d27f884c0c93525cc COPYING diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index c6119a8b80..3a75421f2a 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -4,26 +4,39 @@ # ################################################################################ -UDISKS_VERSION = 1.0.5 -UDISKS_SITE = http://hal.freedesktop.org/releases +UDISKS_VERSION = 2.9.2 +UDISKS_SOURCE = udisks-$(UDISKS_VERSION).tar.bz2 +UDISKS_SITE = https://github.com/storaged-project/udisks/releases/download/udisks-$(UDISKS_VERSION) UDISKS_LICENSE = GPL-2.0+ UDISKS_LICENSE_FILES = COPYING -# For 0002-Fix-systemd-service-file.patch -UDISKS_AUTORECONF = YES UDISKS_DEPENDENCIES = \ host-pkgconf \ dbus \ dbus-glib \ libatasmart \ + libblockdev \ libgudev \ - lvm2 \ parted \ polkit \ sg3_utils \ - udev + udev \ + util-linux -UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages +UDISKS_CONF_OPTS = \ + --disable-acl \ + --disable-bcache \ + --disable-btrfs \ + --disable-fhs-media \ + --disable-introspection \ + --disable-iscsi \ + --disable-lsm \ + --disable-lvm2 \ + --disable-lvmcache \ + --disable-man \ + --disable-rpath \ + --disable-vdo \ + --disable-zram ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) UDISKS_CONF_OPTS += --enable-lvm2 From 7bd1b51d07d9028c997edb1efe5d9e85c39d6e84 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Apr 2021 17:26:01 +0200 Subject: [PATCH 154/158] package/python3: add optional support for berkeleydb Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ion-to-disable-the-berkeleydb-module.patch | 30 +++++++++++++++++++ package/python3/Config.in | 6 ++++ package/python3/python3.mk | 6 ++++ 3 files changed, 42 insertions(+) create mode 100644 package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch diff --git a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch new file mode 100644 index 0000000000..f763fcaa82 --- /dev/null +++ b/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -0,0 +1,30 @@ +From cf4d7fd9f7cb6c1ced32ee323b2b5755640051b7 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 11 Apr 2020 22:01:40 +0200 +Subject: [PATCH] Add an option to disable the berkeleydb module + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 72c1d86e82..8c3912d237 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3326,6 +3326,12 @@ if test "$UUID" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" + fi + ++AC_ARG_ENABLE(berkeleydb, ++ AS_HELP_STRING([--disable-berkeleydb], [disable berkeleydb]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _dbm" ++ fi]) ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.25.0 + diff --git a/package/python3/Config.in b/package/python3/Config.in index 3a9dd4b2f4..efc4dbb3d4 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -46,6 +46,12 @@ config BR2_PACKAGE_PYTHON3_2TO3 help code translation from python 2 to 3 +config BR2_PACKAGE_PYTHON3_BERKELEYDB + bool "berkeleydb" + select BR2_PACKAGE_BERKELEYDB + help + berkeleydb module for Python3 + config BR2_PACKAGE_PYTHON3_BZIP2 bool "bz2 module" select BR2_PACKAGE_BZIP2 diff --git a/package/python3/python3.mk b/package/python3/python3.mk index b492e09154..991e24a440 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -57,6 +57,12 @@ else PYTHON3_CONF_OPTS += --disable-lib2to3 endif +ifeq ($(BR2_PACKAGE_PYTHON3_BERKELEYDB),y) +PYTHON3_DEPENDENCIES += berkeleydb +else +PYTHON3_CONF_OPTS += --disable-berkeleydb +endif + ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) PYTHON3_DEPENDENCIES += readline else From 4140e0ffdfd9b35df7670ebb08074e967a4f0621 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 26 May 2021 21:24:16 +0300 Subject: [PATCH 155/158] package/webkitgtk: allow building with musl and uclibc WebKitGTK 2.32.1 includes fixes for building with the Musl libc, which also makes it possible to use uClibc as well, therefore arrange dependencies to allow selecting the package any of the C libraries is in use. This is done by making the dependencies be more granular, basically following what the wpewebkit package does. In order to make make it build against uClibc a small patch that has been submitted to the upstream's Bugzilla is needed. Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: add upstream commit refs in backported patch] Signed-off-by: Yann E. MORIN --- ...0001-Support-building-against-uClibc.patch | 82 +++++++++++++++++++ package/webkitgtk/Config.in | 10 ++- 2 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 package/webkitgtk/0001-Support-building-against-uClibc.patch diff --git a/package/webkitgtk/0001-Support-building-against-uClibc.patch b/package/webkitgtk/0001-Support-building-against-uClibc.patch new file mode 100644 index 0000000000..7c0918a195 --- /dev/null +++ b/package/webkitgtk/0001-Support-building-against-uClibc.patch @@ -0,0 +1,82 @@ +From 624d3b6a99778443e35fb260bef50a3969df9215 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Wed, 26 May 2021 01:24:59 +0300 +Subject: [PATCH] Support building against uClibc + https://bugs.webkit.org/show_bug.cgi?id=226244 + +Reviewed by Michael Catanzaro. + +Source/JavaScriptCore: + +* assembler/MacroAssemblerARM64.cpp: +(getauxval): Provide a fallback implementation of getauxval() for +systems which do not provide , like those using uClibc +as their C library. + +Source/WTF: + +* wtf/PlatformRegisters.h: Use the header instead of +, which is enough to gain access to the type definitions +for CPU registers and is available on every libc. On the other hand, +uClibc does not have , so this fixes the build in that +case. + +Signed-off-by: Adrian Perez de Castro +[Backport from upstream: + - https://bugs.webkit.org/show_bug.cgi?id=226244 + - https://trac.webkit.org/changeset/278302 (current svn, soon legacy) + - https://commits.webkit.org/238339@main (future-proof for after the migration to git) +] +[yann.morin.1998@free.fr: add upstream commit refs] +Signed-off-by: Yann E. MORIN +--- + .../assembler/MacroAssemblerARM64.cpp | 18 ++++++++++++++++++ + Source/WTF/wtf/PlatformRegisters.h | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +index 9e5c5147ea0..d20e632d825 100644 +--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp ++++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +@@ -34,7 +34,25 @@ + + #if OS(LINUX) + #include ++#if __has_include() + #include ++#else ++#include ++// Provide an implementation for C libraries which do not ship one. ++static unsigned long getauxval(unsigned long type) ++{ ++ char** env = environ; ++ while (*env++) { /* no-op */ } ++ ++ for (auto* auxv = reinterpret_cast(env); *auxv != AT_NULL; auxv += 2) { ++ if (*auxv == type) ++ return auxv[1]; ++ } ++ ++ errno = ENOENT; ++ return 0; ++} ++#endif + #endif + + namespace JSC { +diff --git a/Source/WTF/wtf/PlatformRegisters.h b/Source/WTF/wtf/PlatformRegisters.h +index d26ef985169..e7f15b7eb62 100644 +--- a/Source/WTF/wtf/PlatformRegisters.h ++++ b/Source/WTF/wtf/PlatformRegisters.h +@@ -35,7 +35,7 @@ + #elif OS(WINDOWS) + #include + #else +-#include ++#include + #endif + + namespace WTF { +-- +2.31.1 + diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index a05161d052..425bf81e4e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -12,20 +12,24 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" + depends on !BR2_STATIC_LIBS # wayland + depends on !BR2_BINFMT_FLAT # icu depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO From 35eb9b566a297c8fe78205653a9607fe10563836 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 26 May 2021 21:38:39 +0300 Subject: [PATCH 156/158] package/wpewebkit: import patch to support uclibc Import a small patch from the upstream Bugzilla which is needed to allow building WPE WebKit against uClibc. Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: add upstream commit refs in backported patch] Signed-off-by: Yann E. MORIN --- ...0001-Support-building-against-uClibc.patch | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 package/wpewebkit/0001-Support-building-against-uClibc.patch diff --git a/package/wpewebkit/0001-Support-building-against-uClibc.patch b/package/wpewebkit/0001-Support-building-against-uClibc.patch new file mode 100644 index 0000000000..7c0918a195 --- /dev/null +++ b/package/wpewebkit/0001-Support-building-against-uClibc.patch @@ -0,0 +1,82 @@ +From 624d3b6a99778443e35fb260bef50a3969df9215 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Wed, 26 May 2021 01:24:59 +0300 +Subject: [PATCH] Support building against uClibc + https://bugs.webkit.org/show_bug.cgi?id=226244 + +Reviewed by Michael Catanzaro. + +Source/JavaScriptCore: + +* assembler/MacroAssemblerARM64.cpp: +(getauxval): Provide a fallback implementation of getauxval() for +systems which do not provide , like those using uClibc +as their C library. + +Source/WTF: + +* wtf/PlatformRegisters.h: Use the header instead of +, which is enough to gain access to the type definitions +for CPU registers and is available on every libc. On the other hand, +uClibc does not have , so this fixes the build in that +case. + +Signed-off-by: Adrian Perez de Castro +[Backport from upstream: + - https://bugs.webkit.org/show_bug.cgi?id=226244 + - https://trac.webkit.org/changeset/278302 (current svn, soon legacy) + - https://commits.webkit.org/238339@main (future-proof for after the migration to git) +] +[yann.morin.1998@free.fr: add upstream commit refs] +Signed-off-by: Yann E. MORIN +--- + .../assembler/MacroAssemblerARM64.cpp | 18 ++++++++++++++++++ + Source/WTF/wtf/PlatformRegisters.h | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +index 9e5c5147ea0..d20e632d825 100644 +--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp ++++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +@@ -34,7 +34,25 @@ + + #if OS(LINUX) + #include ++#if __has_include() + #include ++#else ++#include ++// Provide an implementation for C libraries which do not ship one. ++static unsigned long getauxval(unsigned long type) ++{ ++ char** env = environ; ++ while (*env++) { /* no-op */ } ++ ++ for (auto* auxv = reinterpret_cast(env); *auxv != AT_NULL; auxv += 2) { ++ if (*auxv == type) ++ return auxv[1]; ++ } ++ ++ errno = ENOENT; ++ return 0; ++} ++#endif + #endif + + namespace JSC { +diff --git a/Source/WTF/wtf/PlatformRegisters.h b/Source/WTF/wtf/PlatformRegisters.h +index d26ef985169..e7f15b7eb62 100644 +--- a/Source/WTF/wtf/PlatformRegisters.h ++++ b/Source/WTF/wtf/PlatformRegisters.h +@@ -35,7 +35,7 @@ + #elif OS(WINDOWS) + #include + #else +-#include ++#include + #endif + + namespace WTF { +-- +2.31.1 + From 88e55a82e01e29b41e9efd435bc27ec737e95259 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 4 Jun 2021 10:00:19 +0300 Subject: [PATCH 157/158] package/libssh2: requires RIPEMD160 in openssl Enable RIPEMD160 in openssl for libssh2 to avoid link time failure. Fixes: http://autobuild.buildroot.net/results/c6e031fca123865138d18c96d895778c03b639be/ http://autobuild.buildroot.net/results/4284098c0f29fdb7a4df9acbc23986e685c542d2/ http://autobuild.buildroot.net/results/a457bf27dfc0029cbfc2fdbf371aad1e2efa5b83/ Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- package/libssh2/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in index 90c38813b3..ce2dd303fa 100644 --- a/package/libssh2/Config.in +++ b/package/libssh2/Config.in @@ -27,6 +27,7 @@ config BR2_PACKAGE_LIBSSH2_LIBGCRYPT config BR2_PACKAGE_LIBSSH2_OPENSSL bool "openssl" depends on BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL endchoice endif From 81a9e7297cb93eba27a7b7dd85c5fc72a2e270e2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 4 Jun 2021 10:36:00 +0300 Subject: [PATCH 158/158] package/aircrack-ng: requires RC4 support in openssl Enable RC4 in openssl to fix build failure when openssl is the crypto backend of aircrack-ng. Fixes: http://autobuild.buildroot.net/results/007b7d88aed3902fb8ed10ee5c0ff0dc1899756d/ http://autobuild.buildroot.net/results/da464dd449bb950104122535eabf8a4e914d0a9e/ http://autobuild.buildroot.net/results/d10fec8378c334e896d9e38afe00193ef747192f/ Cc: Laurent Cans Signed-off-by: Baruch Siach Acked-by: Laurent Cans Signed-off-by: Yann E. MORIN --- package/aircrack-ng/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in index f3e2bc4ef1..eb997e8d1b 100644 --- a/package/aircrack-ng/Config.in +++ b/package/aircrack-ng/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_AIRCRACK_NG depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL help A set of tools for auditing wireless networks