From: Peter Korsgaard Date: Mon, 5 Mar 2018 20:04:14 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92b8bd0879e5f594d1233091437ac9a8b0c240d7;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- 92b8bd0879e5f594d1233091437ac9a8b0c240d7 diff --cc .gitlab-ci.yml index f76e53b565,b4be44843c..30c8ff920b --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@@ -282,8 -284,8 +284,10 @@@ tests.package.test_ipython.TestIPythonP tests.package.test_ipython.TestIPythonPy3: *runtime_test tests.package.test_python.TestPython2: *runtime_test tests.package.test_python.TestPython3: *runtime_test + tests.package.test_python_cryptography.TestPythonPy2Cryptography: *runtime_test + tests.package.test_python_cryptography.TestPythonPy3Cryptography: *runtime_test +tests.package.test_rust.TestRust: *runtime_test +tests.package.test_rust.TestRustBin: *runtime_test tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: *runtime_test tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: *runtime_test tests.toolchain.test_external.TestExternalToolchainCCache: *runtime_test diff --cc package/libgpiod/libgpiod.hash index 6baeee2358,a98e138fa4..b29e12ebd2 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@@ -1,4 -1,2 +1,4 @@@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc - sha256 50c7862428ca90b58672e2475aea66d33a6fc86c6bab1928c0660f3aedf44a37 libgpiod-0.3.2.tar.xz + sha256 34c76b3730b9d4a1159bcb14000f78b1e890251b8a3823b794fa930654eabdd0 libgpiod-1.0.tar.xz +# Hash for license file +sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --cc utils/scanpypi index c96f1bc892,14ee87784a..2b3188dbf6 --- a/utils/scanpypi +++ b/utils/scanpypi @@@ -205,9 -212,9 +212,9 @@@ class BuildrootPackage() if self.md5_sum == download_url['md5_digest']: break else: - if download.__class__ == urllib2.HTTPError: + if download.__class__ == six.moves.urllib.error.HTTPError: raise download - raise DownloadFailed('Failed to downloas package {pkg}' + raise DownloadFailed('Failed to download package {pkg}' .format(pkg=self.real_name)) self.filename = self.used_url['filename'] self.url = self.used_url['url']