diff --git a/check_substitutes.py b/check_substitutes.py index 177bf688..906ac0c7 100755 --- a/check_substitutes.py +++ b/check_substitutes.py @@ -57,7 +57,7 @@ class Distfile(): def decompress(self): """Decompresses the distfile.""" - compression = self.out_file.split('.')[-1] + compression = self.out_file.rsplit('.', maxsplit=1)[-1] decompress_func = { "gz": gzip.open, "tgz": gzip.open, diff --git a/lib/target.py b/lib/target.py index 3aa0d3d6..981e9b6c 100644 --- a/lib/target.py +++ b/lib/target.py @@ -38,7 +38,7 @@ class Target: mount("tmpfs", self.path, "tmpfs", f"size={size}") self._type = TargetType.TMPFS - # pylint: disable=too-many-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def add_disk(self, name, size="16G", diff --git a/lib/utils.py b/lib/utils.py index 1e4f2af6..efa9550d 100755 --- a/lib/utils.py +++ b/lib/utils.py @@ -31,7 +31,7 @@ def run_as_root(*args, **kwargs): return run("sudo", *args, **kwargs) return run(*args, **kwargs) -# pylint: disable=too-many-arguments +# pylint: disable=too-many-arguments,too-many-positional-arguments def create_disk(image, disk_type, fs_type, size, bootable=False, mkfs_args=None): """Create a disk image, with a filesystem on it""" if mkfs_args is None: diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index 89fcf533..5cc1422c 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -22,7 +22,7 @@ ef08694bf8e78ffcf56f9c8a63b0f189e301c06f02ab240e15e4c7fe354c2a0d automake-1.7_0 c5807850a377e4bb9aa4121d9781d145bdd80327626a9419630a75ce2c8d9c71 automake-1.9.6_0.tar.bz2 f8a55bf656f950ee3c5cea48af03f552166f6db9926b78c78843f3cc52a6e22d bash-5.2.15_0.tar.bz2 ebc631ee8e9382650005984ec5f3910492ccb6fb2656b4c0af0f4afc16998906 bc-1.07.1_0.tar.bz2 -90009c7a2232fce68ad628d6afe1f474d57874462b3ea2c50ab1a3e6c60a5a36 binutils-2.30_0.tar.bz2 +80328d87ef69df910a3f146009b668744a0363d80fb1f289a02941705d2161d6 binutils-2.30_0.tar.bz2 da658346866061324b92a6b734561257acfdb981783ad5794d67a0cd56e14e58 binutils-2.41_0.tar.bz2 026447a32ab08a8a5150bab82a2f150af4a2ed90c47cfde631e1460eaed019aa binutils-2.41_1.tar.bz2 f0bb18831983493b82fde53917e8d16c6a380761ac5e71e14769a82193fee788 bison-2.3_0.tar.bz2 @@ -85,8 +85,8 @@ e69554b0a77b419ddd5d0a0e418ba4005ecd0f6784c92a6928a0270bd929a098 make-3.82_0.ta 6d24960d6a987f68a7e0e3abf6edb52d2e0fe4c86f6ba45327e9634dbf7d40b4 make-4.2.1_0.tar.bz2 17cd976bc0f6e897c6fffe43dd7c55d93ce0adadf1b4dc72925b80e2d266519f mpc-1.2.1_0.tar.bz2 98a9f55c01ed375fae21913284e7fa07ff434c0810f34d791f3fbaa1df221302 mpfr-4.1.0_0.tar.bz2 -40fc3497fa8cdd96ac338a10e78504c6dc942e7f4fa459550fb953d52bd53aa7 musl-1.1.24_0.tar.bz2 -20285055d84ac6106965a9d343ba8ebd19209f62782efb8ed863318c0b7d5e7d musl-1.1.24_1.tar.bz2 +258f247f20dd1544c65f7f978f7399a16e4b655375be7b1d94ad89e24ebaac94 musl-1.1.24_0.tar.bz2 +6966b565124ac639eed3dc38b7a8a8948066d6a1e59e097ff10f5e531ff15e53 musl-1.1.24_1.tar.bz2 d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079 musl-1.1.24_2.tar.bz2 81f79a0faf58e105c5f12d9f538d3ea7578a3b361e633ab8f47324ec23ec9de6 musl-1.2.4_0.tar.bz2 6dc5e763b747b66f72692c6820d7f46b7f4cf2e2fe05229a1d01c03919c1c936 musl-1.2.4_1.tar.bz2 diff --git a/steps/musl-1.1.24/patches/sigsetjmp.patch b/steps/musl-1.1.24/patches/sigsetjmp.patch index a2cc4f87..dbd009e4 100644 --- a/steps/musl-1.1.24/patches/sigsetjmp.patch +++ b/steps/musl-1.1.24/patches/sigsetjmp.patch @@ -11,7 +11,7 @@ tcc does not like jecxz instruction. __sigsetjmp: mov 8(%esp),%ecx - jecxz 1f -+ cmp %ecx,0 ++ cmp $0,%ecx + je 1f mov 4(%esp),%eax