From: Peter Korsgaard Date: Mon, 9 Mar 2020 14:17:09 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd99eb50168af3b4bf9bf1712158f5ac6154ec1b;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- fd99eb50168af3b4bf9bf1712158f5ac6154ec1b diff --cc package/qt5/Config.in index 7051bf517a,4bbc688249..e257b92b99 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@@ -36,11 -36,7 +36,6 @@@ menuconfig BR2_PACKAGE_QT http://qt.io if BR2_PACKAGE_QT5 - - config BR2_PACKAGE_QT5_VERSION_LATEST - bool - default y -- source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" diff --cc package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch index 0000000000,0000000000..79e276b17f new file mode 100644 --- /dev/null +++ b/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch @@@ -1,0 -1,0 +1,26 @@@ ++From e3f63db3124caf5bde9cf688eba563f7f025662d Mon Sep 17 00:00:00 2001 ++From: Peter Seiderer ++Date: Sun, 8 Mar 2020 18:08:26 +0100 ++Subject: [PATCH] double-conversion: enable for nios2 ++ ++[Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] ++Signed-off-by: Peter Seiderer ++--- ++ src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 + ++ 1 file changed, 1 insertion(+) ++ ++diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h ++index d29de950..55ca5bf5 100644 ++--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h ++@@ -87,6 +87,7 @@ int main(int argc, char** argv) { ++ defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ ++ defined(__hppa__) || defined(__ia64__) || \ ++ defined(__mips__) || \ +++ defined(__nios2__) || \ ++ defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ ++ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ ++ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ ++-- ++2.25.1 ++ diff --cc package/systemd/systemd.hash index 4ab514d673,4567812cf6..4a398ef6bb --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@@ -1,6 -1,6 +1,6 @@@ # sha256 locally computed - sha256 e6b463733da5eb37075352a64112d030b8612935a54e5b3468279a4f15a4cec4 systemd-244.3.tar.gz + sha256 6dc956a857c889d6f3cf7d768d4836db48a39e5bef5dd930fbed697ab2421a61 systemd-245.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 ca008b0178b6390e874f6e4a890fbed482b0fb946159a3b1d370bd8d2327d9bc README +sha256 f7299f5f5e8bdffd347dce1bed888b1cea6ddaf27de521c307265098bcbeae92 README sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE diff --cc support/scripts/pkg-stats index 8a67e509e1,c0e2fbf413..9cfb43928b --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@@ -480,7 -580,23 +580,24 @@@ def check_package_latest_version(packag worker_pool = Pool(processes=64) results = worker_pool.map(check_package_latest_version_worker, (pkg.name for pkg in packages)) for pkg, r in zip(packages, results): - pkg.latest_version = r + pkg.latest_version = dict(zip(['status', 'version', 'id'], r)) + + if not pkg.has_valid_infra: + pkg.status['version'] = ("na", "no valid package infra") + continue + + if pkg.latest_version['status'] == RM_API_STATUS_ERROR: + pkg.status['version'] = ('warning', "Release Monitoring API error") + elif pkg.latest_version['status'] == RM_API_STATUS_NOT_FOUND: + pkg.status['version'] = ('warning', "Package not found on Release Monitoring") + + if pkg.latest_version['version'] is None: + pkg.status['version'] = ('warning', "No upstream version available on Release Monitoring") + elif pkg.latest_version['version'] != pkg.current_version: + pkg.status['version'] = ('error', "The newer version {} is available upstream".format(pkg.latest_version['version'])) + else: + pkg.status['version'] = ('ok', 'up-to-date') ++ worker_pool.terminate() del http_pool