From 8654e036b968bf254bc2fa8119a8c05028b60864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=B6nke?= Date: Mon, 13 Apr 2020 15:10:19 +0000 Subject: [PATCH 1/3] explicitly type fcntl.ioctl function addresses an update of Python Typeshed --- libioc/helpers_ioctl.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libioc/helpers_ioctl.py b/libioc/helpers_ioctl.py index 528042f1..b739a079 100644 --- a/libioc/helpers_ioctl.py +++ b/libioc/helpers_ioctl.py @@ -41,7 +41,12 @@ def get_sockio_ioctl(nic_name: str, ioctl: SOCKIO_IOCTLS) -> bytes: """Query a sockio ioctl for a given NIC.""" with socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0) as sock: ifconf = struct.pack('256s', nic_name.encode("UTF-8")[:15]) - return bytes(fcntl.ioctl(sock.fileno(), ioctl.value, ifconf)) + return bytes(fcntl.ioctl( + sock.fileno(), + int(ioctl.value), + bytes(ifconf), + True + )) def get_interface_ip4_address(nic_name: str) -> ipaddress.IPv4Address: From 2768c65055874e98f418233ef88c5c3e22791540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=B6nke?= Date: Mon, 13 Apr 2020 17:59:55 +0200 Subject: [PATCH 2/3] bootstrap pkg on cirrus-ci addresses an error installing git: mount -t fdescfs null /dev/fd pkg install -y git Updating FreeBSD repository catalogue... Fetching meta.txz: . done pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2 repository FreeBSD has no meta file, using default settings Fetching packagesite.txz: .......... done pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2 pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0 Unable to open created repository FreeBSD Unable to update repository FreeBSD Error updating repositories! Exit status: 3 --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 174e2498..789a7fea 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,6 +16,8 @@ task: zfs set compression=lz4 "ioc-test-`uname -r`" install_script: - mount -t fdescfs null /dev/fd + - pkg bootstrap + - pkg update -f - pkg install -y git - make install-dev test_script: From ccb6dd5bca8b821c7d7e872b9777f2c5dfbe50d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=B6nke?= Date: Mon, 13 Apr 2020 18:12:22 +0200 Subject: [PATCH 3/3] run FreeBSD 12.1 on Cirrus CI --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 789a7fea..1ab4fbfd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,7 +2,7 @@ task: freebsd_instance: matrix: #image: freebsd-11-2-release-amd64 - image: freebsd-12-0-release-amd64 + image: freebsd-12-1-release-amd64 pip_cache: folder: ~/.cache/pip fingerprint_script: cat requirements*