From 7315be060ea3c123e44aed79a0d15d523bdfa298 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Apr 2023 14:38:38 +0200 Subject: Reverting removal of systemd.patch in nvme-cli 2.4, this package is identical again to 2.3-2 (before the accidental upload to sid instead of unstable). Signed-off-by: Daniel Baumann --- debian/patches/debian/0001-meson-nose2.patch | 15 --------------- debian/patches/debian/0001-systemd.patch | 14 ++++++++++++++ debian/patches/debian/0002-meson-nose2.patch | 15 +++++++++++++++ debian/patches/series | 3 ++- 4 files changed, 31 insertions(+), 16 deletions(-) delete mode 100644 debian/patches/debian/0001-meson-nose2.patch create mode 100644 debian/patches/debian/0001-systemd.patch create mode 100644 debian/patches/debian/0002-meson-nose2.patch (limited to 'debian') diff --git a/debian/patches/debian/0001-meson-nose2.patch b/debian/patches/debian/0001-meson-nose2.patch deleted file mode 100644 index 4929c6a..0000000 --- a/debian/patches/debian/0001-meson-nose2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Daniel Baumann -Description: Updating meson to find /usr/bin/nose2-3 (python3). - -diff -Naurp nvme-cli.orig/tests/meson.build nvme-cli/tests/meson.build ---- nvme-cli.orig/tests/meson.build -+++ nvme-cli/tests/meson.build -@@ -30,7 +30,7 @@ tests = [ - 'nvme_get_lba_status_test.py', - ] - --runtests = find_program('nose2', required : false) -+runtests = find_program('nose2-3', required : false) - - if meson.version().version_compare('>= 0.56') - nvmecli_path = meson.project_build_root() diff --git a/debian/patches/debian/0001-systemd.patch b/debian/patches/debian/0001-systemd.patch new file mode 100644 index 0000000..bf0b372 --- /dev/null +++ b/debian/patches/debian/0001-systemd.patch @@ -0,0 +1,14 @@ +Author: Daniel Baumann +Description: Removing obsolete settings for newer systemd versions. + +diff -Naurp nvme-cli.orig/nvmf-autoconnect/systemd/nvmf-connect@.service.in nvme-cli/nvmf-autoconnect/systemd/nvmf-connect@.service.in +--- nvme-cli.orig/nvmf-autoconnect/systemd/nvmf-connect@.service.in ++++ nvme-cli/nvmf-autoconnect/systemd/nvmf-connect@.service.in +@@ -4,7 +4,6 @@ + + [Unit] + Description=NVMf auto-connect scan upon nvme discovery controller Events +-After=syslog.target + PartOf=nvmf-connect.target + Requires=nvmf-connect.target + diff --git a/debian/patches/debian/0002-meson-nose2.patch b/debian/patches/debian/0002-meson-nose2.patch new file mode 100644 index 0000000..4929c6a --- /dev/null +++ b/debian/patches/debian/0002-meson-nose2.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann +Description: Updating meson to find /usr/bin/nose2-3 (python3). + +diff -Naurp nvme-cli.orig/tests/meson.build nvme-cli/tests/meson.build +--- nvme-cli.orig/tests/meson.build ++++ nvme-cli/tests/meson.build +@@ -30,7 +30,7 @@ tests = [ + 'nvme_get_lba_status_test.py', + ] + +-runtests = find_program('nose2', required : false) ++runtests = find_program('nose2-3', required : false) + + if meson.version().version_compare('>= 0.56') + nvmecli_path = meson.project_build_root() diff --git a/debian/patches/series b/debian/patches/series index 2ecdfd2..4878cbb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -debian/0001-meson-nose2.patch +debian/0001-systemd.patch +debian/0002-meson-nose2.patch -- cgit v1.2.3