summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/debian/0001-systemd.patch14
-rw-r--r--debian/patches/debian/0002-meson-nose2.patch15
-rw-r--r--debian/patches/debian/0003-meson-systemd.patch15
-rw-r--r--debian/patches/series3
4 files changed, 47 insertions, 0 deletions
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 <daniel.baumann@progress-linux.org>
+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 <daniel.baumann@progress-linux.org>
+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/0003-meson-systemd.patch b/debian/patches/debian/0003-meson-systemd.patch
new file mode 100644
index 0000000..2fb75d7
--- /dev/null
+++ b/debian/patches/debian/0003-meson-systemd.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Overwriting systemd unit directory until debhelper supports /usr/lib/systemd/system (Closes: #1034232).
+
+diff -Naurp nvme-cli.orig/meson.build nvme-cli/meson.build
+--- nvme-cli.orig/meson.build
++++ nvme-cli/meson.build
+@@ -25,7 +25,7 @@ sysconfdir = join_paths(prefixdir, get_o
+
+ udevrulesdir = join_paths(prefixdir, get_option('udevrulesdir'))
+ dracutrulesdir = join_paths(prefixdir, get_option('dracutrulesdir'))
+-systemddir = join_paths(prefixdir, get_option('systemddir'))
++systemddir = '/lib/systemd/system'
+
+ ###############################################################################
+ conf = configuration_data()
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..31c70ee
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+debian/0001-systemd.patch
+debian/0002-meson-nose2.patch
+debian/0003-meson-systemd.patch