From 26229ccc34058b26016be2593e7b63792d2d4d44 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 16 Feb 2025 12:27:40 +0100 Subject: [PATCH] Removing fix-ftbfs-t64.patch, included upstream. Signed-off-by: Daniel Baumann --- debian/patches/series | 1 - .../patches/upstream/0002-fix-ftbfs-t64.patch | 26 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 debian/patches/upstream/0002-fix-ftbfs-t64.patch diff --git a/debian/patches/series b/debian/patches/series index 15be0f7..2ecdfd2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ debian/0001-meson-nose2.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 deleted file mode 100644 index 523e843..0000000 --- a/debian/patches/upstream/0002-fix-ftbfs-t64.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Heitor Alves de Siqueira -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;