diff options
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/upstream/0002-fix-ftbfs-t64.patch | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 61bd738..65215e0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ debian/0001-meson-nose2.patch upstream/0001-avoid-unsupported-arm64-instructions.patch +upstream/0002-fix-ftbfs-t64.patch diff --git a/debian/patches/upstream/0002-fix-ftbfs-t64.patch b/debian/patches/upstream/0002-fix-ftbfs-t64.patch new file mode 100644 index 0000000..523e843 --- /dev/null +++ b/debian/patches/upstream/0002-fix-ftbfs-t64.patch @@ -0,0 +1,26 @@ +Author: Heitor Alves de Siqueira <halves@canonical.com> +Description: plugins/virtium: use time_t for time_stamp values + In the vtview_log structs, time_t should be used for any time_stamp + values instead of long. This ensures correct builds on 32-bit + architectures even with 64-bit time_t (e.g. armhf on Ubuntu). + +diff -Naurp nvme-cli.orig/plugins/virtium/virtium-nvme.c nvme-cli/plugins/virtium/virtium-nvme.c +--- nvme-cli.orig/plugins/virtium/virtium-nvme.c ++++ nvme-cli/plugins/virtium/virtium-nvme.c +@@ -32,14 +32,14 @@ static char vt_default_log_file_name[256 + struct vtview_log_header { + char path[256]; + char test_name[256]; +- long time_stamp; ++ time_t time_stamp; + struct nvme_id_ctrl raw_ctrl; + struct nvme_firmware_slot raw_fw; + }; + + struct vtview_smart_log_entry { + char path[256]; +- long time_stamp; ++ time_t time_stamp; + struct nvme_id_ns raw_ns; + struct nvme_id_ctrl raw_ctrl; + struct nvme_smart_log raw_smart; |